From 61f58dcb492523fa7cbd0264d1f0345bcd93fd74 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 15 Dec 2024 22:27:38 +0100 Subject: [PATCH] Moose audit (#74554) * default moose * tusked + calves + anger triggers for normal * wowee more description edits * nerf calf health a lil * give the moose a ribcage for health benefits * more more more * Update quadruped_weakpoints_animal.json * I love arbitrary numbers !!! * Update mammal.json * Update data/json/monster_weakpoints/quadruped_weakpoints_animal.json * Update quadruped_weakpoints_animal.json * rename lungs to vitals * HP recalculations * Update mammal.json * disable it thank you Guardian * Update monsters.json --------- Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../quadruped_weakpoints_animal.json | 44 ++++++++++++++++++- data/json/monsters/mammal.json | 35 ++++++++------- data/mods/TEST_DATA/monsters.json | 1 + tests/archery_damage_test.cpp | 5 ++- 4 files changed, 65 insertions(+), 20 deletions(-) diff --git a/data/json/monster_weakpoints/quadruped_weakpoints_animal.json b/data/json/monster_weakpoints/quadruped_weakpoints_animal.json index 62c5be41c6086..47a741be78d90 100644 --- a/data/json/monster_weakpoints/quadruped_weakpoints_animal.json +++ b/data/json/monster_weakpoints/quadruped_weakpoints_animal.json @@ -7,7 +7,8 @@ "name": "the head", "armor_mult": { "physical": 0.75 }, "crit_mult": { "all": 1.1 }, - "difficulty": { "melee": 2, "ranged": 5 }, + "difficulty": { "melee": 2, "ranged": 4 }, + "damage_mult": { "physical": 1.1 }, "coverage_mult": { "ranged": 0.75 }, "coverage": 3, "effects": [ @@ -52,6 +53,47 @@ } ] }, + { + "name": "the chest", + "armor_mult": { "bash": 2 }, + "difficulty": { "melee": 2, "ranged": 1 }, + "damage_mult": { "stab": 1.25, "bullet": 1.33 }, + "coverage": 18 + }, + { + "name": "the vitals", + "armor_mult": { "physical": 0.45 }, + "difficulty": { "ranged": 4 }, + "damage_mult": { "physical": 2 }, + "coverage_mult": { "melee": 0 }, + "coverage": 7, + "effects": [ + { + "effect": "bleed", + "intensity": [ 10, 15 ], + "duration": [ 10, 20 ], + "chance": 75, + "message": "The %s is shot in the vitals!", + "damage_required": [ 1, 10 ] + }, + { + "effect": "bleed", + "intensity": [ 20, 30 ], + "duration": [ 20, 30 ], + "chance": 85, + "message": "The %s is shot in the vitals!", + "damage_required": [ 11, 50 ] + }, + { + "effect": "bleed", + "intensity": [ 30, 40 ], + "duration": [ 30, 40 ], + "chance": 95, + "message": "The %s is shot in the vitals!", + "damage_required": [ 51, 100 ] + } + ] + }, { "name": "the leg", "difficulty": { "melee": 1, "ranged": 2 }, diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 11cec7ce7f3c9..36918f23e478b 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -1864,7 +1864,7 @@ "species": [ "MAMMAL" ], "volume": "386 L", "weight": "386 kg", - "hp": 120, + "hp": 366, "speed": 200, "material": [ "flesh" ], "symbol": "M", @@ -1880,10 +1880,10 @@ "stomach_size": 8000, "vision_night": 7, "path_settings": { "max_dist": 10 }, - "anger_triggers": [ "HURT", "MATING_SEASON" ], + "anger_triggers": [ "HURT", "MATING_SEASON", "PLAYER_CLOSE" ], "zombify_into": "mon_zoose", "baby_flags": [ "AUTUMN" ], - "reproduction": { "baby_type": { "baby_monster_group": "REPRODUCTION_MUT_MOOSE" }, "baby_count": 1, "baby_timer": 154 }, + "reproduction": { "baby_type": { "baby_monster_group": "REPRODUCTION_MUT_MOOSE" }, "baby_count": 1, "baby_timer": 240 }, "harvest": "moose_with_skull", "dissect": "dissect_cattle_sample_large", "weakpoint_sets": [ "wps_animal_quadruped" ], @@ -1891,20 +1891,20 @@ "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 50 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "PET_MOUNTABLE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER", "EATS" ], - "armor": { "bash": 4, "cut": 1, "bullet": 1, "electric": 1 } + "armor": { "bash": 6, "cut": 6, "bullet": 5, "electric": 1 } }, { "id": "mon_moose_calf", "type": "MONSTER", "name": { "str": "moose calf", "str_pl": "moose calves" }, - "description": "The baby moose is called a calf. Calves can outrun a human within days of birth and gain weight at an incredible pace.", + "description": "The baby moose is called a calf. They can outrun a human within days of birth and gain weight at an incredible pace.", "default_faction": "herbivore", "bodytype": "dog", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "62500 ml", "weight": "81500 g", - "hp": 40, + "hp": 85, "speed": 120, "material": [ "flesh" ], "symbol": "C", @@ -1926,7 +1926,8 @@ "dissect": "dissect_cattle_sample_single", "weakpoint_sets": [ "wps_animal_quadruped" ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], - "upgrades": { "age_grow": 180, "into": "mon_moose" }, + "upgrades": { "age_grow": 1278, "into": "mon_moose" }, + "//": "4-5 years to reach sexual maturity, so we're assuming 3.5 years to reach roughly the size of an adult.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 50 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "PET_WONT_FOLLOW", "EATS" ], @@ -1936,15 +1937,15 @@ "id": "mon_tusked_moose", "type": "MONSTER", "name": { "str_sp": "great tusked moose" }, - "description": "The great tusked moose is a mutant variety of megafauna that evolved after the Cataclysm. Easily recognized by the underslung tusks off the side of each mouth, in addition to an impressive rack of horns. These moose are more aggressive than their predecessors.", + "description": "A mutant variety of megafauna that evolved after the Cataclysm. Easily recognized by the underslung tusks off each side of the mouth, in addition to an impressive rack of antlers. Given the looks and how aggressive normal moose are, you reckon you shouldn't test the patience of this one.", "default_faction": "herbivore", "bodytype": "horse", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], - "volume": "386000 ml", - "weight": "462 kg", - "hp": 160, - "speed": 200, + "volume": "675 L", + "weight": "675 kg", + "hp": 590, + "speed": 175, "material": [ "flesh" ], "symbol": "M", "color": "brown_red", @@ -1962,7 +1963,7 @@ "path_settings": { "max_dist": 10 }, "anger_triggers": [ "HURT", "MATING_SEASON", "PLAYER_CLOSE" ], "baby_flags": [ "SPRING" ], - "reproduction": { "baby_type": { "baby_monster": "mon_tusked_moose_calf" }, "baby_count": 1, "baby_timer": 104 }, + "reproduction": { "baby_type": { "baby_monster": "mon_tusked_moose_calf" }, "baby_count": 1, "baby_timer": 180 }, "//": "Baby mutant moose are born quicker that their natural counterparts since they are mutants and that way they can be seen a little more often.", "harvest": "tusked_moose_with_skull", "dissect": "dissect_cattle_sample_large", @@ -1970,20 +1971,20 @@ "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 8 }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER", "EATS" ], - "armor": { "bash": 14, "cut": 1, "bullet": 10, "electric": 1 } + "armor": { "bash": 14, "cut": 14, "bullet": 11, "electric": 1 } }, { "id": "mon_tusked_moose_calf", "type": "MONSTER", "name": { "str": "tusked moose calf", "str_pl": "tusked moose calves" }, - "description": "The baby moose is called a calf so are it's tusked mutant descendants. Calves can outrun a human within days of birth and gain weight at an incredible pace.", + "description": "The baby moose is called a calf and so are its mutant descendants. They can outrun a human within days of birth and gain weight at an incredible pace.", "default_faction": "herbivore", "bodytype": "dog", "categories": [ "WILDLIFE" ], "species": [ "MAMMAL" ], "volume": "62500 ml", "weight": "81500 g", - "hp": 60, + "hp": 85, "speed": 120, "material": [ "flesh" ], "symbol": "C", @@ -2005,7 +2006,7 @@ "dissect": "dissect_cattle_sample_single", "weakpoint_sets": [ "wps_animal_quadruped" ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], - "upgrades": { "age_grow": 120, "into": "mon_tusked_moose" }, + "upgrades": { "age_grow": 958, "into": "mon_tusked_moose" }, "//": "Baby mutant moose need to grow quicker to be able to survive in the world after the cataclysm.", "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, "special_attacks": [ [ "EAT_CROP", 60 ], [ "GRAZE", 50 ] ], diff --git a/data/mods/TEST_DATA/monsters.json b/data/mods/TEST_DATA/monsters.json index 4c2750818eb0f..c2bc92a248459 100644 --- a/data/mods/TEST_DATA/monsters.json +++ b/data/mods/TEST_DATA/monsters.json @@ -423,6 +423,7 @@ "copy-from": "mon_cow", "volume": "600 L", "weight": "600 kg", + "weakpoint_sets": [ ], "hp": 300, "dodge": 2, "bleed_rate": 60, diff --git a/tests/archery_damage_test.cpp b/tests/archery_damage_test.cpp index 5f9a514935650..55a5b6aab8763 100644 --- a/tests/archery_damage_test.cpp +++ b/tests/archery_damage_test.cpp @@ -114,6 +114,7 @@ TEST_CASE( "archery_damage_thresholds", "[balance],[archery]" ) // Medium setting compound bow can kill Bear test_archery_balance( "compbow", "arrow_metal", "mon_bear", "" ); // High setting modern compund bow can kill Moose - test_archery_balance( "compcrossbow", "bolt_steel", "mon_moose", "" ); - test_archery_balance( "compbow_high", "arrow_metal", "mon_moose", "" ); + // Currently disabled as it was not possible to make moose realistically tough while keeping the tests functional. Our bleeding isn't strong enough, and the tests are only hooked up to check instakills. Check the comments under PR #74554 for more detailed explanation. + // test_archery_balance( "compcrossbow", "bolt_steel", "mon_moose", "" ); + // test_archery_balance( "compbow_high", "arrow_metal", "mon_moose", "" ); }