From 99973949d808e87b65fe5a17365ea74ba4cb8a8f Mon Sep 17 00:00:00 2001 From: detahramet Date: Tue, 26 Sep 2023 18:07:48 -0700 Subject: [PATCH 01/17] Update scarfs.json Added headwrap variant to each scarf --- data/json/items/armor/scarfs.json | 296 +++++++++++++++++++++++++++--- 1 file changed, 273 insertions(+), 23 deletions(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 89bb5c13c5f50..86daddc2bdf9f 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -87,7 +87,7 @@ "symbol": "[", "color": "light_gray", "name": { "str": "simple patchwork scarf (loose)", "str_pl": "simple patchwork scarves (loose)" }, - "description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", + "description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to wear it around your head if you get too cold.", "price": 1000, "price_postapoc": 50, "material": [ "cotton" ], @@ -95,13 +95,39 @@ "volume": "500 ml", "to_hit": -3, "revert_to": "patchwork_scarf", - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "patchwork_scarf", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "patchwork_scarf_headwrap", + "menu_text": "Wrap around your head" + }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 10, "environmental_protection": 1, "material_thickness": 0.3, "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "patchwork_scarf_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "light_gray", + "name": { "str": "simple patchwork scarf (headwrap)", "str_pl": "simple patchwork scarves (headwrap)" }, + "description": "A simple and light cloth scarf, worn over the head and mouth for warmth. Use it to wear it around your head.", + "price": 1000, + "price_postapoc": 50, + "material": [ "cotton" ], + "weight": "60 g", + "volume": "500 ml", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "patchwork_scarf", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 20, + "environmental_protection": 1, + "material_thickness": 0.3, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "long_patchwork_scarf", "type": "TOOL_ARMOR", @@ -130,7 +156,7 @@ "symbol": "[", "color": "light_gray", "name": { "str": "long patchwork scarf (loose)", "str_pl": "long patchwork scarves (loose)" }, - "description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", + "description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your head if you get too cold.", "price": 1500, "price_postapoc": 100, "material": [ "cotton" ], @@ -139,9 +165,9 @@ "to_hit": -3, "use_action": { "type": "transform", - "msg": "You wrap your scarf tighter.", - "target": "long_patchwork_scarf", - "menu_text": "Wrap tighter" + "msg": "You wrap your %s around your head.", + "target": "long_patchwork_scarf_headwrap", + "menu_text": "Wrap head" }, "revert_to": "long_patchwork_scarf", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], @@ -150,6 +176,27 @@ "material_thickness": 0.3, "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "long_patchwork_scarf_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "light_gray", + "name": { "str": "long patchwork scarf (headwrap)", "str_pl": "long patchwork scarves (headwrap)" }, + "description": "A simple and light cloth scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", + "price": 1500, + "price_postapoc": 100, + "material": [ "cotton" ], + "weight": "120 g", + "volume": "1 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "long_patchwork_scarf", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 20, + "environmental_protection": 1, + "material_thickness": 0.3, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "knit_scarf", "type": "TOOL_ARMOR", @@ -178,7 +225,7 @@ "symbol": "[", "color": "dark_gray", "name": { "str": "knit scarf (loose)", "str_pl": "knit scarves (loose)" }, - "description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", + "description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to wear it around your head if you get too cold.", "price": 2000, "price_postapoc": 100, "material": [ "cotton" ], @@ -186,13 +233,39 @@ "volume": "750 ml", "to_hit": -3, "revert_to": "knit_scarf", - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "knit_scarf", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "patchwork_scarf_headwrap", + "menu_text": "Wrap head" + }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 10, "environmental_protection": 1, "material_thickness": 1, "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "knit_scarf_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "dark_gray", + "name": { "str": "knit scarf (headwrap)", "str_pl": "knit scarf (headwrap)" }, + "description": "A long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", + "price": 2000, + "price_postapoc": 100, + "material": [ "cotton" ], + "weight": "96 g", + "volume": "750 ml", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "knit_scarf", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 20, + "environmental_protection": 2, + "material_thickness": 1, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "long_knit_scarf", "type": "TOOL_ARMOR", @@ -228,7 +301,12 @@ "weight": "192 g", "volume": "1250 ml", "to_hit": -3, - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "long_knit_scarf", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "long_knit_scarf_headwrap", + "menu_text": "Wrap head" + }, "revert_to": "long_knit_scarf", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 10, @@ -236,6 +314,27 @@ "material_thickness": 2, "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "long_knit_scarf_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "dark_gray", + "name": { "str": "knit scarf (headwrap)", "str_pl": "knit scarf (headwrap)" }, + "description": "A long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", + "price": 3000, + "price_postapoc": 100, + "material": [ "cotton" ], + "weight": "192 g", + "volume": "1250 ml", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "long_knit_scarf", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 20, + "environmental_protection": 1, + "material_thickness": 2, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "scarf", "type": "TOOL_ARMOR", @@ -264,7 +363,7 @@ "symbol": "[", "color": "brown", "name": { "str": "wool scarf (loose)", "str_pl": "wool scarves (loose)" }, - "description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", + "description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", "price": 3800, "price_postapoc": 50, "material": [ "wool" ], @@ -272,13 +371,39 @@ "volume": "750 ml", "to_hit": -3, "revert_to": "scarf", - "use_action": { "type": "transform", "msg": "You wrap your scarf a bit tighter.", "target": "scarf", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "scarf_headwrap", + "menu_text": "Wrap head" + }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 20, "environmental_protection": 1, "material_thickness": 1, "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "wool scarf (headwrap)", "str_pl": "wool scarf (headwrap)" }, + "description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "price": 3800, + "price_postapoc": 50, + "material": [ "wool" ], + "weight": "80 g", + "volume": "750 ml", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 45, + "environmental_protection": 1, + "material_thickness": 1, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "scarf_long", "type": "TOOL_ARMOR", @@ -307,14 +432,19 @@ "symbol": "[", "color": "brown", "name": { "str": "long wool scarf (loose)", "str_pl": "long wool scarves (loose)" }, - "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", + "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your head if you get too cold.", "price": 4500, "price_postapoc": 100, "material": [ "wool" ], "weight": "160 g", "volume": "1250 ml", "to_hit": -3, - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_long", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "scarf_long_headwrap", + "menu_text": "Wrap head" + }, "revert_to": "scarf_long", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 20, @@ -322,6 +452,27 @@ "material_thickness": 1, "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_long_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "long wool scarf (headwrap)", "str_pl": "long wool scarf (headwrap)" }, + "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", + "price": 4500, + "price_postapoc": 100, + "material": [ "wool" ], + "weight": "160 g", + "volume": "1250 ml", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_long", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 45, + "environmental_protection": 2, + "material_thickness": 1, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "scarf_fur", "type": "TOOL_ARMOR", @@ -350,7 +501,7 @@ "symbol": "[", "color": "brown", "name": { "str": "fur scarf (loose)", "str_pl": "fur scarves (loose)" }, - "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", + "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your head if you get too cold.", "price": 9000, "price_postapoc": 250, "material": [ "fur" ], @@ -358,13 +509,39 @@ "volume": "1 L", "to_hit": -3, "revert_to": "scarf_fur", - "use_action": { "type": "transform", "msg": "You wrap your scarf a bit tighter.", "target": "scarf_fur", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "scarf_fur_headwrap", + "menu_text": "Wrap head" + }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 30, "environmental_protection": 1, "material_thickness": 2, "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_fur_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, + "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "price": 9000, + "price_postapoc": 250, + "material": [ "fur" ], + "weight": "140 g", + "volume": "1 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_fur", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 65, + "environmental_protection": 2, + "material_thickness": 2, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "scarf_fur_long", "type": "TOOL_ARMOR", @@ -393,14 +570,19 @@ "symbol": "[", "color": "brown", "name": { "str": "long fur scarf (loose)", "str_pl": "long fur scarves (loose)" }, - "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", + "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your head if you get too cold.", "price": 17700, "price_postapoc": 300, "material": [ "fur" ], "weight": "280 g", "volume": "2 L", "to_hit": -3, - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_fur_long", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "scarf_fur_long_headwrap", + "menu_text": "Wrap head" + }, "revert_to": "scarf_fur_long", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 30, @@ -408,6 +590,27 @@ "material_thickness": 2, "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_fur_long_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "long fur scarf (headwrap)", "str_pl": "long fur scarf (headwrap)" }, + "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", + "price": 17700, + "price_postapoc": 300, + "material": [ "fur" ], + "weight": "280 g", + "volume": "2 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_fur_long", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 65, + "environmental_protection": 2, + "material_thickness": 2, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "scarf_faux_fur", "type": "TOOL_ARMOR", @@ -437,7 +640,7 @@ "symbol": "[", "color": "brown", "name": { "str": "faux fur scarf (loose)", "str_pl": "faux fur scarves (loose)" }, - "description": "A long faux fur scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", + "description": "A long faux fur scarf, worn over the mouth for warmth. Use it to wear it around your head if you get too cold.", "price": 9000, "price_postapoc": 250, "material": [ "faux_fur" ], @@ -445,13 +648,39 @@ "volume": "1 L", "to_hit": -3, "revert_to": "scarf_faux_fur", - "use_action": { "type": "transform", "msg": "You wrap your scarf a bit tighter.", "target": "scarf_fur", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your %s around your head.", + "target": "scarf_faux_fur_headwrap", + "menu_text": "Wrap head" + }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 25, "environmental_protection": 1, "material_thickness": 2, "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_faux_fur_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, + "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "price": 9000, + "price_postapoc": 250, + "material": [ "faux_fur" ], + "weight": "140 g", + "volume": "1 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_faux_fur", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 50, + "environmental_protection": 2, + "material_thickness": 2, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "scarf_faux_fur_long", "type": "TOOL_ARMOR", @@ -481,7 +710,7 @@ "symbol": "[", "color": "brown", "name": { "str": "long faux fur scarf (loose)", "str_pl": "long faux fur scarves (loose)" }, - "description": "A really long faux fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", + "description": "A really long faux fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your head if you get too cold.", "price": 17700, "price_postapoc": 300, "material": [ "faux_fur" ], @@ -490,9 +719,9 @@ "to_hit": -3, "use_action": { "type": "transform", - "msg": "You wrap your scarf tighter.", - "target": "scarf_faux_fur_long", - "menu_text": "Wrap tighter" + "msg": "You wrap your %s around your head.", + "target": "scarf_faux_fur_long_headwrap", + "menu_text": "Wrap head" }, "revert_to": "scarf_faux_fur_long", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], @@ -501,6 +730,27 @@ "material_thickness": 2, "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_faux_fur_long_headwrap", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, + "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "price": 17700, + "price_postapoc": 300, + "material": [ "faux_fur" ], + "weight": "280 g", + "volume": "2 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_faux_fur_long", "menu_text": "Lower" }, + "flags": [ "OUTER" ], + "warmth": 50, + "environmental_protection": 2, + "material_thickness": 2, + "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth", "head" ] } ] + }, { "id": "marloss_scarf", "type": "ARMOR", From 9092d1ae7498737f7ebb70505ec1967f6045e4ac Mon Sep 17 00:00:00 2001 From: detahramet Date: Tue, 26 Sep 2023 18:15:56 -0700 Subject: [PATCH 02/17] Update scarfs.json Fixed item names --- data/json/items/armor/scarfs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 86daddc2bdf9f..6399b1680f878 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -666,7 +666,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, + "name": { "str": "faux fur scarf (headwrap)", "str_pl": "faux fur scarf (headwrap)" }, "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", "price": 9000, "price_postapoc": 250, @@ -736,7 +736,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, + "name": { "str": "long faux fur scarf (headwrap)", "str_pl": "long faux fur scarf (headwrap)" }, "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", "price": 17700, "price_postapoc": 300, From 5d49dc88ece1ad1e79fb30c42a39f9b40221cb5a Mon Sep 17 00:00:00 2001 From: detahramet Date: Tue, 26 Sep 2023 18:16:43 -0700 Subject: [PATCH 03/17] Update scarfs.json Fixed another item name --- data/json/items/armor/scarfs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 6399b1680f878..d6600d526d514 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -320,7 +320,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": { "str": "knit scarf (headwrap)", "str_pl": "knit scarf (headwrap)" }, + "name": { "str": "long knit scarf (headwrap)", "str_pl": "long knit scarf (headwrap)" }, "description": "A long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 3000, "price_postapoc": 100, From 5d59901d95bf80bc57e5d5849974600faa3d03d3 Mon Sep 17 00:00:00 2001 From: detahramet Date: Tue, 26 Sep 2023 18:20:56 -0700 Subject: [PATCH 04/17] Update scarfs.json Corrected transform wording, fixed bad transform target --- data/json/items/armor/scarfs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index d6600d526d514..8e6af5939bdc1 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -99,7 +99,7 @@ "type": "transform", "msg": "You wrap your %s around your head.", "target": "patchwork_scarf_headwrap", - "menu_text": "Wrap around your head" + "menu_text": "Wrap head" }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 10, @@ -236,7 +236,7 @@ "use_action": { "type": "transform", "msg": "You wrap your %s around your head.", - "target": "patchwork_scarf_headwrap", + "target": "knit_scarf_headwrap", "menu_text": "Wrap head" }, "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], From c237b1b6eb73f05c3f4c6b6c839b628ec7935d95 Mon Sep 17 00:00:00 2001 From: detahramet Date: Tue, 26 Sep 2023 19:26:42 -0700 Subject: [PATCH 05/17] Update scarfs.json Fixed descriptions --- data/json/items/armor/scarfs.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 8e6af5939bdc1..f47f351648738 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -183,7 +183,7 @@ "symbol": "[", "color": "light_gray", "name": { "str": "long patchwork scarf (headwrap)", "str_pl": "long patchwork scarves (headwrap)" }, - "description": "A simple and light cloth scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", + "description": "A very long light cloth scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 1500, "price_postapoc": 100, "material": [ "cotton" ], @@ -321,7 +321,7 @@ "symbol": "[", "color": "dark_gray", "name": { "str": "long knit scarf (headwrap)", "str_pl": "long knit scarf (headwrap)" }, - "description": "A long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", + "description": "A really long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 3000, "price_postapoc": 100, "material": [ "cotton" ], @@ -390,7 +390,7 @@ "symbol": "[", "color": "brown", "name": { "str": "wool scarf (headwrap)", "str_pl": "wool scarf (headwrap)" }, - "description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "description": "A long wool scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 3800, "price_postapoc": 50, "material": [ "wool" ], @@ -459,7 +459,7 @@ "symbol": "[", "color": "brown", "name": { "str": "long wool scarf (headwrap)", "str_pl": "long wool scarf (headwrap)" }, - "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", + "description": "A really long wool scarf, worn over the head and mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", "price": 4500, "price_postapoc": 100, "material": [ "wool" ], @@ -528,7 +528,7 @@ "symbol": "[", "color": "brown", "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, - "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "description": "A long fur scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 9000, "price_postapoc": 250, "material": [ "fur" ], @@ -597,7 +597,7 @@ "symbol": "[", "color": "brown", "name": { "str": "long fur scarf (headwrap)", "str_pl": "long fur scarf (headwrap)" }, - "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", + "description": "A really long fur scarf, worn over the head and mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", "price": 17700, "price_postapoc": 300, "material": [ "fur" ], @@ -667,7 +667,7 @@ "symbol": "[", "color": "brown", "name": { "str": "faux fur scarf (headwrap)", "str_pl": "faux fur scarf (headwrap)" }, - "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "description": "A long faux fur scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 9000, "price_postapoc": 250, "material": [ "faux_fur" ], @@ -737,7 +737,7 @@ "symbol": "[", "color": "brown", "name": { "str": "long faux fur scarf (headwrap)", "str_pl": "long faux fur scarf (headwrap)" }, - "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it around your mouth.", + "description": "A really long faux fur scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 17700, "price_postapoc": 300, "material": [ "faux_fur" ], From eff067d6996e2c03adcabe90d2585e46f4c5dc99 Mon Sep 17 00:00:00 2001 From: detahramet Date: Tue, 26 Sep 2023 21:19:59 -0700 Subject: [PATCH 06/17] Update scarfs.json Fixed item names --- data/json/items/armor/scarfs.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index f47f351648738..cd5e6afccfce7 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -251,7 +251,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": { "str": "knit scarf (headwrap)", "str_pl": "knit scarf (headwrap)" }, + "name": { "str": "knit scarf (headwrap)", "str_pl": "knit scarves (headwrap)" }, "description": "A long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 2000, "price_postapoc": 100, @@ -320,7 +320,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": { "str": "long knit scarf (headwrap)", "str_pl": "long knit scarf (headwrap)" }, + "name": { "str": "long knit scarf (headwrap)", "str_pl": "long knit scarves (headwrap)" }, "description": "A really long knitted cotton scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 3000, "price_postapoc": 100, @@ -389,7 +389,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "wool scarf (headwrap)", "str_pl": "wool scarf (headwrap)" }, + "name": { "str": "wool scarf (headwrap)", "str_pl": "wool scarves (headwrap)" }, "description": "A long wool scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 3800, "price_postapoc": 50, @@ -458,7 +458,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "long wool scarf (headwrap)", "str_pl": "long wool scarf (headwrap)" }, + "name": { "str": "long wool scarf (headwrap)", "str_pl": "long wool scarves (headwrap)" }, "description": "A really long wool scarf, worn over the head and mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", "price": 4500, "price_postapoc": 100, @@ -527,7 +527,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarf (headwrap)" }, + "name": { "str": "fur scarf (headwrap)", "str_pl": "fur scarves (headwrap)" }, "description": "A long fur scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 9000, "price_postapoc": 250, @@ -596,7 +596,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "long fur scarf (headwrap)", "str_pl": "long fur scarf (headwrap)" }, + "name": { "str": "long fur scarf (headwrap)", "str_pl": "long fur scarves (headwrap)" }, "description": "A really long fur scarf, worn over the head and mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it around your mouth.", "price": 17700, "price_postapoc": 300, @@ -666,7 +666,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "faux fur scarf (headwrap)", "str_pl": "faux fur scarf (headwrap)" }, + "name": { "str": "faux fur scarf (headwrap)", "str_pl": "faux fur scarves (headwrap)" }, "description": "A long faux fur scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 9000, "price_postapoc": 250, @@ -736,7 +736,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": { "str": "long faux fur scarf (headwrap)", "str_pl": "long faux fur scarf (headwrap)" }, + "name": { "str": "long faux fur scarf (headwrap)", "str_pl": "long faux fur scarves (headwrap)" }, "description": "A really long faux fur scarf, worn over the head and mouth for warmth. Use it to wear it around your mouth.", "price": 17700, "price_postapoc": 300, From 36b44aa4340b6ea52565fa225132f6f4ee793368 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 17:09:40 -0700 Subject: [PATCH 07/17] Added Dirt Mounds Added three states of dirt mound, shallow mound, a waist high mound, and a building high mound --- .../furniture-barriers.json | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index f45f55b0b92fd..65da858deb995 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -238,6 +238,73 @@ "sound": "whump!", "sound_fail": "whack!", "items": [ { "item": "2x4", "count": [ 2, 4 ] } ] + } + "//":"Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_shallow", + "name": "shallow mound of dirt", + "symbol": "#", + "color": "brown", + "looks_like": "t_dirtmound", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "required_str": -1, + "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 50, + "str_max": 100, + "sound": "thump!", + "sound_fail": "thud!", + "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ] + }, + "//":"Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_pile", + "name": "mound of dirt", + "symbol": "#", + "color": "brown", + "looks_like": "t_dirtmound", + "move_cost_mod": 8, + "coverage": 60, + "description": "An area of dirt heaped up to your waist, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "required_str": -1, + "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ], "furn_set": "f_dirtmound_shallow" }, + "bash": { + "str_min": 50, + "str_max": 100, + "sound": "thump!", + "sound_fail": "thud!", + "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ], + "furn_set": "f_dirtmound_shallow" + } + }, + { + "type": "furniture", + "id": "f_dirtmound_tall", + "name": "tall mound of dirt", + "symbol": "#", + "color": "brown", + "looks_like": "t_dirtmound", + "move_cost_mod": -1, + "coverage": 100, + "description": "A mound of dirt almost as tall as a building!.", + "required_str": -1, + "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE" ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 400 } ], "furn_set": "f_dirtmound_pile" }, + "bash": { + "str_min": 50, + "str_max": 100, + "sound": "thump!", + "sound_fail": "thud!", + "items": [ { "item": "material_soil", "count": [ 340, 400 ] } ], + "furn_set": "f_dirtmound_pile" } } ] From 87753f379b34e12f21b00d0a6f7c37a883ef22ff Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 17:13:41 -0700 Subject: [PATCH 08/17] Updated old dirt mound name Updated t_dirtmound and t_dirtmoundfloor names to avoid confusion and better reflect what they are. --- .../json/furniture_and_terrain/terrain-floors-outdoors.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index a98e575ebbeec..85f484c79e9da 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -123,8 +123,8 @@ { "type": "terrain", "id": "t_dirtmound", - "name": "mound of dirt", - "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "name": "loose dirt", + "description": "An area of loose dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", "symbol": "#", "color": "brown", "connect_groups": "DIRTMOUND", @@ -137,7 +137,7 @@ { "type": "terrain", "id": "t_dirtmoundfloor", - "name": "mound of dirt", + "name": "mound of loose dirt", "description": "A giant hill of dirt that looks like you could crawl inside for shelter.", "looks_like": "t_dirtmound", "symbol": "#", From 933f910e3d59c2dae631170bdd0caca11c2cb380 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 18:05:07 -0700 Subject: [PATCH 09/17] Added Construction Recipe --- data/json/construction.json | 49 +++++++++++++++++++++++++++++++ data/json/construction_group.json | 5 ++++ 2 files changed, 54 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index 7760154f9f6a2..4fdf7e6b4ee5c 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -6828,6 +6828,55 @@ "activity_level": "EXTRA_EXERCISE", "do_turn_special": "do_turn_shovel" }, + { + "type": "construction", + "id": "constr_mound_shallow", + "skill": "survival", + "group": "constr_dirtmound", + "category": "CONSTRUCT", + "difficulty": 0, + "time": "20m", + "on_display": true, + "qualities": [ { "id": "DIG", "level": 1 } ], + "pre_flags": [ "FLAT" ], + "pre_special": "check_empty", + "post_terrain": "f_dirtmound_shallow", + "activity_level": "EXTRA_EXERCISE", + "do_turn_special": "do_turn_shovel", + "components": [ [ [ "material_soil", 200 ] ] ] + }, + { + "type": "construction", + "id": "constr_mound_mid", + "skill": "survival", + "group": "constr_dirtmound", + "category": "CONSTRUCT", + "difficulty": 0, + "time": "20m", + "on_display": true, + "qualities": [ { "id": "DIG", "level": 1 } ], + "pre_terrain": "f_dirtmound_shallow", + "post_terrain": "f_dirtmound_pile", + "activity_level": "EXTRA_EXERCISE", + "do_turn_special": "do_turn_shovel", + "components": [ [ [ "material_soil", 200 ] ] ] + }, + { + "type": "construction", + "id": "constr_mound_tall", + "skill": "survival", + "group": "constr_dirtmound", + "category": "CONSTRUCT", + "difficulty": 0, + "time": "20m", + "on_display": true, + "qualities": [ { "id": "DIG", "level": 1 } ], + "pre_terrain": "f_dirtmound_pile", + "post_terrain": "f_dirtmound_tall", + "activity_level": "EXTRA_EXERCISE", + "do_turn_special": "do_turn_shovel", + "components": [ [ [ "material_soil", 400 ] ] ] + } { "type": "construction", "id": "constr_water_channel", diff --git a/data/json/construction_group.json b/data/json/construction_group.json index 0ef8db921367f..bdda7278ea74c 100644 --- a/data/json/construction_group.json +++ b/data/json/construction_group.json @@ -1809,6 +1809,11 @@ "id": "constr_excavate_forestfloor", "name": "Turn forest floor into dirt" }, + { + "type": "construction_group", + "id": "constr_dirtmound", + "name": "Build a Mound of Dirt" + }, { "type": "construction_group", "id": "build_brick_oven", From 79d55757b3d0b1395d027e6ae45cc16085a26c88 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 18:06:42 -0700 Subject: [PATCH 10/17] Fixed style error --- data/json/furniture_and_terrain/furniture-barriers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index 65da858deb995..5456c9e726451 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -250,7 +250,7 @@ "looks_like": "t_dirtmound", "move_cost_mod": 6, "coverage": 40, - "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, @@ -272,7 +272,7 @@ "looks_like": "t_dirtmound", "move_cost_mod": 8, "coverage": 60, - "description": "An area of dirt heaped up to your waist, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "description": "An area of dirt heaped up to your waist, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ], "furn_set": "f_dirtmound_shallow" }, @@ -294,7 +294,7 @@ "looks_like": "t_dirtmound", "move_cost_mod": -1, "coverage": 100, - "description": "A mound of dirt almost as tall as a building!.", + "description": "A mound of dirt almost as tall as a building!", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE" ], "deconstruct": { "items": [ { "item": "material_soil", "count": 400 } ], "furn_set": "f_dirtmound_pile" }, From 76241f43c75d4c20753155b88d3d31ac181cddc9 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 18:07:29 -0700 Subject: [PATCH 11/17] Fixed misplaced comment --- data/json/furniture_and_terrain/furniture-barriers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index 5456c9e726451..8f855b1011984 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -239,7 +239,6 @@ "sound_fail": "whack!", "items": [ { "item": "2x4", "count": [ 2, 4 ] } ] } - "//":"Needs planting support" }, { "type": "furniture", @@ -283,7 +282,8 @@ "sound_fail": "thud!", "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ], "furn_set": "f_dirtmound_shallow" - } + }, + "//":"Needs planting support" }, { "type": "furniture", From 4ef5f114710874e2ffe970955fed9fd19b4d4a55 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 18:10:02 -0700 Subject: [PATCH 12/17] Moved mounds to more appropriate file --- .../furniture-barriers.json | 67 ------------------- .../furniture-terrains.json | 67 +++++++++++++++++++ 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-barriers.json b/data/json/furniture_and_terrain/furniture-barriers.json index 8f855b1011984..f45f55b0b92fd 100644 --- a/data/json/furniture_and_terrain/furniture-barriers.json +++ b/data/json/furniture_and_terrain/furniture-barriers.json @@ -239,72 +239,5 @@ "sound_fail": "whack!", "items": [ { "item": "2x4", "count": [ 2, 4 ] } ] } - }, - { - "type": "furniture", - "id": "f_dirtmound_shallow", - "name": "shallow mound of dirt", - "symbol": "#", - "color": "brown", - "looks_like": "t_dirtmound", - "move_cost_mod": 6, - "coverage": 40, - "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", - "required_str": -1, - "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], - "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, - "bash": { - "str_min": 50, - "str_max": 100, - "sound": "thump!", - "sound_fail": "thud!", - "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ] - }, - "//":"Needs planting support" - }, - { - "type": "furniture", - "id": "f_dirtmound_pile", - "name": "mound of dirt", - "symbol": "#", - "color": "brown", - "looks_like": "t_dirtmound", - "move_cost_mod": 8, - "coverage": 60, - "description": "An area of dirt heaped up to your waist, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", - "required_str": -1, - "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], - "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ], "furn_set": "f_dirtmound_shallow" }, - "bash": { - "str_min": 50, - "str_max": 100, - "sound": "thump!", - "sound_fail": "thud!", - "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ], - "furn_set": "f_dirtmound_shallow" - }, - "//":"Needs planting support" - }, - { - "type": "furniture", - "id": "f_dirtmound_tall", - "name": "tall mound of dirt", - "symbol": "#", - "color": "brown", - "looks_like": "t_dirtmound", - "move_cost_mod": -1, - "coverage": 100, - "description": "A mound of dirt almost as tall as a building!", - "required_str": -1, - "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE" ], - "deconstruct": { "items": [ { "item": "material_soil", "count": 400 } ], "furn_set": "f_dirtmound_pile" }, - "bash": { - "str_min": 50, - "str_max": 100, - "sound": "thump!", - "sound_fail": "thud!", - "items": [ { "item": "material_soil", "count": [ 340, 400 ] } ], - "furn_set": "f_dirtmound_pile" - } } ] diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 85396580ed7b0..8b6e0b399838e 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1178,5 +1178,72 @@ { "item": "plastic_chunk", "count": [ 1, 6 ] } ] } + }, + { + "type": "furniture", + "id": "f_dirtmound_shallow", + "name": "shallow mound of dirt", + "symbol": "#", + "color": "brown", + "looks_like": "t_dirtmound", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "required_str": -1, + "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 50, + "str_max": 100, + "sound": "thump!", + "sound_fail": "thud!", + "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ] + }, + "//":"Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_pile", + "name": "mound of dirt", + "symbol": "#", + "color": "brown", + "looks_like": "t_dirtmound", + "move_cost_mod": 8, + "coverage": 60, + "description": "An area of dirt heaped up to your waist, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", + "required_str": -1, + "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ], "furn_set": "f_dirtmound_shallow" }, + "bash": { + "str_min": 50, + "str_max": 100, + "sound": "thump!", + "sound_fail": "thud!", + "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ], + "furn_set": "f_dirtmound_shallow" + }, + "//":"Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_tall", + "name": "tall mound of dirt", + "symbol": "#", + "color": "brown", + "looks_like": "t_dirtmound", + "move_cost_mod": -1, + "coverage": 100, + "description": "A mound of dirt almost as tall as a building!", + "required_str": -1, + "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE" ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 400 } ], "furn_set": "f_dirtmound_pile" }, + "bash": { + "str_min": 50, + "str_max": 100, + "sound": "thump!", + "sound_fail": "thud!", + "items": [ { "item": "material_soil", "count": [ 340, 400 ] } ], + "furn_set": "f_dirtmound_pile" + } } ] From a18a7461a2f322ec56062d308ffbe2a39d696f3d Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 18:35:59 -0700 Subject: [PATCH 13/17] Removed NOITEM to support farming --- data/json/furniture_and_terrain/furniture-terrains.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 8b6e0b399838e..21f835a42d75f 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1190,7 +1190,7 @@ "coverage": 40, "description": "An area of heaped dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", "required_str": -1, - "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], + "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, "bash": { "str_min": 50, @@ -1212,7 +1212,7 @@ "coverage": 60, "description": "An area of dirt heaped up to your waist, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", "required_str": -1, - "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], + "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE", "PLANTABLE" ], "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ], "furn_set": "f_dirtmound_shallow" }, "bash": { "str_min": 50, From 78cb9142e0ab07b3988ec1a08a671a745c855316 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 20:45:24 -0700 Subject: [PATCH 14/17] Added Planting Support --- .../furniture-terrains.json | 324 +++++++++++++++++- 1 file changed, 321 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 21f835a42d75f..6e263a2a2c519 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1179,7 +1179,7 @@ ] } }, - { + { "type": "furniture", "id": "f_dirtmound_shallow", "name": "shallow mound of dirt", @@ -1198,8 +1198,167 @@ "sound": "thump!", "sound_fail": "thud!", "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ] + } + }, + { + "type": "furniture", + "id": "f_dirtmound_shallow_seed", + "name": "shallow mound of dirt with seed", + "symbol": "^", + "color": "brown", + "looks_like": "f_dirtmound_shallow_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. Someone has planted a seed here.", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER" + ], + "examine_action": "aggie_plant", + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_shallow", + "items": [ { "item": "withered", "count": [ 1, 2 ] }, { "item": "leaves", "count": [ 1, 2 ] } ] + }, + "plant_data": { "transform": "f_dirtmound_shallow_seedling", "base": "f_dirtmound_shallow" }, + "//": "Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_shallow_seedling", + "name": "shallow mound of dirt with seedling", + "symbol": "^", + "color": "green", + "looks_like": "f_dirtmound_shallow_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. There is a seed here, that has just begun to sprout its first roots.", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER", + "GROWTH_SEEDLING" + ], + "examine_action": "aggie_plant", + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_shallow", + "items": [ { "item": "withered", "count": [ 1, 2 ] }, { "item": "leaves", "count": [ 1, 2 ] } ] + }, + "plant_data": { "transform": "f_dirtmound_shallow_mature", "base": "f_dirtmound_shallow" }, + "//": "Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_shallow_mature", + "name": "shallow mound of dirt with seed", + "symbol": "#", + "color": "green", + "looks_like": "f_dirtmound_shallow_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. There is a matured plant here, that should be ready for harvest before long.", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER", + "GROWTH_MATURE", + "SMALL_HIDE" + ], + "examine_action": "aggie_plant", + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_shallow", + "items": [ + { "item": "withered", "count": [ 2, 8 ] }, + { "item": "leaves", "count": [ 4, 16 ] }, + { "item": "twig", "count": [ 1, 5 ] } + ] + }, + "plant_data": { "transform": "f_dirtmound_shallow_harvest", "base": "f_dirtmound_shallow" }, + "//": "Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_shallow_harvest", + "name": "shallow mound of dirt with seed", + "symbol": "#", + "color": "light_green", + "looks_like": "f_dirtmound_shallow_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. There is a fully grown plant, and will need closer examination to harvest..", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER", + "GROWTH_HARVEST", + "SMALL_HIDE" + ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_shallow", + "items": [ + { "item": "withered", "count": [ 2, 8 ] }, + { "item": "leaves", "count": [ 4, 1 ] }, + { "item": "twig", "count": [ 1, 5 ] } + ] }, - "//":"Needs planting support" + "plant_data": { "transform": "f_dirtmound_shallow", "base": "f_dirtmound_shallow" }, + "examine_action": "harvest_plant_ex" }, { "type": "furniture", @@ -1221,8 +1380,167 @@ "sound_fail": "thud!", "items": [ { "item": "material_soil", "count": [ 170, 200 ] } ], "furn_set": "f_dirtmound_shallow" + } + }, + { + "type": "furniture", + "id": "f_dirtmound_pile_seed", + "name": "shallow mound of dirt with seed", + "symbol": "^", + "color": "brown", + "looks_like": "f_dirtmound_pile_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. Someone has planted a seed here.", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER" + ], + "examine_action": "aggie_plant", + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_pile", + "items": [ { "item": "withered", "count": [ 1, 2 ] }, { "item": "leaves", "count": [ 1, 2 ] } ] + }, + "plant_data": { "transform": "f_dirtmound_pile_seedling", "base": "f_dirtmound_pile" }, + "//": "Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_pile_seedling", + "name": "shallow mound of dirt with seedling", + "symbol": "^", + "color": "green", + "looks_like": "f_dirtmound_pile_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. There is a seed here, that has just begun to sprout its first roots.", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER", + "GROWTH_SEEDLING" + ], + "examine_action": "aggie_plant", + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_pile", + "items": [ { "item": "withered", "count": [ 1, 2 ] }, { "item": "leaves", "count": [ 1, 2 ] } ] + }, + "plant_data": { "transform": "f_dirtmound_pile_mature", "base": "f_dirtmound_pile" }, + "//": "Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_pile_mature", + "name": "shallow mound of dirt with seed", + "symbol": "#", + "color": "green", + "looks_like": "f_dirtmound_pile_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. There is a matured plant here, that should be ready for harvest before long.", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER", + "GROWTH_MATURE", + "SMALL_HIDE" + ], + "examine_action": "aggie_plant", + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_pile", + "items": [ + { "item": "withered", "count": [ 2, 8 ] }, + { "item": "leaves", "count": [ 4, 16 ] }, + { "item": "twig", "count": [ 1, 5 ] } + ] + }, + "plant_data": { "transform": "f_dirtmound_pile_harvest", "base": "f_dirtmound_pile" }, + "//": "Needs planting support" + }, + { + "type": "furniture", + "id": "f_dirtmound_pile_harvest", + "name": "shallow mound of dirt with seed", + "symbol": "#", + "color": "light_green", + "looks_like": "f_dirtmound_pile_seed", + "move_cost_mod": 6, + "coverage": 40, + "description": "An area of heaped dirt, not easily traversable. There is a fully grown plant, and will need closer examination to harvest..", + "required_str": -1, + "flags": [ + "PLANT", + "TRANSPARENT", + "EASY_DECONSTRUCT", + "NOITEM", + "THIN_OBSTACLE", + "PERMEABLE", + "TINY", + "DONT_REMOVE ROTTEN", + "SEALED", + "CONTAINER", + "GROWTH_HARVEST", + "SMALL_HIDE" + ], + "deconstruct": { "items": [ { "item": "material_soil", "count": 200 } ] }, + "bash": { + "str_min": 2, + "str_max": 6, + "sound": "rrrrip!", + "sound_fail": "brush.", + "sound_vol": 4, + "furn_set": "f_dirtmound_pile", + "items": [ + { "item": "withered", "count": [ 2, 8 ] }, + { "item": "leaves", "count": [ 4, 1 ] }, + { "item": "twig", "count": [ 1, 5 ] } + ] }, - "//":"Needs planting support" + "plant_data": { "transform": "f_dirtmound_pile", "base": "f_dirtmound_pile" }, + "examine_action": "harvest_plant_ex" }, { "type": "furniture", From 8a2a435bc66dec9f8b86d732a7c44ab0694cf3ce Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 21:11:35 -0700 Subject: [PATCH 15/17] Added Ability to climb Tall Dirt Mound --- data/json/furniture_and_terrain/furniture-terrains.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 6e263a2a2c519..ab82606bc33ac 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1550,10 +1550,11 @@ "color": "brown", "looks_like": "t_dirtmound", "move_cost_mod": -1, + "examine_action": "chainfence", "coverage": 100, "description": "A mound of dirt almost as tall as a building!", "required_str": -1, - "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE" ], + "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "material_soil", "count": 400 } ], "furn_set": "f_dirtmound_pile" }, "bash": { "str_min": 50, From f87346773a30585006e1665cac9c53e775aa1997 Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 21:25:27 -0700 Subject: [PATCH 16/17] renamed t_dirtmound --- data/json/furniture_and_terrain/terrain-floors-outdoors.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index 85f484c79e9da..dedc9befb6308 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -123,7 +123,7 @@ { "type": "terrain", "id": "t_dirtmound", - "name": "loose dirt", + "name": "upturned dirt", "description": "An area of loose dirt, not easily traversable. If examined more closely, it's quite favorable for planting seeds and the like.", "symbol": "#", "color": "brown", @@ -137,7 +137,7 @@ { "type": "terrain", "id": "t_dirtmoundfloor", - "name": "mound of loose dirt", + "name": "mound of upturned dirt", "description": "A giant hill of dirt that looks like you could crawl inside for shelter.", "looks_like": "t_dirtmound", "symbol": "#", From dfb0bc6cac298a933d5ada2d7d9e34df175920fe Mon Sep 17 00:00:00 2001 From: detahramet Date: Fri, 29 Sep 2023 21:36:54 -0700 Subject: [PATCH 17/17] Linting, Syntax --- data/json/construction.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 4fdf7e6b4ee5c..f5994805949fd 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -6843,7 +6843,7 @@ "post_terrain": "f_dirtmound_shallow", "activity_level": "EXTRA_EXERCISE", "do_turn_special": "do_turn_shovel", - "components": [ [ [ "material_soil", 200 ] ] ] + "components": [ [ [ "material_soil", 200 ] ] ] }, { "type": "construction", @@ -6859,7 +6859,7 @@ "post_terrain": "f_dirtmound_pile", "activity_level": "EXTRA_EXERCISE", "do_turn_special": "do_turn_shovel", - "components": [ [ [ "material_soil", 200 ] ] ] + "components": [ [ [ "material_soil", 200 ] ] ] }, { "type": "construction", @@ -6875,8 +6875,8 @@ "post_terrain": "f_dirtmound_tall", "activity_level": "EXTRA_EXERCISE", "do_turn_special": "do_turn_shovel", - "components": [ [ [ "material_soil", 400 ] ] ] - } + "components": [ [ [ "material_soil", 400 ] ] ] + }, { "type": "construction", "id": "constr_water_channel",