Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

groups all six previous fursuits in game into one variant-ized item, with some added extras. #75755

Merged
merged 12 commits into from
Dec 6, 2024
Merged
12 changes: 2 additions & 10 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -1624,11 +1624,7 @@
{ "group": "superglue", "prob": 20 },
[ "firecracker_pack", 5 ],
[ "firecracker", 5 ],
[ "wolfsuit", 3 ],
[ "dinosuit", 2 ],
[ "sharksuit", 2 ],
[ "felinesuit", 3 ],
[ "dragonsuit", 2 ],
[ "fursuit", 5 ],
[ "zentai", 5 ],
7erracotta marked this conversation as resolved.
Show resolved Hide resolved
{ "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
{ "item": "condom", "prob": 30, "count": [ 1, 5 ] },
Expand Down Expand Up @@ -4175,16 +4171,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 },
Expand Down
7 changes: 1 addition & 6 deletions data/json/itemgroups/Clothing_Gear/costumes.json
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,8 @@
{ "item": "bodysuit_lycra", "prob": 25 },
{ "item": "suit", "prob": 10 },
{ "item": "tux", "prob": 10 },
{ "item": "wolfsuit", "prob": 10 },
{ "item": "fursuit", "prob": 15 },
{ "item": "clown_suit", "prob": 10 },
{ "item": "dragonsuit", "prob": 10 },
{ "item": "felinesuit", "prob": 10 },
{ "item": "bondage_suit", "prob": 15 },
7erracotta marked this conversation as resolved.
Show resolved Hide resolved
{ "item": "dinosuit", "prob": 10 },
{ "item": "sharksuit", "prob": 10 },
{ "item": "beekeeping_suit", "prob": 5 },
{ "item": "zentai", "prob": 5 }
]
Expand Down
3 changes: 1 addition & 2 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,7 @@
{ "item": "sunglasses", "prob": 25 },
{ "item": "cowboy_hat", "prob": 25 },
{ "item": "mp3", "prob": 35, "charges": [ 0, 100 ] },
7erracotta marked this conversation as resolved.
Show resolved Hide resolved
{ "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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@
[ "sunglasses", 25 ],
[ "cowboy_hat", 25 ],
{ "item": "mp3", "prob": 40, "charges": 100 },
7erracotta marked this conversation as resolved.
Show resolved Hide resolved
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
[ "wolfsuit", 5 ],
[ "dinosuit", 5 ],
[ "fursuit", 5 ],
{ "item": "gum", "prob": 10, "count": [ 1, 10 ] },
[ "shuttlecock", 10 ],
[ "baseball", 40 ],
Expand Down
3 changes: 1 addition & 2 deletions data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
187 changes: 83 additions & 104 deletions data/json/items/armor/suits_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -845,10 +745,10 @@
"flags": [ "VARSIZE", "SKINTIGHT" ]
},
{
"id": "wolfsuit",
"id": "fursuit",
"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.",
"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",
Expand All @@ -869,7 +769,86 @@
"warmth": 50,
"material_thickness": 2,
"environmental_protection": 2,
"flags": [ "OUTER" ]
"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",
Expand Down
10 changes: 1 addition & 9 deletions data/json/monsterdrops/clothing_halloween.json
Original file line number Diff line number Diff line change
Expand Up @@ -1592,15 +1592,7 @@
{ "group": "shirts_unisex", "prob": 65, "damage": [ 1, 4 ] },
{ "group": "pants_unisex", "damage": [ 1, 4 ] },
{ "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 ] }
]
},
{ "distribution": [ { "item": "fursuit", "prob": 20, "damage": [ 1, 4 ] } ] },
{
"distribution": [
{ "item": "flip_flops", "prob": 35, "damage": [ 1, 4 ] },
Expand Down
10 changes: 2 additions & 8 deletions data/json/monsterdrops/zombie.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,7 @@
"type": "item_group",
"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 ] }
]
"entries": [ { "item": "fursuit", "prob": 50, "damage": [ 2, 3 ] } ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -298,4 +292,4 @@
{ "item": "stomach_large", "prob": 80, "damage": [ 2, 3 ] }
]
}
]
]
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
30 changes: 30 additions & 0 deletions data/json/obsoletion_and_migration_0.I/migration_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading