[DDotD] Playtest fixes

CleverRaven · Mar 12, 2022 · c16f60b · c16f60b
1 parent 9771430
commit c16f60b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json
@@ -171,8 +171,8 @@
       "hk_g80",
       "hk_mp5_semi_pistol",
       "hk_mp7",
-      "hk_46mag",
-      "hk_46bigmag",
+      "hk46mag",
+      "hk46bigmag",
       "hm12",
       "huge_atomic_battery_cell",
       "iv_mutagen",
@@ -202,16 +202,16 @@
       "kp3at",
       "kp3atmag",
       "kpf9",
-      "kpf9_mag",
-      "kpf9_mag_8",
+      "kpf9mag",
+      "kpf9mag_8rd",
       "ksg",
       "ksg-25",
       "ksub2000",
       "laser_rifle",
       "leg",
       "light_atomic_battery_cell",
       "light_minus_atomic_battery_cell",
-      "m110_a1",
+      "m110a1",
       "m14ebr",
       "m2010",
       "m2010mag",
@@ -251,7 +251,7 @@
       "p220_10",
       "p220_10_mag",
       "p320_357sig",
-      "p320_13rd_357sig",
+      "p320mag_13rd_357sig",
       "pamd68",
       "exodiiBRmag",
       "pamd68mountable",
@@ -276,7 +276,7 @@
       "px4_40",
       "px4_40mag",
       "raging_judge",
-      "454_speedloader_6",
+      "454_speedloader6",
       "razorclaw_roe",
       "rebar_rail",
       "recipe_caseless",

diff --git a/data/mods/classic_zombies/items/electronics.json b/data/mods/classic_zombies/items/electronics.json
@@ -1,8 +1,9 @@
 [
   {
+    "type": "GENERIC",
     "id": "cell_phone",
-    "type": "TOOL",
     "name": { "str": "cellphone" },
+    "copy-from": "cell_phone",
     "description": "A means of mobile communication, powered by removable batteries. With the networks gone, it's only good for parts.",
     "weight": "226 g",
     "volume": "100 ml",
@@ -11,13 +12,10 @@
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
     "color": "light_gray",
-    "flags": [ "WATER_BREAK" ],
     "pocket_data": [
       {
-        "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
-        "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ]
       }
     ]
   }

diff --git a/data/mods/classic_zombies/items/guns.json b/data/mods/classic_zombies/items/guns.json
@@ -1,25 +1,25 @@
 [
   {
+    "type": "GUN",
     "//": "The C7A1 is semi or full-auto with a 20 in. barrel, which it shares with the M16A3 it overrides.",
     "id": "c7a1",
     "copy-from": "m16_auto_rifle",
-    "type": "GUN",
     "name": { "str": "C7A1" },
     "description": "The C7A1 is the standard issue rifle for the Canadian military manufactured by Diemaco.  It is a gas operated, rotating bolt rifle known for its accuracy and controllable recoil."
   },
   {
+    "type": "GUN",
     "id": "c8_carbine",
     "copy-from": "m4_carbine",
     "looks_like": "ar15",
-    "type": "GUN",
     "name": { "str": "C8" },
     "description": "A carbine variant of the C7A1, recently introduced by the Canadian armed forces.  Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.  It is chambered in 5.56x45mm and accepts STANAG magazines."
   },
   {
-    "id": "hi_power_9mm",
-    "copy-from": "hi_power_9mm",
     "type": "GUN",
+    "id": "hi_power_9mm",
     "name": { "str": "Browning Hi-Power" },
+    "copy-from": "hi_power_9mm",
     "description": "A licensed copy of the Browning Hi-Power, made by John Inglis and Company. Issued to officers and infantry in need of a weapon for confined spaces, this is chambered in 9x19 Parabellum."
   }
 ]