chore: Partial clear of migrations and obsoletions (#5959)

* Holy shit That was too much * BLOOD FOR THE BLOOD MACHINE * style(autofix.ci): automated formatting * more fixes * style(autofix.ci): automated formatting * Update head.json --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Jan 22, 2025 · 4746024 · 4746024
1 parent 613aa54
commit 4746024
Show file tree

Hide file tree

Showing 14 changed files with 315 additions and 3,922 deletions.
diff --git a/data/json/itemgroups/SUS/clothes_store.json b/data/json/itemgroups/SUS/clothes_store.json
@@ -79,21 +79,6 @@
       { "item": "thread", "count": [ 2, 7 ], "prob": 75 }
     ]
   },
-  {
-    "id": "SUS_tailoring_fasteners",
-    "type": "item_group",
-    "//": "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 a container of fasteners for making clothing.",
-    "subtype": "collection",
-    "entries": [
-      { "item": "button_plastic", "count": [ 1, 5 ], "prob": 75 },
-      { "item": "button_steel", "count": [ 1, 5 ], "prob": 75 },
-      { "item": "button_wood", "count": [ 1, 5 ], "prob": 75 },
-      { "item": "snapfastener_steel", "count": [ 1, 5 ], "prob": 75 },
-      { "item": "zipper_long_plastic", "count": [ 1, 8 ], "prob": 75 },
-      { "item": "zipper_short_plastic", "count": [ 1, 8 ], "prob": 75 }
-    ]
-  },
   {
     "id": "SUS_tailoring_materials",
     "type": "item_group",

diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
@@ -149,7 +149,7 @@
       { "item": "copper", "charges": [ 800, 3200 ], "prob": 70 },
       { "item": "lead", "charges": [ 800, 3200 ], "prob": 10 },
       { "item": "tin", "charges": [ 800, 3200 ], "prob": 10 },
-      { "item": "silver", "charges": [ 400, 1600 ], "prob": 5 },
+      { "item": "silver_small", "charges": [ 400, 1600 ], "prob": 5 },
       { "item": "gold_small", "charges": [ 400, 1600 ], "prob": 5 }
     ]
   },

diff --git a/data/json/mapgen/mall/mall_ground.json b/data/json/mapgen/mall/mall_ground.json
@@ -929,7 +929,6 @@
         "K": { "item": "neckties", "chance": 30, "repeat": [ 1, 3 ] },
         "T": { "item": "wedding_suits", "chance": 40, "repeat": [ 1, 2 ] },
         "Ʌ": { "item": "SUS_tailoring_materials", "chance": 30, "repeat": [ 1, 2 ] },
-        "~": { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 1, 2 ] },
         "N": { "item": "SUS_tailoring_tool_drawer", "chance": 80, "repeat": [ 1, 2 ] },
         "Ŧ": { "item": "camping", "chance": 20, "repeat": [ 1, 2 ] },
         "U": { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] },
@@ -1377,7 +1376,6 @@
         ":": { "item": "bed", "chance": 60, "repeat": [ 1, 2 ] },
         "Ʉ": { "item": "bed", "chance": 60, "repeat": [ 1, 2 ] },
         "Δ": [ { "item": "SUS_tailoring_materials", "chance": 30 }, { "item": "SUS_fur_tailoring_materials", "chance": 10 } ],
-        "M": { "item": "SUS_tailoring_fasteners", "chance": 30 },
         "±": [ { "item": "SUS_tailoring_tool_drawer", "chance": 30 }, { "item": "SUS_tailoring_bookcase", "chance": 10 } ]
       },
       "place_items": [

diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json
@@ -109,11 +109,9 @@
       { "item": "223", "prob": 15 },
       { "item": "308", "prob": 10 },
       { "item": "3006", "prob": 10 },
-      { "item": "reloaded_9mm", "prob": 30 },
       { "item": "9mm", "prob": 25 },
       { "item": "9mmfmj", "prob": 5 },
       { "item": "45_acp", "prob": 10 },
-      { "item": "reloaded_45_acp", "prob": 25 },
       { "item": "45_jhp", "prob": 1 },
       { "item": "rifle_9mm", "prob": 20 },
       { "item": "rifle_22", "prob": 20 },