Skip to content

Commit

Permalink
Nerf lycra (CleverRaven#66737)
Browse files Browse the repository at this point in the history
* nerf protection of lycra

* zentai has less prot now

* nerf zentai

* Update coverage_test.cpp
  • Loading branch information
anoobindisguise authored Jul 8, 2023
1 parent 118edf4 commit 7dba942
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@
{ "fuel": 0.05, "smoke": 2, "burn": 0.03 },
{ "fuel": 0.15, "smoke": 5, "burn": 0.5 }
],
"resist": { "bash": 2, "cut": 2, "acid": 9, "heat": 2, "bullet": 2 },
"resist": { "bash": 1, "cut": 1, "acid": 9, "heat": 2, "bullet": 1 },
"repair_difficulty": 3
},
{
Expand Down
2 changes: 1 addition & 1 deletion tests/coverage_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ TEST_CASE( "Infections_from_filthy_clothing", "[coverage]" )
{
SECTION( "Full melee and ranged coverage vs. melee attack" ) {
const float chance = get_avg_melee_dmg( "test_zentai", true );
check_near( "Infection chance", chance, 0.42f, 0.05f );
check_near( "Infection chance", chance, 0.48f, 0.05f );
}

SECTION( "No melee coverage vs. melee attack" ) {
Expand Down
2 changes: 1 addition & 1 deletion tests/iteminfo_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@ static void expected_armor_values( const item &armor, float bash, float cut, flo

TEST_CASE( "armor_stats", "[armor][protection]" )
{
expected_armor_values( item( itype_zentai ), 0.2f, 0.2f, 0.16f, 0.2f );
expected_armor_values( item( itype_zentai ), 0.1f, 0.1f, 0.08f, 0.1f );
expected_armor_values( item( itype_tshirt ), 0.1f, 0.1f, 0.08f, 0.1f );
expected_armor_values( item( itype_dress_shirt ), 0.1f, 0.1f, 0.08f, 0.1f );
}
Expand Down
4 changes: 2 additions & 2 deletions tests/melee_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ TEST_CASE( "Damage_type_effectiveness_vs_monster_resistance", "[melee][damage]"

SECTION( "Attacking an NPC with no resistance to test_fire" ) {
check_damage_from_test_fire( std::vector<std::string> { "test_zentai" },
body_part_torso, 0, false, 13.75f );
body_part_torso, 0, false, 14.84f );
}

SECTION( "Attacking an NPC that is resistant to test_fire" ) {
Expand All @@ -421,6 +421,6 @@ TEST_CASE( "Damage_type_effectiveness_vs_monster_resistance", "[melee][damage]"

SECTION( "Attacking an NPC that is immune to test_fire" ) {
check_damage_from_test_fire( std::vector<std::string> { "test_zentai_immune_test_fire" },
body_part_torso, 0, true, 5.7f );
body_part_torso, 0, true, 6.87f );
}
}

0 comments on commit 7dba942

Please sign in to comment.