Merge pull request CleverRaven#75755 from 7erracotta/fursuitvariants

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

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -1610,11 +1610,7 @@
       { "group": "superglue", "prob": 20 },
       [ "firecracker_pack", 5 ],
       [ "firecracker", 5 ],
-      [ "wolfsuit", 3 ],
-      [ "dinosuit", 2 ],
-      [ "sharksuit", 2 ],
-      [ "felinesuit", 3 ],
-      [ "dragonsuit", 2 ],
+      [ "fursuit", 5 ],
       [ "zentai", 5 ],
       { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "condom", "prob": 30, "count": [ 1, 5 ] },
@@ -4161,16 +4157,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": "wool_suit_devil", "prob": 15 },
       { "item": "unitard", "prob": 60 },

data/json/itemgroups/Clothing_Gear/costumes.json

@@ -342,7 +342,7 @@
       { "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 },

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1972,8 +1972,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 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -895,6 +895,8 @@
       { "item": "folded_bicycle", "prob": 3 },
       { "item": "sunglasses", "prob": 25 },
       { "item": "cowboy_hat", "prob": 25 },
+      { "item": "mp3", "prob": 35, "charges": [ 0, 100 ] },
+      { "item": "fursuit", "prob": 5 },
       { "item": "mp3", "prob": 20, "charges": [ 0, 100 ] },
       { "item": "wolfsuit", "prob": 5 },
       { "item": "dinosuit", "prob": 5 },

data/json/itemgroups/Locations_MapExtras/mall_item_groups.json

@@ -96,6 +96,7 @@
       [ "folded_bicycle", 5 ],
       [ "sunglasses", 25 ],
       [ "cowboy_hat", 25 ],
+      [ "fursuit", 5 ],
       { "item": "mp3", "prob": 20, "charges": 100 },
       [ "wolfsuit", 5 ],
       [ "dinosuit", 5 ],

data/json/itemgroups/collections_domestic.json

@@ -1163,8 +1163,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 },

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

data/json/items/armor/suits_clothes.json

@@ -834,10 +834,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",
@@ -857,7 +857,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",

data/json/monsterdrops/clothing_halloween.json

@@ -1629,15 +1629,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 ] },

data/json/monsterdrops/zombie.json

@@ -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",

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

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

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