diff options
Diffstat (limited to 'revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch')
| -rw-r--r-- | revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch | 515 |
1 files changed, 0 insertions, 515 deletions
diff --git a/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch b/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch deleted file mode 100644 index 5867ada..0000000 --- a/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch +++ /dev/null @@ -1,515 +0,0 @@ -From 8ef2a855d0338e35aa1d9fbbda641315dc53f8db Mon Sep 17 00:00:00 2001 -From: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> -Date: Sat, 25 Mar 2023 14:24:02 +0100 -Subject: [PATCH] Obsoletion and removal of useless bathroom fluff (#2471) - ---- - .../Clothing_Gear/gear_civilian.json | 1 - - .../Locations_MapExtras/locations.json | 4 +- - .../locations_commercial.json | 1 - - .../Locations_MapExtras/mall_item_groups.json | 1 - - .../Locations_MapExtras/mansion.json | 10 +- - data/json/itemgroups/SUS/domestic.json | 12 +- - .../json/itemgroups/collections_domestic.json | 6 +- - data/json/itemgroups/supplies.json | 8 +- - data/json/items/generic/bathroom_house.json | 126 ------------------ - data/json/obsoletion/items.json | 126 ++++++++++++++++++ - data/json/uncraft/generic.json | 8 -- - 11 files changed, 133 insertions(+), 170 deletions(-) - -diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json -index 6c93a36b829..a7a9744e8e1 100644 ---- a/data/json/itemgroups/Clothing_Gear/gear_civilian.json -+++ b/data/json/itemgroups/Clothing_Gear/gear_civilian.json -@@ -218,7 +218,6 @@ - [ "elec_hairtrimmer", 15 ], - [ "razor_blade", 5 ], - [ "razor_shaving", 5 ], -- [ "toothbrush_plain", 10 ], - [ "string_floss", 10 ], - [ "kilt", 5 ], - [ "hobo_stove", 1 ], -diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json -index 2dfb60740ef..b1bfc7941a4 100644 ---- a/data/json/itemgroups/Locations_MapExtras/locations.json -+++ b/data/json/itemgroups/Locations_MapExtras/locations.json -@@ -1158,9 +1158,7 @@ - [ "toolbox", 5 ], - [ "apron_leather", 10 ], - [ "bio_infolink", 10 ], -- [ "chem_aluminium_sulphate", 20 ], -- [ "plunger_toilet", 10 ], -- [ "plunger_futuristic", 5 ] -+ [ "chem_aluminium_sulphate", 20 ] - ] - }, - { -diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json -index 85fb9960d3c..07550e43c95 100644 ---- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json -+++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json -@@ -82,7 +82,6 @@ - "items": [ - [ "rope_6", 20 ], - [ "string_36", 25 ], -- [ "toilet_paper", 10 ], - [ "handflare", 15 ], - [ "duct_tape", 25 ], - [ "flashlight", 25 ], -diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json -index 261ede3a3f8..0841f79f760 100644 ---- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json -+++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json -@@ -281,7 +281,6 @@ - [ "shavingkit", 20 ], - [ "elec_hairtrimmer", 20 ], - [ "razor_shaving", 20 ], -- [ "curler_hair", 30 ], - [ "hair_dryer", 40 ], - [ "curling_iron", 40 ], - [ "comb_pocket", 10 ], -diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json -index 56d45fb47d7..7dcb828df02 100644 ---- a/data/json/itemgroups/Locations_MapExtras/mansion.json -+++ b/data/json/itemgroups/Locations_MapExtras/mansion.json -@@ -956,7 +956,6 @@ - [ "38_casing", 20 ], - [ "45_casing", 20 ], - [ "bone_tainted", 1 ], -- [ "toothbrush_plain", 10 ], - { "group": "corpse_mansion", "prob": 1 } - ] - }, -@@ -1122,10 +1121,7 @@ - [ "oxy_powder", 5 ], - [ "fungicide", 5 ], - [ "insecticide", 5 ], -- { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" }, -- [ "toilet_paper", 30 ], -- [ "plunger_toilet", 10 ], -- [ "plunger_futuristic", 25 ] -+ { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" } - ] - }, - { -@@ -1273,9 +1269,7 @@ - { "group": "harddrugs", "prob": 5 }, - [ "hairbrush", 30 ], - [ "comb_pocket", 15 ], -- [ "curler_hair", 10 ], -- [ "curling_iron", 15 ], -- [ "brush_toilet", 15 ] -+ [ "curling_iron", 15 ] - ] - }, - { -diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json -index c431b052f2b..88574cb4111 100644 ---- a/data/json/itemgroups/SUS/domestic.json -+++ b/data/json/itemgroups/SUS/domestic.json -@@ -343,7 +343,6 @@ - { "item": "comb_pocket", "count": [ 1, 2 ], "prob": 75 }, - { "item": "scissors", "count": [ 1, 2 ], "prob": 60 }, - { "item": "hair_dryer", "prob": 60 }, -- { "collection": [ { "item": "curling_iron", "count": [ 1, 2 ] }, { "item": "curler_hair" } ], "prob": 25 }, - { "item": "elec_hairtrimmer", "prob": 30 } - ] - }, -@@ -353,15 +352,7 @@ - "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", - "//2": "This group is for things you often find stored on or next to a toilet.", - "subtype": "collection", -- "entries": [ -- { -- "distribution": [ { "item": "plunger_toilet", "prob": 90 }, { "item": "plunger_futuristic", "prob": 10 } ], -- "prob": 90 -- }, -- { "item": "brush_toilet", "prob": 75 }, -- { "item": "toilet_paper", "prob": 95 }, -- { "item": "bathroom_scale", "prob": 50 } -- ] -+ "entries": [ { "item": "bathroom_scale", "prob": 50 } ] - }, - { - "id": "SUS_bathroom_cabinet", -@@ -384,7 +375,6 @@ - { "item": "mirror", "prob": 25 }, - { "item": "sponge", "count": [ 1, 3 ], "prob": 75 }, - { "collection": [ { "item": "candle", "count": [ 1, 2 ] }, { "item": "matches" } ], "prob": 20 }, -- { "item": "toilet_paper", "prob": 80 }, - { "item": "towel", "count": [ 1, 2 ], "prob": 75 } - ] - }, -diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json -index 63285818678..87f0178aafd 100644 ---- a/data/json/itemgroups/collections_domestic.json -+++ b/data/json/itemgroups/collections_domestic.json -@@ -230,7 +230,6 @@ - { "group": "mansion_guns", "prob": 3 }, - { "group": "harddrugs", "prob": 1 }, - [ "joint", 1 ], -- [ "curler_hair", 10 ], - [ "hairbrush", 5 ] - ] - }, -@@ -989,10 +988,7 @@ - { "item": "insecticide", "prob": 2 }, - { "item": "soap", "prob": 80 }, - { "item": "detergent", "prob": 80 }, -- { "item": "chem_hydrogen_peroxide", "prob": 20 }, -- { "item": "plunger_toilet", "prob": 30 }, -- { "item": "plunger_futuristic", "prob": 15 }, -- { "item": "toilet_paper", "prob": 10 } -+ { "item": "chem_hydrogen_peroxide", "prob": 20 } - ] - }, - { -diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json -index 0327c507ba9..0748fa9b951 100644 ---- a/data/json/itemgroups/supplies.json -+++ b/data/json/itemgroups/supplies.json -@@ -122,9 +122,7 @@ - [ "pump_complex", 5 ], - [ "well_pump", 5 ], - [ "plastic_sheet", 20 ], -- [ "recharge_station", 20 ], -- [ "plunger_toilet", 75 ], -- [ "plunger_futuristic", 25 ] -+ [ "recharge_station", 20 ] - ] - }, - { -@@ -144,9 +142,7 @@ - [ "jerrycan", 10 ], - [ "pump_complex", 10 ], - [ "well_pump", 10 ], -- { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] }, -- { "item": "plunger_toilet", "prob": 90, "count": [ 1, 2 ] }, -- [ "plunger_futuristic", 50 ] -+ { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] } - ] - }, - { -diff --git a/data/json/items/generic/bathroom_house.json b/data/json/items/generic/bathroom_house.json -index dba9eb592f6..2b4b7874c51 100644 ---- a/data/json/items/generic/bathroom_house.json -+++ b/data/json/items/generic/bathroom_house.json -@@ -14,14 +14,6 @@ - "bashing": 1, - "to_hit": -1 - }, -- { -- "id": "soap_holder", -- "name": { "str": "soap dish", "str_pl": "soap dishes" }, -- "type": "GENERIC", -- "description": "A shallow dish for holding a bar of soap. It has ridges to help drain water away from the dish. Not the most exciting of items.", -- "symbol": "-", -- "copy-from": "base_toiletries" -- }, - { - "id": "razor_shaving", - "name": { "str": "shaving razor" }, -@@ -36,36 +28,6 @@ - "material": [ "plastic", "steel" ], - "cutting": 2 - }, -- { -- "id": "toothbrush_plain", -- "name": { "str": "toothbrush", "str_pl": "toothbrushes" }, -- "type": "GENERIC", -- "description": "A plastic brush with soft bristles for cleaning your teeth.", -- "symbol": "/", -- "copy-from": "base_toiletries", -- "snippet_category": [ -- { -- "id": "tbrush1", -- "text": "A plastic brush with soft bristles for cleaning your teeth. It has a cheap, blocky handle and is likely meant to be disposable." -- }, -- { -- "id": "tbrush2", -- "text": "A combination toothbrush and gum massager. It has an ergonomic silicone grip. Luxurious!" -- }, -- { -- "id": "tbrush3", -- "text": "A plastic brush with soft bristles for cleaning your teeth. The blue and white pattern on the handle implies cleanliness." -- }, -- { -- "id": "tbrush4", -- "text": "A short toothbrush designed for children. It has a wide-eyed cartoon pony on the handle." -- }, -- { -- "id": "tbrush5", -- "text": "A short toothbrush designed for children. It has a grinning red racecar on the handle." -- } -- ] -- }, - { - "id": "hairbrush", - "name": { "str": "hairbrush", "str_pl": "hairbrushes" }, -@@ -80,17 +42,6 @@ - { "id": "hbrush4", "text": "A tacky kid's hairbrush. The cartoon whale on the handle seems friendly enough." } - ] - }, -- { -- "id": "curler_hair", -- "name": { "str": "hair curler" }, -- "type": "GENERIC", -- "description": "A soft plastic cylinder you can wrap a lock of your hair around to curl it.", -- "copy-from": "base_toiletries", -- "symbol": ",", -- "weight": "20 g", -- "volume": "25 ml", -- "container": "box_small" -- }, - { - "id": "string_floss", - "name": { "str": "dental floss", "str_pl": "rolls of dental floss" }, -@@ -117,68 +68,6 @@ - { "id": "pcomb4", "text": "A comb which folds on a hinge, in case you want to look like a greaser." } - ] - }, -- { -- "id": "plunger_toilet", -- "name": { "str": "toilet plunger" }, -- "type": "GENERIC", -- "description": "A rubber-tipped tool for unclogging pipes, or a club for an immature survivor.", -- "symbol": "p", -- "color": "red", -- "price": "8 USD", -- "price_postapoc": "10 cent", -- "weight": "590 g", -- "volume": "2100 ml", -- "//": "the volume is pretty bulky, but this is an old fashioned model.", -- "material": [ "wood", "rubber" ], -- "bashing": 5, -- "to_hit": -1 -- }, -- { -- "id": "plunger_futuristic", -- "name": { "str": "professional plunger" }, -- "type": "GENERIC", -- "description": "This hollow plastic toilet plunger's bell compresses like an accordion. It is efficient at its intended purpose, and complete rubbish as a weapon.", -- "symbol": "p", -- "color": "black", -- "price": "1590 cent", -- "price_postapoc": "10 cent", -- "weight": "680 g", -- "volume": "2400 ml", -- "material": "plastic", -- "bashing": 2, -- "to_hit": -1 -- }, -- { -- "id": "toilet_paper", -- "name": { "str": "toilet paper", "str_pl": "rolls of toilet paper" }, -- "type": "GENERIC", -- "description": "A luxurious remnant of civilization.", -- "symbol": "~", -- "color": "white", -- "container": "box_medium", -- "price": "89 cent", -- "price_postapoc": "180 cent", -- "volume": "250 ml", -- "weight": "227 g", -- "material": "paper", -- "to_hit": -2, -- "snippet_category": [ -- { -- "id": "tpaper1", -- "text": "Imagine the thinnest, most disposable paper you could possibly make. Now imagine something thinner than that." -- }, -- { -- "id": "tpaper2", -- "text": "This roll of toilet paper is two-ply and quilted, for vandalizing houses more comfortably than ever." -- }, -- { "id": "tpaper3", "text": "This brand of toilet paper is designed to dissolve completely in water!" }, -- { "id": "tpaper4", "text": "Images of your least favorite politician are printed on each individual sheet." }, -- { -- "id": "tpaper5", -- "text": "A luxurious remnant of civilization. The splinters of unprocessed wood visible in this one make it seem less luxurious, though." -- } -- ] -- }, - { - "id": "hair_dryer", - "name": { "str": "hair dryer" }, -@@ -208,20 +97,5 @@ - "material": [ "ceramic", "steel" ], - "bashing": 3, - "to_hit": 1 -- }, -- { -- "id": "brush_toilet", -- "name": { "str": "toilet brush", "str_pl": "toilet brushes" }, -- "type": "GENERIC", -- "description": "Zombies cannot be intimidated or humiliated, so this stiff brush is only useful for scouring toilet bowls.", -- "symbol": "p", -- "color": "white", -- "price": "17 USD", -- "price_postapoc": "0 cent", -- "volume": "500 ml", -- "weight": "160 g", -- "material": [ "steel", "plastic" ], -- "bashing": 3, -- "to_hit": 1 - } - ] -diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json -index f2a8063e7ef..e0a1a36ce29 100644 ---- a/data/json/obsoletion/items.json -+++ b/data/json/obsoletion/items.json -@@ -4354,6 +4354,132 @@ - "cutting": 3, - "to_hit": -3, - "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ] -+ }, -+ { -+ "id": "soap_holder", -+ "name": { "str": "soap dish", "str_pl": "soap dishes" }, -+ "type": "GENERIC", -+ "description": "A shallow dish for holding a bar of soap. It has ridges to help drain water away from the dish. Not the most exciting of items.", -+ "symbol": "-", -+ "copy-from": "base_toiletries" -+ }, -+ { -+ "id": "toothbrush_plain", -+ "name": { "str": "toothbrush", "str_pl": "toothbrushes" }, -+ "type": "GENERIC", -+ "description": "A plastic brush with soft bristles for cleaning your teeth.", -+ "symbol": "/", -+ "copy-from": "base_toiletries", -+ "snippet_category": [ -+ { -+ "id": "tbrush1", -+ "text": "A plastic brush with soft bristles for cleaning your teeth. It has a cheap, blocky handle and is likely meant to be disposable." -+ }, -+ { -+ "id": "tbrush2", -+ "text": "A combination toothbrush and gum massager. It has an ergonomic silicone grip. Luxurious!" -+ }, -+ { -+ "id": "tbrush3", -+ "text": "A plastic brush with soft bristles for cleaning your teeth. The blue and white pattern on the handle implies cleanliness." -+ }, -+ { -+ "id": "tbrush4", -+ "text": "A short toothbrush designed for children. It has a wide-eyed cartoon pony on the handle." -+ }, -+ { -+ "id": "tbrush5", -+ "text": "A short toothbrush designed for children. It has a grinning red racecar on the handle." -+ } -+ ] -+ }, -+ { -+ "id": "curler_hair", -+ "name": { "str": "hair curler" }, -+ "type": "GENERIC", -+ "description": "A soft plastic cylinder you can wrap a lock of your hair around to curl it.", -+ "copy-from": "base_toiletries", -+ "symbol": ",", -+ "weight": "20 g", -+ "volume": "25 ml", -+ "container": "box_small" -+ }, -+ { -+ "id": "plunger_toilet", -+ "name": { "str": "toilet plunger" }, -+ "type": "GENERIC", -+ "description": "A rubber-tipped tool for unclogging pipes, or a club for an immature survivor.", -+ "symbol": "p", -+ "color": "red", -+ "price": "8 USD", -+ "price_postapoc": "10 cent", -+ "weight": "590 g", -+ "volume": "2100 ml", -+ "//": "the volume is pretty bulky, but this is an old fashioned model.", -+ "material": [ "wood", "rubber" ], -+ "bashing": 5, -+ "to_hit": -1 -+ }, -+ { -+ "id": "plunger_futuristic", -+ "name": { "str": "professional plunger" }, -+ "type": "GENERIC", -+ "description": "This hollow plastic toilet plunger's bell compresses like an accordion. It is efficient at its intended purpose, and complete rubbish as a weapon.", -+ "symbol": "p", -+ "color": "black", -+ "price": "1590 cent", -+ "price_postapoc": "10 cent", -+ "weight": "680 g", -+ "volume": "2400 ml", -+ "material": "plastic", -+ "bashing": 2, -+ "to_hit": -1 -+ }, -+ { -+ "id": "toilet_paper", -+ "name": { "str": "toilet paper", "str_pl": "rolls of toilet paper" }, -+ "type": "GENERIC", -+ "description": "A luxurious remnant of civilization.", -+ "symbol": "~", -+ "color": "white", -+ "container": "box_medium", -+ "price": "89 cent", -+ "price_postapoc": "180 cent", -+ "volume": "250 ml", -+ "weight": "227 g", -+ "material": "paper", -+ "to_hit": -2, -+ "snippet_category": [ -+ { -+ "id": "tpaper1", -+ "text": "Imagine the thinnest, most disposable paper you could possibly make. Now imagine something thinner than that." -+ }, -+ { -+ "id": "tpaper2", -+ "text": "This roll of toilet paper is two-ply and quilted, for vandalizing houses more comfortably than ever." -+ }, -+ { "id": "tpaper3", "text": "This brand of toilet paper is designed to dissolve completely in water!" }, -+ { "id": "tpaper4", "text": "Images of your least favorite politician are printed on each individual sheet." }, -+ { -+ "id": "tpaper5", -+ "text": "A luxurious remnant of civilization. The splinters of unprocessed wood visible in this one make it seem less luxurious, though." -+ } -+ ] -+ }, -+ { -+ "id": "brush_toilet", -+ "name": { "str": "toilet brush", "str_pl": "toilet brushes" }, -+ "type": "GENERIC", -+ "description": "Zombies cannot be intimidated or humiliated, so this stiff brush is only useful for scouring toilet bowls.", -+ "symbol": "p", -+ "color": "white", -+ "price": "17 USD", -+ "price_postapoc": "0 cent", -+ "volume": "500 ml", -+ "weight": "160 g", -+ "material": [ "steel", "plastic" ], -+ "bashing": 3, -+ "to_hit": 1 - }, - { - "id": "lycra_patch", -diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json -index 30a4c1b1ace..ceacdc75895 100644 ---- a/data/json/uncraft/generic.json -+++ b/data/json/uncraft/generic.json -@@ -3961,14 +3961,6 @@ - "//": "just unspool the floss, no need to make a big production out of it.", - "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "thread", 25 ] ] ] - }, -- { -- "result": "plunger_toilet", -- "type": "uncraft", -- "skill_used": "fabrication", -- "time": "6 s", -- "qualities": [ { "id": "CUT", "level": 1 } ], -- "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "splinter", 3 ] ] ] -- }, - { - "result": "stopcock", - "type": "uncraft", --- -2.39.2 - |