From b5f7b9300847a780c567477e9a7ffb3f0fc0ca21 Mon Sep 17 00:00:00 2001 From: shmakota <47482311+shmakota@users.noreply.github.com> Date: Thu, 26 Dec 2024 18:24:06 -0600 Subject: [PATCH] feat(content,port): port collapsible mop item (#5836) * port collapsible mop, add to item spawn & itemgroups where mop already was defined * ran json formatter & add co-author Co-authored-by: ZombieZilla <48612811+ZombieZilla@users.noreply.github.com> * add space to fix build fail --------- Co-authored-by: ZombieZilla <48612811+ZombieZilla@users.noreply.github.com> --- .../itemgroups/Locations_MapExtras/mansion.json | 3 ++- data/json/itemgroups/supplies.json | 3 ++- data/json/itemgroups/tools.json | 6 ++++-- data/json/items/tool/toiletries.json | 17 +++++++++++++++++ data/json/mapgen/cs_internet_cafe.json | 5 ++++- data/json/mapgen/cs_sex_shop.json | 3 ++- data/json/mapgen/farm_dairy_2.json | 2 +- data/json/mapgen/irradiator_1.json | 3 ++- 8 files changed, 34 insertions(+), 8 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index d1b7bb38feb2..f1ce5b506219 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -1172,7 +1172,8 @@ "subtype": "distribution", "items": [ [ "broom", 40 ], - [ "mop", 40 ], + [ "mop", 25 ], + [ "mop_folded", 15 ], { "item": "ammonia", "prob": 24, "charges-min": 1 }, [ "chem_hydrogen_peroxide", 20 ], [ "boots_rubber", 20 ], diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index e74e849b237f..6dd18c051988 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -488,7 +488,8 @@ [ "laptop", 2 ], [ "inhaler", 1 ], [ "mbag", 2 ], - [ "mop", 5 ], + [ "mop", 3 ], + [ "mop_folded", 2 ], [ "cell_phone", 1 ], [ "smart_phone", 10 ], [ "duct_tape", 5 ], diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index c6a9598f4608..6bdb76a36669 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -28,7 +28,8 @@ "subtype": "distribution", "items": [ [ "broom", 25 ], - [ "mop", 25 ], + [ "mop", 15 ], + [ "mop_folded", 10 ], [ "bucket", 10 ], { "item": "bag_plastic", "prob": 15, "count": [ 1, 5 ] }, { "group": "tools_cleaning_small", "prob": 25 } @@ -193,7 +194,8 @@ [ "crowbar", 10 ], [ "pliers", 200 ], [ "bucket", 50 ], - [ "mop", 100 ], + [ "mop", 60 ], + [ "mop_folded", 40 ], [ "shovel", 40 ], [ "hammer_sledge", 10 ], [ "hammer_sledge_short", 20 ], diff --git a/data/json/items/tool/toiletries.json b/data/json/items/tool/toiletries.json index 1b7de366c6d8..56bce9be4705 100644 --- a/data/json/items/tool/toiletries.json +++ b/data/json/items/tool/toiletries.json @@ -74,6 +74,23 @@ "techniques": [ "WBLOCK_1" ], "use_action": "MOP" }, + { + "id": "mop_folded", + "type": "TOOL", + "name": { "str": "collapsible mop" }, + "description": "A long unwieldy mop with a collapsible handle for convenient transportation. You may use it to clean up any 'mess' you have made.", + "weight": "730 g", + "volume": "760 ml", + "price": "15 USD", + "price_postapoc": "15 cent", + "to_hit": -2, + "bashing": 3, + "material": [ "plastic" ], + "symbol": "/", + "color": "light_gray", + "looks_like": "mop", + "use_action": [ "MOP" ] + }, { "type": "GENERIC", "category": "tools", diff --git a/data/json/mapgen/cs_internet_cafe.json b/data/json/mapgen/cs_internet_cafe.json index e97354e85508..8a7d2dfbf4fd 100644 --- a/data/json/mapgen/cs_internet_cafe.json +++ b/data/json/mapgen/cs_internet_cafe.json @@ -91,7 +91,10 @@ "V": { "item": "ic_merch_vending", "chance": 100 }, "L": { "item": "cleaning", "chance": 100 } }, - "add": [ { "item": "mop", "x": [ 11, 12 ], "y": [ 17, 20 ], "chance": 2 } ], + "add": [ + { "item": "mop", "x": [ 11, 12 ], "y": [ 17, 20 ], "chance": 1 }, + { "item": "mop_folded", "x": [ 11, 12 ], "y": [ 17, 20 ], "chance": 1 } + ], "place_items": [ { "item": "ic_merch_vending", "x": 3, "y": 7, "chance": 90 }, { "item": "ic_merch_vending", "x": 3, "y": 7, "chance": 90 }, diff --git a/data/json/mapgen/cs_sex_shop.json b/data/json/mapgen/cs_sex_shop.json index 8937b45a7499..b1534449c5c0 100644 --- a/data/json/mapgen/cs_sex_shop.json +++ b/data/json/mapgen/cs_sex_shop.json @@ -79,7 +79,8 @@ { "item": "touristmap", "x": 4, "y": 6, "chance": 10 }, { "item": "touristmap", "x": 6, "y": 6, "chance": 10 }, { "item": "syringe", "x": 20, "y": 19, "chance": 5 }, - { "item": "mop", "x": [ 4, 5 ], "y": [ 7, 8 ], "chance": 2 }, + { "item": "mop", "x": [ 4, 5 ], "y": [ 7, 8 ], "chance": 1 }, + { "item": "mop_folded", "x": [ 4, 5 ], "y": [ 7, 8 ], "chance": 1 }, { "item": "extinguisher", "x": 3, "y": 7, "chance": 5 }, { "item": "television", "x": 6, "y": 13, "chance": 5 }, { "item": "television", "x": 7, "y": 13, "chance": 5 } diff --git a/data/json/mapgen/farm_dairy_2.json b/data/json/mapgen/farm_dairy_2.json index 33d0af248125..ae446ad9fcfc 100644 --- a/data/json/mapgen/farm_dairy_2.json +++ b/data/json/mapgen/farm_dairy_2.json @@ -228,7 +228,7 @@ { "item": "human_cooked", "chance": 100 } ], "?": { "item": "bottle_glass", "chance": 70, "repeat": 6 }, - "^": [ { "item": "bucket", "chance": 100 }, { "item": "mop", "chance": 100 } ], + "^": [ { "item": "bucket", "chance": 100 }, { "item": "mop", "chance": 60 }, { "item": "mop_folded", "chance": 40 } ], "8": { "item": "rennet", "chance": 50, "repeat": 5 }, "A": { "item": "wheel_wood", "chance": 100 }, "C": { "item": "bucket", "chance": 100 }, diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json index 7495c6d445c1..2a514cf96643 100644 --- a/data/json/mapgen/irradiator_1.json +++ b/data/json/mapgen/irradiator_1.json @@ -49,7 +49,8 @@ { "item": "towel", "prob": 20 }, { "item": "saline", "prob": 20 }, { "item": "detergent", "prob": 20 }, - { "item": "mop", "prob": 10 }, + { "item": "mop", "prob": 6 }, + { "item": "mop_folded", "prob": 4 }, { "item": "boots_rubber", "prob": 10 }, { "item": "gloves_rubber", "prob": 20 } ]