Add 5.56 AP and 7.62 AP rounds (CleverRaven#69161)

* Add 5.56 AP and 7.62 AP * add migration to GG * add ascii art to a new rounds * add rounds into more itemgroups * Update data/json/items/ammo/223.json Co-authored-by: TheShadowFerret <[email protected]> * Apply suggestions from code review Co-authored-by: Matthew Taylor <[email protected]> * replace the id with proper one * Someone need to fix VS lint extension Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Maleclypse <[email protected]> Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: Matthew Taylor <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Maleclypse · Nov 16, 2023 · f6a1525 · f6a1525
1 parent b084385
commit f6a1525
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 11 deletions.
diff --git a/data/json/ascii_art/ammo/223.json b/data/json/ascii_art/ammo/223.json
@@ -34,5 +34,14 @@
       "<color_yellow>‼",
       "\""
     ]
+  },
+  {
+    "type": "ascii_art",
+    "id": "556_m995",
+    "picture": [
+      "<color_dark_gray>,",
+      "<color_yellow>‼",
+      "\""
+    ]
   }
 ]
diff --git a/data/json/ascii_art/ammo/308.json b/data/json/ascii_art/ammo/308.json
@@ -16,5 +16,14 @@
       "<color_yellow>‼",
       "\""
     ]
+  },
+  {
+    "type": "ascii_art",
+    "id": "762_51_m993",
+    "picture": [
+      "<color_dark_gray>;",
+      "<color_yellow>‼",
+      "\""
+    ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -304,7 +304,9 @@
       { "item": "556_m855a1", "prob": 1 },
       { "item": "556_mk262", "prob": 1 },
       { "item": "556_mk318", "prob": 1 },
+      { "item": "556_m995", "prob": 1 },
       { "item": "762_51", "prob": 50 },
+      { "item": "762_51_m993", "prob": 1 },
       { "item": "4570_sp", "prob": 40 },
       { "item": "4570_pen", "prob": 20 },
       { "item": "4570_low", "prob": 40 },
@@ -392,8 +394,10 @@
       { "item": "556_mk318", "prob": 1 },
       { "item": "556", "prob": 79 },
       { "item": "556_m855a1", "prob": 2 },
+      { "item": "556_m995", "prob": 2 },
       { "item": "762_51_incendiary", "prob": 10 },
       { "item": "762_51", "prob": 40 },
+      { "item": "762_51_m993", "prob": 20 },
       { "item": "8mm_caseless", "prob": 30 },
       { "item": "8mm_fmj", "prob": 30 },
       { "item": "8mm_hvp", "prob": 10 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_223.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_223.json
@@ -168,11 +168,10 @@
     "type": "item_group",
     "id": "belt223_4ap_1tracer",
     "container-item": "belt223",
-    "//": "todo: replace 556 with 556 ap",
     "subtype": "collection",
     "items": [
       { "item": "556_incendiary", "count": 1, "charges-min": 40, "charges-max": 40 },
-      { "item": "556", "count": 1, "charges-min": 160, "charges-max": 160 }
+      { "item": "556_m995", "count": 1, "charges-min": 160, "charges-max": 160 }
     ]
   },
   {
@@ -199,8 +198,7 @@
     "type": "item_group",
     "id": "belt223_5ap",
     "container-item": "belt223",
-    "//": "todo: replace 556 with 556 ap",
     "subtype": "collection",
-    "items": [ { "item": "556", "count": 1, "charges-min": 200, "charges-max": 200 } ]
+    "items": [ { "item": "556_m995", "count": 1, "charges-min": 200, "charges-max": 200 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_308.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_308.json
@@ -102,11 +102,10 @@
     "type": "item_group",
     "id": "belt308_4ap_1tracer",
     "container-item": "belt308",
-    "//": "TODO: replace 762_51 with 762_51_ap (M993) when it would be a thing.  i hope i'll make it as followup",
     "subtype": "collection",
     "items": [
       { "item": "762_51_incendiary", "count": 1, "charges-min": 20, "charges-max": 20 },
-      { "item": "762_51", "count": 1, "charges-min": 80, "charges-max": 80 }
+      { "item": "762_51_m993", "count": 1, "charges-min": 80, "charges-max": 80 }
     ]
   },
   {
@@ -126,8 +125,7 @@
     "type": "item_group",
     "id": "ammo_box_ap_308",
     "container-item": "ammo_box_army_20_308",
-    "//": "TODO: replace 762_51 with 762_51_ap (M993) when it would be a thing.  i hope i'll make it as followup",
-    "items": [ { "item": "762_51", "count": 1, "charges-min": 20, "charges-max": 20 } ]
+    "items": [ { "item": "762_51_m993", "count": 1, "charges-min": 20, "charges-max": 20 } ]
   },
   {
     "//": "---------------------------------------------------",
@@ -179,8 +177,7 @@
     "type": "item_group",
     "id": "belt308_5ap",
     "container-item": "belt308",
-    "//": "TODO: replace 762_51 with 762_51_ap (M993) when it would be a thing",
     "subtype": "collection",
-    "items": [ { "item": "762_51", "count": 1, "charges-min": 100, "charges-max": 100 } ]
+    "items": [ { "item": "762_51_m993", "count": 1, "charges-min": 100, "charges-max": 100 } ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
@@ -393,7 +393,10 @@
       { "item": "556_m855a1", "prob": 30, "charges": [ 66, 120 ] },
       { "item": "556_incendiary", "prob": 100, "charges": [ 1, 30 ] },
       { "item": "556_incendiary", "prob": 75, "charges": [ 33, 60 ] },
-      { "item": "556_incendiary", "prob": 30, "charges": [ 66, 120 ] }
+      { "item": "556_incendiary", "prob": 30, "charges": [ 66, 120 ] },
+      { "item": "556_m995", "prob": 50, "charges": [ 1, 30 ] },
+      { "item": "556_m995", "prob": 35, "charges": [ 33, 60 ] },
+      { "item": "556_m995", "prob": 20, "charges": [ 66, 120 ] }
     ]
   },
   {

diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
@@ -127,6 +127,15 @@
     "ascii_picture": "556_incendiary",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
+  {
+    "id": "556_m995",
+    "copy-from": "556",
+    "type": "AMMO",
+    "name": { "str_sp": "5.56 NATO M995" },
+    "description": "An armor piercing 5.56x45mm M995 round using a 52gr projectile, featuring a black-tipped, tungsten carbide penetrator over an aluminum slug.  Increased penetration over standard ball rounds at the cost of worse wounding potential in soft tissue.",
+    "ascii_picture": "556_m995",
+    "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 8 } }
+  },
   {
     "id": "bp_223",
     "copy-from": "223",

diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
@@ -93,6 +93,15 @@
     "ascii_picture": "762_51_incendiary",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
+  {
+    "id": "762_51_m993",
+    "copy-from": "762_51",
+    "type": "AMMO",
+    "name": { "str_sp": "7.62x51mm NATO M993" },
+    "description": "An armor piercing 7.62x51mm round with a 126gr, tungsten carbide core projectile.  It offers significantly better armor penetration than standard ball rounds at the cost of worse wounding potential in soft tissue.",
+    "ascii_picture": "762_51_m993",
+    "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 8 } }
+  },
   {
     "id": "bp_308",
     "copy-from": "308",

diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
@@ -320,9 +320,11 @@
       "556_mk262",
       "556_mk318",
       "556_incendiary",
+      "556_m995",
       "762_51",
       "762_51_incendiary",
       "762_m43",
+      "762_51_m993",
       "8mm_caseless",
       "8mm_fmj",
       "8mm_hvp",