From bf544f6d4ea014f29c2ba78a9763f9dac9b9de81 Mon Sep 17 00:00:00 2001 From: 7erracotta <89712754+7erracotta@users.noreply.github.com> Date: Fri, 16 Aug 2024 18:52:20 -0400 Subject: [PATCH 01/10] fursuits + variants combines all four previous fursuits into one item through variants. Also added a couple more variants just because. ( I was feeling a little silly, your honor) --- .../itemgroups/Clothing_Gear/clothing.json | 13 +- .../itemgroups/Clothing_Gear/costumes.json | 8 +- .../Locations_MapExtras/locations.json | 3 +- .../locations_commercial.json | 3 +- .../Locations_MapExtras/mall_item_groups.json | 3 +- .../json/itemgroups/collections_domestic.json | 3 +- data/json/itemgroups/food_service.json | 2 +- data/json/items/armor/suits_clothes.json | 238 +++++++++--------- .../json/monsterdrops/clothing_halloween.json | 6 +- data/json/monsterdrops/zombie.json | 6 +- .../beggars/BEGGAR_2_Dino_Dave.json | 2 +- data/json/starting_missions.json | 6 +- 12 files changed, 124 insertions(+), 169 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index e44b9771e31c8..62b24afc2c209 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -1624,12 +1624,7 @@ { "group": "superglue", "prob": 20 }, [ "firecracker_pack", 5 ], [ "firecracker", 5 ], - [ "wolfsuit", 3 ], - [ "dinosuit", 2 ], - [ "sharksuit", 2 ], - [ "felinesuit", 3 ], - [ "dragonsuit", 2 ], - [ "zentai", 5 ], + [ "fursuit", 5 ], { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] }, { "item": "condom", "prob": 30, "count": [ 1, 5 ] }, [ "snuggie", 5 ], @@ -4175,16 +4170,12 @@ "items": [ { "item": "bondage_suit", "prob": 10 }, { "item": "bodysuit_lycra", "prob": 10 }, - { "item": "dinosuit", "prob": 5 }, - { "item": "sharksuit", "prob": 5 }, { "item": "yukata", "prob": 20 }, { "item": "leotard", "prob": 40 }, { "item": "motorbike_armor", "prob": 15 }, { "item": "suit", "prob": 70 }, { "item": "touring_suit", "prob": 20 }, - { "item": "wolfsuit", "prob": 3 }, - { "item": "felinesuit", "prob": 3 }, - { "item": "dragonsuit", "prob": 1 }, + { "item": "fursuit", "prob": 3 }, { "item": "wool_suit", "prob": 40 }, { "item": "unitard", "prob": 60 }, { "item": "zentai", "prob": 5 }, diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json index d856ac0f8a539..f485cc45e0a1f 100644 --- a/data/json/itemgroups/Clothing_Gear/costumes.json +++ b/data/json/itemgroups/Clothing_Gear/costumes.json @@ -334,13 +334,7 @@ { "item": "bodysuit_lycra", "prob": 25 }, { "item": "suit", "prob": 10 }, { "item": "tux", "prob": 10 }, - { "item": "wolfsuit", "prob": 10 }, - { "item": "clown_suit", "prob": 10 }, - { "item": "dragonsuit", "prob": 10 }, - { "item": "felinesuit", "prob": 10 }, - { "item": "bondage_suit", "prob": 15 }, - { "item": "dinosuit", "prob": 10 }, - { "item": "sharksuit", "prob": 10 }, + { "item": "fursuit", "prob": 15 }, { "item": "beekeeping_suit", "prob": 5 }, { "item": "zentai", "prob": 5 } ] diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index c3c840d82eb22..0e864bf401d58 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -1965,8 +1965,7 @@ { "prob": 20, "group": "caffeine_bottle_plastic_pill_supplement_1_10" }, [ "cola_meth", 1 ], [ "picklocks", 10 ], - [ "wolfsuit", 4 ], - [ "dinosuit", 4 ], + [ "fursuit", 4 ], [ "jedi_cloak", 4 ], { "item": "glowstick", "prob": 60, "charges": 1400 }, [ "blanket", 10 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 7b563dc59848d..81804ec484a56 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -903,8 +903,7 @@ { "item": "sunglasses", "prob": 25 }, { "item": "cowboy_hat", "prob": 25 }, { "item": "mp3", "prob": 35, "charges": [ 0, 100 ] }, - { "item": "wolfsuit", "prob": 5 }, - { "item": "dinosuit", "prob": 5 }, + { "item": "fursuit", "prob": 5 }, { "item": "gum", "prob": 10, "count": 10 }, { "item": "talking_doll", "prob": 11, "charges": [ 0, 100 ] }, { "item": "marble", "prob": 15 }, diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index cc3c9aab5e846..2863e1890f991 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -96,8 +96,7 @@ [ "sunglasses", 25 ], [ "cowboy_hat", 25 ], { "item": "mp3", "prob": 40, "charges": 100 }, - [ "wolfsuit", 5 ], - [ "dinosuit", 5 ], + [ "fursuit", 5 ], { "item": "gum", "prob": 10, "count": [ 1, 10 ] }, [ "shuttlecock", 10 ], [ "baseball", 40 ], diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 3bffda514bae7..eaa1433e1d739 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -1160,8 +1160,7 @@ { "prob": 65, "group": "chips_bag_plastic_3" }, { "group": "softdrinks_canned", "prob": 380 }, { "item": "picklocks", "prob": 10 }, - { "item": "wolfsuit", "prob": 4 }, - { "item": "dinosuit", "prob": 4 }, + { "item": "fursuit", "prob": 6 }, { "item": "zentai", "prob": 4 }, { "item": "glowstick", "prob": 60, "charges": 1400 }, { "item": "handflare", "prob": 40, "charges": 300 }, diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index 233bef412c30e..a3edf450ba382 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -369,7 +369,7 @@ { "item": "detergent", "prob": 15, "charges": [ 1, 20 ] }, { "item": "bleach", "prob": 15, "charges": [ 1, -1 ] }, [ "broom", 13 ], - [ "dinosuit", 7 ], + { "item": "fursuit","variant":"dinosuit", "prob": 7 }, [ "hat_ball", 19 ], [ "jacket_light", 15 ], [ "mbag", 10 ], diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index bed77dccef01b..ebc5b69310a1f 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -250,106 +250,6 @@ "material_thickness": 1.1, "flags": [ "VARSIZE", "POCKETS", "STURDY" ] }, - { - "id": "dinosuit", - "type": "ARMOR", - "name": { "str": "dinosaur suit" }, - "description": "A full-body costume in the form of an anthropomorphic dinosaur. It is quite encumbering and has little storage but is very warm.", - "weight": "7033 g", - "volume": "12 L", - "price": "2 kUSD 500 USD", - "price_postapoc": "10 USD", - "to_hit": -3, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "wolfsuit", - "color": "light_green", - "armor": [ - { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, - { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, - { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } - ], - "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } ], - "warmth": 50, - "material_thickness": 3, - "environmental_protection": 2, - "flags": [ "OUTER" ] - }, - { - "id": "sharksuit", - "type": "ARMOR", - "name": { "str": "shark suit" }, - "description": "A full-body costume in the form of an anthropomorphic bull shark. It is quite encumbering and has little storage but is very warm.", - "weight": "6033 g", - "volume": "12 L", - "price": "2 kUSD 500 USD", - "price_postapoc": "10 USD", - "to_hit": -3, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "wolfsuit", - "color": "light_blue", - "armor": [ - { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, - { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } - ], - "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } ], - "warmth": 50, - "material_thickness": 3, - "environmental_protection": 2, - "flags": [ "OUTER" ] - }, - { - "id": "dragonsuit", - "type": "ARMOR", - "name": { "str": "dragon suit" }, - "description": "A cartoonish recreation of a western dragon remade into a suit. Effectively useless nowadays, unless you think the mutants will treat you as one of their own if you wear this. The wings really get in the way.", - "weight": "7033 g", - "volume": "12 L", - "price": "2 kUSD 500 USD", - "price_postapoc": "10 USD", - "to_hit": -3, - "material": [ "cotton" ], - "symbol": "[", - "looks_like": "dinosuit", - "color": "light_green", - "armor": [ - { "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, - { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, - { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] }, - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 36, 40 ] } - ], - "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } ], - "warmth": 50, - "material_thickness": 3, - "environmental_protection": 2, - "flags": [ "OUTER" ] - }, - { - "id": "felinesuit", - "type": "ARMOR", - "name": { "str": "feline suit" }, - "description": "A fursuit made to resemble an anthropomorphic feline of indistinguishable breed. It's a decent source of faux fur if you need it.", - "weight": "7033 g", - "volume": "12 L", - "price": "2 kUSD 500 USD", - "price_postapoc": "10 USD", - "to_hit": -3, - "material": [ "cotton", "faux_fur" ], - "symbol": "[", - "looks_like": "wolfsuit", - "color": "light_green", - "armor": [ - { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, - { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, - { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } - ], - "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } ], - "warmth": 50, - "material_thickness": 2, - "environmental_protection": 2, - "flags": [ "OUTER" ] - }, { "id": "flag_jumpsuit", "type": "ARMOR", @@ -844,33 +744,119 @@ "material_thickness": 0.2, "flags": [ "VARSIZE", "SKINTIGHT" ] }, - { - "id": "wolfsuit", - "type": "ARMOR", - "name": { "str": "wolf suit" }, - "description": "A full-body fursuit in the form of an anthropomorphic wolf. It is quite encumbering and has little storage but is very warm.", - "weight": "7033 g", - "volume": "12 L", - "price": "2 kUSD 500 USD", - "price_postapoc": "10 USD", - "to_hit": -3, - "material": [ "cotton", "faux_fur" ], - "symbol": "[", - "color": "light_gray", - "armor": [ - { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, - { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, - { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } - ], - "pocket_data": [ - { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 } - ], - "warmth": 50, - "material_thickness": 2, - "environmental_protection": 2, - "flags": [ "OUTER" ] +{ + "id": "fursuit", + "type": "ARMOR", + "name": { + "str": "fursuit" }, + "description": "A full-body fursuit in the form of an anthropomorphic animal. It is quite encumbering and has little storage but is very warm.", + "weight": "7033 g", + "volume": "12 L", + "price": "2 kUSD 500 USD", + "price_postapoc": "10 USD", + "to_hit": -3, + "material": [ + "cotton", + "faux_fur" + ], + "symbol": "[", + "color": "light_gray", + "armor": [ + { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, + { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, + { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } + ], + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 } + ], + "warmth": 50, + "material_thickness": 2, + "environmental_protection": 2, + "flags": [ + "OUTER" + ], + "variant_type": "generic", + "variants": [ + { + "id": "wolfsuit", + "name": { "str": "wolf fursuit" }, + "description": "A cartoonish full-body fursuit made to resemble an anthropomorphic wolf. It is quite encumbering and has little storage but is very warm.", + "weight": 35 + }, + { + "id": "dogsuit", + "name": { "str": "dog fursuit" }, + "description": " A fuzzy full-body fursuit made to resemble an anthropomorphic domestic canine of unknown breed. It is quite encumbering and has little storage but is very warm.", + "color": "brown", + "weight": 30 + }, + { + "id": "tigersuit", + "name": { "str": "tiger fursuit" }, + "description": "An intricately designed full-body fursuit made to resemble an anthropomorphic bengal tiger, you can't imagine how long it took for it's maker to sew all those stripes onto it. It is quite encumbering and has little storage but is very warm.", + "color": "light_red", + "weight": 15 + }, + { + "id": "felinesuit", + "name": { "str": "feline fursuit" }, + "description": "A fluffy full-body fursuit made to resemble an anthropomorphic feline of indistinguishable breed. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 30 + }, + { + "id": "ottersuit", + "name": { "str": "otter fursuit" }, + "description": "A dopey-looking full-body fursuit made to resemble an anthropomorphic otter. It is quite encumbering and has little storage but is very warm.", + "color": "light_red", + "weight": 15 + }, + { + "id": "beaversuit", + "name": { "str": "beaver fursuit" }, + "description": "A full-body fursuit made to resemble a nervous-looking anthropomorphic beaver. It is quite encumbering and has little storage but is very warm.", + "color": "brown", + "weight": 10 + }, + { + "id": "dragonsuit", + "name": { "str": "dragon fursuit" }, + "description": "A detailed full-body fursuit made to resemble a western dragon, complete with a set of small stubby wings on its back. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 20 + }, + { + "id": "lizardsuit", + "name": { "str": "lizard fursuit" }, + "description": "A sleek full-body fursuit made to resemble an anthropomorphic lizard. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 20 + }, + { + "id": "sharksuit", + "name": { "str": "shark fursuit" }, + "description": "A gnarly looking full-body costume in the form of an anthropomorphic bull shark. It is quite encumbering and has little storage but is very warm.", + "color": "light_blue", + "weight": 20 + }, + { + "id": "orcasuit", + "name": { "str": "orca fursuit" }, + "description": "A sleek looking full-body costume in the form of an anthropomorphic orca whale. It is quite encumbering and has little storage but is very warm.", + "color": "dark_gray", + "weight": 15 + }, + { + "id": "dinosuit", + "name": { "str": "dinosaur fursuit" }, + "description": "A full-body costume in the form of an anthropomorphic dinosaur. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 10 + } + ] +}, { "id": "wool_suit", "type": "ARMOR", diff --git a/data/json/monsterdrops/clothing_halloween.json b/data/json/monsterdrops/clothing_halloween.json index ed787a5b250a2..4c8ef0a99cd72 100644 --- a/data/json/monsterdrops/clothing_halloween.json +++ b/data/json/monsterdrops/clothing_halloween.json @@ -1594,11 +1594,7 @@ { "group": "socks_unisex", "damage": [ 1, 4 ] }, { "distribution": [ - { "item": "wolfsuit", "prob": 20, "damage": [ 1, 4 ] }, - { "item": "dragonsuit", "prob": 20, "damage": [ 1, 4 ] }, - { "item": "felinesuit", "prob": 20, "damage": [ 1, 4 ] }, - { "item": "dinosuit", "prob": 20, "damage": [ 1, 4 ] }, - { "item": "sharksuit", "prob": 20, "damage": [ 1, 4 ] } + { "item": "fursuit", "prob": 20, "damage": [ 1, 4 ] } ] }, { diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index 4872efa7ddb8c..49f3446479155 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -131,11 +131,7 @@ "id": "zombie_fursuits", "subtype": "distribution", "entries": [ - { "item": "wolfsuit", "prob": 50, "damage": [ 2, 3 ] }, - { "item": "dragonsuit", "prob": 50, "damage": [ 2, 3 ] }, - { "item": "felinesuit", "prob": 50, "damage": [ 2, 3 ] }, - { "item": "dinosuit", "prob": 50, "damage": [ 2, 3 ] }, - { "item": "sharksuit", "prob": 50, "damage": [ 2, 3 ] } + { "item": "fursuit", "prob": 50, "damage": [ 2, 3 ] } ] }, { diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json index f58655ffa976c..449600e13ced7 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json @@ -49,7 +49,7 @@ "entries": [ { "item": "boxer_shorts" }, { "item": "socks_wool" }, - { "item": "dinosuit" }, + { "item": "fursuit", "variant": "dinosuit" }, { "item": "cardboard_crown_loose" }, { "item": "boots_winter" }, { "item": "coat_winter" } diff --git a/data/json/starting_missions.json b/data/json/starting_missions.json index 59f877fa95ce5..3193ea48810c4 100644 --- a/data/json/starting_missions.json +++ b/data/json/starting_missions.json @@ -472,13 +472,9 @@ { "u_has_item": "jumpsuit_skeleton" }, { "u_has_item": "mummy_jumpsuit" }, { "u_has_item": "bodysuit_lycra" }, - { "u_has_item": "wolfsuit" }, - { "u_has_item": "dragonsuit" }, - { "u_has_item": "felinesuit" }, - { "u_has_item": "dinosuit" }, + { "u_has_item": "fursuit" }, { "u_has_item": "bondage_suit" }, { "u_has_item": "clown_suit" }, - { "u_has_item": "sharksuit" }, { "u_has_item": "jumpsuit_skeleton_zipped" }, { "u_has_item": "maid_dress" }, { "u_has_item": "mummy_dress" }, From 76ee05dc44c19dc4263a857d531ba3788781075a Mon Sep 17 00:00:00 2001 From: 7erracotta <89712754+7erracotta@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:43:15 -0400 Subject: [PATCH 02/10] Update data/json/items/armor/suits_clothes.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/armor/suits_clothes.json | 107 ----------------------- 1 file changed, 107 deletions(-) diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index ebc5b69310a1f..ccafcb5c29aea 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -750,113 +750,6 @@ "name": { "str": "fursuit" }, - "description": "A full-body fursuit in the form of an anthropomorphic animal. It is quite encumbering and has little storage but is very warm.", - "weight": "7033 g", - "volume": "12 L", - "price": "2 kUSD 500 USD", - "price_postapoc": "10 USD", - "to_hit": -3, - "material": [ - "cotton", - "faux_fur" - ], - "symbol": "[", - "color": "light_gray", - "armor": [ - { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, - { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, - { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } - ], - "pocket_data": [ - { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 } - ], - "warmth": 50, - "material_thickness": 2, - "environmental_protection": 2, - "flags": [ - "OUTER" - ], - "variant_type": "generic", - "variants": [ - { - "id": "wolfsuit", - "name": { "str": "wolf fursuit" }, - "description": "A cartoonish full-body fursuit made to resemble an anthropomorphic wolf. It is quite encumbering and has little storage but is very warm.", - "weight": 35 - }, - { - "id": "dogsuit", - "name": { "str": "dog fursuit" }, - "description": " A fuzzy full-body fursuit made to resemble an anthropomorphic domestic canine of unknown breed. It is quite encumbering and has little storage but is very warm.", - "color": "brown", - "weight": 30 - }, - { - "id": "tigersuit", - "name": { "str": "tiger fursuit" }, - "description": "An intricately designed full-body fursuit made to resemble an anthropomorphic bengal tiger, you can't imagine how long it took for it's maker to sew all those stripes onto it. It is quite encumbering and has little storage but is very warm.", - "color": "light_red", - "weight": 15 - }, - { - "id": "felinesuit", - "name": { "str": "feline fursuit" }, - "description": "A fluffy full-body fursuit made to resemble an anthropomorphic feline of indistinguishable breed. It is quite encumbering and has little storage but is very warm.", - "color": "light_green", - "weight": 30 - }, - { - "id": "ottersuit", - "name": { "str": "otter fursuit" }, - "description": "A dopey-looking full-body fursuit made to resemble an anthropomorphic otter. It is quite encumbering and has little storage but is very warm.", - "color": "light_red", - "weight": 15 - }, - { - "id": "beaversuit", - "name": { "str": "beaver fursuit" }, - "description": "A full-body fursuit made to resemble a nervous-looking anthropomorphic beaver. It is quite encumbering and has little storage but is very warm.", - "color": "brown", - "weight": 10 - }, - { - "id": "dragonsuit", - "name": { "str": "dragon fursuit" }, - "description": "A detailed full-body fursuit made to resemble a western dragon, complete with a set of small stubby wings on its back. It is quite encumbering and has little storage but is very warm.", - "color": "light_green", - "weight": 20 - }, - { - "id": "lizardsuit", - "name": { "str": "lizard fursuit" }, - "description": "A sleek full-body fursuit made to resemble an anthropomorphic lizard. It is quite encumbering and has little storage but is very warm.", - "color": "light_green", - "weight": 20 - }, - { - "id": "sharksuit", - "name": { "str": "shark fursuit" }, - "description": "A gnarly looking full-body costume in the form of an anthropomorphic bull shark. It is quite encumbering and has little storage but is very warm.", - "color": "light_blue", - "weight": 20 - }, - { - "id": "orcasuit", - "name": { "str": "orca fursuit" }, - "description": "A sleek looking full-body costume in the form of an anthropomorphic orca whale. It is quite encumbering and has little storage but is very warm.", - "color": "dark_gray", - "weight": 15 - }, - { - "id": "dinosuit", - "name": { "str": "dinosaur fursuit" }, - "description": "A full-body costume in the form of an anthropomorphic dinosaur. It is quite encumbering and has little storage but is very warm.", - "color": "light_green", - "weight": 10 - } - ] -}, { "id": "wool_suit", "type": "ARMOR", From 5d3f4ab816bbb2db0e4e74cceeac59872bdbe225 Mon Sep 17 00:00:00 2001 From: 7erracotta <89712754+7erracotta@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:43:25 -0400 Subject: [PATCH 03/10] Update data/json/items/armor/suits_clothes.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/armor/suits_clothes.json | 110 +++++++++++++++++++++-- 1 file changed, 105 insertions(+), 5 deletions(-) diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index ccafcb5c29aea..6ece5057bdb55 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -744,11 +744,111 @@ "material_thickness": 0.2, "flags": [ "VARSIZE", "SKINTIGHT" ] }, -{ - "id": "fursuit", - "type": "ARMOR", - "name": { - "str": "fursuit" + { + "id": "fursuit", + "type": "ARMOR", + "name": { "str": "fursuit" }, + "description": "A full-body fursuit in the form of an anthropomorphic animal. It is quite encumbering and has little storage but is very warm.", + "weight": "7033 g", + "volume": "12 L", + "price": "2 kUSD 500 USD", + "price_postapoc": "10 USD", + "to_hit": -3, + "material": [ "cotton", "faux_fur" ], + "symbol": "[", + "color": "light_gray", + "armor": [ + { "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 26, 30 ] }, + { "covers": [ "mouth", "eyes" ], "coverage": 95, "encumbrance": [ 26, 26 ] }, + { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 26, 26 ] } + ], + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80 } + ], + "warmth": 50, + "material_thickness": 2, + "environmental_protection": 2, + "flags": [ "OUTER" ], + "variant_type": "generic", + "variants": [ + { + "id": "wolfsuit", + "name": { "str": "wolf fursuit" }, + "description": "A cartoonish full-body fursuit made to resemble an anthropomorphic wolf. It is quite encumbering and has little storage but is very warm.", + "weight": 35 + }, + { + "id": "dogsuit", + "name": { "str": "dog fursuit" }, + "description": " A fuzzy full-body fursuit made to resemble an anthropomorphic domestic canine of unknown breed. It is quite encumbering and has little storage but is very warm.", + "color": "brown", + "weight": 30 + }, + { + "id": "tigersuit", + "name": { "str": "tiger fursuit" }, + "description": "An intricately designed full-body fursuit made to resemble an anthropomorphic bengal tiger, you can't imagine how long it took for it's maker to sew all those stripes onto it. It is quite encumbering and has little storage but is very warm.", + "color": "light_red", + "weight": 15 + }, + { + "id": "felinesuit", + "name": { "str": "feline fursuit" }, + "description": "A fluffy full-body fursuit made to resemble an anthropomorphic feline of indistinguishable breed. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 30 + }, + { + "id": "ottersuit", + "name": { "str": "otter fursuit" }, + "description": "A dopey-looking full-body fursuit made to resemble an anthropomorphic otter. It is quite encumbering and has little storage but is very warm.", + "color": "light_red", + "weight": 15 + }, + { + "id": "beaversuit", + "name": { "str": "beaver fursuit" }, + "description": "A full-body fursuit made to resemble a nervous-looking anthropomorphic beaver. It is quite encumbering and has little storage but is very warm.", + "color": "brown", + "weight": 10 + }, + { + "id": "dragonsuit", + "name": { "str": "dragon fursuit" }, + "description": "A detailed full-body fursuit made to resemble a western dragon, complete with a set of small stubby wings on its back. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 20 + }, + { + "id": "lizardsuit", + "name": { "str": "lizard fursuit" }, + "description": "A sleek full-body fursuit made to resemble an anthropomorphic lizard. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 20 + }, + { + "id": "sharksuit", + "name": { "str": "shark fursuit" }, + "description": "A gnarly looking full-body costume in the form of an anthropomorphic bull shark. It is quite encumbering and has little storage but is very warm.", + "color": "light_blue", + "weight": 20 + }, + { + "id": "orcasuit", + "name": { "str": "orca fursuit" }, + "description": "A sleek looking full-body costume in the form of an anthropomorphic orca whale. It is quite encumbering and has little storage but is very warm.", + "color": "dark_gray", + "weight": 15 + }, + { + "id": "dinosuit", + "name": { "str": "dinosaur fursuit" }, + "description": "A full-body costume in the form of an anthropomorphic dinosaur. It is quite encumbering and has little storage but is very warm.", + "color": "light_green", + "weight": 10 + } + ] }, { "id": "wool_suit", From 8c6a6e5402f949ad7550abb35aeaa42651807632 Mon Sep 17 00:00:00 2001 From: 7erracotta <89712754+7erracotta@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:46:44 -0400 Subject: [PATCH 04/10] Update data/json/itemgroups/food_service.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/itemgroups/food_service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index a3edf450ba382..e485c13b69a8f 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -369,7 +369,7 @@ { "item": "detergent", "prob": 15, "charges": [ 1, 20 ] }, { "item": "bleach", "prob": 15, "charges": [ 1, -1 ] }, [ "broom", 13 ], - { "item": "fursuit","variant":"dinosuit", "prob": 7 }, + { "item": "fursuit", "variant": "dinosuit", "prob": 7 }, [ "hat_ball", 19 ], [ "jacket_light", 15 ], [ "mbag", 10 ], From 1068adc6a0fd0042ecbbeda78001cfa13e75510f Mon Sep 17 00:00:00 2001 From: 7erracotta <89712754+7erracotta@users.noreply.github.com> Date: Sat, 17 Aug 2024 11:17:10 -0400 Subject: [PATCH 05/10] Update migration_items.json --- .../migration_items.json | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index 1cf8670de999d..19b0724f3e4ef 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -4,6 +4,36 @@ "type": "MIGRATION", "replace": "combat_exoskeleton_light_salvaged" }, + { + "type": "MIGRATION", + "id": "dinosuit", + "replace": "fursuit", + "variant": "dinosuit" + }, + { + "type": "MIGRATION", + "id": "wolfsuit", + "replace": "fursuit", + "variant": "wolfsuit" + }, + { + "type": "MIGRATION", + "id": "felinesuit", + "replace": "fursuit", + "variant": "felinesuit" + }, + { + "type": "MIGRATION", + "id": "dragonsuit", + "replace": "fursuit", + "variant": "dragonsuit" + }, + { + "type": "MIGRATION", + "id": "sharksuit", + "replace": "fursuit", + "variant": "sharksuit" + }, { "id": "depowered_helmet", "type": "MIGRATION", @@ -1826,4 +1856,4 @@ "replace": "small_squeeze_tube", "contents": [ { "id": "super_glue", "count": 40 } ] } -] +] \ No newline at end of file From c6d13822e33e0ef07b740bd306347eafb70fb4e3 Mon Sep 17 00:00:00 2001 From: 7erracotta <89712754+7erracotta@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:58:01 -0400 Subject: [PATCH 06/10] lints some changed files and readds missing zentai + clown suit --- data/json/itemgroups/Clothing_Gear/clothing.json | 1 + data/json/itemgroups/Clothing_Gear/costumes.json | 1 + data/json/monsterdrops/clothing_halloween.json | 6 +----- data/json/monsterdrops/zombie.json | 6 ++---- data/json/obsoletion_and_migration_0.I/migration_items.json | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 62b24afc2c209..a8ddbf40efce8 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -1625,6 +1625,7 @@ [ "firecracker_pack", 5 ], [ "firecracker", 5 ], [ "fursuit", 5 ], + [ "zentai", 5 ], { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] }, { "item": "condom", "prob": 30, "count": [ 1, 5 ] }, [ "snuggie", 5 ], diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json index f485cc45e0a1f..d14d34f4c66f0 100644 --- a/data/json/itemgroups/Clothing_Gear/costumes.json +++ b/data/json/itemgroups/Clothing_Gear/costumes.json @@ -335,6 +335,7 @@ { "item": "suit", "prob": 10 }, { "item": "tux", "prob": 10 }, { "item": "fursuit", "prob": 15 }, + { "item": "clown_suit", "prob": 10 }, { "item": "beekeeping_suit", "prob": 5 }, { "item": "zentai", "prob": 5 } ] diff --git a/data/json/monsterdrops/clothing_halloween.json b/data/json/monsterdrops/clothing_halloween.json index 4c8ef0a99cd72..a5b0f57e32616 100644 --- a/data/json/monsterdrops/clothing_halloween.json +++ b/data/json/monsterdrops/clothing_halloween.json @@ -1592,11 +1592,7 @@ { "group": "shirts_unisex", "prob": 65, "damage": [ 1, 4 ] }, { "group": "pants_unisex", "damage": [ 1, 4 ] }, { "group": "socks_unisex", "damage": [ 1, 4 ] }, - { - "distribution": [ - { "item": "fursuit", "prob": 20, "damage": [ 1, 4 ] } - ] - }, + { "distribution": [ { "item": "fursuit", "prob": 20, "damage": [ 1, 4 ] } ] }, { "distribution": [ { "item": "flip_flops", "prob": 35, "damage": [ 1, 4 ] }, diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index 49f3446479155..e0e5e7db2010e 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -130,9 +130,7 @@ "type": "item_group", "id": "zombie_fursuits", "subtype": "distribution", - "entries": [ - { "item": "fursuit", "prob": 50, "damage": [ 2, 3 ] } - ] + "entries": [ { "item": "fursuit", "prob": 50, "damage": [ 2, 3 ] } ] }, { "type": "item_group", @@ -294,4 +292,4 @@ { "item": "stomach_large", "prob": 80, "damage": [ 2, 3 ] } ] } -] +] \ No newline at end of file diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index 19b0724f3e4ef..1755612838ed5 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -1856,4 +1856,4 @@ "replace": "small_squeeze_tube", "contents": [ { "id": "super_glue", "count": 40 } ] } -] \ No newline at end of file +] From 27549d92c4911dff782fdabd7219d7e9f2429791 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 29 Sep 2024 01:15:37 -0500 Subject: [PATCH 07/10] Update data/json/items/armor/suits_clothes.json Co-authored-by: Anton Burmistrov --- data/json/items/armor/suits_clothes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index 6ece5057bdb55..177de7969b482 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -809,7 +809,7 @@ { "id": "beaversuit", "name": { "str": "beaver fursuit" }, - "description": "A full-body fursuit made to resemble a nervous-looking anthropomorphic beaver. It is quite encumbering and has little storage but is very warm.", + "description": "A full-body fursuit made to resemble a nervous-looking anthropomorphic beaver. It is quite encumbering and has little storage but is very warm.", "color": "brown", "weight": 10 }, From 2a33a5d1dc7eb78daf6c561e9c34fbc3f5d98db2 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:58:31 -0500 Subject: [PATCH 08/10] Update data/json/monsterdrops/zombie.json --- data/json/monsterdrops/zombie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index e0e5e7db2010e..6c684df3d9f90 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -292,4 +292,4 @@ { "item": "stomach_large", "prob": 80, "damage": [ 2, 3 ] } ] } -] \ No newline at end of file +] From e070f34cbfedaf1270f5d8a35dcc8c23b4acd11d Mon Sep 17 00:00:00 2001 From: Anton Burmistrov Date: Thu, 14 Nov 2024 13:19:03 +0400 Subject: [PATCH 09/10] Update data/json/itemgroups/Locations_MapExtras/mall_item_groups.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/itemgroups/Locations_MapExtras/mall_item_groups.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index 333b3e96e9e8d..e2730953e27a5 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -98,7 +98,6 @@ [ "cowboy_hat", 25 ], { "item": "mp3", "prob": 40, "charges": 100 }, [ "fursuit", 5 ], - { "item": "mp3", "prob": 20, "charges": 100 }, [ "wolfsuit", 5 ], [ "dinosuit", 5 ], From 6c696abbf5915076fb2832bbcac3e53bec6abafc Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 26 Nov 2024 01:56:58 -0600 Subject: [PATCH 10/10] Update data/json/itemgroups/Locations_MapExtras/mall_item_groups.json --- data/json/itemgroups/Locations_MapExtras/mall_item_groups.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index e2730953e27a5..768fcf2a4070f 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -96,7 +96,6 @@ [ "folded_bicycle", 5 ], [ "sunglasses", 25 ], [ "cowboy_hat", 25 ], - { "item": "mp3", "prob": 40, "charges": 100 }, [ "fursuit", 5 ], { "item": "mp3", "prob": 20, "charges": 100 }, [ "wolfsuit", 5 ],