Skip to content

Commit

Permalink
Remove prop_damage from islot_ammo (#39600)
Browse files Browse the repository at this point in the history
  • Loading branch information
anothersimulacrum authored Apr 16, 2020
1 parent 8ef3706 commit 34a3b36
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion src/item_factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,6 @@ void Item_factory::load( islot_ammo &slot, const JsonObject &jo, const std::stri
assign( jo, "count", slot.def_charges, strict, 1 );
assign( jo, "loudness", slot.loudness, strict, 0 );
assign( jo, "effects", slot.ammo_effects, strict );
assign( jo, "prop_damage", slot.prop_damage, strict );
assign( jo, "critical_multiplier", slot.critical_multiplier, strict );
assign( jo, "show_stats", slot.force_stat_display, strict );
}
Expand Down
8 changes: 1 addition & 7 deletions src/itype.h
Original file line number Diff line number Diff line change
Expand Up @@ -710,19 +710,13 @@ struct islot_ammo : common_ranged_data {
* */
bool special_cookoff = false;

/**
* If set, ammo does not give a flat damage, instead it multiplies the base
* damage of the gun by this value.
*/
cata::optional<float> prop_damage;

/**
* The damage multiplier to apply after a critical hit.
*/
float critical_multiplier = 2.0;

/**
* Some combat ammo might not have a damage or prop_damage value
* Some combat ammo might not have a damage value
* Set this to make it show as combat ammo anyway
*/
cata::optional<bool> force_stat_display;
Expand Down

0 comments on commit 34a3b36

Please sign in to comment.