diff options
Diffstat (limited to 'revert-18-Simplify-broken-limb-mending-3054.patch')
| -rw-r--r-- | revert-18-Simplify-broken-limb-mending-3054.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/revert-18-Simplify-broken-limb-mending-3054.patch b/revert-18-Simplify-broken-limb-mending-3054.patch index 12fba7b..70c1259 100644 --- a/revert-18-Simplify-broken-limb-mending-3054.patch +++ b/revert-18-Simplify-broken-limb-mending-3054.patch @@ -123,7 +123,7 @@ index 1fe217b8559..333a471d30e 100644 "category": [ "PLANT", "LIZARD" ], "healing_awake": 0.66, "healing_resting": 0.5, -- "mending_modifier": 4.0 +- "mending_modifier": 4 + "mending_modifier": 0.5 }, { @@ -136,10 +136,10 @@ index 1fe217b8559..333a471d30e 100644 "types": [ "HEALING" ], "prereqs": [ "FASTHEALER2" ], "category": [ "SLIME", "TROGLOBITE" ], - "healing_awake": 2.0, + "healing_awake": 2, "healing_resting": 1.5, -- "mending_modifier": 16.0 -+ "mending_modifier": 1.0 +- "mending_modifier": 16 ++ "mending_modifier": 1 }, { "type": "mutation", @@ -157,8 +157,8 @@ index 1fe217b8559..333a471d30e 100644 + "prereqs": [ "FASTHEALER" ], "threshreq": [ "THRESH_LIZARD" ], "category": [ "LIZARD" ], -- "mending_modifier": 20.0 -+ "mending_modifier": 1.0 +- "mending_modifier": 20 ++ "mending_modifier": 1 }, { "type": "mutation", @@ -369,9 +369,8 @@ index 6cb10461791..761e0785f44 100644 } else if( precise ) { hp_str = string_format( "%d", current_hp ); } else { -@@ -8431,11 +8437,6 @@ void Character::apply_damage( Creature *source, bodypart_id hurt, int dam, - put_into_vehicle_or_drop( *this, item_drop_reason::tumbling, { weapon } ); - i_rem( &weapon ); +@@ -8431,10 +8437,5 @@ void Character::apply_damage( Creature *source, bodypart_id hurt, int dam, + put_into_vehicle_or_drop( *this, item_drop_reason::tumbling, remove_primary_weapon() ); } - if( has_effect( effect_mending, part_to_damage->token ) ) { - effect &e = get_effect( effect_mending, part_to_damage->token ); @@ -557,9 +556,9 @@ index 36b63dd2bb4..9c31869540d 100644 - if( is_limb_broken( convert_bp( bp ) ) && !has_effect( effect_mending, bp ) && + if( is_limb_broken( convert_bp( bp ).id() ) && + !worn_with_flag( flag_SPLINT, convert_bp( bp ).id() ) && - it.covers( convert_bp( bp ).id() ) ) { + it->covers( convert_bp( bp ).id() ) ) { reason = _( "Thanks, I'll wear that now." ); - return !!wear_item( it, false ); + return wear_item( std::move( it ), false ); diff --git a/src/panels.cpp b/src/panels.cpp index 41983b82ae5..9c8ae1701bc 100644 --- a/src/panels.cpp |