diff --git a/data/json/flags.json b/data/json/flags.json index fefd98e41c988..065bad919e303 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -910,11 +910,6 @@ "id": "REVIVE_SPECIAL", "type": "json_flag" }, - { - "id": "SLOWS_MOVEMENT", - "type": "json_flag", - "info": "This clothing is restrictive and slows your movement speed." - }, { "id": "STURDY", "type": "json_flag", diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 807271fa91891..33e7de669fe75 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -3090,8 +3090,13 @@ "color": "dark_gray", "warmth": 15, "material_thickness": 1, - "flags": [ "VARSIZE", "SKINTIGHT", "HOOD", "WATERPROOF", "SLOWS_MOVEMENT", "MUNDANE" ], - "relic_data": { "passive_effects": [ { "has": "WORN", "values": [ { "value": "THIRST", "multiply": -0.3 } ] } ] }, + "flags": [ "VARSIZE", "SKINTIGHT", "HOOD", "WATERPROOF", "MUNDANE" ], + "relic_data": { + "passive_effects": [ + { "has": "WORN", "values": [ { "value": "THIRST", "multiply": -0.3 } ] }, + { "condition": "ALWAYS", "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ] } + ] + }, "armor": [ { "encumbrance": 18, "coverage": 95, "covers": [ "foot_l", "foot_r", "leg_l", "leg_r", "torso", "arm_l", "arm_r" ] } ] }, { diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index e0f7370247979..ba27eb84d16a1 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3868,9 +3868,13 @@ "ammo": "battery", "charges_per_use": 1, "use_action": { "type": "transform", "msg": "The %s engages.", "target": "utility_exoskeleton_on", "active": true }, - "flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "SLOWS_MOVEMENT", "ELECTRONIC" ], + "flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "ELECTRONIC" ], "relic_data": { - "passive_effects": [ { "id": "ench_exo_strength" }, { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 215000 } ] } ] + "passive_effects": [ + { "id": "ench_exo_strength" }, + { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 215000 } ] }, + { "condition": "ALWAYS", "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ] } + ] }, "armor": [ { @@ -3917,9 +3921,13 @@ "ammo": "gasoline", "charges_per_use": 1, "use_action": { "type": "transform", "msg": "The %s engages.", "target": "ice_utility_exoskeleton_on", "active": true }, - "flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "SLOWS_MOVEMENT", "ELECTRONIC" ], + "flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "ELECTRONIC" ], "relic_data": { - "passive_effects": [ { "id": "ench_exo_strength" }, { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 190000 } ] } ] + "passive_effects": [ + { "id": "ench_exo_strength" }, + { "condition": "ACTIVE", "values": [ { "value": "CARRY_WEIGHT", "add": 190000 } ] }, + { "condition": "ALWAYS", "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ] } + ] }, "armor": [ { diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index d3c153536da1a..e2bed6a081863 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -4088,7 +4088,7 @@ "name": { "str": "Padded Feet" }, "points": 1, "visibility": 1, - "description": "The bottoms of your feet are strongly padded. You receive no movement penalty for not wearing shoes, and even receive a 10% bonus when moving barefoot. Also, your steps are significantly quieter, as added tissue dampens the noise.", + "description": "The bottoms of your feet are strongly padded. You receive no movement penalty for not wearing shoes, and your steps are significantly quieter, as added tissue dampens the noise.", "types": [ "SOLES" ], "category": [ "BATRACHIAN", "RABBIT", "URSINE", "FELINE", "LUPINE", "SPIDER", "BEAST" ], "flags": [ "TOUGH_FEET" ], diff --git a/doc/ARMOR_BALANCE_AND_DESIGN.md b/doc/ARMOR_BALANCE_AND_DESIGN.md index 4f1bf99dc253b..4cfd29a3616c1 100644 --- a/doc/ARMOR_BALANCE_AND_DESIGN.md +++ b/doc/ARMOR_BALANCE_AND_DESIGN.md @@ -574,7 +574,6 @@ FANCY | Clothing is impractically fancy, (like a top hat) SUPER_FANCY | Even more fancy than fancy FILTHY | Disgusting dirty clothes FRAGILE | Breaks fast -SLOWS_MOVEMENT | Slows you down to wear #### Immunities/Defenses **only some of these that are used** diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index a125e6647e735..4a02ea08bacf9 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -230,7 +230,6 @@ Some armor flags, such as `WATCH` and `ALARMCLOCK` are compatible with other ite - ```ROLLER_QUAD```The medium choice between `ROLLER_INLINE` and `ROLLER_ONE`, while it is more stable, and moves faster, it also has a harsher non-flat terrain penalty than `ROLLER_ONE`. - ```SEMITANGIBLE``` Prevents the item from participating in the encumbrance system when worn. - ```SKINTIGHT``` Undergarment layer. -- ```SLOWS_MOVEMENT``` This piece of clothing multiplies move cost by 1.1. - ```STAR_PLATE``` Item can be worn with ryūsei battle kit armor; specifically can be put in pocket for armor with this flag restriction. - ```STAR_SHOULDER``` Item can be worn with ryūsei battle kit armor ; specifically can be put in pocket for armor with this flag restriction. - ```STAR_SKIRT``` Item can be worn with ryūsei battle kit armor; specifically can be put in pocket for armor with this flag restriction. diff --git a/src/character.cpp b/src/character.cpp index 6c06c2c4abbad..acbbb63a858cc 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -457,7 +457,6 @@ static const trait_id trait_NOMAD( "NOMAD" ); static const trait_id trait_NOMAD2( "NOMAD2" ); static const trait_id trait_NOMAD3( "NOMAD3" ); static const trait_id trait_PACIFIST( "PACIFIST" ); -static const trait_id trait_PADDED_FEET( "PADDED_FEET" ); static const trait_id trait_PARAIMMUNE( "PARAIMMUNE" ); static const trait_id trait_PAWS( "PAWS" ); static const trait_id trait_PAWS_LARGE( "PAWS_LARGE" ); @@ -10320,14 +10319,6 @@ std::vector Character::run_cost_effects( float &movecost ) cons run_cost_effect_mul( flatground_mult, _( "Flat Ground Mut." ) ); } - if( has_trait( trait_PADDED_FEET ) && is_barefoot() ) { - run_cost_effect_mul( 0.9f, _( "Bare Padded Feet" ) ); - } - - if( worn_with_flag( flag_SLOWS_MOVEMENT ) ) { - run_cost_effect_mul( 1.1f, _( "Tight Clothing" ) ); - } - if( worn_with_flag( flag_FIN ) ) { run_cost_effect_mul( 1.5f, _( "Swim Fins" ) ); } diff --git a/src/flag.cpp b/src/flag.cpp index 4ead11c439f35..613fe80f34616 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -306,7 +306,6 @@ const flag_id flag_SKINTIGHT( "SKINTIGHT" ); const flag_id flag_SLEEP_AID( "SLEEP_AID" ); const flag_id flag_SLEEP_AID_CONTAINER( "SLEEP_AID_CONTAINER" ); const flag_id flag_SLEEP_IGNORE( "SLEEP_IGNORE" ); -const flag_id flag_SLOWS_MOVEMENT( "SLOWS_MOVEMENT" ); const flag_id flag_SLOW_WIELD( "SLOW_WIELD" ); const flag_id flag_SMOKABLE( "SMOKABLE" ); const flag_id flag_SMOKED( "SMOKED" ); diff --git a/src/flag.h b/src/flag.h index 2c0c7a4827488..b3cb0bbe6c1d4 100644 --- a/src/flag.h +++ b/src/flag.h @@ -309,7 +309,6 @@ extern const flag_id flag_SKINTIGHT; extern const flag_id flag_SLEEP_AID; extern const flag_id flag_SLEEP_AID_CONTAINER; extern const flag_id flag_SLEEP_IGNORE; -extern const flag_id flag_SLOWS_MOVEMENT; extern const flag_id flag_SLOW_WIELD; extern const flag_id flag_SMOKABLE; extern const flag_id flag_SMOKED; diff --git a/tests/move_cost_test.cpp b/tests/move_cost_test.cpp index 194442974ef08..b851f39ac01f6 100644 --- a/tests/move_cost_test.cpp +++ b/tests/move_cost_test.cpp @@ -39,7 +39,6 @@ static const ter_str_id ter_t_pavement( "t_pavement" ); static const trait_id trait_HOOVES( "HOOVES" ); static const trait_id trait_LEG_TENTACLES( "LEG_TENTACLES" ); -static const trait_id trait_PADDED_FEET( "PADDED_FEET" ); static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" ); TEST_CASE( "being_knocked_down_triples_movement_cost", "[move_cost][downed]" ) @@ -200,19 +199,6 @@ TEST_CASE( "mutations_may_affect_movement_cost", "[move_cost][mutation]" ) CHECK( ava.run_cost( 100 ) == Approx( base_cost ) ); } } - - GIVEN( "PADDED_FEET" ) { - ava.toggle_trait( trait_PADDED_FEET ); - THEN( "wearing sneakers gives baseline 100 movement speed" ) { - ava.clear_worn(); - ava.wear_item( item( "sneakers" ) ); - CHECK( ava.run_cost( 100 ) == Approx( base_cost ) ); - } - THEN( "being barefoot is faster than wearing sneakers" ) { - ava.clear_worn(); - CHECK( ava.run_cost( 100 ) == Approx( 0.9 * base_cost ) ); - } - } } TEST_CASE( "Crawl_score_effects_on_movement_cost", "[move_cost]" )