Merge branch 'cataclysmbnteam:main' into implement_global_unique

cataclysmbnteam · Jan 7, 2025 · 7cdc171 · 7cdc171
2 parents b5f7bc4 + dfe8ee3
commit 7cdc171
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 54 deletions.
diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json
@@ -57,7 +57,6 @@
     "price_postapoc": "15 USD",
     "//": "Mono-material as it likely would need to be taken apart to repair, plus the material of the vest is less of a factor on resistances.",
     "material": [ "soil" ],
-    "coverage": 85,
     "encumbrance": 45,
     "material_thickness": 6,
     "extend": { "flags": [ "OVERSIZE", "FRAGILE" ] },

diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
@@ -440,7 +440,6 @@
     "description": "A cuirass made from large pieces of carved bone, laced together like lamellar armor.  Tough but stiff, and a bit brittle.",
     "material": [ "bone_heavy" ],
     "color": "white",
-    "encumbrance": 12,
     "warmth": 12,
     "environmental_protection": 1,
     "valid_mods": [  ],

diff --git a/data/mods/CRT_EXPANSION/items/crt_gunmods.json b/data/mods/CRT_EXPANSION/items/crt_gunmods.json
@@ -38,7 +38,7 @@
     "id": "bthk_stock",
     "type": "GUNMOD",
     "name": "butt hook stock",
-    "description": ", A military-grade stock which folds reducing the guns volume.  The weight and the pivoting hook which latches onto your forearm allows for greater stability.  ",
+    "description": "A military-grade stock which folds reducing the guns volume.  The weight and the pivoting hook which latches onto your forearm allows for greater stability.",
     "weight": "500 g",
     "volume": "125 ml",
     "integral_volume": "0 ml",
@@ -66,7 +66,7 @@
     "copy-from": "beam_scatterer",
     "type": "GUNMOD",
     "name": { "str": "diffracting lens", "str_pl": "diffracting lenses" },
-    "description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams.  This slightly increases point-blank damage and makes it difficult to not hit, but reduces range",
+    "description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams.  This slightly increases point-blank damage and makes it difficult to not hit, but reduces range.",
     "range_modifier": -7,
     "damage_modifier": { "damage_type": "stab", "amount": 2 },
     "ammo_effects": [ "SHOT" ],

diff --git a/data/mods/Item_Category_Overhaul/categories.json b/data/mods/Item_Category_Overhaul/categories.json
@@ -1,265 +1,290 @@
 [
+  {
+    "id": "guns",
+    "type": "ITEM_CATEGORY",
+    "name": { "str": "GUNS" },
+    "zone": "LOOT_GUNS",
+    "sort_rank": -42
+  },
+  {
+    "id": "magazines",
+    "type": "ITEM_CATEGORY",
+    "name": { "str": "MAGAZINES" },
+    "zone": "LOOT_MAGAZINES",
+    "sort_rank": -39
+  },
+  {
+    "id": "ammo",
+    "type": "ITEM_CATEGORY",
+    "name": { "str": "AMMO" },
+    "zone": "LOOT_AMMO",
+    "sort_rank": -36
+  },
+  {
+    "id": "weapons",
+    "type": "ITEM_CATEGORY",
+    "name": { "str": "WEAPONS" },
+    "zone": "LOOT_WEAPONS",
+    "sort_rank": -33
+  },
   {
     "id": "tools",
     "type": "ITEM_CATEGORY",
     "name": { "str": "OTHER TOOLS" },
     "zone": "LOOT_TOOLS",
-    "sort_rank": -19
+    "sort_rank": -30
   },
   {
     "id": "tools_entry",
     "type": "ITEM_CATEGORY",
     "name": { "str": "ENTRY TOOLS" },
     "zone": "LOOT_ENTRY_TOOLS",
-    "sort_rank": -18
+    "sort_rank": -27
   },
   {
     "id": "tools_workshop",
     "type": "ITEM_CATEGORY",
     "name": { "str": "WORKSHOP TOOLS" },
     "zone": "LOOT_WORKSHOP_TOOLS",
-    "sort_rank": -17
+    "sort_rank": -24
   },
   {
     "id": "tools_cooking",
     "type": "ITEM_CATEGORY",
     "name": { "str": "COOKING TOOLS" },
     "zone": "LOOT_COOKING_TOOLS",
-    "sort_rank": -16
+    "sort_rank": -21
   },
   {
     "id": "tools_chemistry",
     "type": "ITEM_CATEGORY",
     "name": { "str": "CHEMISTRY TOOLS" },
     "zone": "LOOT_CHEMISTRY_TOOLS",
-    "sort_rank": -15
+    "sort_rank": -18
   },
   {
     "id": "tools_farming",
     "type": "ITEM_CATEGORY",
     "name": { "str": "FARM TOOLS" },
     "zone": "LOOT_FARM_TOOLS",
-    "sort_rank": -14
+    "sort_rank": -15
   },
   {
     "id": "deployables",
     "type": "ITEM_CATEGORY",
     "name": { "str": "DEPLOYABLES" },
     "zone": "LOOT_DEPLOYABLES",
-    "sort_rank": -13
+    "sort_rank": -12
   },
   {
     "id": "electronics",
     "type": "ITEM_CATEGORY",
     "name": { "str": "ELECTRONICS" },
     "zone": "LOOT_ELECTRONICS",
-    "sort_rank": -12
+    "sort_rank": -9
   },
   {
     "id": "clothing",
     "type": "ITEM_CATEGORY",
     "name": { "str": "CLOTHING" },
     "priority_zones": [ { "id": "LOOT_FCLOTHING", "filthy": true } ],
     "zone": "LOOT_CLOTHING",
-    "sort_rank": -11
+    "sort_rank": -6
   },
   {
     "id": "food",
     "type": "ITEM_CATEGORY",
     "name": { "str": "FOOD" },
     "//": "zone is hardcoded",
-    "sort_rank": -10
+    "sort_rank": -3
   },
   {
     "id": "cooking_ingredients",
     "type": "ITEM_CATEGORY",
     "name": { "str": "COOKING INGREDIENTS" },
     "zone": "LOOT_COOKING_INGREDIENTS",
-    "sort_rank": -9
+    "sort_rank": 1
   },
   {
     "id": "drugs",
     "type": "ITEM_CATEGORY",
     "name": { "str": "DRUGS" },
     "zone": "LOOT_DRUGS",
-    "sort_rank": -8
+    "sort_rank": 4
   },
   {
     "id": "books",
     "type": "ITEM_CATEGORY",
     "name": { "str": "BOOKS" },
     "zone": "LOOT_BOOKS",
-    "sort_rank": -7
+    "sort_rank": 7
   },
   {
     "id": "spellbooks",
     "type": "ITEM_CATEGORY",
     "name": { "str": "SPELLBOOKS" },
     "zone": "LOOT_SPELLBOOKS",
-    "sort_rank": -6
+    "sort_rank": 10
   },
   {
     "id": "mods",
     "type": "ITEM_CATEGORY",
     "name": { "str": "MODS" },
     "zone": "LOOT_MODS",
-    "sort_rank": -5
+    "sort_rank": 13
   },
   {
     "id": "mutagen",
     "type": "ITEM_CATEGORY",
     "name": { "str": "MUTAGENS" },
     "zone": "LOOT_MUTAGENS",
-    "sort_rank": -4
+    "sort_rank": 16
   },
   {
     "id": "bionics",
     "type": "ITEM_CATEGORY",
     "name": { "str": "BIONICS" },
     "zone": "LOOT_BIONICS",
-    "sort_rank": -3
+    "sort_rank": 19
   },
   {
     "id": "veh_parts",
     "type": "ITEM_CATEGORY",
     "name": { "str": "VEHICLE PARTS" },
     "zone": "LOOT_VEHICLE_PARTS",
-    "sort_rank": -2
+    "sort_rank": 22
   },
   {
     "id": "other",
     "type": "ITEM_CATEGORY",
     "name": { "str": "OTHER" },
     "zone": "LOOT_OTHER",
-    "sort_rank": -1
+    "sort_rank": 25
   },
   {
     "id": "fuel",
     "type": "ITEM_CATEGORY",
     "name": { "str": "FUEL" },
     "zone": "LOOT_FUEL",
-    "sort_rank": 1
+    "sort_rank": 28
   },
   {
     "id": "seeds",
     "type": "ITEM_CATEGORY",
     "name": { "str": "SEEDS" },
     "zone": "LOOT_SEEDS",
-    "sort_rank": 2
+    "sort_rank": 31
   },
   {
     "id": "chems",
     "type": "ITEM_CATEGORY",
     "name": { "str": "CHEMICAL STUFF" },
     "zone": "LOOT_CHEMICAL",
-    "sort_rank": 5
+    "sort_rank": 34
   },
   {
     "id": "battery",
     "type": "ITEM_CATEGORY",
     "name": { "str": "BATTERIES" },
     "zone": "LOOT_BATTERY",
-    "sort_rank": 6
+    "sort_rank": 37
   },
   {
     "id": "spare_parts",
     "type": "ITEM_CATEGORY",
     "name": { "str": "SPARE PARTS" },
     "zone": "LOOT_SPARE_PARTS",
-    "sort_rank": 8
+    "sort_rank": 40
   },
   {
     "id": "scrap_metal",
     "type": "ITEM_CATEGORY",
     "name": { "str": "METAL SCRAP" },
     "zone": "LOOT_SCRAP_METAL",
-    "sort_rank": 9
+    "sort_rank": 43
   },
   {
     "id": "scrap_electronics",
     "type": "ITEM_CATEGORY",
     "name": { "str": "ELECTRONIC SCRAP" },
     "zone": "LOOT_SCRAP_ELECTRONICS",
-    "sort_rank": 10
+    "sort_rank": 46
   },
   {
     "id": "scrap_fabric",
     "type": "ITEM_CATEGORY",
     "name": { "str": "FABRICS" },
     "zone": "LOOT_SCRAP_FABRIC",
-    "sort_rank": 11
+    "sort_rank": 49
   },
   {
     "id": "scrap_wood",
     "type": "ITEM_CATEGORY",
     "name": { "str": "WOOD SCRAP" },
     "zone": "LOOT_SCRAP_WOOD",
-    "sort_rank": 12
+    "sort_rank": 52
   },
   {
     "id": "scrap_plastic",
     "type": "ITEM_CATEGORY",
     "name": { "str": "PLASTIC SCRAP" },
     "zone": "LOOT_SCRAP_PLASTIC",
-    "sort_rank": 13
+    "sort_rank": 55
   },
   {
     "id": "scrap_ceramics",
     "type": "ITEM_CATEGORY",
     "name": { "str": "CERAMIC SCRAP" },
     "zone": "LOOT_SCRAP_CERAMICS",
-    "sort_rank": 14
+    "sort_rank": 58
   },
   {
     "id": "scrap_glass",
     "type": "ITEM_CATEGORY",
     "name": { "str": "GLASS SCRAP" },
     "zone": "LOOT_SCRAP_GLASS",
-    "sort_rank": 15
+    "sort_rank": 61
   },
   {
     "id": "valuables",
     "type": "ITEM_CATEGORY",
     "name": { "str": "VALUABLES" },
     "zone": "LOOT_VALUABLES",
-    "sort_rank": 16
+    "sort_rank": 64
   },
   {
     "id": "rocks",
     "type": "ITEM_CATEGORY",
     "name": { "str": "ROCKS" },
     "zone": "LOOT_ROCKS",
-    "sort_rank": 17
+    "sort_rank": 67
   },
   {
     "id": "soil",
     "type": "ITEM_CATEGORY",
     "name": { "str": "SOIL" },
     "zone": "LOOT_SOIL",
-    "sort_rank": 18
+    "sort_rank": 70
   },
   {
     "id": "container",
     "type": "ITEM_CATEGORY",
     "name": { "str": "CONTAINERS" },
     "zone": "LOOT_CONTAINERS",
-    "//": "Please don't touch the sort rank, I did this so these are always on bottom.",
-    "sort_rank": 48
+    "sort_rank": 73
   },
   {
     "id": "artifacts",
     "type": "ITEM_CATEGORY",
     "name": { "str": "ARTIFACTS" },
     "zone": "LOOT_ARTIFACTS",
-    "//": "Please don't touch the sort rank, I did this so these are always on bottom.",
-    "sort_rank": 49
+    "sort_rank": 76
   },
   {
     "id": "maps",
     "type": "ITEM_CATEGORY",
     "name": { "str": "MAPS" },
     "zone": "LOOT_MAP",
-    "//": "Mods can inject themselves before containers maps and artifacts, 19 through 47.",
-    "sort_rank": 50
+    "sort_rank": 80
   }
 ]