From 8d1adfff1046c7b6ba77ba7d17423de72848fd5f Mon Sep 17 00:00:00 2001 From: Valiant Date: Tue, 26 Nov 2024 12:39:53 +0400 Subject: [PATCH 01/12] Lowered volume of zombie hulk --- data/json/monsters/zed_misc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index a47d3b5f0f2ad..7562b2d41363e 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -389,7 +389,7 @@ "description": "A human corpse swollen to the size of six men, with arms as wide as trash cans.", "copy-from": "mon_zombie_base", "diff": 5, - "volume": "875 L", + "volume": "375 L", "weight": "200 kg", "hp": 480, "speed": 130, From 968b7ce004b79c851325fb57ec977153c9857687 Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 27 Nov 2024 09:20:27 +0400 Subject: [PATCH 02/12] Updated tests --- tests/martial_art_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/martial_art_test.cpp b/tests/martial_art_test.cpp index 68e05bb4c5532..21d16e957bdf3 100644 --- a/tests/martial_art_test.cpp +++ b/tests/martial_art_test.cpp @@ -175,7 +175,7 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) CHECK( !dude.evaluate_technique( tec, target_1, dude.used_weapon(), false, false, false ).has_value() ); // test sweeping a big zomb (fail) - REQUIRE( target_2.get_size() == 5 ); + REQUIRE( target_2.get_size() == 4 ); CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, false ).has_value() ); // test sweeping a slime (fail) @@ -230,7 +230,7 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) CHECK( !dude.evaluate_technique( tec, target_1, dude.used_weapon(), false, false, false ).has_value() ); // test throwing a large target (fail) - REQUIRE( target_2.get_size() == 5 ); + REQUIRE( target_2.get_size() == 4 ); CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, false ).has_value() ); // test throwing a monster grabbing you (succeed) From 410549fd6a23043e6de7f7fba1c0ea510f032dd1 Mon Sep 17 00:00:00 2001 From: Anton Burmistrov Date: Thu, 28 Nov 2024 10:38:08 +0400 Subject: [PATCH 03/12] Increased weight to 490 kg --- data/json/monsters/zed_misc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 7562b2d41363e..98d88e24ab993 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -390,7 +390,7 @@ "copy-from": "mon_zombie_base", "diff": 5, "volume": "375 L", - "weight": "200 kg", + "weight": "490 kg", "hp": 480, "speed": 130, "color": "white_magenta", From 0414a8e4a014d809140a1cad710ebaefac589e96 Mon Sep 17 00:00:00 2001 From: Valiant Date: Sat, 30 Nov 2024 09:07:02 +0400 Subject: [PATCH 04/12] Update tests --- tests/martial_art_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/martial_art_test.cpp b/tests/martial_art_test.cpp index 21d16e957bdf3..cf0aee05293f4 100644 --- a/tests/martial_art_test.cpp +++ b/tests/martial_art_test.cpp @@ -174,9 +174,9 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) target_1.add_effect( effect_downed, 1_days ); CHECK( !dude.evaluate_technique( tec, target_1, dude.used_weapon(), false, false, false ).has_value() ); - // test sweeping a big zomb (fail) + // test sweeping a big zomb (success) REQUIRE( target_2.get_size() == 4 ); - CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, + CHECK( dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, false ).has_value() ); // test sweeping a slime (fail) REQUIRE( target_3.get_size() == 3 ); @@ -229,9 +229,9 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) target_1.add_effect( effect_downed, 1_days ); CHECK( !dude.evaluate_technique( tec, target_1, dude.used_weapon(), false, false, false ).has_value() ); - // test throwing a large target (fail) + // test throwing a large target (success) REQUIRE( target_2.get_size() == 4 ); - CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, + CHECK( dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, false ).has_value() ); // test throwing a monster grabbing you (succeed) dude.add_effect( effect_grabbed, 1_days ); From b6f58c0267d04d815dd680203b82578bb0a60219 Mon Sep 17 00:00:00 2001 From: Valiant Date: Sat, 30 Nov 2024 09:15:43 +0400 Subject: [PATCH 05/12] Update martial_art_test.cpp --- tests/martial_art_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/martial_art_test.cpp b/tests/martial_art_test.cpp index cf0aee05293f4..bacaaa0526b99 100644 --- a/tests/martial_art_test.cpp +++ b/tests/martial_art_test.cpp @@ -177,7 +177,7 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) // test sweeping a big zomb (success) REQUIRE( target_2.get_size() == 4 ); CHECK( dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, - false ).has_value() ); + false ).has_value() ); // test sweeping a slime (fail) REQUIRE( target_3.get_size() == 3 ); REQUIRE( target_3.type->bodytype == "blob" ); @@ -232,7 +232,7 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) // test throwing a large target (success) REQUIRE( target_2.get_size() == 4 ); CHECK( dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, - false ).has_value() ); + false ).has_value() ); // test throwing a monster grabbing you (succeed) dude.add_effect( effect_grabbed, 1_days ); target_3.add_effect( effect_grabbing, 1_days ); From d18363e436b9ad4b90d8cd3b154fe003973b0500 Mon Sep 17 00:00:00 2001 From: Valiant Date: Sat, 30 Nov 2024 16:25:49 +0400 Subject: [PATCH 06/12] Returned original volume, increased weight --- data/json/monsters/zed_misc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 98d88e24ab993..bd0b737f278c1 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -389,8 +389,8 @@ "description": "A human corpse swollen to the size of six men, with arms as wide as trash cans.", "copy-from": "mon_zombie_base", "diff": 5, - "volume": "375 L", - "weight": "490 kg", + "volume": "975 L", + "weight": "1000 kg", "hp": 480, "speed": 130, "color": "white_magenta", From 4a66ce702ad073eaa264d12e7dfd45cfabe9d8e5 Mon Sep 17 00:00:00 2001 From: Valiant Date: Sat, 30 Nov 2024 16:26:48 +0400 Subject: [PATCH 07/12] Reverted changes to tests --- tests/martial_art_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/martial_art_test.cpp b/tests/martial_art_test.cpp index bacaaa0526b99..5331a622dfa41 100644 --- a/tests/martial_art_test.cpp +++ b/tests/martial_art_test.cpp @@ -174,9 +174,9 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) target_1.add_effect( effect_downed, 1_days ); CHECK( !dude.evaluate_technique( tec, target_1, dude.used_weapon(), false, false, false ).has_value() ); - // test sweeping a big zomb (success) - REQUIRE( target_2.get_size() == 4 ); - CHECK( dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, + // test sweeping a big zomb (fail) + REQUIRE( target_2.get_size() == 5 ); + CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, false ).has_value() ); // test sweeping a slime (fail) REQUIRE( target_3.get_size() == 3 ); @@ -229,9 +229,9 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) target_1.add_effect( effect_downed, 1_days ); CHECK( !dude.evaluate_technique( tec, target_1, dude.used_weapon(), false, false, false ).has_value() ); - // test throwing a large target (success) - REQUIRE( target_2.get_size() == 4 ); - CHECK( dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, + // test throwing a large target (fail) + REQUIRE( target_2.get_size() == 5 ); + CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, false ).has_value() ); // test throwing a monster grabbing you (succeed) dude.add_effect( effect_grabbed, 1_days ); From 38b8e76c35cee9a638269a3b67540775556523ce Mon Sep 17 00:00:00 2001 From: Anton Burmistrov Date: Sat, 30 Nov 2024 16:33:51 +0400 Subject: [PATCH 08/12] Update tests/martial_art_test.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- tests/martial_art_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/martial_art_test.cpp b/tests/martial_art_test.cpp index 5331a622dfa41..23cf376b7613f 100644 --- a/tests/martial_art_test.cpp +++ b/tests/martial_art_test.cpp @@ -177,7 +177,7 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) // test sweeping a big zomb (fail) REQUIRE( target_2.get_size() == 5 ); CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, - false ).has_value() ); + false ).has_value() ); // test sweeping a slime (fail) REQUIRE( target_3.get_size() == 3 ); REQUIRE( target_3.type->bodytype == "blob" ); From 3907538a607950a7f6185f951b8537078cd958b1 Mon Sep 17 00:00:00 2001 From: Anton Burmistrov Date: Sat, 30 Nov 2024 16:34:01 +0400 Subject: [PATCH 09/12] Update tests/martial_art_test.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- tests/martial_art_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/martial_art_test.cpp b/tests/martial_art_test.cpp index 23cf376b7613f..68e05bb4c5532 100644 --- a/tests/martial_art_test.cpp +++ b/tests/martial_art_test.cpp @@ -232,7 +232,7 @@ TEST_CASE( "Martial_art_technique_conditionals", "[martial_arts]" ) // test throwing a large target (fail) REQUIRE( target_2.get_size() == 5 ); CHECK( !dude.evaluate_technique( tec, target_2, dude.used_weapon(), false, false, - false ).has_value() ); + false ).has_value() ); // test throwing a monster grabbing you (succeed) dude.add_effect( effect_grabbed, 1_days ); target_3.add_effect( effect_grabbing, 1_days ); From 3b98f2ad6963f650f3731b582c064a2428d3f6cd Mon Sep 17 00:00:00 2001 From: Valiant Date: Sat, 30 Nov 2024 18:33:19 +0400 Subject: [PATCH 10/12] Update zed_misc.json --- data/json/monsters/zed_misc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index bd0b737f278c1..2d5faf1a1fa94 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -389,7 +389,7 @@ "description": "A human corpse swollen to the size of six men, with arms as wide as trash cans.", "copy-from": "mon_zombie_base", "diff": 5, - "volume": "975 L", + "volume": "875 L", "weight": "1000 kg", "hp": 480, "speed": 130, From 123231b8b40eccd578fc18b9891402b6545fc180 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:43:21 -0600 Subject: [PATCH 11/12] Update data/json/monsters/zed_misc.json --- data/json/monsters/zed_misc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 2d5faf1a1fa94..3bc7bdaa18d73 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -390,7 +390,7 @@ "copy-from": "mon_zombie_base", "diff": 5, "volume": "875 L", - "weight": "1000 kg", + "weight": "1000 kg" "hp": 480, "speed": 130, "color": "white_magenta", From c86aba44edd8446ce82bb6e21fff71dd27dce802 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:43:37 -0600 Subject: [PATCH 12/12] Update data/json/monsters/zed_misc.json --- data/json/monsters/zed_misc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 3bc7bdaa18d73..2d5faf1a1fa94 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -390,7 +390,7 @@ "copy-from": "mon_zombie_base", "diff": 5, "volume": "875 L", - "weight": "1000 kg" + "weight": "1000 kg", "hp": 480, "speed": 130, "color": "white_magenta",