Ammo fix

CleverRaven · Sep 23, 2024 · 3cfb3c4 · 3cfb3c4
1 parent 2354cb3
commit 3cfb3c4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json
@@ -132,12 +132,11 @@
   },
   {
     "id": "matchhead_10mm_jhp",
-    "copy-from": "10mm_jhp",
+    "copy-from": "bp_10mm_jhp",
     "type": "AMMO",
     "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
     "name": { "str_sp": "10mm Auto JHP, matchhead powder" },
     "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 },
-    "looks_like": "bp_10mm_jhp",
     "extend": { "effects": [ "MATCHHEAD" ] }
   },
   {

diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json
@@ -162,7 +162,7 @@
   },
   {
     "id": "bp_3006fmj",
-    "copy-from": "bp_3006",
+    "copy-from": "3006fmj",
     "type": "AMMO",
     "name": { "str_sp": ".30-06 M2 AP, black powder" },
     "proportional": {

diff --git a/data/json/items/ammo/303.json b/data/json/items/ammo/303.json
@@ -112,7 +112,7 @@
   },
   {
     "id": "bp_303sp",
-    "copy-from": "303_fmjbt",
+    "copy-from": "303_sp",
     "type": "AMMO",
     "name": { "str_sp": ".303 British JSP, black powder" },
     "proportional": {

diff --git a/data/json/items/ammo/30carbine.json b/data/json/items/ammo/30carbine.json
@@ -87,7 +87,8 @@
     "copy-from": "30carbine_jsp",
     "type": "AMMO",
     "name": { "str_sp": ".30 Carbine JSP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 },
+    "extend": { "effects": [ "RECYCLED" ] }
   },
   {
     "id": "matchhead_30carbine_jsp",
@@ -118,7 +119,8 @@
     "copy-from": "30carbine",
     "type": "AMMO",
     "name": { "str_sp": ".30 Carbine, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 },
+    "extend": { "effects": [ "RECYCLED" ] }
   },
   {
     "id": "matchhead_30carbine",

diff --git a/data/json/items/ammo/338lapua.json b/data/json/items/ammo/338lapua.json
@@ -81,7 +81,8 @@
       "recoil": 0.7,
       "dispersion": 1.2
     },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "reloaded_338lapua_hpbt",

diff --git a/data/json/items/ammo/38super.json b/data/json/items/ammo/38super.json
@@ -110,7 +110,7 @@
   },
   {
     "id": "matchhead_38_super",
-    "copy-from": "38_super",
+    "copy-from": "bp_38super",
     "type": "AMMO",
     "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
     "name": { "str_sp": ".38 Super JHP, matchhead powder" },
@@ -120,7 +120,7 @@
   },
   {
     "id": "matchhead_38_super_fmj",
-    "copy-from": "38super_fmj",
+    "copy-from": "bp_38super_fmj",
     "type": "AMMO",
     "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
     "name": { "str_sp": ".38 Super FMJ, matchhead powder" },

diff --git a/data/json/items/ammo/762x25.json b/data/json/items/ammo/762x25.json
@@ -68,15 +68,15 @@
     "id": "reloaded_762_25",
     "copy-from": "762_25hot",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x25mm, reloaded" },
+    "name": { "str_sp": "7.62x25mm FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
   },
   {
     "id": "matchhead_762_25",
     "copy-from": "bp_762_25",
     "type": "AMMO",
     "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
-    "name": { "str_sp": "7.62x25mm, matchhead powder" },
+    "name": { "str_sp": "7.62x25mm FMJ, matchhead powder" },
     "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 },
     "looks_like": "bp_762_25",
     "extend": { "effects": [ "MATCHHEAD" ] }