From afd6aa6ad74670c9494a2ec82c1aacaf6477e521 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 11:02:03 -0400 Subject: [PATCH 1/8] [DinoMod] dino carriers --- data/mods/DinoMod/items/pets.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 data/mods/DinoMod/items/pets.json diff --git a/data/mods/DinoMod/items/pets.json b/data/mods/DinoMod/items/pets.json new file mode 100644 index 0000000000000..02a338093f5fc --- /dev/null +++ b/data/mods/DinoMod/items/pets.json @@ -0,0 +1,35 @@ +[ + { + "id": "dino_carrier", + "type": "TOOL", + "name": { "str": "pet carrier" }, + "description": "A sturdy reinforced plastic container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", + "weight": "10000 g", + "volume": "50 L", + "price": 2000, + "price_postapoc": 200, + "bashing": 1, + "cutting": 1, + "material": [ "steel", "plastic" ], + "symbol": "#", + "color": "light_gray", + "properties": [ [ "creature_size_capacity", "HUGE" ] ], + "use_action": [ "CAPTURE_MONSTER_ACT" ], + "flags": [ "TRADER_AVOID" ] + }, + { + "id": "dino_carrier_wooden", + "copy-from": "pet_carrier", + "type": "TOOL", + "name": { "str": "wooden pet carrier" }, + "description": "A sturdy reinforced wooden container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", + "weight": "15000 g", + "volume": "62500 ml", + "price": 1600, + "price_postapoc": 100, + "material": [ "wood" ], + "symbol": "#", + "color": "brown", + "looks_like": "pet_carrier" + } +] From cb7ad5a09c33b167aa4aa36f5ea1ae9b14d2b837 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 12:46:13 -0400 Subject: [PATCH 2/8] add wood variant to innawoods --- data/mods/innawood/items/pets.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 data/mods/innawood/items/pets.json diff --git a/data/mods/innawood/items/pets.json b/data/mods/innawood/items/pets.json new file mode 100644 index 0000000000000..1e7ee185b409e --- /dev/null +++ b/data/mods/innawood/items/pets.json @@ -0,0 +1,18 @@ +[ + { + "id": "dino_carrier_wooden", + "copy-from": "pet_carrier", + "type": "TOOL", + "name": { "str": "wooden pet carrier" }, + "description": "A sturdy reinforced wooden container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", + "weight": "15000 g", + "volume": "62500 ml", + "price": 1600, + "price_postapoc": 100, + "material": [ "wood" ], + "properties": [ [ "creature_size_capacity", "HUGE" ] ], + "symbol": "#", + "color": "brown", + "looks_like": "pet_carrier" + } +] From 61ec07b559388fde294e529568fbb20003859edd Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 12:50:47 -0400 Subject: [PATCH 3/8] revert innawood change --- data/mods/innawood/items/pets.json | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 data/mods/innawood/items/pets.json diff --git a/data/mods/innawood/items/pets.json b/data/mods/innawood/items/pets.json deleted file mode 100644 index 1e7ee185b409e..0000000000000 --- a/data/mods/innawood/items/pets.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "id": "dino_carrier_wooden", - "copy-from": "pet_carrier", - "type": "TOOL", - "name": { "str": "wooden pet carrier" }, - "description": "A sturdy reinforced wooden container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", - "weight": "15000 g", - "volume": "62500 ml", - "price": 1600, - "price_postapoc": 100, - "material": [ "wood" ], - "properties": [ [ "creature_size_capacity", "HUGE" ] ], - "symbol": "#", - "color": "brown", - "looks_like": "pet_carrier" - } -] From 13d0b0a322dd08b3ef049ccd172f8a1a3d2ebade Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 12:52:24 -0400 Subject: [PATCH 4/8] Create recipe_others.json --- data/mods/DinoMod/recipes/recipe_others.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/mods/DinoMod/recipes/recipe_others.json diff --git a/data/mods/DinoMod/recipes/recipe_others.json b/data/mods/DinoMod/recipes/recipe_others.json new file mode 100644 index 0000000000000..b90e3924ca19f --- /dev/null +++ b/data/mods/DinoMod/recipes/recipe_others.json @@ -0,0 +1,16 @@ +[ + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "dino_carrier_wooden", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_OTHER", + "skill_used": "fabrication", + "difficulty": 3, + "time": "4 h", + "reversible": true, + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], + "components": [ [ [ "2x4", 40 ] ], [ [ "nail", 200 ] ], [ [ "hinge", 2 ] ] ] + } +] From b7367595b75dfd7ce1b4a7839bd166607b2cfd47 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 12:59:03 -0400 Subject: [PATCH 5/8] spawn in dino locations --- data/mods/DinoMod/items/itemgroups.json | 72 ++----------------------- 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/data/mods/DinoMod/items/itemgroups.json b/data/mods/DinoMod/items/itemgroups.json index d4df78dee6a02..3365abf475f90 100644 --- a/data/mods/DinoMod/items/itemgroups.json +++ b/data/mods/DinoMod/items/itemgroups.json @@ -132,77 +132,11 @@ { "item": "sweater_armor_ostrich", "prob": 10, "event": "christmas" }, { "item": "iron_armor_ostrich", "prob": 10 }, { "item": "steel_armor_ostrich", "prob": 10 }, - { "item": "bronze_armor_ostrich", "prob": 10 } + { "item": "bronze_armor_ostrich", "prob": 10 }, + { "item": "dino_carrier", "prob": 10 }, + { "item": "dino_carrier_wooden", "prob": 10 } ] }, - { - "type": "item_group", - "id": "rare", - "magazine": 100, - "subtype": "distribution", - "copy-from": "rare", - "extend": { - "entries": [ - { "item": "kiernans_notes", "prob": 10 }, - { "item": "kevlar_armor_elephant", "prob": 10 }, - { "item": "acidchitin_armor_elephant", "prob": 10 }, - { "item": "chitin_armor_elephant", "prob": 10 }, - { "item": "chainmail_armor_elephant", "prob": 10 }, - { "item": "leather_armor_elephant", "prob": 10 }, - { "item": "leatherbone_armor_elephant", "prob": 10 }, - { "item": "rubber_armor_elephant", "prob": 10 }, - { "item": "sweater_armor_elephant", "prob": 10, "event": "christmas" }, - { "item": "iron_armor_elephant", "prob": 10 }, - { "item": "steel_armor_elephant", "prob": 10 }, - { "item": "bronze_armor_elephant", "prob": 10 }, - { "item": "kevlar_armor_ostrich", "prob": 10 }, - { "item": "acidchitin_armor_ostrich", "prob": 10 }, - { "item": "chitin_armor_ostrich", "prob": 10 }, - { "item": "chainmail_armor_ostrich", "prob": 10 }, - { "item": "leather_armor_ostrich", "prob": 10 }, - { "item": "leatherbone_armor_ostrich", "prob": 10 }, - { "item": "rubber_armor_ostrich", "prob": 10 }, - { "item": "sweater_armor_ostrich", "prob": 10, "event": "christmas" }, - { "item": "iron_armor_ostrich", "prob": 10 }, - { "item": "steel_armor_ostrich", "prob": 10 }, - { "item": "bronze_armor_ostrich", "prob": 10 } - ] - } - }, - { - "type": "item_group", - "id": "spider", - "magazine": 100, - "subtype": "distribution", - "copy-from": "spider", - "extend": { - "entries": [ - { "item": "kiernans_notes", "prob": 10 }, - { "item": "kevlar_armor_elephant", "prob": 10 }, - { "item": "acidchitin_armor_elephant", "prob": 10 }, - { "item": "chitin_armor_elephant", "prob": 10 }, - { "item": "chainmail_armor_elephant", "prob": 10 }, - { "item": "leather_armor_elephant", "prob": 10 }, - { "item": "leatherbone_armor_elephant", "prob": 10 }, - { "item": "rubber_armor_elephant", "prob": 10 }, - { "item": "sweater_armor_elephant", "prob": 10, "event": "christmas" }, - { "item": "iron_armor_elephant", "prob": 10 }, - { "item": "steel_armor_elephant", "prob": 10 }, - { "item": "bronze_armor_elephant", "prob": 10 }, - { "item": "kevlar_armor_ostrich", "prob": 10 }, - { "item": "acidchitin_armor_ostrich", "prob": 10 }, - { "item": "chitin_armor_ostrich", "prob": 10 }, - { "item": "chainmail_armor_ostrich", "prob": 10 }, - { "item": "leather_armor_ostrich", "prob": 10 }, - { "item": "leatherbone_armor_ostrich", "prob": 10 }, - { "item": "rubber_armor_ostrich", "prob": 10 }, - { "item": "sweater_armor_ostrich", "prob": 10, "event": "christmas" }, - { "item": "iron_armor_ostrich", "prob": 10 }, - { "item": "steel_armor_ostrich", "prob": 10 }, - { "item": "bronze_armor_ostrich", "prob": 10 } - ] - } - }, { "type": "item_group", "id": "museum_armor_pet", From 92fc8df8b1203539b0c2aedc69411f4a2be24f16 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 17:37:18 -0400 Subject: [PATCH 6/8] Update pets.json --- data/mods/DinoMod/items/pets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/DinoMod/items/pets.json b/data/mods/DinoMod/items/pets.json index 02a338093f5fc..dca0831a36a3f 100644 --- a/data/mods/DinoMod/items/pets.json +++ b/data/mods/DinoMod/items/pets.json @@ -2,7 +2,7 @@ { "id": "dino_carrier", "type": "TOOL", - "name": { "str": "pet carrier" }, + "name": { "str": "large pet carrier" }, "description": "A sturdy reinforced plastic container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", "weight": "10000 g", "volume": "50 L", @@ -21,7 +21,7 @@ "id": "dino_carrier_wooden", "copy-from": "pet_carrier", "type": "TOOL", - "name": { "str": "wooden pet carrier" }, + "name": { "str": "large wooden pet carrier" }, "description": "A sturdy reinforced wooden container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", "weight": "15000 g", "volume": "62500 ml", From 45194bb0970a17afd03a1f01d74d05a062a9292b Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 17:38:04 -0400 Subject: [PATCH 7/8] Update pets.json --- data/mods/DinoMod/items/pets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/DinoMod/items/pets.json b/data/mods/DinoMod/items/pets.json index dca0831a36a3f..c6b1e222b09a0 100644 --- a/data/mods/DinoMod/items/pets.json +++ b/data/mods/DinoMod/items/pets.json @@ -19,7 +19,7 @@ }, { "id": "dino_carrier_wooden", - "copy-from": "pet_carrier", + "copy-from": "dino_carrier", "type": "TOOL", "name": { "str": "large wooden pet carrier" }, "description": "A sturdy reinforced wooden container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", From 70fffe315e38065466ca7450de7de067d86e7301 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 31 Aug 2022 17:45:35 -0400 Subject: [PATCH 8/8] Update pets.json --- data/mods/DinoMod/items/pets.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/data/mods/DinoMod/items/pets.json b/data/mods/DinoMod/items/pets.json index c6b1e222b09a0..dbc01d03668f0 100644 --- a/data/mods/DinoMod/items/pets.json +++ b/data/mods/DinoMod/items/pets.json @@ -15,21 +15,26 @@ "color": "light_gray", "properties": [ [ "creature_size_capacity", "HUGE" ] ], "use_action": [ "CAPTURE_MONSTER_ACT" ], - "flags": [ "TRADER_AVOID" ] + "flags": [ "TRADER_AVOID" ], + "looks_like": "pet_carrier" }, { "id": "dino_carrier_wooden", - "copy-from": "dino_carrier", "type": "TOOL", "name": { "str": "large wooden pet carrier" }, "description": "A sturdy reinforced wooden container meant to hold dinosaurs for transport. Use it on a suitable animal to capture, use it on an empty tile to release.", "weight": "15000 g", - "volume": "62500 ml", + "volume": "50 L", "price": 1600, "price_postapoc": 100, + "bashing": 1, + "cutting": 1, "material": [ "wood" ], "symbol": "#", "color": "brown", + "properties": [ [ "creature_size_capacity", "HUGE" ] ], + "use_action": [ "CAPTURE_MONSTER_ACT" ], + "flags": [ "TRADER_AVOID" ], "looks_like": "pet_carrier" } ]