Misc tweaks update

Kenan2000 · Oct 14, 2023 · df40e8c · df40e8c
1 parent 5806f1d
commit df40e8c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/...ghts-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/22etc.json b/...ghts-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/22etc.json
@@ -68,7 +68,7 @@
     "copy-from": "22etc_hp",
     "type": "AMMO",
     "name": { "str": "handloaded .22 ETC HP" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "looks_like": "reloaded_22_lr",
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -78,7 +78,7 @@
     "copy-from": "22etc_match",
     "type": "AMMO",
     "name": { "str": "handloaded .22 ETC APM" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "looks_like": "reloaded_22_fmj",
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/...hts-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/556etc.json b/...hts-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/556etc.json
@@ -63,7 +63,7 @@
     "copy-from": "556dk",
     "type": "AMMO",
     "name": { "str": "reloaded 5.56 DK" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "reloaded_556",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -73,7 +73,7 @@
     "copy-from": "556dk_incendiary",
     "type": "AMMO",
     "name": { "str": "reloaded 5.56 DK tracer" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "reloaded_556_incendiary",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/...ghts-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/762ec.json b/...ghts-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/762ec.json
@@ -53,7 +53,7 @@
     "copy-from": "762ec",
     "type": "AMMO",
     "name": { "str": "handloaded 7.62x51mm EC orbital" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "308",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -63,7 +63,7 @@
     "copy-from": "762echv",
     "type": "AMMO",
     "name": { "str": "handloaded 7.62x51mm EC HV" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "762_51",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -73,7 +73,7 @@
     "copy-from": "762echv_incendiary",
     "type": "AMMO",
     "name": { "str": "handloaded 7.62x51mm EC HV tracer" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "762_51_incendiary",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -84,7 +84,7 @@
     "type": "AMMO",
     "name": { "str": "reloaded 7.62x51mm EC orbital" },
     "description": "7.62x51mm electrothermal, electrically charged round with a discarding sabot encasing a 4gr microflechette and integrated handmade radioactive hazard replacing an UPS. Its microflechette accelerates to the point of spontaneous combustion. Dangerous to shooter and targets alike.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "308",
@@ -96,7 +96,7 @@
     "type": "AMMO",
     "name": { "str": "reloaded 7.62x51mm EC HV" },
     "description": "7.62x51mm electrothermal, electrically charged round with a 54gr hypervelocity bullet and a handmade radioactive hazard replacing an UPS. Dangerous to shooter and targets alike.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "762_51",
@@ -108,7 +108,7 @@
     "type": "AMMO",
     "name": { "str": "reloaded 7.62x51mm EC HV tracer" },
     "description": "7.62x51mm electrothermal, electrically charged round with a 54gr hypervelocity bullet, a handmade radioactive hazard replacing an UPS, plus an one-in-five mix of tracer rounds. Dangerous to shooter and targets alike.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "762_51_incendiary",

diff --git a/...ights-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/9etc.json b/...ights-Structured-Modpack/High-Maintenance-Huge-Mods/ETC_handguns_etc/items/ammo/9etc.json
@@ -78,7 +78,7 @@
     "copy-from": "9etc",
     "type": "AMMO",
     "name": { "str": "reloaded 9x19mm ETC HVHP" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "9mm",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -88,7 +88,7 @@
     "copy-from": "9etcfmj",
     "type": "AMMO",
     "name": { "str": "reloaded 9x19mm ETC FMJ" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "9mmfmj",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -98,7 +98,7 @@
     "copy-from": "9etchvp",
     "type": "AMMO",
     "name": { "str": "reloaded 9x19mm ETC HVAP" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "looks_like": "9mmP",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

diff --git a/...s-Structured-Modpack/High-Maintenance-Huge-Mods/Expansion_Tefnut/items/guns/ammo_950.json b/...s-Structured-Modpack/High-Maintenance-Huge-Mods/Expansion_Tefnut/items/guns/ammo_950.json
@@ -73,7 +73,7 @@
     "copy-from": "950jdj",
     "type": "AMMO",
     "name": { "str": ".950 JDJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },