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] 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" },