From cb9f8d912ebcad5ff9fb28fd06b5f4252680b32f Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Tue, 27 Aug 2024 07:10:57 +0200 Subject: [PATCH] Some new reptiles (#75829) * rattlesnake + abstracts * wormsnake * correct biosig for wormsnakes * Update reptile_amphibian.json * garter snake * Update reptile_amphibian.json * skink * turtles * make snappers angry if close to the player * typos are evil * destroy * handle mods * Update reptile_amphibian.json * Update default_blacklist.json * spawning * Update reptile_amphibian.json --- .../Agriculture_Forage_Excavation/forage.json | 3 +- data/json/itemgroups/Labs/labs_mutagen.json | 1 - data/json/itemgroups/misc.json | 10 + data/json/items/comestibles/egg.json | 48 ++- data/json/monstergroups/eggs.json | 20 ++ data/json/monstergroups/misc.json | 3 - data/json/monstergroups/wilderness.json | 38 ++- data/json/monsters/reptile_amphibian.json | 286 +++++++++++++++--- .../migration_items.json | 5 + data/json/recipes/chem/mutagens.json | 2 +- data/json/recipes/food/bread.json | 2 +- data/json/recipes/food/dry.json | 4 +- data/json/recipes/food/frozen.json | 2 +- data/json/recipes/food/offal_dishes.json | 2 +- data/json/recipes/recipe_food.json | 26 +- .../json/requirements/cooking_components.json | 27 +- data/mods/DinoMod/items/egg.json | 10 +- data/mods/DinoMod/recipes/offal_dishes.json | 2 +- .../Tamable_Wildlife/reptile_amphibian.json | 108 +++++-- .../blacklists/default_blacklist.json | 12 + .../TropiCataclysm/items/comestibles/egg.json | 14 +- 21 files changed, 495 insertions(+), 130 deletions(-) diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json index 4a63031440d78..d8c7d099551f6 100644 --- a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json +++ b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json @@ -8,7 +8,6 @@ { "item": "plant_stalk", "prob": 20, "count": [ 1, 3 ] }, { "group": "any_wild_egg", "prob": 15, "count": [ 2, 5 ] }, { "item": "groundnut", "prob": 5, "count": [ 1, 8 ] }, - { "item": "egg_reptile", "prob": 5, "count": [ 2, 5 ] }, { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] }, { "item": "wild_garlic", "prob": 5, "count": [ 2, 7 ] }, { "item": "rhubarb", "prob": 5, "count": [ 2, 5 ] }, @@ -34,7 +33,7 @@ { "item": "groundnut", "prob": 3, "count": [ 1, 6 ] }, { "group": "forage_mushroom", "prob": 25 }, { "group": "any_wild_egg", "prob": 5, "count": [ 2, 5 ] }, - { "item": "egg_reptile", "prob": 5, "count": [ 1, 3 ] }, + { "group": "egg_reptile_forest", "prob": 5, "count": [ 2, 5 ] }, { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] }, { "item": "wild_herbs", "prob": 20, "count": 20 }, { "item": "buckwheat", "prob": 5, "count": [ 2, 8 ] }, diff --git a/data/json/itemgroups/Labs/labs_mutagen.json b/data/json/itemgroups/Labs/labs_mutagen.json index a3d17f27b9ffe..82a52cd0df609 100644 --- a/data/json/itemgroups/Labs/labs_mutagen.json +++ b/data/json/itemgroups/Labs/labs_mutagen.json @@ -64,7 +64,6 @@ { "item": "slime_sample", "prob": 40, "count": [ 1, 3 ] }, { "item": "bird_sample", "prob": 40, "count": [ 1, 3 ] }, { "item": "crustacean_sample", "prob": 40, "count": [ 1, 3 ] }, - { "item": "egg_reptile", "prob": 20, "count": [ 1, 12 ] }, { "item": "water_clean", "container-item": "bottle_plastic", "prob": 65, "count": [ 1, 3 ], "sealed": false }, { "item": "water_mineral", "container-item": "bottle_plastic", "prob": 35, "count": [ 1, 2 ], "sealed": false } ] diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 3c654a9370d23..f04fdbd70f5af 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -357,5 +357,15 @@ "type": "item_group", "id": "butterfly_net_any", "items": [ { "item": "butterfly_net_collapsible", "prob": 4 }, { "item": "butterfly_net_makeshift", "prob": 6 } ] + }, + { + "type": "item_group", + "id": "egg_reptile_forest", + "//": "Any reptile eggs that make sense to find in random underbrush, assuming that it's a fair distance away from water.", + "items": [ + { "item": "egg_turtle_painted", "prob": 5 }, + { "item": "egg_wormsnake", "prob": 2 }, + { "item": "egg_skink_fivelined", "prob": 2 } + ] } ] diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 8c5b3de4ad6d8..77ce17bd4aa40 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -187,23 +187,39 @@ }, { "type": "COMESTIBLE", - "id": "egg_reptile", - "name": { "str": "reptile egg" }, - "weight": "60 g", - "color": "white", + "id": "egg_wormsnake", + "name": { "str": "worm snake egg" }, + "spoils_in": "23 days", + "copy-from": "egg_chicken", + "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 }, + "rot_spawn": "GROUP_EGG_WORMSNAKE" + }, + { + "type": "COMESTIBLE", + "id": "egg_turtle_painted", + "name": { "str": "painted turtle egg" }, + "spoils_in": "40 days", + "copy-from": "egg_chicken", + "proportional": { "volume": 0.25, "weight": 0.25, "calories": 0.25 }, + "rot_spawn": "GROUP_EGG_TURTLE_PAINTED" + }, + { + "type": "COMESTIBLE", + "id": "egg_turtle_snapping_common", + "name": { "str": "common snapping turtle egg" }, + "spoils_in": "51 days", + "copy-from": "egg_chicken", + "proportional": { "volume": 0.25, "weight": 0.25, "calories": 0.25 }, + "rot_spawn": "GROUP_EGG_TURTLE_SNAPPING_COMMON" + }, + { + "type": "COMESTIBLE", + "id": "egg_skink_fivelined", + "name": { "str": "five-lined skink egg" }, "spoils_in": "28 days", - "comestible_type": "FOOD", - "symbol": "o", - "quench": 3, - "calories": 87, - "description": "An egg laid by one of reptile species found in New England.", - "price": "62 cent", - "price_postapoc": "12 cent", - "material": [ "egg" ], - "volume": "62 ml", - "fun": -12, - "flags": [ "RAW" ], - "vitamins": [ [ "egg_allergen", 1 ] ] + "copy-from": "egg_chicken", + "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 }, + "rot_spawn": "GROUP_EGG_SKINK_FIVELINED" }, { "type": "COMESTIBLE", diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 4917b69723785..50d687065c94f 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -103,6 +103,26 @@ "type": "monstergroup", "monsters": [ { "monster": "mon_pheasant_chick" } ] }, + { + "name": "GROUP_EGG_WORMSNAKE", + "type": "monstergroup", + "monsters": [ { "monster": "mon_wormsnake_baby" } ] + }, + { + "name": "GROUP_EGG_TURTLE_PAINTED", + "type": "monstergroup", + "monsters": [ { "monster": "mon_turtle_painted_baby" } ] + }, + { + "name": "GROUP_EGG_TURTLE_SNAPPING_COMMON", + "type": "monstergroup", + "monsters": [ { "monster": "mon_turtle_snapping_common_baby" } ] + }, + { + "name": "GROUP_EGG_SKINK_FIVELINED", + "type": "monstergroup", + "monsters": [ { "monster": "mon_skink_fivelined_baby" } ] + }, { "name": "GROUP_EGG_ROACH", "type": "monstergroup", diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index f963b75d9b48c..9b3fb23341d74 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -292,7 +292,6 @@ { "monster": "mon_opossum", "weight": 10 }, { "monster": "mon_sewer_rat", "weight": 10 }, { "monster": "mon_black_rat", "weight": 10 }, - { "monster": "mon_rattlesnake", "weight": 10 }, { "group": "GROUP_COWS", "weight": 10 }, { "group": "GROUP_HORSES", "weight": 10 }, { "group": "GROUP_PIGS", "weight": 10 }, @@ -335,8 +334,6 @@ { "monster": "mon_black_rat", "weight": 100 }, { "monster": "mon_opossum", "weight": 15 }, { "monster": "mon_raccoon", "weight": 15 }, - { "monster": "mon_rattlesnake", "weight": 10 }, - { "monster": "mon_rattlesnake_giant", "weight": 5, "cost_multiplier": 2 }, { "group": "GROUP_WORM", "weight": 20 }, { "monster": "mon_wasp_small", "weight": 10 } ] diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 79cf5afb648a0..11f5d3f094ae7 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -115,8 +115,8 @@ "starts": "90 days" }, { - "monster": "mon_rattlesnake", - "weight": 3, + "group": "GROUP_WILDERNESS_FOREST_REPTILE", + "weight": 10, "cost_multiplier": 5, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, @@ -215,6 +215,18 @@ { "monster": "mon_woodpecker", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 3 ] } ] }, + { + "type": "monstergroup", + "name": "GROUP_WILDERNESS_FOREST_REPTILE", + "default": "mon_null", + "is_animal": true, + "monsters": [ + { "monster": "mon_rattlesnake", "weight": 3 }, + { "monster": "mon_gartersnake", "weight": 10 }, + { "monster": "mon_wormsnake", "weight": 5 }, + { "monster": "mon_skink_fivelined", "weight": 2, "pack_size": [ 1, 2 ] } + ] + }, { "type": "monstergroup", "name": "GROUP_WILDERNESS_FOREST_INSECT_HARMLESS", @@ -457,9 +469,20 @@ { "group": "GROUP_SNAIL", "weight": 15, "cost_multiplier": 2, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, { "group": "GROUP_TADPOLES_SWAMP", "weight": 100, "pack_size": [ 3, 6 ] }, { "group": "GROUP_FROGS_SWAMP", "weight": 100, "pack_size": [ 1, 3 ] }, + { "group": "GROUP_WILDERNESS_FRESHWATER_REPTILE", "weight": 85, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, { "group": "GROUP_MUTAFROGS_SWAMP", "weight": 75, "starts": "7 days" } ] }, + { + "type": "monstergroup", + "name": "GROUP_WILDERNESS_FRESHWATER_REPTILE", + "default": "mon_null", + "is_animal": true, + "monsters": [ + { "monster": "mon_turtle_painted", "weight": 15, "pack_size": [ 1, 5 ] }, + { "monster": "mon_turtle_snapping_common", "weight": 5 } + ] + }, { "type": "monstergroup", "name": "GROUP_WILDERNESS_SWAMP_INSECT", @@ -554,7 +577,13 @@ { "group": "GROUP_RABBIT_WILD", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 }, - { "group": "GROUP_FROGS_ALL", "weight": 100, "cost_multiplier": 0 } + { "group": "GROUP_FROGS_ALL", "weight": 100, "cost_multiplier": 0 }, + { + "group": "GROUP_WILDERNESS_FRESHWATER_REPTILE", + "weight": 10, + "cost_multiplier": 0, + "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] + } ] }, { @@ -617,7 +646,8 @@ { "group": "GROUP_STREAM_SMALL", "weight": 30 }, { "group": "GROUP_STREAM_BIRDS", "weight": 30 }, { "group": "GROUP_STREAM_DOMESTIC", "weight": 2 }, - { "group": "GROUP_FROGS_ALL", "weight": 20 } + { "group": "GROUP_FROGS_ALL", "weight": 20 }, + { "group": "GROUP_WILDERNESS_FRESHWATER_REPTILE", "weight": 10, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] } ] }, { diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index a533d1285c8f0..d20cab084bcd8 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -1,72 +1,279 @@ [ { - "id": "mon_rattlesnake_s", + "abstract": "mon_snake_abstract", "type": "MONSTER", - "name": { "str_sp": "rattlesnake snakelet" }, - "description": "A timber rattlesnake in its hatchling stage. It will eventually grow a rattle and learn how to hunt.", + "name": { "str": "abstract snake" }, + "description": "This is an abstract monster for other snakes to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.", "default_faction": "small_animal", "bodytype": "snake", "categories": [ "WILDLIFE" ], "species": [ "REPTILE" ], - "volume": "250 ml", - "weight": "300 g", - "hp": 2, - "speed": 70, - "dodge": 5, - "vision_day": 25, - "vision_night": 6, + "volume": "150 ml", + "weight": "150 g", + "hp": 1, + "speed": 100, "material": [ "flesh" ], "symbol": "s", "color": "brown", - "aggression": -60, - "morale": -5, - "upgrades": { "age_grow": 365, "into": "mon_rattlesnake" }, - "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ], + "aggression": 15, + "morale": 60, + "aggro_character": false, + "melee_skill": 2, + "melee_dice": 1, + "melee_dice_sides": 2, + "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], + "dodge": 6, + "vision_day": 15, + "vision_night": 8, "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], "harvest": "mammal_tiny", + "dissect": "dissect_lizard_sample_single", + "fear_triggers": [ "PLAYER_CLOSE", "HURT" ], + "placate_triggers": [ "PLAYER_WEAK" ], + "baby_flags": [ "SUMMER" ], + "biosignature": { "biosig_item": "shed_snakeskin", "biosig_timer": 180 }, + "flags": [ + "SEES", + "HEARS", + "SMELLS", + "KEENNOSE", + "HARDTOSHOOT", + "CLIMBS", + "PATH_AVOID_DANGER", + "ANIMAL", + "SWIMS", + "CORNERED_FIGHTER" + ] + }, + { + "abstract": "mon_snakelet_abstract", + "type": "MONSTER", + "name": { "str": "abstract snakelet" }, + "description": "This is an abstract monster for other snakelets to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.", + "copy-from": "mon_snake_abstract", + "volume": "10 ml", + "weight": "10 g", + "speed": 60, + "aggression": -35, + "morale": -20, + "vision_day": 10, + "vision_night": 6, "biosignature": { "biosig_item": "shed_snakeskin_little", "biosig_timer": 180 }, - "flags": [ "SEES", "HEARS", "SMELLS", "VENOM", "HARDTOSHOOT", "KEENNOSE", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ] + "extend": { "flags": [ "NO_BREED" ], "fear_triggers": [ "SOUND" ] } }, { - "id": "mon_rattlesnake", + "abstract": "mon_turtle_abstract", "type": "MONSTER", - "name": { "str": "rattlesnake" }, - "description": "The timber rattlesnake, the most venomous viper native to New England. Climatic changes have extended its range far into the north.", + "name": { "str": "abstract turtle" }, + "description": "This is an abstract monster for other turtles to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.", "default_faction": "small_animal", - "bodytype": "snake", + "bodytype": "turtle", "categories": [ "WILDLIFE" ], "species": [ "REPTILE" ], - "diff": 2, - "volume": "750 ml", - "weight": "1 kg", - "hp": 12, - "speed": 90, + "volume": "350 ml", + "weight": "350 g", + "hp": 1, + "speed": 65, "material": [ "flesh" ], - "symbol": "s", + "symbol": "o", "color": "brown", - "aggression": -50, + "aggression": 5, "morale": 60, - "aggro_character": false, - "melee_skill": 5, + "melee_skill": 2, "melee_dice": 1, + "melee_dice_sides": 2, + "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], + "dodge": 1, + "vision_day": 15, + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], + "harvest": "mammal_tiny", + "dissect": "dissect_lizard_sample_single", + "fear_triggers": [ "SOUND", "HURT" ], + "baby_flags": [ "SUMMER" ], + "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS", "CORNERED_FIGHTER" ] + }, + { + "abstract": "mon_turtle_baby_abstract", + "type": "MONSTER", + "name": { "str": "abstract turtle hatchling" }, + "description": "This is an abstract monster for other turtle hatchlings to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.", + "copy-from": "mon_turtle_abstract", + "volume": "15 ml", + "weight": "15 g", + "speed": 45, + "aggression": -35, + "morale": -20, + "vision_day": 10, + "extend": { "flags": [ "NO_BREED" ] } + }, + { + "id": "mon_rattlesnake_s", + "type": "MONSTER", + "name": { "str": "timber rattlesnake snakelet" }, + "description": "A timber rattlesnake in its hatchling stage. It will eventually grow a rattle and learn how to hunt.", + "copy-from": "mon_snakelet_abstract", + "upgrades": { "age_grow": 365, "into": "mon_rattlesnake" }, + "extend": { "flags": [ "VENOM" ] } + }, + { + "id": "mon_rattlesnake", + "type": "MONSTER", + "name": { "str": "timber rattlesnake" }, + "description": "The most venomous viper native to New England. Climatic changes have extended its range far into the north.", + "copy-from": "mon_snake_abstract", + "volume": "750 ml", + "weight": "750 g", + "hp": 2, + "melee_skill": 5, "melee_dice_sides": 4, "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], + "special_attacks": [ [ "RATTLE", 6 ] ], + "anger_triggers": [ "PLAYER_CLOSE" ], + "fear_triggers": [ "HURT" ], + "reproduction": { "baby_monster": "mon_rattlesnake_s", "baby_count": 10, "baby_timer": 135 }, + "baby_flags": [ "SUMMER" ], + "//babies": "On average, a female rattlesnake gives birth to at least eight babies, up to around fifteen. Most baby rattlesnakes are born in the early summer, but sometimes in late summer and early autumn.", + "extend": { "flags": [ "BADVENOM" ] } + }, + { + "id": "mon_gartersnake", + "type": "MONSTER", + "name": { "str": "common garnet snake" }, + "description": "A common species of snake found all across North America.", + "copy-from": "mon_snake_abstract", + "reproduction": { "baby_monster": "mon_gartersnake_baby", "baby_count": 10, "baby_timer": 90 }, + "//": "The numbers here can technically go up to 80 snakelets, with averages reaching 40, but lets be honest the game couldn't handle that.", + "baby_flags": [ "SUMMER" ] + }, + { + "id": "mon_gartersnake_baby", + "type": "MONSTER", + "name": { "str": "common garnet snake snakelet" }, + "description": "A garter snake in its juvenile stage.", + "copy-from": "mon_snakelet_abstract", + "upgrades": { "age_grow": 136, "into": "mon_gartersnake" } + }, + { + "id": "mon_wormsnake", + "type": "MONSTER", + "name": { "str": "worm snake" }, + "description": "A small burrowing reptile that's just enjoying its time hunting earthworms.", + "copy-from": "mon_snake_abstract", + "volume": "25 ml", + "weight": "25 g", + "//": "Actually no info on weight, I just kinda assumed 1g per 1cm of length since they're tiny.", + "speed": 70, + "vision_day": 6, + "vision_night": 6, + "reproduction": { "baby_egg": "egg_wormsnake", "baby_count": 8, "baby_timer": 50 }, + "biosignature": { "biosig_item": "shed_snakeskin_little", "biosig_timer": 180 }, + "extend": { "flags": [ "CAN_DIG" ], "fear_triggers": [ "SOUND", "BRIGHT_LIGHT" ] } + }, + { + "id": "mon_wormsnake_baby", + "type": "MONSTER", + "name": { "str": "worm snake snakelet" }, + "description": "A worm snake in its hatchling stage. Not that much smaller than an adult, actually.", + "copy-from": "mon_snakelet_abstract", + "upgrades": { "age_grow": 75, "into": "mon_wormsnake" }, + "extend": { "fear_triggers": [ "BRIGHT_LIGHT" ] } + }, + { + "id": "mon_turtle_painted", + "type": "MONSTER", + "name": { "str": "painted turtle" }, + "description": "A dark-colored species of freshwater turtle with bright orange markings.", + "copy-from": "mon_turtle_abstract", + "volume": "370 ml", + "weight": "370 g", + "hp": 2, + "reproduction": { "baby_egg": "egg_turtle_painted", "baby_count": 8, "baby_timer": 40 }, + "baby_flags": [ "SUMMER" ] + }, + { + "id": "mon_turtle_painted_baby", + "type": "MONSTER", + "name": { "str": "painted turtle hatchling" }, + "description": "A painted turtle in its hatchling stage.", + "copy-from": "mon_turtle_baby_abstract", + "upgrades": { "age_grow": 548, "into": "mon_turtle_painted" }, + "//": "In northmost regions of the range we're looking at 6 years as an absolute minimum to reach adulthood." + }, + { + "id": "mon_turtle_snapping_common", + "type": "MONSTER", + "name": { "str": "common snapping turtle" }, + "description": "A prehistoric-looking species of freshwater turtle with a nasty bite.", + "copy-from": "mon_turtle_abstract", + "volume": "6 L", + "weight": "6 kg", + "hp": 16, + "aggression": 15, + "melee_skill": 3, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], + "anger_triggers": [ "PLAYER_CLOSE" ], + "reproduction": { "baby_egg": "egg_turtle_snapping_common", "baby_count": 25, "baby_timer": 103 }, + "//": "Similar to the garter snake, we're reaching 80 at maximum estimates, but that is a deeply unserious amount of baby turtles for the game to handle.", + "baby_flags": [ "SUMMER" ] + }, + { + "id": "mon_turtle_snapping_common_baby", + "type": "MONSTER", + "name": { "str": "common snapping turtle hatchling" }, + "description": "A common snapping turtle in its hatchling stage.", + "copy-from": "mon_turtle_baby_abstract", + "upgrades": { "age_grow": 1095, "into": "mon_turtle_snapping_common" }, + "//": "12 years to reach maturity. It should probably be 15 years, because we're reaching the Northern range of the species in the setting, but odds are nobody is ever gonna see those grow to adulthood anyway." + }, + { + "id": "mon_skink_fivelined", + "type": "MONSTER", + "name": { "str": "five-lined skink" }, + "description": "A small species of skink. The only native lizard of New England.", + "default_faction": "small_animal", + "bodytype": "lizard", + "categories": [ "WILDLIFE" ], + "species": [ "REPTILE" ], + "volume": "25 ml", + "weight": "25 g", + "//": "This is only a guesstimate. Other species of skinks with similar bodyplan reach ~40g of body mass at over double body length, so what we have is likely higher than in reality.", + "hp": 1, + "speed": 125, + "material": [ "flesh" ], + "symbol": "i", + "color": "brown", + "aggression": -30, + "morale": 60, + "melee_skill": 1, + "melee_dice": 1, + "melee_dice_sides": 1, "dodge": 6, - "vision_day": 30, - "vision_night": 8, + "vision_day": 20, + "vision_night": 5, "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], "harvest": "mammal_tiny", "dissect": "dissect_lizard_sample_single", - "special_attacks": [ [ "RATTLE", 6 ] ], - "anger_triggers": [ "HURT" ], - "fear_triggers": [ "PLAYER_CLOSE" ], - "placate_triggers": [ "PLAYER_WEAK" ], - "reproduction": { "baby_monster": "mon_rattlesnake_s", "baby_count": 10, "baby_timer": 360 }, + "fear_triggers": [ "PLAYER_CLOSE", "HURT", "SOUND" ], + "reproduction": { "baby_egg": "egg_skink_fivelined", "baby_count": 18, "baby_timer": 55 }, "baby_flags": [ "SUMMER" ], - "//babies": "On average, a female rattlesnake gives birth to at least eight babies, up to around fifteen. Most baby rattlesnakes are born in the early summer, but sometimes in late summer and early autumn.", - "upgrades": { "half_life": 34, "into": "mon_rattlesnake_big" }, - "biosignature": { "biosig_item": "shed_snakeskin", "biosig_timer": 180 }, - "flags": [ "SEES", "HEARS", "SMELLS", "BADVENOM", "HARDTOSHOOT", "KEENNOSE", "CLIMBS", "PATH_AVOID_DANGER", "ANIMAL", "SWIMS" ] + "flags": [ "SEES", "HEARS", "SMELLS", "HARDTOSHOOT", "PATH_AVOID_DANGER", "ANIMAL" ] + }, + { + "id": "mon_skink_fivelined_baby", + "type": "MONSTER", + "name": { "str": "five-lined skink hatchling" }, + "description": "A five-lined skink in its hatchling stage.", + "copy-from": "mon_skink_fivelined", + "volume": "3 ml", + "weight": "3 g", + "speed": 60, + "morale": -20, + "vision_day": 16, + "vision_night": 3, + "upgrades": { "age_grow": 75, "into": "mon_skink_fivelined" }, + "//": "Sexual maturity at 2-3 years, but there's no way in hell they don't reach adult size before that, so we take 10 months as a fairly safe guesstimate.", + "extend": { "flags": [ "NO_BREED" ] } }, { "id": "mon_rattlesnake_big", @@ -106,7 +313,6 @@ "weight": "1 kg", "hp": 12, "speed": 90, - "dodge": 6, "material": [ "flesh" ], "symbol": "s", "color": "brown", diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index 48fa7e43f0ab0..3785789768476 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -1898,6 +1898,11 @@ "type": "MIGRATION", "replace": "egg_goose" }, + { + "id": "egg_reptile", + "type": "MIGRATION", + "replace": "egg_turtle_painted" + }, { "id": "ar_pistol", "type": "MIGRATION", diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index b696b60edd9b5..c4c2b07ce7be4 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -891,7 +891,7 @@ "components": [ [ [ "mutagen", 1 ] ], [ [ "lizard_sample", 1 ] ], - [ [ "egg_reptile", 1 ] ], + [ [ "eggs_reptile", 1, "LIST" ] ], [ [ "bfipowder", 4 ], [ "lizard_sample", 1 ] ] ], "flags": [ "SECRET" ] diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 3b67dfa2dd949..5ab59be063572 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -202,7 +202,7 @@ "//": "bread: 1u, oil: 1u, egg: 3u", "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_frying" } ], "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ], [ [ "bread_sandwich", 1, "LIST" ], [ "toast", 1 ], [ "buttered_toast", 1 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ] diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index f9f30264cf0a1..a8ce69adc571d 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -755,7 +755,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 55, "LIST" ] ] ], "//": "by weight of unfertilized bird egg 550g of stuff", - "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "egg_reptile", 12 ], [ "eggs_invert", 1, "LIST" ] ] ] + "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "eggs_reptile", 12, "LIST" ], [ "eggs_invert", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -772,7 +772,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 55, "LIST" ] ], [ [ "surface_heat", 36, "LIST" ] ] ], "//": "by weight of unfertilized bird egg 550g of stuff plus 36u heat for the eggs (standard is 3 per egg)", - "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "egg_reptile", 12 ], [ "eggs_invert", 1, "LIST" ] ] ] + "components": [ [ [ "eggs_bird", 12, "LIST" ], [ "eggs_reptile", 12, "LIST" ], [ "eggs_invert", 1, "LIST" ] ] ] }, { "result": "protein_powder", diff --git a/data/json/recipes/food/frozen.json b/data/json/recipes/food/frozen.json index 71c21bd5f7d1b..2b57a45e6127f 100644 --- a/data/json/recipes/food/frozen.json +++ b/data/json/recipes/food/frozen.json @@ -512,7 +512,7 @@ [ "blackberries", 1 ] ], [ [ "sugar", 10 ], [ "artificial_sweetener", 10 ] ], - [ [ "powder_eggs", 5 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ] + [ [ "powder_eggs", 5 ], [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ] ] }, { diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index b61ecec7c464e..81091e8fc96a5 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -216,7 +216,7 @@ [ "veggy_any", 2, "LIST" ], [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], - [ "egg_reptile", 2 ], + [ "eggs_reptile", 2, "LIST" ], [ "mushroom_cooked", 2 ], [ "morel_cooked", 2 ], [ "mushroom", 2 ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 23c3036a3be40..a859ad9c6f68c 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -5113,7 +5113,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil", - "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ] ], + "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ] ], "charges": 2 }, { @@ -5131,7 +5131,7 @@ "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "salt", 2 ], [ "seasoning_salt", 2 ], [ "pepper", 4 ] ] ], @@ -5152,7 +5152,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "//": "6u for the eggs, 1u for the oil, 2u for the veggy, 1u for the cheese", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "mushroom", 1 ], @@ -5184,7 +5184,7 @@ "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil. no energy is spent cooking the bread, that's already done.", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "condiment", 2, "LIST" ] ] @@ -5220,7 +5220,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "//": "6u for the egg, 1u for the oil, 3u for the cheese and veggy. no energy is spent cooking the bread, that's already done.", "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "mushroom", 1 ], @@ -5254,7 +5254,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ] @@ -5274,7 +5274,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "veggy_any", 2, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] @@ -5295,7 +5295,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "veggy_any", 2, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ] ], @@ -5317,7 +5317,7 @@ "tools": [ [ [ "water_boiling_heat", 1, "LIST" ] ], [ [ "water", -1 ], [ "water_clean", -1 ] ] ], "//": "this is technically cheating on energy, as you need to boil the water longer to really cook the egg.", "//1": "However, water that boiled an egg in it doesn't get contaminated and you'd keep putting eggs into the same boiling water, so this recipe uses water as a tool and has lentient energy use.", - "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ] ] + "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -5333,7 +5333,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "//": "6u for the egg, meat not needed since it's just diced up and mixed in", - "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], [ [ "meat_cooked", 1, "LIST" ] ] ], + "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ] ] ], "charges": 3 }, { @@ -7510,7 +7510,7 @@ [ "milk_powder", 1 ], [ "con_milk", 1 ] ], - [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "eggs_reptile", 2, "LIST" ] ], [ [ "sugar", 2 ], [ "artificial_sweetener", 2 ] ], [ [ "any_butter_or_oil", 8, "LIST" ] ], [ [ "water_clean", 1 ] ] @@ -8329,7 +8329,7 @@ "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "//": "3u for egg, 2u for milk", "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ], [ "powder_eggs", 1 ] ], + [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ], [ "powder_eggs", 1 ] ], [ [ "milk_standard_raw", 2, "LIST" ], [ "lf_milk_standard", 2, "LIST" ], [ "con_milk", 2 ] ], [ [ "sugar", 4 ], [ "artificial_sweetener", 4 ] ], [ [ "cinnamon", 2 ] ] @@ -8350,7 +8350,7 @@ "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "//": "3u for egg, 2u for milk, 1u for alcohol/sugar", "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ], [ "powder_eggs", 1 ] ], + [ [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ], [ "powder_eggs", 1 ] ], [ [ "milk_standard_raw", 2, "LIST" ], [ "lf_milk_standard", 2, "LIST" ], [ "con_milk", 2 ] ], [ [ "sugar", 4 ], [ "artificial_sweetener", 4 ] ], [ [ "hard_liquor_chem", 1, "LIST" ] ], diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 65a87602cf2b4..4da99e68dd10d 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -99,6 +99,19 @@ ] ] }, + { + "id": "eggs_reptile", + "type": "requirement", + "//": "All of the different reptile eggs", + "components": [ + [ + [ "egg_turtle_painted", 4 ], + [ "egg_turtle_snapping_common", 4 ], + [ "egg_wormsnake", 17 ], + [ "egg_skink_fivelined", 17 ] + ] + ] + }, { "id": "eggs_frog", "type": "requirement", @@ -242,7 +255,7 @@ "id": "eggs_any_shape", "type": "requirement", "//": "When we only need the nutrition of eggs and don't care about their shape. About 0.05L ", - "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "rehydrated_eggs", 1 ], [ "egg_reptile", 1 ] ] ] + "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "rehydrated_eggs", 1 ], [ "eggs_reptile", 1, "LIST" ] ] ] }, { "id": "milk_standard", @@ -665,7 +678,7 @@ [ "sauerkraut", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "can_beans", 1 ], [ "beans_cooked", 1 ], [ "spaghetti_raw", 1 ], @@ -729,7 +742,7 @@ [ "crackers", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "dry_beans", 1 ], [ "raw_beans", 1 ], [ "dry_lentils", 1 ], @@ -794,7 +807,7 @@ [ "crackers", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "dry_beans", 1 ], [ "raw_beans", 1 ], [ "dry_lentils", 1 ], @@ -884,7 +897,7 @@ "type": "requirement", "components": [ [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "broth_meat", 1 ], [ "pine_tea", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ], [ [ "veggy_wild", 1 ], [ "veggy", 1 ], @@ -1248,7 +1261,7 @@ "id": "broth_meat_ingredients", "type": "requirement", "components": [ - [ [ "meat_nofish", 1, "LIST" ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "meat_nofish", 1, "LIST" ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "eggs_reptile", 1, "LIST" ] ], [ [ "hot_sauce", 1 ], [ "seasoning_italian", 4 ], @@ -1276,7 +1289,7 @@ [ "sauerkraut", 1 ], [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], - [ "egg_reptile", 1 ], + [ "eggs_reptile", 1, "LIST" ], [ "dry_beans", 1 ], [ "raw_beans", 1 ], [ "dry_rice", 1 ], diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json index ab3fe94c0d761..adfa16772df94 100644 --- a/data/mods/DinoMod/items/egg.json +++ b/data/mods/DinoMod/items/egg.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "egg_dino", "name": "dinosaur egg", - "looks_like": "egg_reptile", + "looks_like": "egg_bird", "weight": "2 kg", "color": "green", "spoils_in": "32 days", @@ -27,7 +27,6 @@ "id": "egg_dino_small", "name": "small dinosaur egg", "copy-from": "egg_dino", - "looks_like": "egg_reptile", "spoils_in": "16 days", "weight": "57 g", "comestible_type": "FOOD", @@ -45,7 +44,6 @@ "id": "egg_dino_large", "name": "large dinosaur egg", "copy-from": "egg_dino", - "looks_like": "egg_reptile", "spoils_in": "64 days", "weight": "4 kg", "comestible_type": "FOOD", @@ -754,21 +752,21 @@ "type": "COMESTIBLE", "id": "egg_dimorphodon", "name": "dimorphodon egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "rot_spawn": "GROUP_EGG_dimorphodon" }, { "type": "COMESTIBLE", "id": "egg_pteranodon", "name": "pteranodon egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "rot_spawn": "GROUP_EGG_pteranodon" }, { "type": "COMESTIBLE", "id": "egg_quetzalcoatlus", "name": "quetzalcoatlus egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "rot_spawn": "GROUP_EGG_quetzalcoatlus" }, { diff --git a/data/mods/DinoMod/recipes/offal_dishes.json b/data/mods/DinoMod/recipes/offal_dishes.json index 4de479f5565e2..9a2d46d773952 100644 --- a/data/mods/DinoMod/recipes/offal_dishes.json +++ b/data/mods/DinoMod/recipes/offal_dishes.json @@ -22,7 +22,7 @@ [ "veggy_any", 8, "LIST" ], [ "powder_eggs", 8 ], [ "eggs_bird", 8, "LIST" ], - [ "egg_reptile", 8 ], + [ "eggs_reptile", 8, "LIST" ], [ "mushroom_cooked", 8 ], [ "morel_cooked", 8 ], [ "mushroom", 8 ], diff --git a/data/mods/Tamable_Wildlife/reptile_amphibian.json b/data/mods/Tamable_Wildlife/reptile_amphibian.json index b976ecb0708c2..7051f03e8220a 100644 --- a/data/mods/Tamable_Wildlife/reptile_amphibian.json +++ b/data/mods/Tamable_Wildlife/reptile_amphibian.json @@ -3,98 +3,84 @@ "id": "mon_pattern_bigfrog", "type": "MONSTER", "copy-from": "mon_pattern_bigfrog", - "name": { "str": "staticskin frog" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_pattern_giganfrog", "type": "MONSTER", "copy-from": "mon_pattern_giganfrog", - "name": { "str": "stuntongue" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_strange_bigfrog", "type": "MONSTER", "copy-from": "mon_strange_bigfrog", - "name": { "str": "mutant bullfrog" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_strange_giganfrog", "type": "MONSTER", "copy-from": "mon_strange_giganfrog", - "name": { "str": "giant bullfrog" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_strange_megafrog", "type": "MONSTER", "copy-from": "mon_strange_megafrog", - "name": { "str": "colossal croaker" }, "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } }, { "id": "mon_foul_bigfrog", "type": "MONSTER", "copy-from": "mon_foul_bigfrog", - "name": { "str": "greasy stinktoad" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_foul_giganfrog", "type": "MONSTER", "copy-from": "mon_foul_giganfrog", - "name": { "str": "foul hogtoad" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_foul_megafrog", "type": "MONSTER", "copy-from": "mon_foul_megafrog", - "name": { "str": "great beaked toad" }, "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } }, { "id": "mon_odd_bigfrog", "type": "MONSTER", "copy-from": "mon_odd_bigfrog", - "name": { "str": "oversized toad" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_odd_giganfrog", "type": "MONSTER", "copy-from": "mon_odd_giganfrog", - "name": { "str": "giant toad" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_odd_megafrog", "type": "MONSTER", "copy-from": "mon_odd_megafrog", - "name": { "str": "gargantuan toad" }, "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } }, { "id": "mon_vocal_bigfrog", "type": "MONSTER", "copy-from": "mon_vocal_bigfrog", - "name": { "str": "wailing treefrog" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_jumbo_bigfrog", "type": "MONSTER", "copy-from": "mon_jumbo_bigfrog", - "name": { "str": "jumbo treefrog" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_shift_bigfrog", "type": "MONSTER", "copy-from": "mon_shift_bigfrog", - "name": { "str": "mimic treefrog" }, "extend": { "flags": [ "CANPLAY" ] } }, { @@ -343,7 +329,6 @@ "id": "mon_rattlesnake_s", "type": "MONSTER", "copy-from": "mon_rattlesnake_s", - "name": { "str": "rattlesnake snakelet" }, "petfood": { "food": [ "CATFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", @@ -352,10 +337,15 @@ "extend": { "flags": [ "CANPLAY" ] } }, { - "id": "mon_rattlesnake_big_s", + "id": "mon_rattlesnake", "type": "MONSTER", - "copy-from": "mon_rattlesnake_big_s", - "name": { "str": "mutant rattlesnake snakelet" }, + "copy-from": "mon_rattlesnake", + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_gartersnake_baby", + "type": "MONSTER", + "copy-from": "mon_gartersnake_baby", "petfood": { "food": [ "CATFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", @@ -364,10 +354,83 @@ "extend": { "flags": [ "CANPLAY" ] } }, { - "id": "mon_rattlesnake", + "id": "mon_gartersnake", "type": "MONSTER", - "copy-from": "mon_rattlesnake", - "name": { "str": "rattlesnake" }, + "copy-from": "mon_gartersnake", + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_wormsnake_baby", + "type": "MONSTER", + "copy-from": "mon_wormsnake_baby", + "petfood": { + "food": [ "CATFOOD" ], + "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", + "pet": "The %s slithers around you." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_wormsnake", + "type": "MONSTER", + "copy-from": "mon_wormsnake", + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_turtle_painted_baby", + "type": "MONSTER", + "copy-from": "mon_turtle_painted_baby", + "petfood": { + "food": [ "CATFOOD" ], + "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", + "pet": "The %s slithers around you." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_turtle_painted", + "type": "MONSTER", + "copy-from": "mon_turtle_painted", + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_turtle_snapping_common_baby", + "type": "MONSTER", + "copy-from": "mon_turtle_snapping_common_baby", + "petfood": { + "food": [ "CATFOOD" ], + "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", + "pet": "The %s slithers around you." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_turtle_snapping_common", + "type": "MONSTER", + "copy-from": "mon_turtle_snapping_common", + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_skink_fivelined_baby", + "type": "MONSTER", + "copy-from": "mon_skink_fivelined_baby", + "petfood": { + "food": [ "CATFOOD" ], + "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", + "pet": "The %s slithers around you." + }, + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_skink_fivelined", + "type": "MONSTER", + "copy-from": "mon_skink_fivelined", + "extend": { "flags": [ "CANPLAY" ] } + }, + { + "id": "mon_rattlesnake_big_s", + "type": "MONSTER", + "copy-from": "mon_rattlesnake_big_s", "petfood": { "food": [ "CATFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly.", @@ -379,21 +442,18 @@ "id": "mon_rattlesnake_big", "type": "MONSTER", "copy-from": "mon_rattlesnake_big", - "name": { "str": "mutant rattlesnake" }, "extend": { "flags": [ "CANPLAY" ] } }, { "id": "mon_rattlesnake_giant", "type": "MONSTER", "copy-from": "mon_rattlesnake_giant", - "name": { "str": "giant rattlesnake" }, "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } }, { "id": "mon_rattlesnake_mega", "type": "MONSTER", "copy-from": "mon_rattlesnake_mega", - "name": { "str": "deathrattle serpent" }, "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] } } ] diff --git a/data/mods/TropiCataclysm/blacklists/default_blacklist.json b/data/mods/TropiCataclysm/blacklists/default_blacklist.json index 5c305c29f6888..75ab4ac841f3d 100644 --- a/data/mods/TropiCataclysm/blacklists/default_blacklist.json +++ b/data/mods/TropiCataclysm/blacklists/default_blacklist.json @@ -121,6 +121,18 @@ "mon_peeper_tadpole", "mon_gray_frog", "mon_gray_tadpole", + "mon_rattlesnake", + "mon_rattlesnake_s", + "mon_gartersnake", + "mon_gartersnake_baby", + "mon_wormsnake", + "mon_wormsnake_baby", + "mon_turtle_painted", + "mon_turtle_painted_baby", + "mon_turtle_snapping_common", + "mon_turtle_snapping_common_baby", + "mon_skink_fivelined", + "mon_skink_fivelined_baby", "mon_bear_mutant_3headed", "mon_beaver_mutant_huge", "mon_beaver_mutant_avian", diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json index 625611a616b0d..e81a41da01f6f 100644 --- a/data/mods/TropiCataclysm/items/comestibles/egg.json +++ b/data/mods/TropiCataclysm/items/comestibles/egg.json @@ -113,7 +113,7 @@ "type": "COMESTIBLE", "id": "egg_constrictor", "name": "snake egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The egg of a tropical snake.", "rot_spawn": "GROUP_EGG_CONSTRICTOR" }, @@ -121,7 +121,7 @@ "type": "COMESTIBLE", "id": "egg_lizard", "name": "lizard egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The egg of a tropical lizard.", "rot_spawn": "GROUP_EGG_LIZARD" }, @@ -129,7 +129,7 @@ "type": "COMESTIBLE", "id": "egg_monitor", "name": "varanid egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The egg of a monitor lizard.", "rot_spawn": "GROUP_EGG_MONITOR" }, @@ -137,7 +137,7 @@ "type": "COMESTIBLE", "id": "egg_iguana", "name": "iguana egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The egg of an iguana.", "rot_spawn": "GROUP_EGG_IGUANA" }, @@ -145,7 +145,7 @@ "type": "COMESTIBLE", "id": "egg_turtle", "name": "turtle egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The round egg of a turtle. It is covered in leaves.", "rot_spawn": "GROUP_EGG_TURTLE" }, @@ -153,7 +153,7 @@ "type": "COMESTIBLE", "id": "egg_snapper", "name": "iguana egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The round egg of a snapping turtle. It is covered in mud.", "rot_spawn": "GROUP_EGG_IGUANA" }, @@ -161,7 +161,7 @@ "type": "COMESTIBLE", "id": "egg_tortoise", "name": "iguana egg", - "copy-from": "egg_reptile", + "copy-from": "egg_bird", "description": "The round egg of a tortoise. It is covered in dirt.", "rot_spawn": "GROUP_EGG_IGUANA" },