From 959d3f7de480a70646b7bc783b496f37d4505dbe Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Fri, 10 Sep 2021 14:15:57 +0000 Subject: [PATCH 01/14] adds giant giant stag beetles --- data/json/items/comestibles/egg.json | 14 ++ data/json/monster_factions.json | 21 ++- .../monster_attacks.json | 18 +++ data/json/monstergroups/eggs.json | 6 + data/json/monstergroups/wilderness.json | 15 +- data/json/monsters/insect_spider.json | 149 ++++++++++++++++++ 6 files changed, 214 insertions(+), 9 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 0e7e0253b57d7..5f8006cfecb12 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -292,6 +292,20 @@ "rot_spawn": "GROUP_EGG_WASP", "rot_spawn_chance": 100 }, + { + "type": "COMESTIBLE", + "id": "egg_stag_beetle", + "name": { "str": "stag beetle egg" }, + "copy-from": "egg_insect", + "color": "brown", + "symbol": "o", + "spoils_in": "20 days", + "proportional": { "weight": 5, "calories": 5, "volume": 5 }, + "vitamins": [ [ "vitA", 95 ], [ "calcium", 35 ], [ "iron", 90 ], [ "vitB", 330 ], [ "mutant_toxin", 125 ] ], + "description": "A huge translucent beetle egg. You can see a larva slowly squirming inside, contorting uncomfortably outside of the soil.", + "rot_spawn": "GROUP_EGG_STAG_BEETLE", + "rot_spawn_chance": 100 + }, { "type": "COMESTIBLE", "id": "egg_antlion", diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json index 0cfc4c7699ee7..176135a65f11c 100644 --- a/data/json/monster_factions.json +++ b/data/json/monster_factions.json @@ -27,7 +27,7 @@ "name": "zombie", "friendly": [ "slime" ], "neutral": [ "cult", "small_animal", "fish", "insect", "aquatic_predator" ], - "by_mood": [ "ant", "acid_ant", "bee", "wasp" ] + "by_mood": [ "ant", "acid_ant", "bee", "wasp", "stag_beetle" ] }, { "type": "MONSTER_FACTION", @@ -375,20 +375,20 @@ "name": "ant", "base_faction": "insect", "by_mood": [ "zombie", "fungus" ], - "neutral": [ "aphid" ] + "neutral": [ "aphid", "stag_beetle_larva" ] }, { "type": "MONSTER_FACTION", "name": "acid_ant", "base_faction": "insect", "by_mood": [ "zombie", "fungus" ], - "neutral": [ "aphid" ] + "neutral": [ "aphid", "stag_beetle_larva" ] }, { "type": "MONSTER_FACTION", "name": "aphid", "base_faction": "insect", - "neutral": [ "ant", "acid_ant" ] + "neutral": [ "ant", "acid_ant", "stag_beetle_larva" ] }, { "type": "MONSTER_FACTION", @@ -396,6 +396,19 @@ "base_faction": "insect", "hate": "fish" }, + { + "type": "MONSTER_FACTION", + "name": "stag_beetle", + "base_faction": "insect", + "friendly": "stag_beetle_larva" + }, + { + "type": "MONSTER_FACTION", + "name": "stag_beetle_larva", + "base_faction": "insect", + "neutral": [ "ant", "acid_ant" ], + "friendly": "stag_beetle" + }, { "type": "MONSTER_FACTION", "name": "antlion_grub", diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json index ae3b4d14a8685..1b81286093014 100644 --- a/data/json/monster_special_attacks/monster_attacks.json +++ b/data/json/monster_special_attacks/monster_attacks.json @@ -129,6 +129,24 @@ "miss_msg_u": "The %s takes a powerful swing at you, but you dodge it!", "miss_msg_npc": "The %s takes a powerful swing at , who dodges it!" }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "stag_smash", + "accuracy": 7, + "move_cost": 250, + "cooldown": 25, + "range": 2, + "damage_max_instance": [ { "damage_type": "bash", "amount": 35, "armor_multiplier": 0.5 } ], + "body_parts": [ [ "torso", 6 ], [ "leg_r", 1 ], [ "leg_l", 1 ], [ "arm_r", 1 ], [ "arm_l", 1 ] ], + "throw_strength": 60, + "hit_dmg_u": "The %1$s brutally rams you in the %2$s!", + "hit_dmg_npc": "The %1$s brutally rams in the %2$s!", + "no_dmg_msg_u": "The %1$s rams your %2$s, but you hold steady!", + "no_dmg_msg_npc": "The %1$s rams 's %2$s, but they hold steady!", + "miss_msg_u": "The %s flicks it's horns at you, but you dodge!", + "miss_msg_npc": "The %s flicks it's horns at , but they dodge!" + }, { "type": "monster_attack", "attack_type": "melee", diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 663cccc28f285..d5804caa693ab 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -153,6 +153,12 @@ { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SUMMER" ] } ] }, + { + "name": "GROUP_EGG_STAG_BEETLE", + "type": "monstergroup", + "default": "mon_stag_beetle_larva", + "monsters": [ { "monster": "mon_stag_beetle_larva", "freq": 1000, "cost_multiplier": 1 } ] + }, { "name": "GROUP_EGG_ANTLION", "type": "monstergroup", diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index d59f0ba1fa52c..cd02a8cc88caf 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -3,22 +3,23 @@ "type": "monstergroup", "name": "GROUP_CAVE", "default": "mon_null", - "//": "Current count is 925. Note that 'freq' units are tenth of a percent, with default filling in the gap.", + "//": "Current count is 975. Note that 'freq' units are tenth of a percent, with default filling in the gap.", "is_animal": true, "monsters": [ - { "monster": "mon_bat", "freq": 600, "cost_multiplier": 5, "pack_size": [ 6, 32 ] }, + { "monster": "mon_bat", "freq": 550, "cost_multiplier": 5, "pack_size": [ 6, 32 ] }, { "monster": "mon_bear", "freq": 100, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, { "monster": "mon_cougar", "freq": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] }, + { "monster": "mon_mole_cricket", "freq": 60, "cost_multiplier": 3 }, { "monster": "mon_mutant_experimental", "freq": 25, "cost_multiplier": 3 }, { "monster": "mon_nakedmolerat_giant", "freq": 100, "cost_multiplier": 3 }, - { "monster": "mon_mole_cricket", "freq": 60, "cost_multiplier": 3 } + { "monster": "mon_stag_beetle_larva", "freq": 40, "cost_multiplier": 5 } ] }, { "type": "monstergroup", "name": "GROUP_FOREST", "default": "mon_null", - "//": "Current SPRING first DAY count is 513. Note that 'freq' units are tenth of a percent, with default filling in the gap.", + "//": "Current SPRING first DAY count is 514. Note that 'freq' units are tenth of a percent, with default filling in the gap.", "is_animal": true, "monsters": [ { @@ -1712,7 +1713,11 @@ { "monster": "mon_aphid", "freq": 15, "pack_size": [ 1, 5 ], "cost_multiplier": 0 }, { "monster": "mon_grasshopper_small", "freq": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 0 }, { "monster": "mon_antlion_larva", "freq": 7, "cost_multiplier": 10 }, - { "monster": "mon_antlion_giant", "freq": 2, "cost_multiplier": 10 } + { "monster": "mon_antlion_giant", "freq": 2, "cost_multiplier": 10 }, + { "monster": "mon_stag_beetle_small", "freq": 1, "cost_multiplier": 0, "ends": 504 }, + { "monster": "mon_stag_beetle_small", "freq": 2, "cost_multiplier": 0, "starts": 168 }, + { "monster": "mon_stag_beetle_giant", "freq": 2, "cost_multiplier": 0, "starts": 504 }, + { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720, "pack_size": [ 1, 2 ] } ] }, { diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index ab8683fbd117e..516154bf22c19 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2294,6 +2294,155 @@ "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CROP", 80 ], { "type": "leap", "cooldown": 3, "max_range": 10, "allow_no_target": true } ], "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS", "PATH_AVOID_FALL", "PATH_AVOID_FIRE" ] }, + { + "id": "mon_stag_beetle_larva", + "type": "MONSTER", + "name": { "str": "giant stag beetle larva", "str_pl": "giant stag beetle larvae" }, + "description": "Something about this cow-sized larva is pitiable, despite it's immense size and sickening cream color.", + "default_faction": "stag_beetle_larva", + "bodytype": "snake", + "species": [ "INSECT" ], + "volume": "200 L", + "weight": "300 kg", + "hp": 120, + "speed": 25, + "material": [ "iflesh" ], + "symbol": "S", + "color": "white", + "aggression": -99, + "morale": -10, + "armor_bash": 5, + "armor_cut": 6, + "armor_bullet": 3, + "armor_acid": 6, + "vision_day": 0, + "vision_night": 6, + "harvest": "arachnid", + "//": "when taming becomes more involved, this should be slowly tameable with honeydew, allowing for a tamed stag beetle through almost a year of effort", + "fear_triggers": [ "FIRE", "HURT" ], + "upgrades": { "age_grow": 288, "into": "mon_stag_beetle_small" }, + "flags": [ "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "SUNDEATH", "PET_WONT_FOLLOW" ] + }, + { + "id": "mon_stag_beetle_small", + "type": "MONSTER", + "name": { "str": "giant stag beetle" }, + "description": "It was called a giant even before the Cataclysm, but now this mutant beetle is the size of a small horse. It looks ready to molt again, even though parts of the shell are still soft.", + "copy-from": "mon_stag_beetle_giant", + "proportional": { "hp": 0.5, "morale": 0.5, "melee_dice_sides": 0.67 }, + "volume": "200 L", + "weight": "300 kg", + "diff": 1, + "melee_cut": 4, + "armor_bash": 24, + "armor_cut": 32, + "armor_bullet": 20, + "armor_acid": 8, + "armor_fire": 2, + "special_attacks": [ + { + "id": "stag_smash", + "throw_strength": 40, + "damage_max_instance": [ { "damage_type": "bash", "amount": 20, "armor_multiplier": 0.5 } ] + } + ], + "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_giant" }, + "delete": { + "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 20 }, + "flags": [ "DESTROYS", "PUSH_VEH" ] + } + }, + { + "id": "mon_stag_beetle_giant", + "type": "MONSTER", + "name": { "str": "massive stag beetle" }, + "description": "This enormous stag beetle has reached mutated maturity, but continues to grow. Thankfully, that growth is exposing vulnerable cracks of flesh in the strained chitin.", + "default_faction": "stag_beetle", + "bodytype": "insect", + "species": [ "INSECT" ], + "volume": "400 L", + "weight": "600 kg", + "diff": 2, + "hp": 350, + "speed": 80, + "material": [ "iflesh" ], + "symbol": "S", + "color": "brown", + "aggression": 40, + "morale": 30, + "melee_skill": 5, + "melee_dice": 6, + "melee_dice_sides": 6, + "melee_cut": 9, + "dodge": 1, + "armor_bash": 60, + "armor_cut": 72, + "armor_bullet": 50, + "armor_acid": 18, + "armor_fire": 8, + "weakpoints": [ + { "name": "a soft section of chitin", "armor_mult": { "physical": 0.33 }, "coverage": 20 }, + { "name": "a crack in the chitin", "armor_mult": { "physical": 0 }, "coverage": 5 } + ], + "mountable_weight_ratio": 6, + "vision_day": 14, + "vision_night": 12, + "harvest": "arachnid", + "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], + "fear_triggers": [ "FIRE" ], + "special_attacks": [ + { + "id": "stag_smash", + "throw_strength": 60, + "hit_dmg_u": "The %1$s rams you in the %2$s!", + "hit_dmg_npc": "The %1$s rams in the %2$s!", + "no_dmg_msg_u": "The %1$s rams your %2$s, but you hold steady!", + "no_dmg_msg_npc": "The %1$s rams 's %2$s, but they hold steady!", + "miss_msg_u": "The %s flicks it's horns at you, but you dodge!", + "miss_msg_npc": "The %s flicks it's horns at , but they dodge!" + } + ], + "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_mega" }, + "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 20 }, + "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "BASHES", + "DESTROYS", + "PATH_AVOID_FIRE", + "PATH_AVOID_FALL", + "PUSH_MON", + "PUSH_VEH", + "PET_WONT_FOLLOW", + "PET_MOUNTABLE" + ] + }, + { + "id": "mon_stag_beetle_mega", + "type": "MONSTER", + "name": { "str": "titan stag beetle" }, + "description": "This stag beetle rivals an armored personnel carrier in size, bearing horns that could fell a tree and chitin thick enough to ignore most bullets. It's bulky shell looks nigh-impenetrable, and the cracks have sealed with a foul paste.", + "copy-from": "mon_stag_beetle_giant", + "proportional": { "hp": 4, "speed": 0.75, "morale": 3, "melee_dice_sides": 2 }, + "volume": "950 L", + "weight": "4400 kg", + "diff": 4, + "armor_bash": 86, + "armor_cut": 100, + "armor_bullet": 75, + "special_attacks": [ + { + "id": "stag_smash", + "throw_strength": 120, + "damage_max_instance": [ { "damage_type": "bash", "amount": 45, "armor_multiplier": 0.5 } ] + } + ], + "weakpoints": [ { "name": "a foul scar in the chitin", "armor_mult": { "physical": 0.33 }, "coverage": 20 } ], + "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 364 }, + "delete": { "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_mega" } } + }, { "id": "mon_antlion_larva", "type": "MONSTER", From ac34dea185dcb02f9372c8c75094f4d6a50dfaf1 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Fri, 10 Sep 2021 15:55:06 +0000 Subject: [PATCH 02/14] remove sundeath from stag larva --- data/json/monsters/insect_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 516154bf22c19..41ef1cbba7ae6 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2321,7 +2321,7 @@ "//": "when taming becomes more involved, this should be slowly tameable with honeydew, allowing for a tamed stag beetle through almost a year of effort", "fear_triggers": [ "FIRE", "HURT" ], "upgrades": { "age_grow": 288, "into": "mon_stag_beetle_small" }, - "flags": [ "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "SUNDEATH", "PET_WONT_FOLLOW" ] + "flags": [ "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "PET_WONT_FOLLOW" ] }, { "id": "mon_stag_beetle_small", From 6f5fc178abf48d6d8aee181ac1a4f515c502d000 Mon Sep 17 00:00:00 2001 From: Mik <25803648+Mikenyes@users.noreply.github.com> Date: Fri, 10 Sep 2021 11:57:23 -0500 Subject: [PATCH 03/14] Apply actual_nh's suggestions Mostly grammar, but also some nice tips on faction inheritance. Still discussing weight for corpse. Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> --- data/json/monster_factions.json | 7 +++---- .../json/monster_special_attacks/monster_attacks.json | 4 ++-- data/json/monsters/insect_spider.json | 11 +++++------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json index 176135a65f11c..31cee12a23ad2 100644 --- a/data/json/monster_factions.json +++ b/data/json/monster_factions.json @@ -400,14 +400,13 @@ "type": "MONSTER_FACTION", "name": "stag_beetle", "base_faction": "insect", - "friendly": "stag_beetle_larva" + "by_mood": "zombie" }, { "type": "MONSTER_FACTION", "name": "stag_beetle_larva", - "base_faction": "insect", - "neutral": [ "ant", "acid_ant" ], - "friendly": "stag_beetle" + "base_faction": "stag_beetle", + "neutral": [ "ant", "acid_ant" ] }, { "type": "MONSTER_FACTION", diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json index 1b81286093014..48b8c63e64188 100644 --- a/data/json/monster_special_attacks/monster_attacks.json +++ b/data/json/monster_special_attacks/monster_attacks.json @@ -144,8 +144,8 @@ "hit_dmg_npc": "The %1$s brutally rams in the %2$s!", "no_dmg_msg_u": "The %1$s rams your %2$s, but you hold steady!", "no_dmg_msg_npc": "The %1$s rams 's %2$s, but they hold steady!", - "miss_msg_u": "The %s flicks it's horns at you, but you dodge!", - "miss_msg_npc": "The %s flicks it's horns at , but they dodge!" + "miss_msg_u": "The %s flicks its horns at you, but you dodge!", + "miss_msg_npc": "The %s flicks its horns at , but they dodge!" }, { "type": "monster_attack", diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 41ef1cbba7ae6..ea4ca28417966 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2298,7 +2298,7 @@ "id": "mon_stag_beetle_larva", "type": "MONSTER", "name": { "str": "giant stag beetle larva", "str_pl": "giant stag beetle larvae" }, - "description": "Something about this cow-sized larva is pitiable, despite it's immense size and sickening cream color.", + "description": "Something about this cow-sized larva is pitiable, despite its immense size and sickening cream color.", "default_faction": "stag_beetle_larva", "bodytype": "snake", "species": [ "INSECT" ], @@ -2398,8 +2398,8 @@ "hit_dmg_npc": "The %1$s rams in the %2$s!", "no_dmg_msg_u": "The %1$s rams your %2$s, but you hold steady!", "no_dmg_msg_npc": "The %1$s rams 's %2$s, but they hold steady!", - "miss_msg_u": "The %s flicks it's horns at you, but you dodge!", - "miss_msg_npc": "The %s flicks it's horns at , but they dodge!" + "miss_msg_u": "The %s flicks its horns at you, but you dodge!", + "miss_msg_npc": "The %s flicks its horns at , but they dodge!" } ], "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_mega" }, @@ -2411,8 +2411,7 @@ "GOODHEARING", "BASHES", "DESTROYS", - "PATH_AVOID_FIRE", - "PATH_AVOID_FALL", + "PATH_AVOID_DANGER_1", "PUSH_MON", "PUSH_VEH", "PET_WONT_FOLLOW", @@ -2423,7 +2422,7 @@ "id": "mon_stag_beetle_mega", "type": "MONSTER", "name": { "str": "titan stag beetle" }, - "description": "This stag beetle rivals an armored personnel carrier in size, bearing horns that could fell a tree and chitin thick enough to ignore most bullets. It's bulky shell looks nigh-impenetrable, and the cracks have sealed with a foul paste.", + "description": "This stag beetle rivals an armored personnel carrier in size, bearing horns that could fell a tree and chitin thick enough to ignore most bullets. Its bulky shell looks nigh-impenetrable, and the cracks have sealed with a foul paste.", "copy-from": "mon_stag_beetle_giant", "proportional": { "hp": 4, "speed": 0.75, "morale": 3, "melee_dice_sides": 2 }, "volume": "950 L", From 17744f542aef24fe7b9213a23a1a5d4b1d87612b Mon Sep 17 00:00:00 2001 From: Mik <25803648+Mikenyes@users.noreply.github.com> Date: Fri, 10 Sep 2021 18:15:37 -0500 Subject: [PATCH 04/14] Apply Venera3's suggestions Manual editing still required to resolve issues with reproduction on mon_stag_beetle_small Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com> --- data/json/monster_special_attacks/monster_attacks.json | 2 +- data/json/monstergroups/wilderness.json | 5 ++--- data/json/monsters/insect_spider.json | 9 ++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json index 48b8c63e64188..feb5648c17e85 100644 --- a/data/json/monster_special_attacks/monster_attacks.json +++ b/data/json/monster_special_attacks/monster_attacks.json @@ -143,7 +143,7 @@ "hit_dmg_u": "The %1$s brutally rams you in the %2$s!", "hit_dmg_npc": "The %1$s brutally rams in the %2$s!", "no_dmg_msg_u": "The %1$s rams your %2$s, but you hold steady!", - "no_dmg_msg_npc": "The %1$s rams 's %2$s, but they hold steady!", + "no_dmg_msg_npc": "The %1$s rams , but they hold steady!", "miss_msg_u": "The %s flicks its horns at you, but you dodge!", "miss_msg_npc": "The %s flicks its horns at , but they dodge!" }, diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index cd02a8cc88caf..ac7b635ce1398 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -1714,10 +1714,9 @@ { "monster": "mon_grasshopper_small", "freq": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 0 }, { "monster": "mon_antlion_larva", "freq": 7, "cost_multiplier": 10 }, { "monster": "mon_antlion_giant", "freq": 2, "cost_multiplier": 10 }, - { "monster": "mon_stag_beetle_small", "freq": 1, "cost_multiplier": 0, "ends": 504 }, + { "monster": "mon_stag_beetle_small", "freq": 2, "cost_multiplier": 0, "starts": 168, "ends": 720 }, { "monster": "mon_stag_beetle_small", "freq": 2, "cost_multiplier": 0, "starts": 168 }, - { "monster": "mon_stag_beetle_giant", "freq": 2, "cost_multiplier": 0, "starts": 504 }, - { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720, "pack_size": [ 1, 2 ] } + { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720 } ] }, { diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index ea4ca28417966..60f914a5cb981 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2311,17 +2311,16 @@ "color": "white", "aggression": -99, "morale": -10, + "special_attacks": [ "EAT_CROP", 30 ], "armor_bash": 5, "armor_cut": 6, "armor_bullet": 3, "armor_acid": 6, - "vision_day": 0, - "vision_night": 6, "harvest": "arachnid", "//": "when taming becomes more involved, this should be slowly tameable with honeydew, allowing for a tamed stag beetle through almost a year of effort", "fear_triggers": [ "FIRE", "HURT" ], "upgrades": { "age_grow": 288, "into": "mon_stag_beetle_small" }, - "flags": [ "HEARS", "GOODHEARING", "PATH_AVOID_FIRE", "PET_WONT_FOLLOW" ] + "flags": [ "PATH_AVOID_FIRE", "PET_WONT_FOLLOW" ] }, { "id": "mon_stag_beetle_small", @@ -2346,7 +2345,7 @@ "damage_max_instance": [ { "damage_type": "bash", "amount": 20, "armor_multiplier": 0.5 } ] } ], - "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_giant" }, + "upgrades": { "age_grow": 60, "into": "mon_stag_beetle_giant" }, "delete": { "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 20 }, "flags": [ "DESTROYS", "PUSH_VEH" ] @@ -2440,7 +2439,7 @@ ], "weakpoints": [ { "name": "a foul scar in the chitin", "armor_mult": { "physical": 0.33 }, "coverage": 20 } ], "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 364 }, - "delete": { "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_mega" } } + "upgrades": false }, { "id": "mon_antlion_larva", From 4109203a0e1fac633e90364ff580aa51990462db Mon Sep 17 00:00:00 2001 From: Mik <25803648+Mikenyes@users.noreply.github.com> Date: Fri, 10 Sep 2021 18:18:27 -0500 Subject: [PATCH 05/14] Missed one of Venera3's suggestions Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com> --- data/json/monster_special_attacks/monster_attacks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json index feb5648c17e85..59f8a1ab0582b 100644 --- a/data/json/monster_special_attacks/monster_attacks.json +++ b/data/json/monster_special_attacks/monster_attacks.json @@ -141,7 +141,7 @@ "body_parts": [ [ "torso", 6 ], [ "leg_r", 1 ], [ "leg_l", 1 ], [ "arm_r", 1 ], [ "arm_l", 1 ] ], "throw_strength": 60, "hit_dmg_u": "The %1$s brutally rams you in the %2$s!", - "hit_dmg_npc": "The %1$s brutally rams in the %2$s!", + "hit_dmg_npc": "The %1$s brutally rams !", "no_dmg_msg_u": "The %1$s rams your %2$s, but you hold steady!", "no_dmg_msg_npc": "The %1$s rams , but they hold steady!", "miss_msg_u": "The %s flicks its horns at you, but you dodge!", From 6bb000969063c52207f6acd48b7c3613bc29725b Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Fri, 10 Sep 2021 23:33:21 +0000 Subject: [PATCH 06/14] Fix monstergroup comment, fix mon_stag_beetle_small egg laying, add stag beetle eggs to insect eggs requirement list --- data/json/monstergroups/wilderness.json | 2 +- data/json/monsters/insect_spider.json | 6 ++---- data/json/requirements/cooking_components.json | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index ac7b635ce1398..51892b4c69939 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -19,7 +19,7 @@ "type": "monstergroup", "name": "GROUP_FOREST", "default": "mon_null", - "//": "Current SPRING first DAY count is 514. Note that 'freq' units are tenth of a percent, with default filling in the gap.", + "//": "Current SPRING first DAY count is 513. Note that 'freq' units are tenth of a percent, with default filling in the gap.", "is_animal": true, "monsters": [ { diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 60f914a5cb981..1a424c4d9cabb 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2346,10 +2346,8 @@ } ], "upgrades": { "age_grow": 60, "into": "mon_stag_beetle_giant" }, - "delete": { - "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 20 }, - "flags": [ "DESTROYS", "PUSH_VEH" ] - } + "extend": { "flags": [ "NO_BREED" ] }, + "delete": { "flags": [ "DESTROYS", "PUSH_VEH" ] } }, { "id": "mon_stag_beetle_giant", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 58c03e21ac9e8..d0e1cba196822 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -84,7 +84,8 @@ [ "egg_grasshopper", 4 ], [ "egg_lady_bug", 4 ], [ "egg_mole_cricket", 4 ], - [ "egg_mantis", 4 ] + [ "egg_mantis", 4 ], + [ "egg_stag_beetle", 1 ] ] ] }, From 7e19430d9df7c48b21ac4972c7161c89a1ec1d60 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Sat, 11 Sep 2021 01:51:10 +0000 Subject: [PATCH 07/14] beetle harvest pool and change larva eat crop to array --- data/json/harvest.json | 48 +++++++++++++++++++++++ data/json/monsters/insect_spider.json | 5 ++- data/json/snippets/mutant_anatomy.json | 54 ++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index dbe457db42f19..45c4425155ff6 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -990,6 +990,54 @@ { "drop": "egg_centipede", "type": "offal", "base_num": [ 0, 3 ], "scale_num": [ 0.5, 1 ], "max": 10 } ] }, + { + "id": "arachnid_beetle", + "type": "harvest", + "message": "", + "//": "replace some chitin with plate when added", + "entries": [ + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.05 }, + { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.125 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.04 }, + { "drop": "endochitin", "type": "bone", "mass_ratio": 0.2 }, + { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.004 }, + { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 }, + { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.3 } + ] + }, + { + "id": "arachnid_beetle_mega", + "type": "harvest", + "message": "", + "//": "replace most chitin with plate when added", + "entries": [ + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.05 }, + { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.125 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.04 }, + { "drop": "endochitin", "type": "bone", "mass_ratio": 0.2 }, + { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.004 }, + { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 }, + { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.3 } + ] + }, + { + "id": "arachnid_beetle", + "type": "harvest", + "message": "", + "//": "Lots of chitin plate, lots of ", + "entries": [ + { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.35 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.05 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, + { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, + { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 } + ] + }, { "id": "arachnid_flying", "type": "harvest", diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 1a424c4d9cabb..df9b5eaf70f80 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2311,7 +2311,7 @@ "color": "white", "aggression": -99, "morale": -10, - "special_attacks": [ "EAT_CROP", 30 ], + "special_attacks": [ [ "EAT_CROP", 30 ] ], "armor_bash": 5, "armor_cut": 6, "armor_bullet": 3, @@ -2384,7 +2384,7 @@ "mountable_weight_ratio": 6, "vision_day": 14, "vision_night": 12, - "harvest": "arachnid", + "harvest": "arachnid_beetle", "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], "fear_triggers": [ "FIRE" ], "special_attacks": [ @@ -2436,6 +2436,7 @@ } ], "weakpoints": [ { "name": "a foul scar in the chitin", "armor_mult": { "physical": 0.33 }, "coverage": 20 } ], + "harvest": "arachnid_beetle_mega", "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 364 }, "upgrades": false }, diff --git a/data/json/snippets/mutant_anatomy.json b/data/json/snippets/mutant_anatomy.json index 23849977383a9..7a4130f819c12 100644 --- a/data/json/snippets/mutant_anatomy.json +++ b/data/json/snippets/mutant_anatomy.json @@ -387,6 +387,42 @@ "In a hidden organ without an obvious connection to the outside world, you find a seemingly forgotten handful of glistening eggs" ] }, + { + "type": "snippet", + "category": "", + "text": [ + "When you sever the vestigial wings, a spurt of mud-thick fluid gushes up and every leg twitches", + "Prying off the elytra is easier than you thought it would be, but a thicker duplicate lies beneath, melted into the veiny wings", + "You hack off the legs, finding them surprisingly light once the knotted veins within are drained", + "The thick chitin is difficult to saw through, and rooted so deeply in fat that each panel you pull off comes with dangling ropes of sinew and grease.", + "Each leg bears too many hooks and outcrops to count, and they look far too much like teeth for your liking", + "The eyes are easily pulled loose, though with them spills out numerous coiled ropes of nerve, sinew, and something halfway between" + ] + }, + { + "type": "snippet", + "category": "", + "text": [ + "A lattice of glossy tubes still holds the mound of foamy fat and organs in place after the abdomen falls apart", + "The head is occupied entirely by organic hydraulics wrapped in muscle, and you dont find tangled strands of brain tissue until the thorax", + "A fist-sized organ next to the chain of hearts still subtly throbs, and you find broken shards of chitin inside it after a swift hacking", + "You find a clutch of stillborn grubs inside, curled up in their parents fatty innards with eggshells nearby", + "The reproductive organs of this beetle, sealed inside a chitin casket, have coiled into a mockery of nature and bristle with half-developed eggs", + "Something that looks like it belongs in an engine lies between the splayed out lungs, and it sprays grease five paces when you puncture it" + ] + }, + { + "type": "snippet", + "category": "", + "text": [ + "A small landslide of flesh and gristle buries you to the waist at one point, and you could swear something was slithering near your ankles", + "When you grab one particularly bristled organ, it writhes and nearly escapes your grasp before you can smash it. You find developing wings in the paste", + "A much smaller second shell lies buried deep inside the beetle, an entomological matryoshka that contains within itself... oh, fecal matter", + "Chunks of meat, bone, and fabric inside one of the digestive tracts are still easy to identify, and you wonder what their name was.", + "A bundle of gigantic wasp eggs is buried in the beast, but all are pierced with wirey tubes draining nutrients and fluid from their fetal husks", + "You finish up, coming to grips with the fact that toxins suffuse every inch of the truckload of meat you just pulled from this mutant beetle" + ] + }, { "type": "snippet", "category": "", @@ -529,6 +565,24 @@ "category": "", "text": [ "", " ." ] }, + { + "type": "snippet", + "category": "", + "text": [ ".", ". ." ] + }, + { + "type": "snippet", + "category": "", + "text": [ + ".", + ". ." + ] + }, + { + "type": "snippet", + "category": "", + "text": [ "", " ." ] + }, { "type": "snippet", "category": "", From b2d416238b5e15afc6437a731c10cacdac099c58 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Sat, 11 Sep 2021 01:56:56 +0000 Subject: [PATCH 08/14] typo fixing --- data/json/snippets/mutant_anatomy.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/snippets/mutant_anatomy.json b/data/json/snippets/mutant_anatomy.json index 7a4130f819c12..01dee67b0f711 100644 --- a/data/json/snippets/mutant_anatomy.json +++ b/data/json/snippets/mutant_anatomy.json @@ -394,7 +394,7 @@ "When you sever the vestigial wings, a spurt of mud-thick fluid gushes up and every leg twitches", "Prying off the elytra is easier than you thought it would be, but a thicker duplicate lies beneath, melted into the veiny wings", "You hack off the legs, finding them surprisingly light once the knotted veins within are drained", - "The thick chitin is difficult to saw through, and rooted so deeply in fat that each panel you pull off comes with dangling ropes of sinew and grease.", + "The thick chitin is difficult to saw through, and rooted so deeply in fat that each panel you pull off comes with dangling ropes of sinew and grease", "Each leg bears too many hooks and outcrops to count, and they look far too much like teeth for your liking", "The eyes are easily pulled loose, though with them spills out numerous coiled ropes of nerve, sinew, and something halfway between" ] @@ -418,7 +418,7 @@ "A small landslide of flesh and gristle buries you to the waist at one point, and you could swear something was slithering near your ankles", "When you grab one particularly bristled organ, it writhes and nearly escapes your grasp before you can smash it. You find developing wings in the paste", "A much smaller second shell lies buried deep inside the beetle, an entomological matryoshka that contains within itself... oh, fecal matter", - "Chunks of meat, bone, and fabric inside one of the digestive tracts are still easy to identify, and you wonder what their name was.", + "Chunks of meat, bone, and fabric inside one of the digestive tracts are still easy to identify, and you wonder what their name was", "A bundle of gigantic wasp eggs is buried in the beast, but all are pierced with wirey tubes draining nutrients and fluid from their fetal husks", "You finish up, coming to grips with the fact that toxins suffuse every inch of the truckload of meat you just pulled from this mutant beetle" ] @@ -581,7 +581,7 @@ { "type": "snippet", "category": "", - "text": [ "", " ." ] + "text": [ "", " ." ] }, { "type": "snippet", From 053706c5ec8c3463d82f1690c36343cc51987612 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Sat, 11 Sep 2021 03:03:50 +0000 Subject: [PATCH 09/14] remove duplicate --- data/json/snippets/mutant_anatomy.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/json/snippets/mutant_anatomy.json b/data/json/snippets/mutant_anatomy.json index 01dee67b0f711..d9f87d5007396 100644 --- a/data/json/snippets/mutant_anatomy.json +++ b/data/json/snippets/mutant_anatomy.json @@ -565,11 +565,6 @@ "category": "", "text": [ "", " ." ] }, - { - "type": "snippet", - "category": "", - "text": [ ".", ". ." ] - }, { "type": "snippet", "category": "", From 560e6fbc3390e43fd2a55e3595844e9c298c3907 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Sun, 12 Sep 2021 16:26:00 +0000 Subject: [PATCH 10/14] Fix and tweak harvest values --- data/json/harvest.json | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 45c4425155ff6..db141214c3c50 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -996,13 +996,13 @@ "message": "", "//": "replace some chitin with plate when added", "entries": [ - { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 }, - { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.05 }, - { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.125 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.04 }, + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.25 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.06 }, + { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.035 }, { "drop": "endochitin", "type": "bone", "mass_ratio": 0.2 }, - { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.004 }, - { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 }, + { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.005 }, + { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 }, { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.3 } ] }, @@ -1012,32 +1012,16 @@ "message": "", "//": "replace most chitin with plate when added", "entries": [ - { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 }, - { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.05 }, - { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.125 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.04 }, + { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.25 }, + { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.06 }, + { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.035 }, { "drop": "endochitin", "type": "bone", "mass_ratio": 0.2 }, - { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.004 }, - { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 }, + { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.005 }, + { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 }, { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.3 } ] }, - { - "id": "arachnid_beetle", - "type": "harvest", - "message": "", - "//": "Lots of chitin plate, lots of ", - "entries": [ - { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }, - { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.35 }, - { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.05 }, - { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 }, - { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 }, - { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 }, - { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 }, - { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 } - ] - }, { "id": "arachnid_flying", "type": "harvest", From a7f20378f01070b4eed35286dd329a93b25af057 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:12:58 +0000 Subject: [PATCH 11/14] stag beetle massive to titan now takes 60 days --- data/json/monsters/insect_spider.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index df9b5eaf70f80..9ac8fe4682384 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2399,8 +2399,8 @@ "miss_msg_npc": "The %s flicks its horns at , but they dodge!" } ], - "upgrades": { "age_grow": 28, "into": "mon_stag_beetle_mega" }, - "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 20 }, + "upgrades": { "age_grow": 60, "into": "mon_stag_beetle_mega" }, + "reproduction": { "baby_egg": "egg_stag_beetle", "baby_count": 1, "baby_timer": 32 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "flags": [ "SEES", From 470917dad4409c2e7bfb7139cd1547185a206531 Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:48:26 +0000 Subject: [PATCH 12/14] change triple period to ellipsis --- data/json/snippets/mutant_anatomy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/snippets/mutant_anatomy.json b/data/json/snippets/mutant_anatomy.json index d9f87d5007396..f3219eaaa9259 100644 --- a/data/json/snippets/mutant_anatomy.json +++ b/data/json/snippets/mutant_anatomy.json @@ -417,7 +417,7 @@ "text": [ "A small landslide of flesh and gristle buries you to the waist at one point, and you could swear something was slithering near your ankles", "When you grab one particularly bristled organ, it writhes and nearly escapes your grasp before you can smash it. You find developing wings in the paste", - "A much smaller second shell lies buried deep inside the beetle, an entomological matryoshka that contains within itself... oh, fecal matter", + "A much smaller second shell lies buried deep inside the beetle, an entomological matryoshka that contains within itself… oh, fecal matter", "Chunks of meat, bone, and fabric inside one of the digestive tracts are still easy to identify, and you wonder what their name was", "A bundle of gigantic wasp eggs is buried in the beast, but all are pierced with wirey tubes draining nutrients and fluid from their fetal husks", "You finish up, coming to grips with the fact that toxins suffuse every inch of the truckload of meat you just pulled from this mutant beetle" From bab27122b92de1296226d7c4011a9ebec008840d Mon Sep 17 00:00:00 2001 From: Mikenyes <25803648+Mikenyes@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:55:41 +0000 Subject: [PATCH 13/14] stag larva neutral to aphids --- data/json/monster_factions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json index 31cee12a23ad2..c01bc1f1ebfa9 100644 --- a/data/json/monster_factions.json +++ b/data/json/monster_factions.json @@ -406,7 +406,7 @@ "type": "MONSTER_FACTION", "name": "stag_beetle_larva", "base_faction": "stag_beetle", - "neutral": [ "ant", "acid_ant" ] + "neutral": [ "ant", "acid_ant", "aphid" ] }, { "type": "MONSTER_FACTION", From b4374638972ce8b599339a48f836ddeb9c9a0ab1 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 25 Oct 2021 22:38:11 -0500 Subject: [PATCH 14/14] Update data/json/monsters/insect_spider.json Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> --- data/json/monsters/insect_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 9ac8fe4682384..3a3ecc2030eee 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2423,7 +2423,7 @@ "copy-from": "mon_stag_beetle_giant", "proportional": { "hp": 4, "speed": 0.75, "morale": 3, "melee_dice_sides": 2 }, "volume": "950 L", - "weight": "4400 kg", + "weight": "1000 kg", "diff": 4, "armor_bash": 86, "armor_cut": 100,