From 544015c9410c42bba5661f04bd5b38dad996d1e0 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:12:50 -0500 Subject: [PATCH 01/63] Update bird.json added geese, rails, grebes, cormorants, hummingbirds and woodpeckers to vanilla birds file along with their offspring. --- data/json/monsters/bird.json | 232 +++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 72f1d6c935def..49b4f3cf31a6a 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -594,5 +594,237 @@ "pet": "The %s runs around your leg." }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ] + }, + { + "id": "mon_goose", + "type": "MONSTER", + "copy-from": "mon_duck", + "name": { "str": "goose", "str_pl": "geese" }, + "description": "The domestic goose. A waterfowl well known for its loud honking and aggressive behavior.", + "volume": "5 L", + "weight": "3750 g", + "hp": 15, + "looks_like": "mon_goose_canadian", + "aggression": 1, + "morale": 15, + "dodge": 3, + "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], + "anger_triggers": [ "PLAYER_CLOSE" ], + "reproduction": { "baby_egg": "egg_goose", "baby_count": 5, "baby_timer": 10 }, + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 4 }, + "petfood": { + "food": [ "BIRDFOOD" ], + "feed": "The %s seems to like you! It runs around your legs and seems friendly.", + "pet": "The %s runs around your leg." + }, + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + }, + { + "id": "mon_goose_golden", + "type": "MONSTER", + "copy-from": "mon_goose", + "name": { "str": "regal honker" }, + "description": "This strange colored goose seems larger than the rest. Even more strange is its docile demeanor.", + "volume": "8 L", + "weight": "4000 g", + "hp": 25, + "symbol": "g", + "color": "yellow", + "aggression": 0, + "morale": 30, + "dodge": 3, + "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "reproduction": { "baby_egg": "egg_goose_golden", "baby_count": 1, "baby_timer": 10 } + }, + { + "id": "mon_goose_chick", + "type": "MONSTER", + "copy-from": "mon_duck_chick", + "upgrades": { "age_grow": 16, "into": "mon_goose" } + }, + { + "id": "mon_goose_golden_chick", + "type": "MONSTER", + "copy-from": "mon_goose_chick", + "upgrades": { "age_grow": 16, "into": "mon_goose_golden" } + }, + { + "id": "mon_hummingbird", + "type": "MONSTER", + "name": { "str": "hummingbird" }, + "description": "A very small bird of varied colored feathers depending on species. It flies at incredible speeds while seeking nectar among flowers.", + "bodytype": "bird", + "default_faction": "small_animal", + "categories": [ "WILDLIFE" ], + "species": [ "BIRD" ], + "volume": "150 ml", + "weight": "18 g", + "hp": 3, + "speed": 160, + "material": [ "flesh" ], + "symbol": "v", + "color": "brown", + "aggression": -99, + "morale": -8, + "melee_dice": 1, + "melee_dice_sides": 1, + "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "dodge": 4, + "harvest": "bird_tiny", + "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], + "reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 5, "baby_timer": 14 }, + "baby_flags": [ "SPRING" ], + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ] + }, + { + "id": "mon_woodpecker", + "type": "MONSTER", + "name": { "str": "woodpecker" }, + "description": "A small bird with woody colors and a colored crest on its head. These birds are well known for their ability to poke holes on trees while looking for grubs.", + "bodytype": "bird", + "default_faction": "small_animal", + "categories": [ "WILDLIFE" ], + "species": [ "BIRD" ], + "volume": "400 ml", + "weight": "400 g", + "hp": 10, + "speed": 140, + "material": [ "flesh" ], + "symbol": "v", + "color": "brown", + "aggression": -99, + "morale": -8, + "melee_dice": 1, + "melee_dice_sides": 1, + "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "dodge": 4, + "harvest": "bird_small", + "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], + "reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 14 }, + "baby_flags": [ "SPRING" ], + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ] + }, + { + "id": "mon_hummingbird_chick", + "type": "MONSTER", + "copy-from": "mon_crow_chick", + "name": { "str": "brown chick" }, + "volume": "80 ml", + "weight": "7 g", + "upgrades": { "age_grow": 11, "into": "mon_hummingbird" } + }, + { + "id": "mon_woodpecker_chick", + "type": "MONSTER", + "copy-from": "mon_crow_chick", + "name": { "str": "brown chick" }, + "volume": "200 ml", + "weight": "15 g", + "upgrades": { "age_grow": 11, "into": "mon_woodpecker" } + }, + { + "id": "mon_coot", + "type": "MONSTER", + "name": { "str": "coot" }, + "description": "A bird belonging to the Rallidae family. They can be found worldwide on freshwater habitats, including many islands in the not so distant past.", + "default_faction": "small_animal", + "bodytype": "bird", + "categories": [ "WILDLIFE" ], + "species": [ "BIRD" ], + "volume": "800 ml", + "weight": "800 g", + "hp": 5, + "speed": 110, + "material": [ "flesh" ], + "symbol": "v", + "color": "brown", + "aggression": -99, + "morale": -8, + "melee_dice": 1, + "melee_dice_sides": 1, + "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "dodge": 4, + "harvest": "bird_small", + "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], + "reproduction": { "baby_egg": "egg_coot", "baby_count": 3, "baby_timer": 5 }, + "baby_flags": [ "SPRING" ], + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 }, + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ] + }, + { + "id": "mon_cormorant", + "type": "MONSTER", + "copy-from": "mon_coot", + "name": { "str": "cormorant" }, + "description": "An aquatic bird with a long snake-like neck. They are considered coastal birds but many species can also be found on freshwater habitats.", + "volume": "340 ml", + "weight": "340 g", + "hp": 5, + "speed": 110, + "color": "brown", + "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 2, "baby_timer": 6 }, + "baby_flags": [ "SPRING", "SUMMER" ], + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + }, + { + "id": "mon_moorhen", + "type": "MONSTER", + "copy-from": "mon_coot", + "name": { "str": "moorhen" }, + "description": "A bird belonging to the Rallidae family. They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.", + "volume": "400 ml", + "weight": "400 g", + "hp": 5, + "speed": 110, + "color": "brown", + "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 }, + "baby_flags": [ "SPRING", "SUMMER" ], + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + }, + { + "id": "mon_grebe", + "type": "MONSTER", + "copy-from": "mon_coot", + "name": { "str": "grebe" }, + "description": "A medium sized aquatic bird with a long neck. These birds can be distinguished by their strange leg placement which makes them great at diving.", + "volume": "500 ml", + "weight": "500 g", + "hp": 5, + "speed": 110, + "color": "brown", + "reproduction": { "baby_egg": "egg_grebe", "baby_count": 2, "baby_timer": 6 }, + "baby_flags": [ "SPRING", "SUMMER" ], + "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + }, + { + "id": "mon_coot_chick", + "type": "MONSTER", + "copy-from": "mon_duck_chick", + "name": { "str": "brown chick" }, + "upgrades": { "age_grow": 14, "into": "mon_coot" } + }, + { + "id": "mon_cormorant_chick", + "type": "MONSTER", + "copy-from": "mon_duck_chick", + "name": { "str": "brown chick" }, + "upgrades": { "age_grow": 14, "into": "mon_cormorant" } + }, + { + "id": "mon_moorhen_chick", + "type": "MONSTER", + "copy-from": "mon_duck_chick", + "name": { "str": "brown chick" }, + "upgrades": { "age_grow": 14, "into": "mon_moorhen" } + }, + { + "id": "mon_grebe_chick", + "type": "MONSTER", + "copy-from": "mon_duck_chick", + "name": { "str": "brown chick" }, + "upgrades": { "age_grow": 14, "into": "mon_grebe" } } ] From 0a54d598a67c136edabf07cff2d8405d8369c40c Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:13:27 -0500 Subject: [PATCH 02/63] Update tropical_bird.json moved several birds to vanilla game from mod --- .../monsters/tropical_bird.json | 232 ------------------ 1 file changed, 232 deletions(-) diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json index 6d3f580836239..0d0f0272810f2 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_bird.json +++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json @@ -1,46 +1,4 @@ [ - { - "id": "mon_goose", - "type": "MONSTER", - "copy-from": "mon_duck", - "name": { "str": "goose", "str_pl": "geese" }, - "description": "The domestic goose. A waterfowl well known for its loud honking and aggressive behavior.", - "volume": "5 L", - "weight": "3750 g", - "hp": 15, - "looks_like": "mon_goose_canadian", - "aggression": 1, - "morale": 15, - "dodge": 3, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "anger_triggers": [ "PLAYER_CLOSE" ], - "reproduction": { "baby_egg": "egg_goose", "baby_count": 5, "baby_timer": 10 }, - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 4 }, - "petfood": { - "food": [ "BIRDFOOD" ], - "feed": "The %s seems to like you! It runs around your legs and seems friendly.", - "pet": "The %s runs around your leg." - }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] - }, - { - "id": "mon_goose_golden", - "type": "MONSTER", - "copy-from": "mon_goose", - "name": { "str": "regal honker" }, - "description": "This strange colored goose seems larger than the rest. Even more strange is its docile demeanor.", - "volume": "8 L", - "weight": "4000 g", - "hp": 25, - "symbol": "g", - "color": "yellow", - "aggression": 0, - "morale": 30, - "dodge": 3, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "reproduction": { "baby_egg": "egg_goose_golden", "baby_count": 1, "baby_timer": 10 } - }, { "id": "mon_rhea", "type": "MONSTER", @@ -163,76 +121,6 @@ "name": { "str": "brown chick" }, "upgrades": { "age_grow": 18, "into": "mon_rhea" } }, - { - "id": "mon_goose_chick", - "type": "MONSTER", - "copy-from": "mon_duck_chick", - "upgrades": { "age_grow": 16, "into": "mon_goose" } - }, - { - "id": "mon_goose_golden_chick", - "type": "MONSTER", - "copy-from": "mon_goose_chick", - "upgrades": { "age_grow": 16, "into": "mon_goose_golden" } - }, - { - "id": "mon_hummingbird", - "type": "MONSTER", - "name": { "str": "hummingbird" }, - "description": "A very small bird of varied colored feathers depending on species. It flies at incredible speeds while seeking nectar among flowers.", - "bodytype": "bird", - "default_faction": "small_animal", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "150 ml", - "weight": "18 g", - "hp": 3, - "speed": 160, - "material": [ "flesh" ], - "symbol": "v", - "color": "brown", - "aggression": -99, - "morale": -8, - "melee_dice": 1, - "melee_dice_sides": 1, - "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], - "dodge": 4, - "harvest": "bird_tiny", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 5, "baby_timer": 14 }, - "baby_flags": [ "SPRING" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ] - }, - { - "id": "mon_woodpecker", - "type": "MONSTER", - "name": { "str": "woodpecker" }, - "description": "A small bird with woody colors and a colored crest on its head. These birds are well known for their ability to poke holes on trees while looking for grubs.", - "bodytype": "bird", - "default_faction": "small_animal", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "400 ml", - "weight": "400 g", - "hp": 10, - "speed": 140, - "material": [ "flesh" ], - "symbol": "v", - "color": "brown", - "aggression": -99, - "morale": -8, - "melee_dice": 1, - "melee_dice_sides": 1, - "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], - "dodge": 4, - "harvest": "bird_small", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 14 }, - "baby_flags": [ "SPRING" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ] - }, { "id": "mon_toucan", "type": "MONSTER", @@ -398,24 +286,6 @@ }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ] }, - { - "id": "mon_hummingbird_chick", - "type": "MONSTER", - "copy-from": "mon_crow_chick", - "name": { "str": "brown chick" }, - "volume": "80 ml", - "weight": "7 g", - "upgrades": { "age_grow": 11, "into": "mon_hummingbird" } - }, - { - "id": "mon_woodpecker_chick", - "type": "MONSTER", - "copy-from": "mon_crow_chick", - "name": { "str": "brown chick" }, - "volume": "200 ml", - "weight": "15 g", - "upgrades": { "age_grow": 11, "into": "mon_woodpecker" } - }, { "id": "mon_toucan_chick", "type": "MONSTER", @@ -620,80 +490,6 @@ "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ] }, - { - "id": "mon_coot", - "type": "MONSTER", - "name": { "str": "coot" }, - "description": "A bird belonging to the Rallidae family. They can be found worldwide on freshwater habitats, including many islands in the not so distant past.", - "default_faction": "small_animal", - "bodytype": "bird", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "800 ml", - "weight": "800 g", - "hp": 5, - "speed": 110, - "material": [ "flesh" ], - "symbol": "v", - "color": "brown", - "aggression": -99, - "morale": -8, - "melee_dice": 1, - "melee_dice_sides": 1, - "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], - "dodge": 4, - "harvest": "bird_small", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "reproduction": { "baby_egg": "egg_coot", "baby_count": 3, "baby_timer": 5 }, - "baby_flags": [ "SPRING" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ] - }, - { - "id": "mon_cormorant", - "type": "MONSTER", - "copy-from": "mon_coot", - "name": { "str": "cormorant" }, - "description": "An aquatic bird with a long snake-like neck. They are considered coastal birds but many species can also be found on freshwater habitats.", - "volume": "340 ml", - "weight": "340 g", - "hp": 5, - "speed": 110, - "color": "brown", - "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } - }, - { - "id": "mon_moorhen", - "type": "MONSTER", - "copy-from": "mon_coot", - "name": { "str": "moorhen" }, - "description": "A bird belonging to the Rallidae family. They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.", - "volume": "400 ml", - "weight": "400 g", - "hp": 5, - "speed": 110, - "color": "brown", - "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } - }, - { - "id": "mon_grebe", - "type": "MONSTER", - "copy-from": "mon_coot", - "name": { "str": "grebe" }, - "description": "A medium sized aquatic bird with a long neck. These birds can be distinguished by their strange leg placement which makes them great at diving.", - "volume": "500 ml", - "weight": "500 g", - "hp": 5, - "speed": 110, - "color": "brown", - "reproduction": { "baby_egg": "egg_grebe", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } - }, { "id": "mon_flamingo_chick", "type": "MONSTER", @@ -704,33 +500,5 @@ "weight": "280 g", "color": "light_gray", "upgrades": { "age_grow": 16, "into": "mon_flamingo" } - }, - { - "id": "mon_coot_chick", - "type": "MONSTER", - "copy-from": "mon_duck_chick", - "name": { "str": "brown chick" }, - "upgrades": { "age_grow": 14, "into": "mon_coot" } - }, - { - "id": "mon_cormorant_chick", - "type": "MONSTER", - "copy-from": "mon_duck_chick", - "name": { "str": "brown chick" }, - "upgrades": { "age_grow": 14, "into": "mon_cormorant" } - }, - { - "id": "mon_moorhen_chick", - "type": "MONSTER", - "copy-from": "mon_duck_chick", - "name": { "str": "brown chick" }, - "upgrades": { "age_grow": 14, "into": "mon_moorhen" } - }, - { - "id": "mon_grebe_chick", - "type": "MONSTER", - "copy-from": "mon_duck_chick", - "name": { "str": "brown chick" }, - "upgrades": { "age_grow": 14, "into": "mon_grebe" } } ] From ad66fdba18d9ee290974fb8b5f3fe8d7a28b9716 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:17:04 -0500 Subject: [PATCH 03/63] Update egg.json added several types for eggs for animals that are being ported from mod to vanilla --- data/json/items/comestibles/egg.json | 112 +++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index bfd818499dab5..d5667fa97bab2 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -637,5 +637,117 @@ "volume": "650 ml", "description": "A large clump of the eggs of a frog. The eggs themselves are gelatinous and transparent.", "rot_spawn": "GROUP_EGG_FROG" + }, + { + "type": "COMESTIBLE", + "id": "egg_goose", + "name": "goose egg", + "copy-from": "egg_guinea_fowl", + "calories": 266, + "volume": "125 ml", + "weight": "144 g", + "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], + "rot_spawn": "GROUP_EGG_GOOSE" + }, + { + "type": "COMESTIBLE", + "id": "egg_goose_golden", + "name": "golden goose egg", + "copy-from": "egg_goose", + "calories": 300, + "volume": "125 ml", + "weight": "144 g", + "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], + "rot_spawn": "GROUP_EGG_GOOSE" + }, + { + "type": "COMESTIBLE", + "id": "egg_hummingbird", + "name": "hummingbird egg", + "copy-from": "egg_bird", + "rot_spawn": "GROUP_EGG_HUMMINGBIRD", + "rot_spawn_chance": 70 + }, + { + "type": "COMESTIBLE", + "id": "egg_woodpecker", + "name": "woodpecker egg", + "copy-from": "egg_bird", + "rot_spawn": "GROUP_EGG_WOODPECKER", + "rot_spawn_chance": 70 + }, + { + "type": "COMESTIBLE", + "id": "egg_coot", + "name": "coot egg", + "copy-from": "egg_bird", + "rot_spawn": "GROUP_EGG_COOT", + "rot_spawn_chance": 70 + }, + { + "type": "COMESTIBLE", + "id": "egg_cormorant", + "name": "cormorant egg", + "copy-from": "egg_bird", + "rot_spawn": "GROUP_EGG_CORMORANT", + "rot_spawn_chance": 70 + }, + { + "type": "COMESTIBLE", + "id": "egg_moorhen", + "name": "moorhen egg", + "copy-from": "egg_bird", + "rot_spawn": "GROUP_EGG_MOORHEN", + "rot_spawn_chance": 70 + }, + { + "type": "COMESTIBLE", + "id": "egg_grebe", + "name": "grebe egg", + "copy-from": "egg_bird", + "rot_spawn": "GROUP_EGG_GREBE", + "rot_spawn_chance": 70 + }, + { + "type": "COMESTIBLE", + "id": "egg_toad", + "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" }, + "copy-from": "egg_chicken", + "weight": "20 g", + "volume": "650 ml", + "description": "A large clump of the eggs of a toad. The eggs themselves are gelatinous and transparent.", + "rot_spawn": "GROUP_EGG_TOAD" + }, + { + "type": "COMESTIBLE", + "id": "egg_water_beetle", + "name": "water beetle egg", + "copy-from": "egg_strider", + "description": "The egg of a water beetle, usually found near aquatic grass.", + "rot_spawn": "GROUP_EGG_WATER_BEETLE" + }, + { + "type": "COMESTIBLE", + "id": "egg_water_bug", + "name": "water scorpion egg", + "copy-from": "egg_strider", + "description": "The egg of a water scorpion, usually found near aquatic grass.", + "rot_spawn": "GROUP_EGG_WATER_BUG" + }, + { + "type": "COMESTIBLE", + "id": "egg_butterfly", + "name": "butterfly egg", + "copy-from": "egg_insect", + "description": "The egg of a butterfly. They are usually found clustered on leaves.", + "rot_spawn": "GROUP_EGG_BUTTERFLY" + }, + { + "type": "COMESTIBLE", + "id": "egg_cicada", + "name": "cicada egg", + "copy-from": "egg_insect", + "description": "The egg of a cicada. They are usually found near trees.", + "rot_spawn": "GROUP_EGG_CICADA" } ] From 1a84553bff4a1f513169e6e262df7e661bd6ec97 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:17:36 -0500 Subject: [PATCH 04/63] Update egg.json moved several eggs from mod to vanilla --- .../TropiCataclysm/items/comestibles/egg.json | 112 ------------------ 1 file changed, 112 deletions(-) diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json index cd59ef1fa2839..23398f0c16c05 100644 --- a/data/mods/TropiCataclysm/items/comestibles/egg.json +++ b/data/mods/TropiCataclysm/items/comestibles/egg.json @@ -7,28 +7,6 @@ "rot_spawn": "GROUP_EGG_GUINEA_FOWL", "rot_spawn_chance": 70 }, - { - "type": "COMESTIBLE", - "id": "egg_goose", - "name": "goose egg", - "copy-from": "egg_guinea_fowl", - "calories": 266, - "volume": "125 ml", - "weight": "144 g", - "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], - "rot_spawn": "GROUP_EGG_GOOSE" - }, - { - "type": "COMESTIBLE", - "id": "egg_goose_golden", - "name": "golden goose egg", - "copy-from": "egg_goose", - "calories": 300, - "volume": "125 ml", - "weight": "144 g", - "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], - "rot_spawn": "GROUP_EGG_GOOSE" - }, { "type": "COMESTIBLE", "id": "egg_quail", @@ -46,22 +24,6 @@ "calories": 1000, "rot_spawn": "GROUP_EGG_RHEA" }, - { - "type": "COMESTIBLE", - "id": "egg_hummingbird", - "name": "hummingbird egg", - "copy-from": "egg_bird", - "rot_spawn": "GROUP_EGG_HUMMINGBIRD", - "rot_spawn_chance": 70 - }, - { - "type": "COMESTIBLE", - "id": "egg_woodpecker", - "name": "woodpecker egg", - "copy-from": "egg_bird", - "rot_spawn": "GROUP_EGG_WOODPECKER", - "rot_spawn_chance": 70 - }, { "type": "COMESTIBLE", "id": "egg_toucan", @@ -150,48 +112,6 @@ "rot_spawn": "GROUP_EGG_FLAMINGO", "rot_spawn_chance": 70 }, - { - "type": "COMESTIBLE", - "id": "egg_coot", - "name": "coot egg", - "copy-from": "egg_bird", - "rot_spawn": "GROUP_EGG_COOT", - "rot_spawn_chance": 70 - }, - { - "type": "COMESTIBLE", - "id": "egg_cormorant", - "name": "cormorant egg", - "copy-from": "egg_bird", - "rot_spawn": "GROUP_EGG_CORMORANT", - "rot_spawn_chance": 70 - }, - { - "type": "COMESTIBLE", - "id": "egg_moorhen", - "name": "moorhen egg", - "copy-from": "egg_bird", - "rot_spawn": "GROUP_EGG_MOORHEN", - "rot_spawn_chance": 70 - }, - { - "type": "COMESTIBLE", - "id": "egg_grebe", - "name": "grebe egg", - "copy-from": "egg_bird", - "rot_spawn": "GROUP_EGG_GREBE", - "rot_spawn_chance": 70 - }, - { - "type": "COMESTIBLE", - "id": "egg_toad", - "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" }, - "copy-from": "egg_chicken", - "weight": "20 g", - "volume": "650 ml", - "description": "A large clump of the eggs of a toad. The eggs themselves are gelatinous and transparent.", - "rot_spawn": "GROUP_EGG_TOAD" - }, { "type": "COMESTIBLE", "id": "egg_constrictor", @@ -224,22 +144,6 @@ "description": "The egg of an iguana.", "rot_spawn": "GROUP_EGG_IGUANA" }, - { - "type": "COMESTIBLE", - "id": "egg_water_beetle", - "name": "water beetle egg", - "copy-from": "egg_strider", - "description": "The egg of a water beetle, usually found near aquatic grass.", - "rot_spawn": "GROUP_EGG_WATER_BEETLE" - }, - { - "type": "COMESTIBLE", - "id": "egg_water_bug", - "name": "water scorpion egg", - "copy-from": "egg_strider", - "description": "The egg of a water scorpion, usually found near aquatic grass.", - "rot_spawn": "GROUP_EGG_WATER_BUG" - }, { "type": "COMESTIBLE", "id": "egg_turtle", @@ -272,22 +176,6 @@ "description": "The small translucent egg of a termite. It will grow quickly into a nymph if allowed.", "rot_spawn": "GROUP_EGG_TERMITE" }, - { - "type": "COMESTIBLE", - "id": "egg_butterfly", - "name": "butterfly egg", - "copy-from": "egg_insect", - "description": "The egg of a butterfly. They are usually found clustered on leaves.", - "rot_spawn": "GROUP_EGG_BUTTERFLY" - }, - { - "type": "COMESTIBLE", - "id": "egg_cicada", - "name": "cicada egg", - "copy-from": "egg_insect", - "description": "The egg of a cicada. They are usually found near trees.", - "rot_spawn": "GROUP_EGG_CICADA" - }, { "type": "COMESTIBLE", "id": "triffid_pod", From 84f37bbe355aaf2e7dccfacb7710202203e25a24 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:22:09 -0500 Subject: [PATCH 05/63] Update eggs.json added monstegroup for eggs from mod --- data/json/monstergroups/eggs.json | 83 +++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 4b208bf8a8c47..3cac0a7e11e63 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -15,6 +15,8 @@ { "monster": "mon_cardinal_chick", "weight": 15 }, { "monster": "mon_sparrow_chick", "weight": 15 }, { "monster": "mon_goose_canadian_chick", "weight": 100 }, + { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 }, + { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } { "monster": "mon_rattlesnake", "weight": 65 } ] }, @@ -179,5 +181,86 @@ "name": "GROUP_EGG_FROG", "type": "monstergroup", "monsters": [ { "monster": "mon_tadpole" } ] + }, + { + "name": "GROUP_EGG_GOOSE", + "type": "monstergroup", + "default": "mon_goose_chick", + "monsters": [ { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_GOOSE_GOLD", + "type": "monstergroup", + "default": "mon_goose_golden_chick", + "monsters": [ { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_HUMMINGBIRD", + "type": "monstergroup", + "default": "mon_hummingbird_chick", + "monsters": [ { "monster": "mon_hummingbird_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_WOODPECKER", + "type": "monstergroup", + "default": "mon_woodpecker_chick", + "monsters": [ { "monster": "mon_woodpecker_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_COOT", + "type": "monstergroup", + "default": "mon_coot_chick", + "monsters": [ { "monster": "mon_coot_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_CORMORANT", + "type": "monstergroup", + "default": "mon_cormorant_chick", + "monsters": [ { "monster": "mon_cormorant_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_MOORHEN", + "type": "monstergroup", + "default": "mon_moorhen_chick", + "monsters": [ { "monster": "mon_moorhen_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_GREBE", + "type": "monstergroup", + "default": "mon_grebe_chick", + "monsters": [ { "monster": "mon_grebe_chick", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_TOAD", + "type": "monstergroup", + "default": "mon_tadpole_brown", + "monsters": [ { "monster": "mon_tadpole_brown", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_WATER_BEETLE", + "type": "monstergroup", + "default": "mon_diving_larva", + "monsters": [ { "monster": "mon_diving_larva", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_WATER_BUG", + "type": "monstergroup", + "default": "mon_water_scorpion_larva", + "monsters": [ { "monster": "mon_water_scorpion_larva", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_CICADA", + "type": "monstergroup", + "default": "mon_cicada_nymph", + "monsters": [ { "monster": "mon_cicada_nymph", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_EGG_BUTTERFLY", + "type": "monstergroup", + "default": "mon_caterpillar", + "monsters": [ + { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1 }, + { "monster": "mon_caterpillar", "freq": 100, "cost_multiplier": 1 } + ] } ] From 51608a4970bf810170e20c7d348aeac9a63ad209 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:22:48 -0500 Subject: [PATCH 06/63] Update eggs.json moved several monstergroups from eggs to vanilla files --- .../TropiCataclysm/monstergroups/eggs.json | 85 +------------------ 1 file changed, 1 insertion(+), 84 deletions(-) diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json index 6aa7aa2535e79..65d35b916642e 100644 --- a/data/mods/TropiCataclysm/monstergroups/eggs.json +++ b/data/mods/TropiCataclysm/monstergroups/eggs.json @@ -6,9 +6,7 @@ "monsters": [ { "monster": "mon_guinea_fowl_chick", "freq": 50, "cost_multiplier": 1 }, { "monster": "mon_quail_chick", "freq": 100, "cost_multiplier": 1 }, - { "monster": "mon_rhea_chick", "freq": 250, "cost_multiplier": 1 }, - { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 }, - { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } + { "monster": "mon_rhea_chick", "freq": 250, "cost_multiplier": 1 } ] }, { @@ -17,18 +15,6 @@ "default": "mon_guinea_fowl_chick", "monsters": [ { "monster": "mon_guinea_fowl_chick", "freq": 100, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_EGG_GOOSE", - "type": "monstergroup", - "default": "mon_goose_chick", - "monsters": [ { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_GOOSE_GOLD", - "type": "monstergroup", - "default": "mon_goose_golden_chick", - "monsters": [ { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } ] - }, { "name": "GROUP_EGG_QUAIL", "type": "monstergroup", @@ -41,18 +27,6 @@ "default": "mon_rhea_chick", "monsters": [ { "monster": "mon_rhea_chick", "freq": 100, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_EGG_HUMMINGBIRD", - "type": "monstergroup", - "default": "mon_hummingbird_chick", - "monsters": [ { "monster": "mon_hummingbird_chick", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_WOODPECKER", - "type": "monstergroup", - "default": "mon_woodpecker_chick", - "monsters": [ { "monster": "mon_woodpecker_chick", "freq": 100, "cost_multiplier": 1 } ] - }, { "name": "GROUP_EGG_TOUCAN", "type": "monstergroup", @@ -119,36 +93,6 @@ "default": "mon_flamingo_chick", "monsters": [ { "monster": "mon_flamingo_chick", "freq": 100, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_EGG_COOT", - "type": "monstergroup", - "default": "mon_coot_chick", - "monsters": [ { "monster": "mon_coot_chick", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_CORMORANT", - "type": "monstergroup", - "default": "mon_cormorant_chick", - "monsters": [ { "monster": "mon_cormorant_chick", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_MOORHEN", - "type": "monstergroup", - "default": "mon_moorhen_chick", - "monsters": [ { "monster": "mon_moorhen_chick", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_GREBE", - "type": "monstergroup", - "default": "mon_grebe_chick", - "monsters": [ { "monster": "mon_grebe_chick", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_TOAD", - "type": "monstergroup", - "default": "mon_tadpole_brown", - "monsters": [ { "monster": "mon_tadpole_brown", "freq": 100, "cost_multiplier": 1 } ] - }, { "name": "GROUP_EGG_CONSTRICTOR", "type": "monstergroup", @@ -176,18 +120,6 @@ "default": "mon_iguana", "monsters": [ { "monster": "mon_iguana", "freq": 100, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_EGG_WATER_BEETLE", - "type": "monstergroup", - "default": "mon_diving_larva", - "monsters": [ { "monster": "mon_diving_larva", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_WATER_BUG", - "type": "monstergroup", - "default": "mon_water_scorpion_larva", - "monsters": [ { "monster": "mon_water_scorpion_larva", "freq": 100, "cost_multiplier": 1 } ] - }, { "name": "GROUP_EGG_TURTLE", "type": "monstergroup", @@ -212,21 +144,6 @@ "default": "mon_termite_nymph", "monsters": [ { "monster": "mon_termite_nymph", "freq": 100, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_EGG_CICADA", - "type": "monstergroup", - "default": "mon_cicada_nymph", - "monsters": [ { "monster": "mon_cicada_nymph", "freq": 100, "cost_multiplier": 1 } ] - }, - { - "name": "GROUP_EGG_BUTTERFLY", - "type": "monstergroup", - "default": "mon_caterpillar", - "monsters": [ - { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1 }, - { "monster": "mon_caterpillar", "freq": 100, "cost_multiplier": 1 } - ] - }, { "name": "GROUP_EGG_TRIFFID", "type": "monstergroup", From da968423161b093aaeb0c9140ce272ccd18f8afb Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:26:12 -0500 Subject: [PATCH 07/63] Update reptile_amphibian.json added toads to vanilla game --- data/json/monsters/reptile_amphibian.json | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index ef705904bc859..53647adb840ef 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -344,5 +344,62 @@ "dissect": "dissect_lizard_sample_single", "path_settings": { "max_dist": 5 }, "flags": [ "SEES", "SMELLS", "WARM", "VENOM", "SWIMS" ] + }, + { + "id": "mon_toad", + "type": "MONSTER", + "name": { "str": "toad" }, + "description": "Toads are a diverse and varied family of amphibians sister to frogs. Very distinguishable for their warty and dry skin.", + "copy-from": "mon_frog", + "reproduction": { "baby_egg": "egg_toad", "baby_count": 8, "baby_timer": 26 } + }, + { + "id": "mon_tadpole_brown", + "type": "MONSTER", + "name": { "str": "toad tadpole" }, + "description": "Toad tadpoles looks exactly like a frog tadpoles at birth. The main difference is that they keep this color during their whole larval stage.", + "copy-from": "mon_tadpole", + "color": "brown", + "upgrades": { "age_grow": 365, "into": "mon_toad" } + }, + { + "id": "mon_toad_small", + "type": "MONSTER", + "name": { "str": "huge toad" }, + "description": "The cane toad is a regular sight in tropical America and some other parts of the world. This one however, seems to have been mutated to absurd size by the Cataclysm.", + "copy-from": "mon_frog_small", + "upgrades": { "half_life": 14, "into": "mon_toad_giant" } + }, + { + "id": "mon_toad_giant", + "type": "MONSTER", + "name": { "str": "giant toad" }, + "description": "This cane toad has grown bigger than a human. It looks uninterested in eating you but you better not give it a chance.", + "default_faction": "frog", + "bodytype": "frog", + "looks_like": "mon_frog_giant", + "categories": [ "WILDLIFE" ], + "species": [ "AMPHIBIAN" ], + "volume": "92500 ml", + "weight": "120 kg", + "hp": 70, + "speed": 90, + "material": [ "flesh" ], + "symbol": "M", + "color": "light_green", + "aggression": 10, + "morale": 100, + "melee_skill": 5, + "melee_dice": 1, + "melee_dice_sides": 12, + "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], + "dodge": 2, + "armor_bash": 4, + "harvest": "mutant_animal_large_noskin", + "path_settings": { "max_dist": 5 }, + "upgrades": { "half_life": 50, "into": "mon_gastro_bufo" }, + "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], + "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], + "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ] } ] From 3ee14a9b421c70ef8a1dc2ac843eb0d611733a6b Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:26:36 -0500 Subject: [PATCH 08/63] Update tropical_reptile_amphibian.json moved toads to vanilla --- .../monsters/tropical_reptile_amphibian.json | 57 ------------------- 1 file changed, 57 deletions(-) diff --git a/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json b/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json index b90f4c6751e05..1d712665f1377 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json +++ b/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json @@ -179,31 +179,6 @@ "fear_triggers": [ "FIRE", "HURT" ], "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ] }, - { - "id": "mon_toad", - "type": "MONSTER", - "name": { "str": "toad" }, - "description": "Toads are a diverse and varied family of amphibians sister to frogs. Very distinguishable for their warty and dry skin.", - "copy-from": "mon_frog", - "reproduction": { "baby_egg": "egg_toad", "baby_count": 8, "baby_timer": 26 } - }, - { - "id": "mon_tadpole_brown", - "type": "MONSTER", - "name": { "str": "toad tadpole" }, - "description": "Toad tadpoles looks exactly like a frog tadpoles at birth. The main difference is that they keep this color during their whole larval stage.", - "copy-from": "mon_tadpole", - "color": "brown", - "upgrades": { "age_grow": 365, "into": "mon_toad" } - }, - { - "id": "mon_toad_small", - "type": "MONSTER", - "name": { "str": "huge toad" }, - "description": "The cane toad is a regular sight in tropical America and some other parts of the world. This one however, seems to have been mutated to absurd size by the Cataclysm.", - "copy-from": "mon_frog_small", - "upgrades": { "half_life": 14, "into": "mon_toad_giant" } - }, { "id": "mon_tadpole_small", "type": "MONSTER", @@ -264,38 +239,6 @@ "fear_triggers": [ "HURT" ], "flags": [ "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE" ] }, - { - "id": "mon_toad_giant", - "type": "MONSTER", - "name": { "str": "giant toad" }, - "description": "This cane toad has grown bigger than a human. It looks uninterested in eating you but you better not give it a chance.", - "default_faction": "frog", - "bodytype": "frog", - "looks_like": "mon_frog_giant", - "categories": [ "WILDLIFE" ], - "species": [ "AMPHIBIAN" ], - "volume": "92500 ml", - "weight": "120 kg", - "hp": 70, - "speed": 90, - "material": [ "flesh" ], - "symbol": "M", - "color": "light_green", - "aggression": 10, - "morale": 100, - "melee_skill": 5, - "melee_dice": 1, - "melee_dice_sides": 12, - "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "dodge": 2, - "armor_bash": 4, - "harvest": "mutant_animal_large_noskin", - "path_settings": { "max_dist": 5 }, - "upgrades": { "half_life": 50, "into": "mon_gastro_bufo" }, - "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], - "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ] - }, { "id": "mon_anaconda", "type": "MONSTER", From 12282dc27aa9dfe294167fce73a66bffea16b6ce Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:27:15 -0500 Subject: [PATCH 09/63] Update tropical_zanimals.json moved gastrobufo to vanilla game --- .../monsters/tropical_zanimals.json | 48 +------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/data/mods/TropiCataclysm/monsters/tropical_zanimals.json b/data/mods/TropiCataclysm/monsters/tropical_zanimals.json index 9e129c7b3123d..3c5c1916ab7ab 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_zanimals.json +++ b/data/mods/TropiCataclysm/monsters/tropical_zanimals.json @@ -1,49 +1,3 @@ [ - { - "id": "mon_gastro_bufo", - "type": "MONSTER", - "name": { "str": "gastro bufo" }, - "description": "A massive toad stumbling around while leaking acid from its skin. Doesn't look friendly at all.", - "default_faction": "zombie", - "species": [ "ZOMBIE", "AMPHIBIAN" ], - "volume": "200 L", - "weight": "280 kg", - "hp": 200, - "speed": 75, - "material": [ "flesh" ], - "symbol": "F", - "color": "black_green", - "aggression": 100, - "morale": 100, - "melee_skill": 5, - "melee_dice": 5, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], - "dodge": 2, - "armor_bash": 8, - "armor_cut": 2, - "armor_bullet": 1, - "vision_night": 7, - "harvest": "zombie", - "path_settings": { "max_dist": 5 }, - "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], - "special_when_hit": [ "ACIDSPLASH", 100 ], - "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } }, - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "KEENNOSE", - "STUMBLES", - "WARM", - "BASHES", - "POISON", - "NO_BREATHE", - "REVIVES", - "PUSH_MON", - "FILTHY", - "ACIDPROOF", - "ACID_BLOOD" - ] - } + ] From d403bb2b462bec3343b06b63408c544f25ab6d92 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:27:23 -0500 Subject: [PATCH 10/63] Delete tropical_zanimals.json --- data/mods/TropiCataclysm/monsters/tropical_zanimals.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 data/mods/TropiCataclysm/monsters/tropical_zanimals.json diff --git a/data/mods/TropiCataclysm/monsters/tropical_zanimals.json b/data/mods/TropiCataclysm/monsters/tropical_zanimals.json deleted file mode 100644 index 3c5c1916ab7ab..0000000000000 --- a/data/mods/TropiCataclysm/monsters/tropical_zanimals.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - -] From a7b8c15e359b540a1839628067c61fefdb9fba94 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:28:04 -0500 Subject: [PATCH 11/63] Update zed-animal.json added gastrobufo to vanilla game --- data/json/monsters/zed-animal.json | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json index 34780ee08e5a4..4b7ea04e66270 100644 --- a/data/json/monsters/zed-animal.json +++ b/data/json/monsters/zed-animal.json @@ -590,5 +590,52 @@ "vision_night": 10, "harvest": "zombie_leather", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ] + }, + { + "id": "mon_gastro_bufo", + "type": "MONSTER", + "name": { "str": "gastro bufo" }, + "description": "A massive toad stumbling around while leaking acid from its skin. Doesn't look friendly at all.", + "default_faction": "zombie", + "species": [ "ZOMBIE", "AMPHIBIAN" ], + "volume": "200 L", + "weight": "280 kg", + "hp": 200, + "speed": 75, + "material": [ "flesh" ], + "symbol": "F", + "color": "black_green", + "aggression": 100, + "morale": 100, + "melee_skill": 5, + "melee_dice": 5, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], + "dodge": 2, + "armor_bash": 8, + "armor_cut": 2, + "armor_bullet": 1, + "vision_night": 7, + "harvest": "zombie", + "path_settings": { "max_dist": 5 }, + "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], + "special_when_hit": [ "ACIDSPLASH", 100 ], + "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } }, + "flags": [ + "SEES", + "HEARS", + "SMELLS", + "KEENNOSE", + "STUMBLES", + "WARM", + "BASHES", + "POISON", + "NO_BREATHE", + "REVIVES", + "PUSH_MON", + "FILTHY", + "ACIDPROOF", + "ACID_BLOOD" + ] } ] From 5e281a6dc08424fb3cfe41c59576831fdddc1465 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:30:05 -0500 Subject: [PATCH 12/63] Update biosignatures.json ported insect dust for butterflies and moths from mod --- data/json/items/biosignatures.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json index 6f18670e5951e..15ed7861a1b89 100644 --- a/data/json/items/biosignatures.json +++ b/data/json/items/biosignatures.json @@ -71,5 +71,26 @@ "charges_to_use": 1, "effects": [ { "id": "fetid_goop", "duration": 3600 } ] } + }, + { + "type": "COMESTIBLE", + "id": "insect_dust", + "name": { "str_sp": "chitin dust" }, + "category": "chems", + "weight": "40 g", + "color": "white", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -3, + "healthy": -10, + "calories": 26, + "description": "The dust left over by winged insects such as butterflies or moths. It's mostly chitin but may also contain dirt and other gross materials.", + "price": 0, + "price_postapoc": 0, + "material": [ "feces" ], + "volume": "250 ml", + "charges": 4, + "stack_size": 4, + "fun": -25 } ] From e274f12195e19b91004a18a81f63379169df061a Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:30:11 -0500 Subject: [PATCH 13/63] Delete biosignatures.json --- .../items/comestibles/biosignatures.json | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 data/mods/TropiCataclysm/items/comestibles/biosignatures.json diff --git a/data/mods/TropiCataclysm/items/comestibles/biosignatures.json b/data/mods/TropiCataclysm/items/comestibles/biosignatures.json deleted file mode 100644 index 81d1ac3cdf732..0000000000000 --- a/data/mods/TropiCataclysm/items/comestibles/biosignatures.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "type": "COMESTIBLE", - "id": "insect_dust", - "name": { "str_sp": "chitin dust" }, - "category": "chems", - "weight": "40 g", - "color": "white", - "comestible_type": "FOOD", - "symbol": "%", - "quench": -3, - "healthy": -10, - "calories": 26, - "description": "The dust left over by winged insects such as butterflies or moths. It's mostly chitin but may also contain dirt and other gross materials.", - "price": 0, - "price_postapoc": 0, - "material": [ "feces" ], - "volume": "250 ml", - "charges": 4, - "stack_size": 4, - "fun": -25 - } -] From 5a8d9a0de0de56ca8614c43c2aa3ca3acfe60120 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:32:00 -0500 Subject: [PATCH 14/63] Update recipe_others.json added insect dust to chitin meal recipes --- data/json/recipes/recipe_others.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 35b487acfbd06..d866b7a89ab20 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -196,7 +196,7 @@ "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], - "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ] ] ] + "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ] }, { "type": "recipe", @@ -213,7 +213,7 @@ "batch_time_factors": [ 83, 3 ], "flags": [ "BLIND_EASY" ], "qualities": [ { "id": "FINE_GRIND", "level": 1 } ], - "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ] ] ] + "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ] }, { "type": "recipe", From a92dc98db6d5a2d893fbab47d4fc7c51bfeee572 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:35:56 -0500 Subject: [PATCH 15/63] Delete recipe_others.json --- .../TropiCataclysm/recipes/recipe_others.json | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 data/mods/TropiCataclysm/recipes/recipe_others.json diff --git a/data/mods/TropiCataclysm/recipes/recipe_others.json b/data/mods/TropiCataclysm/recipes/recipe_others.json deleted file mode 100644 index 56e2cd9b4b460..0000000000000 --- a/data/mods/TropiCataclysm/recipes/recipe_others.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "type": "recipe", - "activity_level": "fake", - "result": "meal_chitin_piece", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", - "difficulty": 2, - "time": "1 h", - "autolearn": true, - "batch_time_factors": [ 83, 3 ], - "flags": [ "BLIND_EASY" ], - "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], - "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "fake", - "result": "meal_chitin_piece", - "id_suffix": "mortar", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", - "skills_required": [ [ "survival", 1 ] ], - "difficulty": 2, - "time": "1 h 30 m", - "autolearn": true, - "batch_time_factors": [ 83, 3 ], - "flags": [ "BLIND_EASY" ], - "tools": [ [ [ "mortar_pestle", -1 ] ] ], - "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ] - }, - { - "result": "meal_chitin_piece", - "type": "recipe", - "activity_level": "NO_EXERCISE", - "id_suffix": "with_from_food_processor", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "15 m", - "autolearn": true, - "batch_time_factors": [ 83, 3 ], - "tools": [ [ [ "food_processor", 20 ] ] ], - "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ] - } -] From dfb2f011c673ad646b36a291599c96af6cb1ae3a Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:38:27 -0500 Subject: [PATCH 16/63] Update insect_spider.json ported several insects from mod to vanilla --- data/json/monsters/insect_spider.json | 374 ++++++++++++++++++++++++++ 1 file changed, 374 insertions(+) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 39766b0a59d72..bece6d0e742ee 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2969,5 +2969,379 @@ "anger_triggers": [ "PLAYER_WEAK" ], "fear_triggers": [ "FIRE", "PLAYER_CLOSE" ], "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS" ] + }, + { + "id": "mon_butterfly", + "type": "MONSTER", + "name": { "str": "mutated butterfly", "str_pl": "mutated butterflies" }, + "description": "An oversized butterfly with vibrant colored markings. Unlike the other big insects of the Cataclysm this is a very peaceful nectivore.", + "bodytype": "flying insect", + "species": [ "INSECT_FLYING" ], + "default_faction": "insect", + "material": [ "iflesh" ], + "symbol": "l", + "color": "white", + "volume": "15 L", + "weight": "20 kg", + "hp": 25, + "speed": 95, + "vision_day": 15, + "dodge": 2, + "harvest": "arachnid_firefly", + "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, + "upgrades": { "half_life": 14, "into": "mon_butterfly_giant" }, + "baby_flags": [ "SPRING", "SUMMER" ], + "fear_triggers": [ "HURT", "FIRE" ], + "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] + }, + { + "id": "mon_butterfly_giant", + "type": "MONSTER", + "name": { "str": "giant butterfly", "str_pl": "giant butterflies" }, + "description": "A mutated butterfly larger than a human. Despite its size it is very lightweight and feeds mainly on the nectar produced by triffid flowers.", + "bodytype": "flying insect", + "species": [ "INSECT_FLYING" ], + "default_faction": "insect", + "material": [ "iflesh" ], + "symbol": "L", + "color": "white", + "volume": "75 L", + "weight": "40 kg", + "hp": 50, + "speed": 95, + "vision_day": 15, + "dodge": 2, + "harvest": "arachnid_firefly", + "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 }, + "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, + "baby_flags": [ "SPRING", "SUMMER" ], + "fear_triggers": [ "HURT", "FIRE" ], + "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] + }, + { + "id": "mon_butterfly_titan", + "type": "MONSTER", + "name": { "str": "emperor butterfly", "str_pl": "emperor butterflies" }, + "description": "An enormous butterfly with regal looking wings. This giant of the sky flies cheerfully under the sun, leaving dust as it passes.", + "copy-from": "mon_butterfly_giant", + "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 }, + "symbol": "L", + "color": "yellow", + "volume": "120 L", + "weight": "75 kg" + }, + { + "id": "mon_moth", + "type": "MONSTER", + "name": { "str": "mutated moth" }, + "description": "An oversized moth with its typical wood-like motifs. It is as peaceful as the mutated butterflies found during the day.", + "bodytype": "flying insect", + "species": [ "INSECT_FLYING" ], + "default_faction": "insect", + "material": [ "iflesh" ], + "symbol": "l", + "color": "light_gray", + "volume": "15 L", + "weight": "20 kg", + "hp": 25, + "speed": 95, + "vision_night": 15, + "dodge": 2, + "harvest": "arachnid_firefly", + "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, + "upgrades": { "half_life": 14, "into": "mon_moth_giant" }, + "baby_flags": [ "SPRING", "SUMMER" ], + "fear_triggers": [ "HURT", "FIRE" ], + "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] + }, + { + "id": "mon_moth_giant", + "type": "MONSTER", + "name": { "str": "giant moth" }, + "description": "A mutated moth larger than a human. It silently flies with its huge wings after dusk looking for nocturnal flowers to feed upon.", + "bodytype": "flying insect", + "species": [ "INSECT_FLYING" ], + "default_faction": "insect", + "material": [ "iflesh" ], + "symbol": "L", + "color": "light_gray", + "volume": "70 L", + "weight": "40 kg", + "hp": 50, + "speed": 95, + "vision_night": 15, + "dodge": 2, + "harvest": "arachnid_firefly", + "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 }, + "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, + "baby_flags": [ "SPRING", "SUMMER" ], + "fear_triggers": [ "HURT", "FIRE" ], + "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] + }, + { + "id": "mon_moth_titan", + "type": "MONSTER", + "name": { "str": "lunar moth" }, + "description": "A majestic moth painted in pale colors. This giant of the night only comes out after the moon is out, leaving glittering dust.", + "copy-from": "mon_moth_giant", + "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 }, + "symbol": "L", + "color": "cyan", + "volume": "120 L", + "weight": "75 kg" + }, + { + "id": "mon_caterpillar", + "type": "MONSTER", + "name": { "str": "caterpillar" }, + "description": "Caterpillars are the larval stage of butterflies and moths. This one seems newly hatched from an egg but even now it is large as a cat.", + "default_faction": "ant", + "bodytype": "insect", + "species": [ "INSECT" ], + "volume": "5 L", + "weight": "6 kg", + "hp": 10, + "material": [ "iflesh" ], + "symbol": "c", + "color": "green", + "speed": 50, + "vision_day": 15, + "dodge": 2, + "harvest": "arachnid", + "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY" }, + "flags": [ "SEES", "SMELLS", "CLIMBS", "HEARS", "STUMBLES", "PATH_AVOID_FIRE" ] + }, + { + "id": "mon_caterpillar_giant", + "type": "MONSTER", + "name": { "str": "giant caterpillar" }, + "description": "This caterpillar has reached the size of a person and it looks close to make a cocoon. You can only imagine the size of the insect that will emerge.", + "copy-from": "mon_caterpillar", + "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 }, + "symbol": "C", + "volume": "60 L", + "weight": "75 kg", + "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY_GIANT" } + }, + { + "id": "mon_cicada_nymph", + "type": "MONSTER", + "name": { "str": "cicada nymph" }, + "description": "The mutated larval form of a Cicada. It doesn't produce noise like the adults but its digging claws seem suited for scratching.", + "default_faction": "insect", + "bodytype": "insect", + "species": [ "INSECT" ], + "volume": "40 L", + "weight": "40 kg", + "hp": 80, + "speed": 80, + "material": [ "iflesh" ], + "symbol": "c", + "color": "white", + "aggression": -10, + "morale": 60, + "melee_skill": 3, + "melee_dice": 4, + "melee_dice_sides": 4, + "melee_damage": [ { "damage_type": "cut", "amount": 6 } ], + "armor_bash": 15, + "armor_cut": 18, + "armor_bullet": 20, + "armor_elec": 2, + "vision_day": 10, + "vision_night": 15, + "harvest": "arachnid", + "upgrades": { "age_grow": 21, "into": "mon_cicada" }, + "special_attacks": [ { "id": "scratch", "attack_upper": false, "cooldown": 15 } ], + "anger_triggers": [ "HURT", "PLAYER_CLOSE" ], + "fear_triggers": [ "FIRE" ], + "flags": [ "SEES", "BORES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ] + }, + { + "id": "mon_cicada", + "type": "MONSTER", + "name": { "str": "giant cicada" }, + "description": "A huge Cicada the size of a person. These insects are mostly harmless but may bite if attacked and produce a loud buzzing sound.", + "default_faction": "insect", + "bodytype": "insect", + "species": [ "INSECT" ], + "volume": "80 L", + "weight": "80 kg", + "hp": 100, + "speed": 80, + "material": [ "iflesh" ], + "symbol": "C", + "color": "light_gray", + "aggression": -10, + "morale": 60, + "melee_skill": 4, + "melee_dice": 4, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "cut", "amount": 5 } ], + "armor_bash": 8, + "armor_cut": 10, + "armor_bullet": 10, + "armor_elec": 2, + "vision_day": 10, + "vision_night": 15, + "harvest": "arachnid", + "reproduction": { "baby_egg": "egg_cicada", "baby_count": 3, "baby_timer": 20 }, + "baby_flags": [ "SUMMER" ], + "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 5 ] ], + "anger_triggers": [ "PLAYER_CLOSE" ], + "fear_triggers": [ "FIRE", "HURT" ], + "flags": [ "SEES", "FLIES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ] + }, + { + "id": "mon_woodlouse", + "type": "MONSTER", + "name": { "str": "giant woodlouse", "str_pl": "giant woodlice" }, + "description": "A woodlouse grown to the size of a dog. These humble crustaceans are harmless and enjoy damp places.", + "default_faction": "insect", + "bodytype": "insect", + "species": [ "INSECT" ], + "volume": "50 L", + "weight": "50 kg", + "hp": 90, + "speed": 80, + "material": [ "iflesh" ], + "symbol": "w", + "color": "brown", + "armor_bash": 15, + "armor_cut": 18, + "armor_bullet": 20, + "armor_elec": 2, + "vision_day": 10, + "vision_night": 15, + "harvest": "shellfish", + "reproduction": { "baby_monster": "mon_woodlouse_manca", "baby_count": 5, "baby_timer": 210 }, + "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, + "fear_triggers": [ "FIRE", "HURT" ], + "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ] + }, + { + "id": "mon_woodlouse_manca", + "type": "MONSTER", + "name": { "str": "baby woodlouse", "str_pl": "baby woodlice" }, + "description": "Woodlice reproduce by carrying their eggs in a pouch and releasing them as juveniles. Their mancae look like small adults except for their pale color.", + "copy-from": "mon_woodlouse", + "proportional": { "hp": 0.25, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, + "symbol": "w", + "color": "white", + "volume": "5 L", + "weight": "5 kg", + "upgrades": { "half_life": 14, "into": "mon_woodlouse" } + }, + { + "id": "mon_diving_larva", + "type": "MONSTER", + "name": { "str": "giant water tiger" }, + "description": "The predatory, aquatic larva of a diving beetle grown to large proportions. It is quite slow but still a good ambusher.", + "species": [ "INSECT" ], + "bodytype": "insect", + "material": [ "iflesh" ], + "volume": "8 L", + "weight": "10 kg", + "hp": 35, + "speed": 50, + "symbol": "b", + "color": "light_gray", + "default_faction": "aquatic_predator", + "aggression": 8, + "melee_skill": 4, + "melee_dice": 1, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "cut", "amount": 5 } ], + "dodge": 2, + "vision_day": 10, + "vision_night": 5, + "harvest": "arachnid", + "anger_triggers": [ "PLAYER_CLOSE" ], + "fear_triggers": [ "HURT" ], + "flags": [ "AQUATIC", "SEES", "WATER_CAMOUFLAGE" ], + "upgrades": { "age_grow": 21, "into": "mon_diving_beetle_small" } + }, + { + "id": "mon_diving_beetle_small", + "type": "MONSTER", + "name": { "str": "giant diving beetle" }, + "description": "Water beetles can be found in all freshwater environments, with diving beetles being their predatory variant. These however seem to have grown far larger with the Cataclysm.", + "bodytype": "insect", + "species": [ "INSECT" ], + "default_faction": "beetle", + "volume": "62500 ml", + "weight": "81500 g", + "hp": 90, + "speed": 50, + "material": [ "iflesh" ], + "symbol": "B", + "color": "light_gray", + "aggression": 15, + "morale": 30, + "melee_skill": 5, + "melee_dice": 4, + "melee_dice_sides": 4, + "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], + "dodge": 1, + "armor_bash": 1, + "armor_cut": 3, + "armor_bullet": 2, + "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 } + ], + "vision_day": 14, + "vision_night": 12, + "harvest": "arachnid_beetle", + "reproduction": { "baby_egg": "egg_water_beetle", "baby_count": 3, "baby_timer": 15 }, + "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], + "fear_triggers": [ "FIRE" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "SWIMS", "WATER_CAMOUFLAGE" ] + }, + { + "id": "mon_water_scorpion", + "type": "MONSTER", + "name": { "str": "giant water scorpion" }, + "description": "A slender relative of the water bug, grown close to human size. It uses its long tail as a snorkel while ambushing prey.", + "default_faction": "strider", + "bodytype": "insect", + "species": [ "INSECT" ], + "volume": "40 L", + "weight": "50 kg", + "hp": 45, + "speed": 50, + "attack_cost": 50, + "material": [ "iflesh" ], + "symbol": "W", + "color": "light_gray", + "aggression": 10, + "morale": 30, + "melee_skill": 3, + "melee_dice": 1, + "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], + "dodge": 3, + "armor_bash": 1, + "armor_cut": 3, + "armor_bullet": 2, + "vision_day": 12, + "vision_night": 5, + "harvest": "arachnid", + "reproduction": { "baby_egg": "egg_water_bug", "baby_count": 3, "baby_timer": 10 }, + "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], + "fear_triggers": [ "HURT" ], + "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS", "GRABS", "AQUATIC" ] + }, + { + "id": "mon_water_scorpion_larva", + "type": "MONSTER", + "name": { "str": "water scorpion nymph" }, + "description": "The nymph of a water scorpion, looks like a smaller version of its parents.", + "copy-from": "mon_water_scorpion", + "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, + "symbol": "w", + "volume": "10 L", + "weight": "15 kg", + "upgrades": { "half_life": 14, "into": "mon_water_scorpion" } } ] From 30aa74a70da9df853b45efc311888ee33af85c80 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:38:40 -0500 Subject: [PATCH 17/63] Update tropical_insect_spider.json moved several insects from mod to vanilla --- .../monsters/tropical_insect_spider.json | 374 ------------------ 1 file changed, 374 deletions(-) diff --git a/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json b/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json index 11d8fc7692688..40b22c8898c2b 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json +++ b/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json @@ -41,159 +41,6 @@ "fungalize_into": "mon_scorpion_fungus", "flags": [ "SEES", "SMELLS", "HEARS", "BADVENOM", "PARALYZEVENOM", "GRABS" ] }, - { - "id": "mon_butterfly", - "type": "MONSTER", - "name": { "str": "mutated butterfly", "str_pl": "mutated butterflies" }, - "description": "An oversized butterfly with vibrant colored markings. Unlike the other big insects of the Cataclysm this is a very peaceful nectivore.", - "bodytype": "flying insect", - "species": [ "INSECT_FLYING" ], - "default_faction": "insect", - "material": [ "iflesh" ], - "symbol": "l", - "color": "white", - "volume": "15 L", - "weight": "20 kg", - "hp": 25, - "speed": 95, - "vision_day": 15, - "dodge": 2, - "harvest": "arachnid_firefly", - "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, - "upgrades": { "half_life": 14, "into": "mon_butterfly_giant" }, - "baby_flags": [ "SPRING", "SUMMER" ], - "fear_triggers": [ "HURT", "FIRE" ], - "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] - }, - { - "id": "mon_butterfly_giant", - "type": "MONSTER", - "name": { "str": "giant butterfly", "str_pl": "giant butterflies" }, - "description": "A mutated butterfly larger than a human. Despite its size it is very lightweight and feeds mainly on the nectar produced by triffid flowers.", - "bodytype": "flying insect", - "species": [ "INSECT_FLYING" ], - "default_faction": "insect", - "material": [ "iflesh" ], - "symbol": "L", - "color": "white", - "volume": "75 L", - "weight": "40 kg", - "hp": 50, - "speed": 95, - "vision_day": 15, - "dodge": 2, - "harvest": "arachnid_firefly", - "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 }, - "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "fear_triggers": [ "HURT", "FIRE" ], - "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] - }, - { - "id": "mon_butterfly_titan", - "type": "MONSTER", - "name": { "str": "emperor butterfly", "str_pl": "emperor butterflies" }, - "description": "An enormous butterfly with regal looking wings. This giant of the sky flies cheerfully under the sun, leaving dust as it passes.", - "copy-from": "mon_butterfly_giant", - "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 }, - "symbol": "L", - "color": "yellow", - "volume": "120 L", - "weight": "75 kg" - }, - { - "id": "mon_moth", - "type": "MONSTER", - "name": { "str": "mutated moth" }, - "description": "An oversized moth with its typical wood-like motifs. It is as peaceful as the mutated butterflies found during the day.", - "bodytype": "flying insect", - "species": [ "INSECT_FLYING" ], - "default_faction": "insect", - "material": [ "iflesh" ], - "symbol": "l", - "color": "light_gray", - "volume": "15 L", - "weight": "20 kg", - "hp": 25, - "speed": 95, - "vision_night": 15, - "dodge": 2, - "harvest": "arachnid_firefly", - "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, - "upgrades": { "half_life": 14, "into": "mon_moth_giant" }, - "baby_flags": [ "SPRING", "SUMMER" ], - "fear_triggers": [ "HURT", "FIRE" ], - "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] - }, - { - "id": "mon_moth_giant", - "type": "MONSTER", - "name": { "str": "giant moth" }, - "description": "A mutated moth larger than a human. It silently flies with its huge wings after dusk looking for nocturnal flowers to feed upon.", - "bodytype": "flying insect", - "species": [ "INSECT_FLYING" ], - "default_faction": "insect", - "material": [ "iflesh" ], - "symbol": "L", - "color": "light_gray", - "volume": "70 L", - "weight": "40 kg", - "hp": 50, - "speed": 95, - "vision_night": 15, - "dodge": 2, - "harvest": "arachnid_firefly", - "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 }, - "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "fear_triggers": [ "HURT", "FIRE" ], - "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] - }, - { - "id": "mon_moth_titan", - "type": "MONSTER", - "name": { "str": "lunar moth" }, - "description": "A majestic moth painted in pale colors. This giant of the night only comes out after the moon is out, leaving glittering dust.", - "copy-from": "mon_moth_giant", - "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 }, - "symbol": "L", - "color": "cyan", - "volume": "120 L", - "weight": "75 kg" - }, - { - "id": "mon_caterpillar", - "type": "MONSTER", - "name": { "str": "caterpillar" }, - "description": "Caterpillars are the larval stage of butterflies and moths. This one seems newly hatched from an egg but even now it is large as a cat.", - "default_faction": "ant", - "bodytype": "insect", - "species": [ "INSECT" ], - "volume": "5 L", - "weight": "6 kg", - "hp": 10, - "material": [ "iflesh" ], - "symbol": "c", - "color": "green", - "speed": 50, - "vision_day": 15, - "dodge": 2, - "harvest": "arachnid", - "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY" }, - "flags": [ "SEES", "SMELLS", "CLIMBS", "HEARS", "STUMBLES", "PATH_AVOID_FIRE" ] - }, - { - "id": "mon_caterpillar_giant", - "type": "MONSTER", - "name": { "str": "giant caterpillar" }, - "description": "This caterpillar has reached the size of a person and it looks close to make a cocoon. You can only imagine the size of the insect that will emerge.", - "copy-from": "mon_caterpillar", - "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 }, - "symbol": "C", - "volume": "60 L", - "weight": "75 kg", - "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY_GIANT" } - }, { "id": "mon_termite_nymph", "type": "MONSTER", @@ -436,115 +283,6 @@ "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], "flags": [ "SMELLS", "QUEEN", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ] }, - { - "id": "mon_cicada_nymph", - "type": "MONSTER", - "name": { "str": "cicada nymph" }, - "description": "The mutated larval form of a Cicada. It doesn't produce noise like the adults but its digging claws seem suited for scratching.", - "default_faction": "insect", - "bodytype": "insect", - "species": [ "INSECT" ], - "volume": "40 L", - "weight": "40 kg", - "hp": 80, - "speed": 80, - "material": [ "iflesh" ], - "symbol": "c", - "color": "white", - "aggression": -10, - "morale": 60, - "melee_skill": 3, - "melee_dice": 4, - "melee_dice_sides": 4, - "melee_damage": [ { "damage_type": "cut", "amount": 6 } ], - "armor_bash": 15, - "armor_cut": 18, - "armor_bullet": 20, - "armor_elec": 2, - "vision_day": 10, - "vision_night": 15, - "harvest": "arachnid", - "upgrades": { "age_grow": 21, "into": "mon_cicada" }, - "special_attacks": [ { "id": "scratch", "attack_upper": false, "cooldown": 15 } ], - "anger_triggers": [ "HURT", "PLAYER_CLOSE" ], - "fear_triggers": [ "FIRE" ], - "flags": [ "SEES", "BORES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ] - }, - { - "id": "mon_cicada", - "type": "MONSTER", - "name": { "str": "giant cicada" }, - "description": "A huge Cicada the size of a person. These insects are mostly harmless but may bite if attacked and produce a loud buzzing sound.", - "default_faction": "insect", - "bodytype": "insect", - "species": [ "INSECT" ], - "volume": "80 L", - "weight": "80 kg", - "hp": 100, - "speed": 80, - "material": [ "iflesh" ], - "symbol": "C", - "color": "light_gray", - "aggression": -10, - "morale": 60, - "melee_skill": 4, - "melee_dice": 4, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "cut", "amount": 5 } ], - "armor_bash": 8, - "armor_cut": 10, - "armor_bullet": 10, - "armor_elec": 2, - "vision_day": 10, - "vision_night": 15, - "harvest": "arachnid", - "reproduction": { "baby_egg": "egg_cicada", "baby_count": 3, "baby_timer": 20 }, - "baby_flags": [ "SUMMER" ], - "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 5 ] ], - "anger_triggers": [ "PLAYER_CLOSE" ], - "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "FLIES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ] - }, - { - "id": "mon_woodlouse", - "type": "MONSTER", - "name": { "str": "giant woodlouse", "str_pl": "giant woodlice" }, - "description": "A woodlouse grown to the size of a dog. These humble crustaceans are harmless and enjoy damp places.", - "default_faction": "insect", - "bodytype": "insect", - "species": [ "INSECT" ], - "volume": "50 L", - "weight": "50 kg", - "hp": 90, - "speed": 80, - "material": [ "iflesh" ], - "symbol": "w", - "color": "brown", - "armor_bash": 15, - "armor_cut": 18, - "armor_bullet": 20, - "armor_elec": 2, - "vision_day": 10, - "vision_night": 15, - "harvest": "shellfish", - "reproduction": { "baby_monster": "mon_woodlouse_manca", "baby_count": 5, "baby_timer": 210 }, - "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "fear_triggers": [ "FIRE", "HURT" ], - "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ] - }, - { - "id": "mon_woodlouse_manca", - "type": "MONSTER", - "name": { "str": "baby woodlouse", "str_pl": "baby woodlice" }, - "description": "Woodlice reproduce by carrying their eggs in a pouch and releasing them as juveniles. Their mancae look like small adults except for their pale color.", - "copy-from": "mon_woodlouse", - "proportional": { "hp": 0.25, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, - "symbol": "w", - "color": "white", - "volume": "5 L", - "weight": "5 kg", - "upgrades": { "half_life": 14, "into": "mon_woodlouse" } - }, { "id": "mon_onicophore", "type": "MONSTER", @@ -616,117 +354,5 @@ "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ], "fear_triggers": [ "FIRE", "HURT" ], "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "CLIMBS" ] - }, - { - "id": "mon_diving_larva", - "type": "MONSTER", - "name": { "str": "giant water tiger" }, - "description": "The predatory, aquatic larva of a diving beetle grown to large proportions. It is quite slow but still a good ambusher.", - "species": [ "INSECT" ], - "bodytype": "insect", - "material": [ "iflesh" ], - "volume": "8 L", - "weight": "10 kg", - "hp": 35, - "speed": 50, - "symbol": "b", - "color": "light_gray", - "default_faction": "aquatic_predator", - "aggression": 8, - "melee_skill": 4, - "melee_dice": 1, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "cut", "amount": 5 } ], - "dodge": 2, - "vision_day": 10, - "vision_night": 5, - "harvest": "arachnid", - "anger_triggers": [ "PLAYER_CLOSE" ], - "fear_triggers": [ "HURT" ], - "flags": [ "AQUATIC", "SEES", "WATER_CAMOUFLAGE" ], - "upgrades": { "age_grow": 21, "into": "mon_diving_beetle_small" } - }, - { - "id": "mon_diving_beetle_small", - "type": "MONSTER", - "name": { "str": "giant diving beetle" }, - "description": "Water beetles can be found in all freshwater environments, with diving beetles being their predatory variant. These however seem to have grown far larger with the Cataclysm.", - "bodytype": "insect", - "species": [ "INSECT" ], - "default_faction": "beetle", - "volume": "62500 ml", - "weight": "81500 g", - "hp": 90, - "speed": 50, - "material": [ "iflesh" ], - "symbol": "B", - "color": "light_gray", - "aggression": 15, - "morale": 30, - "melee_skill": 5, - "melee_dice": 4, - "melee_dice_sides": 4, - "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], - "dodge": 1, - "armor_bash": 1, - "armor_cut": 3, - "armor_bullet": 2, - "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 } - ], - "vision_day": 14, - "vision_night": 12, - "harvest": "arachnid_beetle", - "reproduction": { "baby_egg": "egg_water_beetle", "baby_count": 3, "baby_timer": 15 }, - "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ], - "fear_triggers": [ "FIRE" ], - "flags": [ "SEES", "HEARS", "GOODHEARING", "SWIMS", "WATER_CAMOUFLAGE" ] - }, - { - "id": "mon_water_scorpion", - "type": "MONSTER", - "name": { "str": "giant water scorpion" }, - "description": "A slender relative of the water bug, grown close to human size. It uses its long tail as a snorkel while ambushing prey.", - "default_faction": "strider", - "bodytype": "insect", - "species": [ "INSECT" ], - "volume": "40 L", - "weight": "50 kg", - "hp": 45, - "speed": 50, - "attack_cost": 50, - "material": [ "iflesh" ], - "symbol": "W", - "color": "light_gray", - "aggression": 10, - "morale": 30, - "melee_skill": 3, - "melee_dice": 1, - "melee_dice_sides": 5, - "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], - "dodge": 3, - "armor_bash": 1, - "armor_cut": 3, - "armor_bullet": 2, - "vision_day": 12, - "vision_night": 5, - "harvest": "arachnid", - "reproduction": { "baby_egg": "egg_water_bug", "baby_count": 3, "baby_timer": 10 }, - "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ], - "fear_triggers": [ "HURT" ], - "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS", "GRABS", "AQUATIC" ] - }, - { - "id": "mon_water_scorpion_larva", - "type": "MONSTER", - "name": { "str": "water scorpion nymph" }, - "description": "The nymph of a water scorpion, looks like a smaller version of its parents.", - "copy-from": "mon_water_scorpion", - "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, - "symbol": "w", - "volume": "10 L", - "weight": "15 kg", - "upgrades": { "half_life": 14, "into": "mon_water_scorpion" } } ] From 2c7d4fb73ca8e38403f4d387a7f34af752066ded Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:40:31 -0500 Subject: [PATCH 18/63] Update mammal.json ported llamas from mod to vanilla --- data/json/monsters/mammal.json | 66 ++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 12a84d835fb79..acf2cbe5bcb9b 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -2818,5 +2818,71 @@ "dissect": "dissect_cattle_sample_single", "special_attacks": [ [ "EAT_FOOD", 60 ] ], "upgrades": { "age_grow": 500, "into": "mon_reindeer" } + }, + { + "id": "mon_llama_calf", + "type": "MONSTER", + "name": { "str": "llama calf" }, + "description": "A baby llama. Unlike their parents, the calves tend to be more friendly in demeanor.", + "default_faction": "herbivore", + "bodytype": "horse", + "looks_like": "mon_llama", + "categories": [ "WILDLIFE" ], + "species": [ "MAMMAL" ], + "volume": "60000 ml", + "weight": "60000 g", + "hp": 35, + "speed": 90, + "material": [ "flesh" ], + "symbol": "l", + "color": "white", + "melee_skill": 1, + "melee_dice": 1, + "melee_dice_sides": 2, + "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], + "dodge": 2, + "anger_triggers": [ ], + "harvest": "mammal_small_wool", + "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], + "placate_triggers": [ "PLAYER_WEAK" ], + "upgrades": { "age_grow": 240, "into": "mon_llama" }, + "//": "Puberty reached in 6-9 months, copied from lamb but it probably applies the same on llamas.", + "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] + }, + { + "id": "mon_llama", + "type": "MONSTER", + "name": { "str_sp": "llama" }, + "description": "A big and wooly herbivore domesticated by the Andean cultures of South America. Llamas and their kin are distant relatives to camels and are adapted to mountain environments.", + "default_faction": "herbivore", + "bodytype": "horse", + "categories": [ "WILDLIFE" ], + "species": [ "MAMMAL" ], + "volume": "200000 ml", + "weight": "200000 g", + "hp": 90, + "speed": 90, + "material": [ "flesh" ], + "symbol": "L", + "color": "white", + "melee_skill": 3, + "melee_dice": 1, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "dodge": 2, + "starting_ammo": { "milk_raw": 5 }, + "anger_triggers": [ ], + "shearing": [ { "result": "wool_staple", "amount": 22 } ], + "harvest": "mammal_large_wool", + "reproduction": { "baby_monster": "mon_llama_calf", "baby_count": 1, "baby_timer": 275 }, + "//": "Llamas produce offspring between summer and fall according to internet sources, makes sense due to the southern hemisphere seasons.", + "baby_flags": [ "FALL" ], + "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 3 }, + "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], + "placate_triggers": [ "PLAYER_WEAK" ], + "special_attacks": [ [ "EAT_CROP", 120 ] ], + "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, + "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ] } ] From 61856c6b6f53194c001d72e5febc6900885657f1 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:40:43 -0500 Subject: [PATCH 19/63] Update tropical_mammal.json moved llamas to vanilla --- .../monsters/tropical_mammal.json | 66 ------------------- 1 file changed, 66 deletions(-) diff --git a/data/mods/TropiCataclysm/monsters/tropical_mammal.json b/data/mods/TropiCataclysm/monsters/tropical_mammal.json index 172e67de1b1cd..7c68e1ba528d5 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_mammal.json +++ b/data/mods/TropiCataclysm/monsters/tropical_mammal.json @@ -389,72 +389,6 @@ "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ] }, - { - "id": "mon_llama_calf", - "type": "MONSTER", - "name": { "str": "llama calf" }, - "description": "A baby llama. Unlike their parents, the calves tend to be more friendly in demeanor.", - "default_faction": "herbivore", - "bodytype": "horse", - "looks_like": "mon_llama", - "categories": [ "WILDLIFE" ], - "species": [ "MAMMAL" ], - "volume": "60000 ml", - "weight": "60000 g", - "hp": 35, - "speed": 90, - "material": [ "flesh" ], - "symbol": "l", - "color": "white", - "melee_skill": 1, - "melee_dice": 1, - "melee_dice_sides": 2, - "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "dodge": 2, - "anger_triggers": [ ], - "harvest": "mammal_small_wool", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], - "placate_triggers": [ "PLAYER_WEAK" ], - "upgrades": { "age_grow": 240, "into": "mon_llama" }, - "//": "Puberty reached in 6-9 months, copied from lamb but it probably applies the same on llamas.", - "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ] - }, - { - "id": "mon_llama", - "type": "MONSTER", - "name": { "str_sp": "llama" }, - "description": "A big and wooly herbivore domesticated by the Andean cultures of South America. Llamas and their kin are distant relatives to camels and are adapted to mountain environments.", - "default_faction": "herbivore", - "bodytype": "horse", - "categories": [ "WILDLIFE" ], - "species": [ "MAMMAL" ], - "volume": "200000 ml", - "weight": "200000 g", - "hp": 90, - "speed": 90, - "material": [ "flesh" ], - "symbol": "L", - "color": "white", - "melee_skill": 3, - "melee_dice": 1, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "dodge": 2, - "starting_ammo": { "milk_raw": 5 }, - "anger_triggers": [ ], - "shearing": [ { "result": "wool_staple", "amount": 22 } ], - "harvest": "mammal_large_wool", - "reproduction": { "baby_monster": "mon_llama_calf", "baby_count": 1, "baby_timer": 275 }, - "//": "Llamas produce offspring between summer and fall according to internet sources, makes sense due to the southern hemisphere seasons.", - "baby_flags": [ "FALL" ], - "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 3 }, - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], - "placate_triggers": [ "PLAYER_WEAK" ], - "special_attacks": [ [ "EAT_CROP", 120 ] ], - "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ] - }, { "id": "mon_guinea_pig", "type": "MONSTER", From fcf7e6f14d4a17f64cf988164d69df71de45c951 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:42:00 -0500 Subject: [PATCH 20/63] Update tropical_bugs.json moved butterfly groups to vanilla file --- .../monstergroups/tropical_bugs.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json b/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json index fc53a21563220..4ebbcd2694501 100644 --- a/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json +++ b/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json @@ -24,23 +24,6 @@ { "monster": "mon_termite_worker", "weight": 852, "cost_multiplier": 0 } ] }, - { - "type": "monstergroup", - "name": "GROUP_BUTTERFLY", - "default": "mon_butterfly", - "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ] - }, - { - "type": "monstergroup", - "name": "GROUP_BUTTERFLY_GIANT", - "default": "mon_butterfly_giant", - "monsters": [ - { "monster": "mon_butterfly_giant", "weight": 45 }, - { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 }, - { "monster": "mon_moth_giant", "weight": 45 }, - { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 } - ] - }, { "type": "monstergroup", "name": "GROUP_TERMITE_ALATE", From 4efa5fbd24f43b2d7b14de2d0a7603d65d06e455 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:42:26 -0500 Subject: [PATCH 21/63] Update bugs.json ported butterfly groups from mod to vanilla --- data/json/monstergroups/bugs.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json index 931d81620240a..d93a633b971a2 100644 --- a/data/json/monstergroups/bugs.json +++ b/data/json/monstergroups/bugs.json @@ -269,5 +269,22 @@ { "monster": "mon_halfworm", "weight": 0, "cost_multiplier": 0 }, { "monster": "mon_worm_small", "weight": 970, "cost_multiplier": 0 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_BUTTERFLY", + "default": "mon_butterfly", + "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_BUTTERFLY_GIANT", + "default": "mon_butterfly_giant", + "monsters": [ + { "monster": "mon_butterfly_giant", "weight": 45 }, + { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 }, + { "monster": "mon_moth_giant", "weight": 45 }, + { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 } + ] } ] From 1b4818bead5302823785d1de4d78beb05f5bede2 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:48:10 -0500 Subject: [PATCH 22/63] Update misc.json ported animal entries on monstergroups from mod to vanilla files --- data/json/monstergroups/misc.json | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index 1d39efd1ddf78..4db9632f68bb5 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -92,6 +92,7 @@ "//": "Z-2 subways, some lost nether things but otherwise mostly normal mobs", "default": "mon_spider_jumping_small", "monsters": [ + { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] }, { "monster": "mon_slug_small", "weight": 180, "ends": "180 hours" }, { "monster": "mon_slug_giant", "weight": 180, "starts": "180 hours" }, { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 2, "ends": "180 hours" }, @@ -231,6 +232,8 @@ { "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "90 days", "pack_size": [ 1, 6 ] }, { "monster": "mon_sheep", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] }, { "monster": "mon_goat", "weight": 25, "cost_multiplier": 25, "pack_size": [ 1, 12 ] }, + { "monster": "mon_goose", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, + { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] }, { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "3 days", "pack_size": [ 1, 5 ] }, { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "7 days", "pack_size": [ 1, 5 ] }, { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "28 days", "pack_size": [ 1, 5 ] }, @@ -238,7 +241,9 @@ { "monster": "mon_giant_cockroach", "weight": 10, "pack_size": [ 1, 5 ] }, { "monster": "mon_pregnant_giant_cockroach", "weight": 1, "cost_multiplier": 3 }, { "monster": "mon_giant_cockroach_nymph", "weight": 5 }, - { "monster": "mon_tiger", "weight": 1, "cost_multiplier": 30 } + { "monster": "mon_tiger", "weight": 1, "cost_multiplier": 30 }, + { "monster": "mon_woodlouse", "weight": 10, "pack_size": [ 1, 5 ] }, + { "monster": "mon_woodlouse_manca", "weight": 5 } ] }, { @@ -282,7 +287,12 @@ { "monster": "mon_pig", "weight": 10 }, { "monster": "mon_sheep", "weight": 10 }, { "monster": "mon_goat", "weight": 10 }, - { "monster": "mon_lemming", "weight": 10 } + { "monster": "mon_lemming", "weight": 10 }, + { "monster": "mon_goose", "weight": 10 }, + { "monster": "mon_goose_golden", "weight": 1 }, + { "monster": "mon_llama", "weight": 10 }, + { "monster": "mon_woodlouse", "weight": 10 }, + { "monster": "mon_cicada_nymph", "weight": 10 } ] }, { @@ -331,7 +341,8 @@ { "monster": "mon_zombie_child", "weight": 20, "pack_size": [ 2, 6 ] }, { "monster": "mon_zombie", "weight": 20, "pack_size": [ 2, 6 ] }, { "monster": "mon_zombie_rot", "weight": 10, "pack_size": [ 1, 5 ] }, - { "monster": "mon_beekeeper", "weight": 10, "pack_size": [ 1, 5 ] } + { "monster": "mon_beekeeper", "weight": 10, "pack_size": [ 1, 5 ] }, + { "monster": "mon_woodlouse", "weight": 30, "pack_size": [ 4, 8 ] } ] }, { @@ -350,7 +361,10 @@ { "monster": "mon_slug_giant", "weight": 75, "starts": "180 hours" }, { "monster": "mon_sludge_crawler", "weight": 25 }, { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" }, - { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" } + { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }. + { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 }, + { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 }, + { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" } ] }, { From 2e3f72be41d7371d9dcc401ee41d6295255c11e0 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:48:31 -0500 Subject: [PATCH 23/63] Update misc.json ported several animals in groups to vanilla files --- .../TropiCataclysm/monstergroups/misc.json | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/data/mods/TropiCataclysm/monstergroups/misc.json b/data/mods/TropiCataclysm/monstergroups/misc.json index a8a5270b05b8e..30aa0a601d38a 100644 --- a/data/mods/TropiCataclysm/monstergroups/misc.json +++ b/data/mods/TropiCataclysm/monstergroups/misc.json @@ -6,15 +6,10 @@ "is_animal": true, "monsters": [ { "monster": "mon_guinea_fowl", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 12 ] }, - { "monster": "mon_goose", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] }, { "monster": "mon_camel", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 4 ] }, { "monster": "mon_guinea_pig", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, - { "monster": "mon_turkey", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, - { "monster": "mon_duck", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 12 ] }, - { "monster": "mon_quail", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] }, - { "monster": "mon_woodlouse", "weight": 10, "pack_size": [ 1, 5 ] }, - { "monster": "mon_woodlouse_manca", "weight": 5 } + { "monster": "mon_quail", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] } ] }, { @@ -25,34 +20,13 @@ "monsters": [ { "monster": "mon_tapir", "weight": 10 }, { "monster": "mon_capybara", "weight": 10 }, - { "monster": "mon_goose", "weight": 10 }, - { "monster": "mon_goose_golden", "weight": 1 }, { "monster": "mon_guinea_pig", "weight": 10 }, { "monster": "mon_bushdog", "weight": 10 }, { "monster": "mon_guinea_fowl", "weight": 10 }, { "monster": "mon_quail", "weight": 10 }, { "monster": "mon_camel", "weight": 10 }, - { "monster": "mon_llama", "weight": 10 }, { "monster": "mon_boa", "weight": 10 }, - { "monster": "mon_anaconda", "weight": 10 }, - { "monster": "mon_woodlouse", "weight": 10 }, - { "monster": "mon_cicada_nymph", "weight": 10 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_PEST", - "is_animal": true, - "monsters": [ { "monster": "mon_woodlouse", "weight": 30, "pack_size": [ 4, 8 ] } ] - }, - { - "type": "monstergroup", - "name": "GROUP_SEWER", - "//": "Freqs sum to 555 since there's no way to define spawn chance for map extras", - "monsters": [ - { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 }, - { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 }, - { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" } + { "monster": "mon_anaconda", "weight": 10 } ] }, { @@ -62,8 +36,7 @@ "default": "mon_spider_cellar_giant", "monsters": [ { "monster": "mon_onicophore", "weight": 180, "ends": "180 hours" }, - { "monster": "mon_onicophore_giant", "weight": 180, "starts": "180 hours" }, - { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] } + { "monster": "mon_onicophore_giant", "weight": 180, "starts": "180 hours" } ] } ] From 804724bdd57e21d08e422d0b0ce2545a4d0cfccb Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:57:34 -0500 Subject: [PATCH 24/63] Update wilderness.json ported monster entries from mod to vanilla --- data/json/monstergroups/wilderness.json | 149 ++++++++++++++++++++++-- 1 file changed, 140 insertions(+), 9 deletions(-) diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 07d19238b2c7f..e581c3da58779 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -11,6 +11,7 @@ { "monster": "mon_mutant_experimental", "weight": 25, "cost_multiplier": 3 }, { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 3 }, { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 }, + { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, { "monster": "mon_stag_beetle_larva", "freq": 40, "cost_multiplier": 5 } ] }, @@ -1825,7 +1826,44 @@ { "monster": "mon_antlion_giant", "weight": 2, "cost_multiplier": 10 }, { "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": 1, "cost_multiplier": 0, "starts": 720 } + { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720 }, + { "monster": "mon_caterpillar", "weight": 3, "cost_multiplier": 0 }, + { "monster": "mon_woodlouse", "weight": 3, "cost_multiplier": 0 }, + { "monster": "mon_caterpillar_giant", "weight": 2, "cost_multiplier": 0 }, + { "monster": "mon_butterfly", "weight": 2, "cost_multiplier": 0 }, + { "monster": "mon_moth", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] }, + { "monster": "mon_butterfly_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" }, + { "monster": "mon_butterfly_titan", "weight": 1, "cost_multiplier": 3, "starts": "480 hours" }, + { + "monster": "mon_moth_giant", + "weight": 1, + "cost_multiplier": 3, + "conditions": [ "DAWN", "DUSK" ], + "starts": "240 hours" + }, + { + "monster": "mon_moth_titan", + "weight": 1, + "cost_multiplier": 3, + "conditions": [ "DAWN", "DUSK" ], + "starts": "480 hours" + }, + { "monster": "mon_cicada", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" }, + { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, + { + "monster": "mon_hummingbird", + "weight": 5, + "cost_multiplier": 0, + "pack_size": [ 1, 3 ], + "conditions": [ "DAWN", "DUSK", "DAY" ] + }, + { + "monster": "mon_woodpecker", + "weight": 5, + "cost_multiplier": 0, + "pack_size": [ 1, 3 ], + "conditions": [ "DAWN", "DUSK", "DAY" ] + } ] }, { @@ -2249,7 +2287,25 @@ "starts": "7 days", "pack_size": [ 1, 3 ] }, - { "monster": "mon_strider_small", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] } + { "monster": "mon_strider_small", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, + { "monster": "mon_goose", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, + { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, + { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, + { "monster": "mon_cormorant", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, + { "monster": "mon_grebe", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, + { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, + { "monster": "mon_diving_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" }, + { "monster": "mon_diving_larva", "weight": 30, "cost_multiplier": 3, "starts": "7 days", "pack_size": [ 1, 3 ] }, + { "monster": "mon_water_scorpion_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" }, + { + "monster": "mon_water_scorpion_larva", + "weight": 30, + "cost_multiplier": 3, + "starts": "7 days", + "pack_size": [ 1, 3 ] + }, + { "monster": "mon_diving_beetle_small", "weight": 4, "cost_multiplier": 10 }, + { "monster": "mon_water_scorpion", "weight": 4, "cost_multiplier": 10 } ] }, { @@ -2853,7 +2909,69 @@ }, { "monster": "mon_mutant_experimental", "weight": 2, "cost_multiplier": 6 }, { "monster": "mon_mantis_small", "weight": 2, "cost_multiplier": 8 }, - { "monster": "mon_antlion_giant", "weight": 4, "cost_multiplier": 10 } + { "monster": "mon_antlion_giant", "weight": 4, "cost_multiplier": 10 }, + { + "monster": "mon_toad", + "weight": 30, + "cost_multiplier": 2, + "ends": 24, + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad", + "weight": 35, + "cost_multiplier": 2, + "starts": 24, + "ends": 95, + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad", + "weight": 40, + "cost_multiplier": 2, + "starts": 95, + "ends": 180, + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad_small", + "weight": 20, + "cost_multiplier": 2, + "ends": "84 hours", + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad_small", + "weight": 25, + "cost_multiplier": 2, + "starts": "84 hours", + "ends": "180 hours", + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad_small", + "weight": 30, + "cost_multiplier": 2, + "starts": "180 hours", + "ends": "15 days", + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad_giant", + "weight": 30, + "cost_multiplier": 2, + "starts": "15 days", + "ends": "540 hours", + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { + "monster": "mon_toad_giant", + "weight": 40, + "cost_multiplier": 2, + "starts": "540 hours", + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + }, + { "monster": "mon_toad", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 3 ] } ] }, { @@ -2896,7 +3014,9 @@ { "monster": "mon_aphid", "weight": 20, "cost_multiplier": 0 }, { "monster": "mon_grasshopper_small", "weight": 30, "cost_multiplier": 0 }, { "monster": "mon_antlion_larva", "weight": 7, "cost_multiplier": 10 }, - { "monster": "mon_antlion_giant", "weight": 5, "cost_multiplier": 10 } + { "monster": "mon_antlion_giant", "weight": 5, "cost_multiplier": 10 }, + { "monster": "mon_hummingbird", "weight": 25, "cost_multiplier": 0 }, + { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }, ] }, { @@ -2951,7 +3071,8 @@ "cost_multiplier": 0, "pack_size": [ 6, 12 ], "conditions": [ "DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN" ] - } + }, + { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }, ] }, { @@ -2964,7 +3085,8 @@ { "monster": "mon_rabbit", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_frog", "weight": 50, "cost_multiplier": 0 } + { "monster": "mon_frog", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_toad", "weight": 50, "cost_multiplier": 0 } ] }, { @@ -2975,7 +3097,13 @@ "monsters": [ { "monster": "mon_null", "weight": 900, "cost_multiplier": 0 }, { "monster": "mon_duck", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_goose_canadian", "weight": 50, "cost_multiplier": 0 } + { "monster": "mon_goose_canadian", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_goose", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_grebe", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_goose_golden", "weight": 10, "cost_multiplier": 0 } ] }, { @@ -2988,7 +3116,8 @@ { "monster": "mon_fish_bluegill", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_fish_carp", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_fish_sbass", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_strider_small", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] } + { "monster": "mon_strider_small", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] }, + { "monster": "mon_water_scorpion_larva", "weight": 30, "cost_multiplier": 0 } ] }, { @@ -3002,7 +3131,9 @@ { "monster": "mon_cardinal", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_robin", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_sparrow", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_squirrel", "weight": 25, "cost_multiplier": 0 } + { "monster": "mon_squirrel", "weight": 25, "cost_multiplier": 0 }, + { "monster": "mon_hummingbird", "weight": 50, "cost_multiplier": 0 }, + { "monster": "mon_woodpecker", "weight": 50, "cost_multiplier": 0 } ] } ] From d955eadf200768668bd15317d5d47261d2864394 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 22:57:47 -0500 Subject: [PATCH 25/63] Update wilderness.json moved monster entries from mod to vanilla --- .../monstergroups/wilderness.json | 137 +----------------- 1 file changed, 3 insertions(+), 134 deletions(-) diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json index 52bd14b42c68c..dfa5cf522cfb9 100644 --- a/data/mods/TropiCataclysm/monstergroups/wilderness.json +++ b/data/mods/TropiCataclysm/monstergroups/wilderness.json @@ -8,7 +8,6 @@ { "monster": "mon_jaguar", "weight": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] }, { "monster": "mon_bear_andean", "weight": 100, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, { "monster": "mon_large_scorpion", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, - { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, { "monster": "mon_scorpion_giant", "weight": 40, "cost_multiplier": 5, "pack_size": [ 1, 2 ], "starts": 240 } ] }, @@ -32,13 +31,8 @@ { "monster": "mon_jaguar", "weight": 1, "cost_multiplier": 3 }, { "monster": "mon_jaguar", "weight": 2, "cost_multiplier": 3, "conditions": [ "DAWN", "DUSK" ] }, { "monster": "mon_peccari", "weight": 15, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }, - { "monster": "mon_caterpillar", "weight": 3, "cost_multiplier": 0 }, - { "monster": "mon_woodlouse", "weight": 3, "cost_multiplier": 0 }, - { "monster": "mon_caterpillar_giant", "weight": 2, "cost_multiplier": 0 }, { "monster": "mon_large_scorpion", "weight": 2, "cost_multiplier": 0 }, { "monster": "mon_onicophore", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] }, - { "monster": "mon_butterfly", "weight": 2, "cost_multiplier": 0 }, - { "monster": "mon_moth", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] }, { "monster": "mon_scorpion_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" }, { "monster": "mon_onicophore_giant", @@ -47,23 +41,6 @@ "starts": "240 hours", "conditions": [ "DAWN", "DUSK" ] }, - { "monster": "mon_butterfly_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" }, - { "monster": "mon_butterfly_titan", "weight": 1, "cost_multiplier": 3, "starts": "480 hours" }, - { - "monster": "mon_moth_giant", - "weight": 1, - "cost_multiplier": 3, - "conditions": [ "DAWN", "DUSK" ], - "starts": "240 hours" - }, - { - "monster": "mon_moth_titan", - "weight": 1, - "cost_multiplier": 3, - "conditions": [ "DAWN", "DUSK" ], - "starts": "480 hours" - }, - { "monster": "mon_cicada", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" }, { "monster": "mon_bushelephant", "weight": 1, "cost_multiplier": 3 }, { "monster": "mon_hippo", "weight": 1, "cost_multiplier": 3 }, { "monster": "mon_guinea_pig", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 6 ] }, @@ -78,23 +55,8 @@ { "monster": "mon_monitor_lizard", "weight": 15, "cost_multiplier": 10 }, { "monster": "mon_boa", "weight": 15, "cost_multiplier": 10 }, { "monster": "mon_anaconda", "weight": 15, "cost_multiplier": 10 }, - { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, { "monster": "mon_tortoise_small", "weight": 3, "pack_size": [ 1, 3 ], "starts": "240 hours" }, { "monster": "mon_tortoise_giant", "weight": 3, "pack_size": [ 1, 3 ], "starts": "480 hours" }, - { - "monster": "mon_hummingbird", - "weight": 5, - "cost_multiplier": 0, - "pack_size": [ 1, 3 ], - "conditions": [ "DAWN", "DUSK", "DAY" ] - }, - { - "monster": "mon_woodpecker", - "weight": 5, - "cost_multiplier": 0, - "pack_size": [ 1, 3 ], - "conditions": [ "DAWN", "DUSK", "DAY" ] - }, { "monster": "mon_parrot", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] }, { "monster": "mon_budgerigar", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] }, { "monster": "mon_toucan", "weight": 2, "cost_multiplier": 0, "pack_size": [ 1, 10 ] }, @@ -115,12 +77,7 @@ "monsters": [ { "monster": "mon_coypus", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, { "monster": "mon_turtle", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, - { "monster": "mon_goose", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, - { "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, - { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, - { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, - { "monster": "mon_cormorant", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, - { "monster": "mon_grebe", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, + { "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] } { "monster": "mon_capybara", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, { "monster": "mon_goose_golden", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_caiman", "weight": 10, "cost_multiplier": 5 }, @@ -130,17 +87,6 @@ { "monster": "mon_hippo", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, { "monster": "mon_tadpole_small", "weight": 5, "cost_multiplier": 10, "starts": "168 hours" }, { "monster": "mon_axolotl_giant", "weight": 5, "cost_multiplier": 10, "starts": "168 hours" }, - { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, - { "monster": "mon_diving_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" }, - { "monster": "mon_diving_larva", "weight": 30, "cost_multiplier": 3, "starts": "7 days", "pack_size": [ 1, 3 ] }, - { "monster": "mon_water_scorpion_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" }, - { - "monster": "mon_water_scorpion_larva", - "weight": 30, - "cost_multiplier": 3, - "starts": "7 days", - "pack_size": [ 1, 3 ] - }, { "monster": "mon_tadpole_small", "weight": 30, @@ -148,8 +94,6 @@ "starts": "7 days", "pack_size": [ 1, 3 ] }, - { "monster": "mon_diving_beetle_small", "weight": 4, "cost_multiplier": 10 }, - { "monster": "mon_water_scorpion", "weight": 4, "cost_multiplier": 10 }, { "monster": "mon_shark", "weight": 3, "cost_multiplier": 15 }, { "monster": "mon_shark_pup", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] }, { "monster": "mon_fish_lungfish", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] }, @@ -185,69 +129,7 @@ { "monster": "mon_anaconda", "weight": 50, "cost_multiplier": 2 }, { "monster": "mon_caiman", "weight": 50, "cost_multiplier": 2 }, { "monster": "mon_turtle", "weight": 60, "cost_multiplier": 2 }, - { - "monster": "mon_toad", - "weight": 30, - "cost_multiplier": 2, - "ends": 24, - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad", - "weight": 35, - "cost_multiplier": 2, - "starts": 24, - "ends": 95, - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad", - "weight": 40, - "cost_multiplier": 2, - "starts": 95, - "ends": 180, - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad_small", - "weight": 20, - "cost_multiplier": 2, - "ends": "84 hours", - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad_small", - "weight": 25, - "cost_multiplier": 2, - "starts": "84 hours", - "ends": "180 hours", - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad_small", - "weight": 30, - "cost_multiplier": 2, - "starts": "180 hours", - "ends": "15 days", - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad_giant", - "weight": 30, - "cost_multiplier": 2, - "starts": "15 days", - "ends": "540 hours", - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, - { - "monster": "mon_toad_giant", - "weight": 40, - "cost_multiplier": 2, - "starts": "540 hours", - "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] - }, { "monster": "mon_capybara", "weight": 60, "cost_multiplier": 2, "pack_size": [ 1, 3 ] }, - { "monster": "mon_toad", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 3 ] }, { "monster": "mon_fish_crab", "weight": 10, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, { "monster": "mon_fish_pancora", "weight": 10, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] } ] @@ -258,8 +140,6 @@ "//": "Current SPRING first DAY count is 425. Note that 'freq' units are tenth of a percent, with default filling in the gap.", "is_animal": true, "monsters": [ - { "monster": "mon_hummingbird", "weight": 25, "cost_multiplier": 0 }, - { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }, { "monster": "mon_budgerigar", "weight": 35, "cost_multiplier": 0 }, { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 }, { "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 }, @@ -275,7 +155,6 @@ { "monster": "mon_budgerigar", "weight": 45, "cost_multiplier": 0 }, { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 }, { "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 }, - { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }, { "monster": "mon_guinea_fowl", "weight": 10, "cost_multiplier": 0 }, { "monster": "mon_macaw", "weight": 10, "cost_multiplier": 0 }, { @@ -297,9 +176,7 @@ { "monster": "mon_turtle", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 3 ] }, { "monster": "mon_capybara", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 3 ] }, { "monster": "mon_caiman", "weight": 40, "cost_multiplier": 0 }, - { "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 0 }, - { "monster": "mon_toad", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_water_scorpion_larva", "weight": 30, "cost_multiplier": 0 } + { "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 0 } ] }, { @@ -308,13 +185,7 @@ "default": "mon_null", "is_animal": true, "monsters": [ - { "monster": "mon_goose", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_grebe", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_goose_golden", "weight": 10, "cost_multiplier": 0 } + { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 } ] }, { @@ -323,8 +194,6 @@ "//": "Current count is 225. Note that 'freq' units are tenth of a percent, with default filling in the gap.", "is_animal": true, "monsters": [ - { "monster": "mon_hummingbird", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_woodpecker", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 }, { "monster": "mon_cockatoo", "weight": 35, "cost_multiplier": 0 }, { "monster": "mon_budgerigar", "weight": 50, "cost_multiplier": 0 } From 9a33d664b7a3e001223a940c777b5f25a8002923 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:07:08 -0500 Subject: [PATCH 26/63] Update monster_factions.json --- data/json/monster_factions.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json index b9a76110a6fa7..2273460868c5a 100644 --- a/data/json/monster_factions.json +++ b/data/json/monster_factions.json @@ -596,5 +596,10 @@ "name": "dark_wyrm", "base_faction": "mutant", "neutral": [ "dark_wyrm" ] + }, + { + "type": "MONSTER_FACTION", + "name": "beetle", + "//": "faction for non-stag beetles, ported from TropiCata" } ] From 575f6a163281354e75a600f8cd7fdaaa32bb81ad Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:27:23 -0500 Subject: [PATCH 27/63] Update wilderness.json --- data/mods/TropiCataclysm/monstergroups/wilderness.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json index dfa5cf522cfb9..23b089a9f279f 100644 --- a/data/mods/TropiCataclysm/monstergroups/wilderness.json +++ b/data/mods/TropiCataclysm/monstergroups/wilderness.json @@ -77,7 +77,7 @@ "monsters": [ { "monster": "mon_coypus", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, { "monster": "mon_turtle", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] }, - { "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] } + { "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, { "monster": "mon_capybara", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, { "monster": "mon_goose_golden", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_caiman", "weight": 10, "cost_multiplier": 5 }, @@ -184,9 +184,7 @@ "name": "GROUP_POND_BIRD", "default": "mon_null", "is_animal": true, - "monsters": [ - { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 } - ] + "monsters": [ { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 } ] }, { "type": "monstergroup", From 56e7367e26ab69d47cbff10fd4757b9ee89ea3ee Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:28:41 -0500 Subject: [PATCH 28/63] Update eggs.json --- data/json/monstergroups/eggs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 3cac0a7e11e63..3285dc10bf229 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -16,7 +16,7 @@ { "monster": "mon_sparrow_chick", "weight": 15 }, { "monster": "mon_goose_canadian_chick", "weight": 100 }, { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 }, - { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } + { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 }, { "monster": "mon_rattlesnake", "weight": 65 } ] }, From 964d79f2d154c71c96a4e0b74525757c7f73e8f1 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:29:43 -0500 Subject: [PATCH 29/63] Update misc.json --- data/json/monstergroups/misc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index 4db9632f68bb5..98205bd09b271 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -361,7 +361,7 @@ { "monster": "mon_slug_giant", "weight": 75, "starts": "180 hours" }, { "monster": "mon_sludge_crawler", "weight": 25 }, { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" }, - { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }. + { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }, { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 }, { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 }, { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" } From ac71199e10e9e91bbdd03369a34e25ccc3adab87 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:30:30 -0500 Subject: [PATCH 30/63] Update wilderness.json --- data/json/monstergroups/wilderness.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index e581c3da58779..a63db8b0b65da 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -3016,7 +3016,7 @@ { "monster": "mon_antlion_larva", "weight": 7, "cost_multiplier": 10 }, { "monster": "mon_antlion_giant", "weight": 5, "cost_multiplier": 10 }, { "monster": "mon_hummingbird", "weight": 25, "cost_multiplier": 0 }, - { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }, + { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 } ] }, { From 439632cfc896291954602583343269e20ad9c3e5 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:35:23 -0500 Subject: [PATCH 31/63] Update wilderness.json --- data/json/monstergroups/wilderness.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index a63db8b0b65da..272bc48978430 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -3072,7 +3072,7 @@ "pack_size": [ 6, 12 ], "conditions": [ "DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN" ] }, - { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }, + { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 } ] }, { From 399ec6901c3b26152a6c9686e30da8ac1403ef61 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:52:00 -0500 Subject: [PATCH 32/63] Update bird.json build fixes --- data/json/monsters/bird.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 49b4f3cf31a6a..0cd41c5560458 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -624,7 +624,7 @@ "id": "mon_goose_golden", "type": "MONSTER", "copy-from": "mon_goose", - "name": { "str": "regal honker" }, + "name": { "str": "royal honker" }, "description": "This strange colored goose seems larger than the rest. Even more strange is its docile demeanor.", "volume": "8 L", "weight": "4000 g", @@ -777,8 +777,6 @@ "description": "A bird belonging to the Rallidae family. They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.", "volume": "400 ml", "weight": "400 g", - "hp": 5, - "speed": 110, "color": "brown", "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 }, "baby_flags": [ "SPRING", "SUMMER" ], @@ -792,8 +790,6 @@ "description": "A medium sized aquatic bird with a long neck. These birds can be distinguished by their strange leg placement which makes them great at diving.", "volume": "500 ml", "weight": "500 g", - "hp": 5, - "speed": 110, "color": "brown", "reproduction": { "baby_egg": "egg_grebe", "baby_count": 2, "baby_timer": 6 }, "baby_flags": [ "SPRING", "SUMMER" ], From a62a303d07ce04eb7c56d35db1e5eb97654b74c3 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:53:51 -0500 Subject: [PATCH 33/63] Update bird.json --- data/json/monsters/bird.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 0cd41c5560458..3de1e1083a31e 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -625,7 +625,7 @@ "type": "MONSTER", "copy-from": "mon_goose", "name": { "str": "royal honker" }, - "description": "This strange colored goose seems larger than the rest. Even more strange is its docile demeanor.", + "description": "This strange colored goose seems larger than the rest. Even more strange is its docile, almost regal demeanor.", "volume": "8 L", "weight": "4000 g", "hp": 25, @@ -762,8 +762,6 @@ "description": "An aquatic bird with a long snake-like neck. They are considered coastal birds but many species can also be found on freshwater habitats.", "volume": "340 ml", "weight": "340 g", - "hp": 5, - "speed": 110, "color": "brown", "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 2, "baby_timer": 6 }, "baby_flags": [ "SPRING", "SUMMER" ], From 27194c7f05342b35496025c894107e166f642a7f Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:56:45 -0500 Subject: [PATCH 34/63] Update eggs.json build fixes --- data/json/monstergroups/eggs.json | 36 +++++++++++-------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 3285dc10bf229..06aade22dc3a8 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -185,74 +185,62 @@ { "name": "GROUP_EGG_GOOSE", "type": "monstergroup", - "default": "mon_goose_chick", - "monsters": [ { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_goose_chick" } ] }, { "name": "GROUP_EGG_GOOSE_GOLD", "type": "monstergroup", - "default": "mon_goose_golden_chick", - "monsters": [ { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_goose_golden_chick" } ] }, { "name": "GROUP_EGG_HUMMINGBIRD", "type": "monstergroup", - "default": "mon_hummingbird_chick", - "monsters": [ { "monster": "mon_hummingbird_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_hummingbird_chick" } ] }, { "name": "GROUP_EGG_WOODPECKER", "type": "monstergroup", - "default": "mon_woodpecker_chick", - "monsters": [ { "monster": "mon_woodpecker_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_woodpecker_chick" } ] }, { "name": "GROUP_EGG_COOT", "type": "monstergroup", - "default": "mon_coot_chick", - "monsters": [ { "monster": "mon_coot_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_coot_chick" } ] }, { "name": "GROUP_EGG_CORMORANT", "type": "monstergroup", - "default": "mon_cormorant_chick", - "monsters": [ { "monster": "mon_cormorant_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_cormorant_chick" } ] }, { "name": "GROUP_EGG_MOORHEN", "type": "monstergroup", - "default": "mon_moorhen_chick", - "monsters": [ { "monster": "mon_moorhen_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_moorhen_chick" } ] }, { "name": "GROUP_EGG_GREBE", "type": "monstergroup", - "default": "mon_grebe_chick", - "monsters": [ { "monster": "mon_grebe_chick", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_grebe_chick" } ] }, { "name": "GROUP_EGG_TOAD", "type": "monstergroup", - "default": "mon_tadpole_brown", - "monsters": [ { "monster": "mon_tadpole_brown", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_tadpole_brown" } ] }, { "name": "GROUP_EGG_WATER_BEETLE", "type": "monstergroup", - "default": "mon_diving_larva", - "monsters": [ { "monster": "mon_diving_larva", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_diving_larva" } ] }, { "name": "GROUP_EGG_WATER_BUG", "type": "monstergroup", - "default": "mon_water_scorpion_larva", - "monsters": [ { "monster": "mon_water_scorpion_larva", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_water_scorpion_larva" } ] }, { "name": "GROUP_EGG_CICADA", "type": "monstergroup", - "default": "mon_cicada_nymph", - "monsters": [ { "monster": "mon_cicada_nymph", "freq": 100, "cost_multiplier": 1 } ] + "monsters": [ { "monster": "mon_cicada_nymph" } ] }, { "name": "GROUP_EGG_BUTTERFLY", From 8a5e3833c5a079c8b5750e89270664e89e431458 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 00:08:23 -0500 Subject: [PATCH 35/63] Update egg.json --- data/json/items/comestibles/egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index d5667fa97bab2..324ce45480b6a 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -642,7 +642,7 @@ "type": "COMESTIBLE", "id": "egg_goose", "name": "goose egg", - "copy-from": "egg_guinea_fowl", + "copy-from": "egg_chicken", "calories": 266, "volume": "125 ml", "weight": "144 g", From bd46cc63e6c34feaf3448b54e04d15bec49c9dd6 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 00:10:04 -0500 Subject: [PATCH 36/63] Update bird.json --- data/json/monsters/bird.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 3de1e1083a31e..cd2e15b14a782 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -633,7 +633,6 @@ "color": "yellow", "aggression": 0, "morale": 30, - "dodge": 3, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], "reproduction": { "baby_egg": "egg_goose_golden", "baby_count": 1, "baby_timer": 10 } }, From 13124beb0354e4d7d6f9ace4e24a16840fda7dae Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 00:23:09 -0500 Subject: [PATCH 37/63] Update egg.json --- data/json/items/comestibles/egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 324ce45480b6a..6b91c3e12f501 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -656,7 +656,7 @@ "copy-from": "egg_goose", "calories": 300, "volume": "125 ml", - "weight": "144 g", + "weight": "155 g", "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], "rot_spawn": "GROUP_EGG_GOOSE" }, From f2de85e7ff5612897b680f5e988b2f03f3bd2d0d Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:09:58 -0500 Subject: [PATCH 38/63] Update biosignatures.json changed chitin dust so it matches other chitinous materials --- data/json/items/biosignatures.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json index 15ed7861a1b89..2c46651f0e3d8 100644 --- a/data/json/items/biosignatures.json +++ b/data/json/items/biosignatures.json @@ -76,21 +76,18 @@ "type": "COMESTIBLE", "id": "insect_dust", "name": { "str_sp": "chitin dust" }, - "category": "chems", + "category": "spare_parts", "weight": "40 g", "color": "white", "comestible_type": "FOOD", "symbol": "%", - "quench": -3, - "healthy": -10, - "calories": 26, "description": "The dust left over by winged insects such as butterflies or moths. It's mostly chitin but may also contain dirt and other gross materials.", "price": 0, "price_postapoc": 0, - "material": [ "feces" ], + "material": [ "chitin" ], + "flags": [ "NO_SALVAGE" ], "volume": "250 ml", "charges": 4, "stack_size": 4, - "fun": -25 } ] From 1d7cbc497fa8ecbdcf5db0355d1a64746f222551 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:14:10 -0500 Subject: [PATCH 39/63] Update egg.json hummingbird egg fixes --- data/json/items/comestibles/egg.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 6b91c3e12f501..6f6c065db81a0 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -665,6 +665,8 @@ "id": "egg_hummingbird", "name": "hummingbird egg", "copy-from": "egg_bird", + "volume": "1 ml", + "weight": "1 g", "rot_spawn": "GROUP_EGG_HUMMINGBIRD", "rot_spawn_chance": 70 }, From b96597a049276a7ca3ec8d0757b193d2adf438aa Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:17:08 -0500 Subject: [PATCH 40/63] Update eggs.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit added starting date for giant caterpillars to spawn from eggs as per Venera´s feedback --- data/json/monstergroups/eggs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 06aade22dc3a8..d39977095c168 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -247,7 +247,7 @@ "type": "monstergroup", "default": "mon_caterpillar", "monsters": [ - { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1 }, + { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1, "starts": "28 days" }, { "monster": "mon_caterpillar", "freq": 100, "cost_multiplier": 1 } ] } From 0439e64d9a6c70e2d40f8fd7ee8dc06ed17da8a4 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:19:30 -0500 Subject: [PATCH 41/63] Update wilderness.json added starting hours for giant caterpillars to appear on overmap --- data/json/monstergroups/wilderness.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 272bc48978430..0ba9d2f496014 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -1829,7 +1829,7 @@ { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720 }, { "monster": "mon_caterpillar", "weight": 3, "cost_multiplier": 0 }, { "monster": "mon_woodlouse", "weight": 3, "cost_multiplier": 0 }, - { "monster": "mon_caterpillar_giant", "weight": 2, "cost_multiplier": 0 }, + { "monster": "mon_caterpillar_giant", "weight": 2, "cost_multiplier": 0, "starts": "120 hours" }, { "monster": "mon_butterfly", "weight": 2, "cost_multiplier": 0 }, { "monster": "mon_moth", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] }, { "monster": "mon_butterfly_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" }, From eb477a41c726192ac7d8b1a15bf830805408ffd3 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:23:54 -0500 Subject: [PATCH 42/63] Update insect_spider.json updated harvest type for lepidopterans and cicadas --- data/json/monsters/insect_spider.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index bece6d0e742ee..4cf79be5de9e7 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2987,7 +2987,7 @@ "speed": 95, "vision_day": 15, "dodge": 2, - "harvest": "arachnid_firefly", + "harvest": "arachnid_flying", "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, "upgrades": { "half_life": 14, "into": "mon_butterfly_giant" }, "baby_flags": [ "SPRING", "SUMMER" ], @@ -3011,7 +3011,7 @@ "speed": 95, "vision_day": 15, "dodge": 2, - "harvest": "arachnid_firefly", + "harvest": "arachnid_flying", "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 }, "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, "baby_flags": [ "SPRING", "SUMMER" ], @@ -3047,7 +3047,7 @@ "speed": 95, "vision_night": 15, "dodge": 2, - "harvest": "arachnid_firefly", + "harvest": "arachnid_flying", "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, "upgrades": { "half_life": 14, "into": "mon_moth_giant" }, "baby_flags": [ "SPRING", "SUMMER" ], @@ -3071,7 +3071,7 @@ "speed": 95, "vision_night": 15, "dodge": 2, - "harvest": "arachnid_firefly", + "harvest": "arachnid_flying", "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 }, "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, "baby_flags": [ "SPRING", "SUMMER" ], @@ -3184,7 +3184,7 @@ "armor_elec": 2, "vision_day": 10, "vision_night": 15, - "harvest": "arachnid", + "harvest": "arachnid_flying", "reproduction": { "baby_egg": "egg_cicada", "baby_count": 3, "baby_timer": 20 }, "baby_flags": [ "SUMMER" ], "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 5 ] ], From c65a632abeb12a409ccec32851fd0f0599384f66 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:26:12 -0500 Subject: [PATCH 43/63] Update insect_spider.json changed growth of mutated butterflies into giants (per Venera's advice) --- 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 4cf79be5de9e7..40e42c08dbdc1 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2989,7 +2989,7 @@ "dodge": 2, "harvest": "arachnid_flying", "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, - "upgrades": { "half_life": 14, "into": "mon_butterfly_giant" }, + "upgrades": { "age_grow": 30, "into": "mon_butterfly_giant" }, "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "HURT", "FIRE" ], "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] @@ -3049,7 +3049,7 @@ "dodge": 2, "harvest": "arachnid_flying", "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 }, - "upgrades": { "half_life": 14, "into": "mon_moth_giant" }, + "upgrades": { "age_grow": 30, "into": "mon_moth_giant" }, "baby_flags": [ "SPRING", "SUMMER" ], "fear_triggers": [ "HURT", "FIRE" ], "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ] From 4bed2ff32ace95fa1831041ca5bacc8eaa1a5167 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:28:21 -0500 Subject: [PATCH 44/63] Update insect_spider.json nerfed cicada agression and caterpillar speeds --- data/json/monsters/insect_spider.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 40e42c08dbdc1..b9d90b8559ed9 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -3104,7 +3104,7 @@ "material": [ "iflesh" ], "symbol": "c", "color": "green", - "speed": 50, + "speed": 30, "vision_day": 15, "dodge": 2, "harvest": "arachnid", @@ -3138,7 +3138,7 @@ "material": [ "iflesh" ], "symbol": "c", "color": "white", - "aggression": -10, + "aggression": -5, "morale": 60, "melee_skill": 3, "melee_dice": 4, @@ -3172,7 +3172,7 @@ "material": [ "iflesh" ], "symbol": "C", "color": "light_gray", - "aggression": -10, + "aggression": -5, "morale": 60, "melee_skill": 4, "melee_dice": 4, From 7a87c7015bc0adce7a5ad2deb9b647b26073ce3a Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:38:47 -0500 Subject: [PATCH 45/63] Update insect_spider.json several fixes to cicadas and beetles --- data/json/monsters/insect_spider.json | 33 ++++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index b9d90b8559ed9..5c08697534f4f 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -3141,12 +3141,12 @@ "aggression": -5, "morale": 60, "melee_skill": 3, - "melee_dice": 4, - "melee_dice_sides": 4, - "melee_damage": [ { "damage_type": "cut", "amount": 6 } ], - "armor_bash": 15, - "armor_cut": 18, - "armor_bullet": 20, + "melee_dice": 1, + "melee_dice_sides": 2, + "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], + "armor_bash": 1, + "armor_cut": 3, + "armor_bullet": 2, "armor_elec": 2, "vision_day": 10, "vision_night": 15, @@ -3174,13 +3174,13 @@ "color": "light_gray", "aggression": -5, "morale": 60, - "melee_skill": 4, - "melee_dice": 4, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "cut", "amount": 5 } ], - "armor_bash": 8, - "armor_cut": 10, - "armor_bullet": 10, + "melee_skill": 3, + "melee_dice": 1, + "melee_dice_sides": 2, + "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], + "armor_bash": 1, + "armor_cut": 3, + "armor_bullet": 2, "armor_elec": 2, "vision_day": 10, "vision_night": 15, @@ -3283,9 +3283,10 @@ "melee_dice_sides": 4, "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], "dodge": 1, - "armor_bash": 1, - "armor_cut": 3, - "armor_bullet": 2, + "armor_bash": 7, + "armor_cut": 9, + "armor_bullet": 10, + "armor_elec": 2, "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 } From 30042a7c1ce31de5af95559be4adcbf8e5d36990 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:50:06 -0500 Subject: [PATCH 46/63] Update misc.json branch conflict fixes --- data/json/monstergroups/misc.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index 98205bd09b271..2e6b17f0f9830 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -361,10 +361,11 @@ { "monster": "mon_slug_giant", "weight": 75, "starts": "180 hours" }, { "monster": "mon_sludge_crawler", "weight": 25 }, { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" }, - { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }, { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 }, { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 }, - { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" } + { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }, + { "monster": "mon_zombullfrog", "weight": 10, "cost_multiplier": 2 }, + { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" } ] }, { From 74aca001e334aa2e38692a59632912516cf35f22 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Wed, 17 Aug 2022 23:04:53 -0500 Subject: [PATCH 47/63] Update biosignatures.json --- data/json/items/biosignatures.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json index 2c46651f0e3d8..619c7a577a2b8 100644 --- a/data/json/items/biosignatures.json +++ b/data/json/items/biosignatures.json @@ -88,6 +88,6 @@ "flags": [ "NO_SALVAGE" ], "volume": "250 ml", "charges": 4, - "stack_size": 4, + "stack_size": 4 } ] From b1a2af960f52f12d0bfc4bc1f1d5a548b09fe1ba Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 00:08:18 -0500 Subject: [PATCH 48/63] Update egg.json trying to fix the density errors --- data/json/items/comestibles/egg.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 6f6c065db81a0..eb434ed2233db 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -664,7 +664,7 @@ "type": "COMESTIBLE", "id": "egg_hummingbird", "name": "hummingbird egg", - "copy-from": "egg_bird", + "copy-from": "egg_chicken", "volume": "1 ml", "weight": "1 g", "rot_spawn": "GROUP_EGG_HUMMINGBIRD", @@ -674,7 +674,7 @@ "type": "COMESTIBLE", "id": "egg_woodpecker", "name": "woodpecker egg", - "copy-from": "egg_bird", + "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_WOODPECKER", "rot_spawn_chance": 70 }, @@ -682,7 +682,7 @@ "type": "COMESTIBLE", "id": "egg_coot", "name": "coot egg", - "copy-from": "egg_bird", + "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_COOT", "rot_spawn_chance": 70 }, @@ -690,7 +690,7 @@ "type": "COMESTIBLE", "id": "egg_cormorant", "name": "cormorant egg", - "copy-from": "egg_bird", + "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_CORMORANT", "rot_spawn_chance": 70 }, @@ -698,7 +698,7 @@ "type": "COMESTIBLE", "id": "egg_moorhen", "name": "moorhen egg", - "copy-from": "egg_bird", + "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_MOORHEN", "rot_spawn_chance": 70 }, @@ -706,7 +706,7 @@ "type": "COMESTIBLE", "id": "egg_grebe", "name": "grebe egg", - "copy-from": "egg_bird", + "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_GREBE", "rot_spawn_chance": 70 }, From d7072a71cf3caa5438e9fbea92feb333dc9c4b2b Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 00:33:00 -0500 Subject: [PATCH 49/63] Update egg.json --- data/json/items/comestibles/egg.json | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index eb434ed2233db..23eb172291352 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -642,29 +642,22 @@ "type": "COMESTIBLE", "id": "egg_goose", "name": "goose egg", - "copy-from": "egg_chicken", - "calories": 266, - "volume": "125 ml", - "weight": "144 g", - "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], + "copy-from": "egg_goose_canadian", "rot_spawn": "GROUP_EGG_GOOSE" }, { "type": "COMESTIBLE", "id": "egg_goose_golden", "name": "golden goose egg", - "copy-from": "egg_goose", - "calories": 300, - "volume": "125 ml", - "weight": "155 g", - "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], + "copy-from": "egg_goose_canadian", + "proportional": { "weight": 2, "calories": 2, "volume": 2 }, "rot_spawn": "GROUP_EGG_GOOSE" }, { "type": "COMESTIBLE", "id": "egg_hummingbird", "name": "hummingbird egg", - "copy-from": "egg_chicken", + "copy-from": "egg_crow", "volume": "1 ml", "weight": "1 g", "rot_spawn": "GROUP_EGG_HUMMINGBIRD", @@ -674,7 +667,7 @@ "type": "COMESTIBLE", "id": "egg_woodpecker", "name": "woodpecker egg", - "copy-from": "egg_chicken", + "copy-from": "egg_crow", "rot_spawn": "GROUP_EGG_WOODPECKER", "rot_spawn_chance": 70 }, @@ -714,9 +707,7 @@ "type": "COMESTIBLE", "id": "egg_toad", "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" }, - "copy-from": "egg_chicken", - "weight": "20 g", - "volume": "650 ml", + "copy-from": "egg_frog", "description": "A large clump of the eggs of a toad. The eggs themselves are gelatinous and transparent.", "rot_spawn": "GROUP_EGG_TOAD" }, From f6d1eb44a3a35d5bbddf164c5ab6c8a332884795 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:03:24 -0500 Subject: [PATCH 50/63] Update egg.json changed the size of bird eggs to match "medium" size chicken eggs (from 57g and 50ml to 50g and 43 ml). this change was made so as to see if the density errors on item test stop appearing. --- data/json/items/comestibles/egg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 23eb172291352..bc4743eaa23dc 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "egg_bird", "name": { "str": "bird egg" }, - "weight": "57 g", + "weight": "50 g", "color": "brown", "spoils_in": "7 days", "comestible_type": "FOOD", @@ -14,7 +14,7 @@ "price": 44, "price_postapoc": 50, "material": [ "egg" ], - "volume": "50 ml", + "volume": "43 ml", "stack_size": 1, "fun": -8, "flags": [ "FREEZERBURN", "RAW" ], From c993e0aa86f92866771624692005e28e813c0ed1 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:34:03 -0500 Subject: [PATCH 51/63] Update egg.json matched egg volume to mass to see if it stop sending errors --- data/json/items/comestibles/egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index bc4743eaa23dc..0743b1a074c13 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -14,7 +14,7 @@ "price": 44, "price_postapoc": 50, "material": [ "egg" ], - "volume": "43 ml", + "volume": "50 ml", "stack_size": 1, "fun": -8, "flags": [ "FREEZERBURN", "RAW" ], From a248e4363e63bc79cc2a61bfea2993019d14599d Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:50:54 -0500 Subject: [PATCH 52/63] Update egg.json --- data/json/items/comestibles/egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 0743b1a074c13..cb988af0417db 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "egg_bird", "name": { "str": "bird egg" }, - "weight": "50 g", + "weight": "55 g", "color": "brown", "spoils_in": "7 days", "comestible_type": "FOOD", From afd9dc068fc5d8c5c235dc37d7a1f3e8450134dc Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:10:15 -0500 Subject: [PATCH 53/63] Update known_bad_density.json listed off eggs fixed with the density fix --- data/mods/TEST_DATA/known_bad_density.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index f35dcff7d692e..833d364bc018d 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -490,7 +490,6 @@ "tourniquet_upper_XS", "disinfectant_makeshift", "choco_coffee_beans", - "boiled_egg", "sourdough_young_uncovered", "fishing_rod_basic", "mre_dessert", @@ -627,7 +626,6 @@ "fake_drop_hammer", "fake_oven", "fetid_goop", - "egg_bird_unfert", "tinder", "rehydrated_meat", "art_teardrop", @@ -916,7 +914,6 @@ "migo_bio_tech", "material_cement", "textbook_toxicology", - "egg_chicken", "gasdiscount_platinum", "meat_fatty_cooked", "mutant_bug_organs", @@ -945,7 +942,6 @@ "brew_mycus_wine", "integrated_chitin2", "chicory_coffee", - "pickled_egg", "AID_bio_power_armor_interface", "juice_pulp", "peanutbutter", From c16bdaa971cb4749ac2daed7833a734122244fbf Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:10:43 -0500 Subject: [PATCH 54/63] Update egg.json --- data/json/items/comestibles/egg.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index cb988af0417db..888e5d1725e35 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -661,7 +661,6 @@ "volume": "1 ml", "weight": "1 g", "rot_spawn": "GROUP_EGG_HUMMINGBIRD", - "rot_spawn_chance": 70 }, { "type": "COMESTIBLE", @@ -669,7 +668,6 @@ "name": "woodpecker egg", "copy-from": "egg_crow", "rot_spawn": "GROUP_EGG_WOODPECKER", - "rot_spawn_chance": 70 }, { "type": "COMESTIBLE", @@ -677,7 +675,6 @@ "name": "coot egg", "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_COOT", - "rot_spawn_chance": 70 }, { "type": "COMESTIBLE", @@ -685,7 +682,6 @@ "name": "cormorant egg", "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_CORMORANT", - "rot_spawn_chance": 70 }, { "type": "COMESTIBLE", @@ -693,7 +689,6 @@ "name": "moorhen egg", "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_MOORHEN", - "rot_spawn_chance": 70 }, { "type": "COMESTIBLE", @@ -701,7 +696,6 @@ "name": "grebe egg", "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_GREBE", - "rot_spawn_chance": 70 }, { "type": "COMESTIBLE", From 483405a3089f00cb8163d91c085a2469d22c9950 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:13:28 -0500 Subject: [PATCH 55/63] Update egg.json lint fix --- data/json/items/comestibles/egg.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 888e5d1725e35..7b15539dd143b 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -660,42 +660,42 @@ "copy-from": "egg_crow", "volume": "1 ml", "weight": "1 g", - "rot_spawn": "GROUP_EGG_HUMMINGBIRD", + "rot_spawn": "GROUP_EGG_HUMMINGBIRD" }, { "type": "COMESTIBLE", "id": "egg_woodpecker", "name": "woodpecker egg", "copy-from": "egg_crow", - "rot_spawn": "GROUP_EGG_WOODPECKER", + "rot_spawn": "GROUP_EGG_WOODPECKER" }, { "type": "COMESTIBLE", "id": "egg_coot", "name": "coot egg", "copy-from": "egg_chicken", - "rot_spawn": "GROUP_EGG_COOT", + "rot_spawn": "GROUP_EGG_COOT" }, { "type": "COMESTIBLE", "id": "egg_cormorant", "name": "cormorant egg", "copy-from": "egg_chicken", - "rot_spawn": "GROUP_EGG_CORMORANT", + "rot_spawn": "GROUP_EGG_CORMORANT" }, { "type": "COMESTIBLE", "id": "egg_moorhen", "name": "moorhen egg", "copy-from": "egg_chicken", - "rot_spawn": "GROUP_EGG_MOORHEN", + "rot_spawn": "GROUP_EGG_MOORHEN" }, { "type": "COMESTIBLE", "id": "egg_grebe", "name": "grebe egg", "copy-from": "egg_chicken", - "rot_spawn": "GROUP_EGG_GREBE", + "rot_spawn": "GROUP_EGG_GREBE" }, { "type": "COMESTIBLE", From 6135cb4941151f99b29b4f6eeaa49b7133fbd350 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:29:05 -0500 Subject: [PATCH 56/63] Update known_bad_density.json more writting off eggs --- data/mods/TEST_DATA/known_bad_density.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 833d364bc018d..343f7299ed327 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -46,7 +46,6 @@ "AID_bio_flashlight", "loom_frame", "raw_curing_fatty_meat", - "egg_bird", "art_napkin", "light_minus_battery_cell", "shot_beanbag", @@ -86,7 +85,6 @@ "cuvettes", "mp3_on", "mutant_cracklins", - "egg_pheasant", "venom_wasp", "art_sphere", "id_science", @@ -101,7 +99,6 @@ "awl_bone", "beer", "chem_hexamine", - "egg_raven", "sandwich_sauce_wheat_free", "mutant_human_flesh", "adobe_pallet_full", @@ -182,7 +179,6 @@ "wasp_sting", "corpse_generic_girl", "pipe_tobacco", - "egg_grouse", "carbon_electrode", "hotdogs_cooked", "candy", @@ -652,7 +648,6 @@ "textbook_arthropod", "vitamins", "chem_match_head_powder", - "egg_salad", "wood_panel", "unfinished_charcoal", "con_milk", @@ -834,7 +829,6 @@ "toothbrush_plain", "solar_panel", "homemade_burrito", - "egg_cockatrice", "bot_lab_security_drone_BM", "dog_whistle", "training_dummy_light", From 68df30a7cad46b043450d39052c45aebd6934cfe Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:46:24 -0500 Subject: [PATCH 57/63] Update egg.json changed insect and canadian goose egg volume to match density requirements --- data/json/items/comestibles/egg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 7b15539dd143b..ee59a4a871ac8 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -113,7 +113,7 @@ "name": { "str": "goose egg" }, "copy-from": "egg_chicken", "calories": 266, - "volume": "125 ml", + "volume": "130 ml", "weight": "144 g", "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], "rot_spawn": "GROUP_EGG_GOOSE_CANADIAN" @@ -175,7 +175,7 @@ "symbol": "%", "material": [ "egg" ], "stack_size": 1, - "volume": "250 ml", + "volume": "272 ml", "weight": "300 g", "calories": 240, "quench": 10, From b47b93c7d09d09381054059c16f03c985e2471f2 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:04:21 -0500 Subject: [PATCH 58/63] Update egg.json --- data/json/items/comestibles/egg.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index ee59a4a871ac8..a1676cd8093ad 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -114,7 +114,7 @@ "copy-from": "egg_chicken", "calories": 266, "volume": "130 ml", - "weight": "144 g", + "weight": "143 g", "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], "rot_spawn": "GROUP_EGG_GOOSE_CANADIAN" }, @@ -175,8 +175,8 @@ "symbol": "%", "material": [ "egg" ], "stack_size": 1, - "volume": "272 ml", - "weight": "300 g", + "volume": "270 ml", + "weight": "299 g", "calories": 240, "quench": 10, "fun": -20, From f4b4533336336d82e3b6c1d2c803f499beae6d83 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:23:53 -0500 Subject: [PATCH 59/63] Update known_bad_density.json --- data/mods/TEST_DATA/known_bad_density.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 343f7299ed327..c18ef44ae3810 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -810,7 +810,6 @@ "test_bullwhip", "amplifier_head", "sarcophagus_access_code", - "egg_goose_canadian", "mutant_blood", "8mm_fmj", "chestnut", From 8b5e1ee47aaf43af4f1dfa0b2558f96262a9cba1 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:25:54 -0500 Subject: [PATCH 60/63] Update egg.json --- data/json/items/comestibles/egg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index a1676cd8093ad..b4e076728249a 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -175,8 +175,8 @@ "symbol": "%", "material": [ "egg" ], "stack_size": 1, - "volume": "270 ml", - "weight": "299 g", + "volume": "250 ml", + "weight": "275 g", "calories": 240, "quench": 10, "fun": -20, From 4640b8f93e42ab845fe017499562a43dd6b8e239 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:41:34 -0500 Subject: [PATCH 61/63] Update known_bad_density.json wrote off insect eggs now that egg_insect has a correct density --- data/mods/TEST_DATA/known_bad_density.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index c18ef44ae3810..33e4de525d085 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -25,7 +25,6 @@ "brew_sake_koji", "artifact_slow_aura", "coffee_raw", - "egg_roach", "v_rockwheel_item", "art_knot", "glassblowing_book", @@ -142,13 +141,10 @@ "dynamite", "bot_lab_security_drone_GR", "parkour_practice", - "egg_centipede", "flatbread_wheat_free", - "egg_roach_plague", "butchery_rack_pseudo", "birchbark", "material_zincite", - "egg_mantis", "small_lcd_screen", "corpse_child_calm", "biscuit", @@ -190,7 +186,6 @@ "broken_lab_security_drone_BM2", "bot_lab_security_drone_BS", "book_anthology_sst", - "egg_dragonfly", "protein_drink", "badge_cybercop", "id_science_maintenance_yellow", @@ -268,7 +263,6 @@ "motorcycle_headlight", "altered_rubicks_cube", "hi_q_shatter", - "egg_mole_cricket", "meal_bone", "corpse_generic_gunned", "bellywrap_leather", @@ -280,7 +274,6 @@ "can_peach", "bowling_pin", "fake_firestarter", - "egg_stag_beetle", "rehydration_drink", "bee_sting", "test_cracklins", @@ -470,7 +463,6 @@ "joint_roach", "sandwich_deluxe_wheat_free", "base_toiletries", - "egg_locust", "glass_tinted", "stomach_sealed", "sake_koji_rice", @@ -592,7 +584,6 @@ "art_spiral", "conc_paralytic", "soft_adobe_brick", - "spider_egg", "radio_car", "seed_sugar_beet", "manual_stabbing", @@ -676,7 +667,6 @@ "cheeseburger", "k_gambeson_vest_xs_loose", "tramadol", - "egg_firefly", "helmet_eod", "car_wide_headlight", "hc_steel_lump", @@ -696,8 +686,6 @@ "integrated_chitin3", "pointy_stick_long", "chem_phenol", - "ant_egg", - "egg_wasp", "empty_corn_cob", "combination_gun_shotgun", "mask_dust", @@ -956,7 +944,6 @@ "seasoning_italian", "crossbow", "qt_steel_lump", - "egg_antlion", "corpse_generic_male", "5llead", "cookies", @@ -1066,7 +1053,6 @@ "mortar_adobe", "chilidogs_wheat_free", "deviled_kidney", - "egg_lady_bug_giant", "v_plow_item", "cinnamon", "meat_mutant_tainted_smoked", From 93781d70c0a0630ca9f7aed292c9fe2804fb06b1 Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:56:54 -0500 Subject: [PATCH 62/63] Update known_bad_density.json --- data/mods/TEST_DATA/known_bad_density.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 33e4de525d085..6bc862130619d 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -325,7 +325,6 @@ "chem_chloroform", "soaked_dandelion", "coffee_syrup", - "egg_strider", "bot_lab_security_drone_GM", "fertilizer_liquid", "neccowafers", @@ -443,7 +442,6 @@ "arrow_fire_hardened_fletched", "mutant_human_cooked", "plastic_fork", - "egg_lady_bug", "brew_whiskey", "human_meat_scrap", "manual_bashing", @@ -983,7 +981,6 @@ "XL_holster", "xs_tacvest", "bat", - "egg_grasshopper", "xl_gambeson_hood", "corpse_child_gunned", "plastic_spoon_kids", From 1e7aee164be89167d737274e559c0c7a4da7a9ac Mon Sep 17 00:00:00 2001 From: Xaritscin <76923928+Xaritscin@users.noreply.github.com> Date: Thu, 18 Aug 2022 23:37:47 -0500 Subject: [PATCH 63/63] Update known_bad_density.json owlbear egg also written off -_- --- data/mods/TEST_DATA/known_bad_density.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 6bc862130619d..c8dbb2afc22c9 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -1091,7 +1091,6 @@ "techno_basic", "sledge_heavy_plus_one", "wizard_advanced", - "egg_owlbear", "summon_scroll_smudged", "wolfshead_cufflinks", "magic_armormaking",