Sort black powder variants to after reloaded variants.

10 files changed, 185 insertions, 185 deletions

diff --git a/json/items/ammo/10mm.json b/json/items/ammo/10mm.json
index 7585a25..26b4dd4 100644
--- a/json/items/ammo/10mm.json
+++ b/json/items/ammo/10mm.json
@@ -23,6 +23,15 @@
     "effects": [ "COOKOFF" ]
   },
   {
+    "id": "reloaded_10mm_fmj",
+    "copy-from": "10mm_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": "10mm Auto FMJ, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "bp_10mm_fmj",
     "copy-from": "10mm_fmj",
     "type": "AMMO",
@@ -35,14 +44,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_10mm_fmj",
-    "copy-from": "10mm_fmj",
-    "type": "AMMO",
-    "name": { "str_sp": "10mm Auto FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/22.json b/json/items/ammo/22.json
index b667f2c..23d6c2c 100644
--- a/json/items/ammo/22.json
+++ b/json/items/ammo/22.json
@@ -53,6 +53,24 @@
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
   {
+    "id": "reloaded_22_lr",
+    "copy-from": "22_lr",
+    "type": "AMMO",
+    "name": { "str_sp": ".22 LR, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_22_fmj",
+    "copy-from": "22_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".22 FMJ, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "bp_22_fmj",
     "copy-from": "22_fmj",
     "type": "AMMO",
@@ -79,23 +97,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_22_lr",
-    "copy-from": "22_lr",
-    "type": "AMMO",
-    "name": { "str_sp": ".22 LR, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_22_fmj",
-    "copy-from": "22_fmj",
-    "type": "AMMO",
-    "name": { "str_sp": ".22 FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/32.json b/json/items/ammo/32.json
index c947643..f6b9695 100644
--- a/json/items/ammo/32.json
+++ b/json/items/ammo/32.json
@@ -23,6 +23,15 @@
     "effects": [ "COOKOFF" ]
   },
   {
+    "id": "reloaded_32_acp",
+    "copy-from": "32_acp",
+    "type": "AMMO",
+    "name": { "str_sp": ".32 ACP, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "bp_32_acp",
     "copy-from": "32_acp",
     "type": "AMMO",
@@ -35,14 +44,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_32_acp",
-    "copy-from": "32_acp",
-    "type": "AMMO",
-    "name": { "str_sp": ".32 ACP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/357mag.json b/json/items/ammo/357mag.json
index 6fde5db..f8a3380 100644
--- a/json/items/ammo/357mag.json
+++ b/json/items/ammo/357mag.json
@@ -31,6 +31,20 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -2 } }
   },
   {
+    "id": "reloaded_357mag_fmj",
+    "copy-from": "357mag_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".357 Magnum FMJ, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+  },
+  {
+    "id": "reloaded_357mag_jhp",
+    "copy-from": "357mag_jhp",
+    "type": "AMMO",
+    "name": { "str_sp": ".357 Magnum JHP, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+  },
+  {
     "id": "bp_357mag_fmj",
     "copy-from": "357mag_fmj",
     "type": "AMMO",
@@ -57,19 +71,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_357mag_fmj",
-    "copy-from": "357mag_fmj",
-    "type": "AMMO",
-    "name": { "str_sp": ".357 Magnum FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
-  },
-  {
-    "id": "reloaded_357mag_jhp",
-    "copy-from": "357mag_jhp",
-    "type": "AMMO",
-    "name": { "str_sp": ".357 Magnum JHP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
   }
 ]
diff --git a/json/items/ammo/380.json b/json/items/ammo/380.json
index 7917e70..beeda93 100644
--- a/json/items/ammo/380.json
+++ b/json/items/ammo/380.json
@@ -44,6 +44,33 @@
     "proportional": { "recoil": 1.1 }
   },
   {
+    "id": "reloaded_380_FMJ",
+    "copy-from": "380_FMJ",
+    "type": "AMMO",
+    "name": { "str_sp": ".380 ACP FMJ, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_380_JHP",
+    "copy-from": "380_JHP",
+    "type": "AMMO",
+    "name": { "str_sp": ".380 ACP JHP, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_380_p",
+    "copy-from": "380_p",
+    "type": "AMMO",
+    "name": { "str_sp": ".380 ACP +P, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "bp_380_FMJ",
     "copy-from": "380_FMJ",
     "type": "AMMO",
@@ -70,32 +97,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_380_FMJ",
-    "copy-from": "380_FMJ",
-    "type": "AMMO",
-    "name": { "str_sp": ".380 ACP FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_380_JHP",
-    "copy-from": "380_JHP",
-    "type": "AMMO",
-    "name": { "str_sp": ".380 ACP JHP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_380_p",
-    "copy-from": "380_p",
-    "type": "AMMO",
-    "name": { "str_sp": ".380 ACP +P, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/40.json b/json/items/ammo/40.json
index 7e425f7..8724373 100644
--- a/json/items/ammo/40.json
+++ b/json/items/ammo/40.json
@@ -31,6 +31,24 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } }
   },
   {
+    "id": "reloaded_40fmj",
+    "copy-from": "40fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".40 S&W FMJ, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_40sw",
+    "copy-from": "40sw",
+    "type": "AMMO",
+    "name": { "str_sp": ".40 S&W JHP, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "bp_40fmj",
     "copy-from": "40fmj",
     "type": "AMMO",
@@ -57,23 +75,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_40fmj",
-    "copy-from": "40fmj",
-    "type": "AMMO",
-    "name": { "str_sp": ".40 S&W FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_40sw",
-    "copy-from": "40sw",
-    "type": "AMMO",
-    "name": { "str_sp": ".40 S&W JHP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/45.json b/json/items/ammo/45.json
index e6be9db..0245b8f 100644
--- a/json/items/ammo/45.json
+++ b/json/items/ammo/45.json
@@ -43,6 +43,33 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 4 }, "dispersion": -10, "recoil": 60 }
   },
   {
+    "id": "reloaded_45_acp",
+    "copy-from": "45_acp",
+    "type": "AMMO",
+    "name": { "str_sp": ".45 ACP FMJ, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_45_jhp",
+    "copy-from": "45_jhp",
+    "type": "AMMO",
+    "name": { "str_sp": ".45 ACP JHP, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_45_super",
+    "copy-from": "45_super",
+    "type": "AMMO",
+    "name": { "str_sp": ".45 ACP +P, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "bp_45_acp",
     "copy-from": "45_acp",
     "type": "AMMO",
@@ -69,32 +96,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_45_acp",
-    "copy-from": "45_acp",
-    "type": "AMMO",
-    "name": { "str_sp": ".45 ACP FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_45_jhp",
-    "copy-from": "45_jhp",
-    "type": "AMMO",
-    "name": { "str_sp": ".45 ACP JHP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_45_super",
-    "copy-from": "45_super",
-    "type": "AMMO",
-    "name": { "str_sp": ".45 ACP +P, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/762x25.json b/json/items/ammo/762x25.json
index 9f94711..8f55b8b 100644
--- a/json/items/ammo/762x25.json
+++ b/json/items/ammo/762x25.json
@@ -48,6 +48,13 @@
     }
   },
   {
+    "id": "reloaded_762_25",
+    "copy-from": "762_25hot",
+    "type": "AMMO",
+    "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": "bp_762_25",
     "//": "Should this be copied from 762_25hot, or 762_25?",
     "copy-from": "762_25hot",
@@ -61,12 +68,5 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_762_25",
-    "copy-from": "762_25hot",
-    "type": "AMMO",
-    "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 }
   }
 ]
diff --git a/json/items/ammo/9mm.json b/json/items/ammo/9mm.json
index 8b9ecde..7f92f9b 100644
--- a/json/items/ammo/9mm.json
+++ b/json/items/ammo/9mm.json
@@ -57,34 +57,6 @@
     "proportional": { "recoil": 1.2 }
   },
   {
-    "id": "bp_9mm",
-    "copy-from": "9mm",
-    "type": "AMMO",
-    "name": { "str_sp": "9x19mm JHP, black powder" },
-    "proportional": {
-      "price": 0.3,
-      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-      "recoil": 0.76,
-      "dispersion": 1.2
-    },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "bp_9mmfmj",
-    "copy-from": "9mmfmj",
-    "type": "AMMO",
-    "name": { "str_sp": "9x19mm FMJ, black powder" },
-    "proportional": {
-      "price": 0.3,
-      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-      "recoil": 0.76,
-      "dispersion": 1.2
-    },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "reloaded_9mm",
     "copy-from": "9mm",
     "type": "AMMO",
@@ -119,5 +91,33 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_9mm",
+    "copy-from": "9mm",
+    "type": "AMMO",
+    "name": { "str_sp": "9x19mm JHP, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_9mmfmj",
+    "copy-from": "9mmfmj",
+    "type": "AMMO",
+    "name": { "str_sp": "9x19mm FMJ, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/9x18.json b/json/items/ammo/9x18.json
index 08339b0..3c3fc83 100644
--- a/json/items/ammo/9x18.json
+++ b/json/items/ammo/9x18.json
@@ -46,34 +46,6 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 8 } }
   },
   {
-    "id": "bp_9x18mm",
-    "copy-from": "9x18mm",
-    "type": "AMMO",
-    "name": { "str_sp": "9x18mm, black powder" },
-    "proportional": {
-      "price": 0.3,
-      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-      "recoil": 0.76,
-      "dispersion": 1.2
-    },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "bp_9x18mmfmj",
-    "copy-from": "9x18mmfmj",
-    "type": "AMMO",
-    "name": { "str_sp": "9x18mm FMJ, black powder" },
-    "proportional": {
-      "price": 0.3,
-      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-      "recoil": 0.76,
-      "dispersion": 1.2
-    },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "reloaded_9x18mm",
     "copy-from": "9x18mm",
     "type": "AMMO",
@@ -103,5 +75,33 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_9x18mm",
+    "copy-from": "9x18mm",
+    "type": "AMMO",
+    "name": { "str_sp": "9x18mm, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_9x18mmfmj",
+    "copy-from": "9x18mmfmj",
+    "type": "AMMO",
+    "name": { "str_sp": "9x18mm FMJ, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]