Update 84x246mm guns with weight, volume, and longest_side, addition …

…of M3E1 (CleverRaven#42747) * Update M3 recoiless rifle, add M3E1 * Update itemgroup lists for M3E1 (M4) * Update AT4 volume, and longest_side
Fris0uman · Aug 6, 2020 · f4440a4 · f4440a4
1 parent 0859116
commit f4440a4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -604,6 +604,7 @@
       [ "m202_flash", 100 ],
       [ "m74_clip", 150 ],
       { "item": "m3_carlgustav", "prob": 50, "charges-min": 1, "charges-max": 1 },
+      { "item": "m4_carlgustav", "prob": 50, "charges-min": 1, "charges-max": 1 },
       { "item": "AT4", "prob": 50, "charges-min": 1, "charges-max": 1 },
       [ "84x246mm_he", 100 ],
       [ "84x246mm_hedp", 80 ],

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -172,6 +172,7 @@
       { "item": "m203", "prob": 50 },
       { "item": "LAW_Packed", "prob": 80 },
       { "item": "m3_carlgustav", "prob": 10 },
+      { "item": "m4_carlgustav", "prob": 10 },
       { "item": "m202_flash", "prob": 20 },
       { "item": "RPG", "prob": 40 },
       { "item": "RPG-7_ammo", "prob": 35 },

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -215,6 +215,7 @@
       { "item": "rucksack", "prob": 20 },
       { "item": "LAW_Packed", "prob": 30 },
       { "item": "m3_carlgustav", "prob": 1 },
+      { "item": "m4_carlgustav", "prob": 1 },
       { "item": "84x246mm_he", "prob": 3 },
       { "item": "84x246mm_hedp", "prob": 2 },
       { "item": "84x246mm_smoke", "prob": 3 },
@@ -373,6 +374,7 @@
       { "item": "40x46mm_m433", "prob": 7 },
       { "item": "40x53mm_m1001", "prob": 6 },
       { "item": "m3_carlgustav", "prob": 10 },
+      { "item": "m4_carlgustav", "prob": 10 },
       { "item": "84x246mm_he", "prob": 8 },
       { "item": "84x246mm_hedp", "prob": 8 },
       { "item": "84x246mm_smoke", "prob": 9 },

diff --git a/data/json/items/gun/84x246mm.json b/data/json/items/gun/84x246mm.json
@@ -14,24 +14,41 @@
     "flags": [ "RELOAD_ONE", "BACKBLAST", "NEVER_JAMS" ],
     "skill": "launcher",
     "ammo": [ "84x246mm" ],
-    "weight": "6900 g",
-    "volume": "4500 ml",
+    "weight": "10 kg",
+    "longest_side": "1065 mm",
+    "volume": "6730 ml",
     "bashing": 8,
     "to_hit": -3,
     "dispersion": 300,
     "durability": 8,
     "clip_size": 1,
     "reload": 300,
     "loudness": 200,
+    "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "sights", 1 ] ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "84x246mm": 1 } } ]
+  },
+  {
+    "id": "m4_carlgustav",
+    "type": "GUN",
+    "copy-from": "m3_carlgustav",
+    "name": { "str": "M3E1 recoilless rifle" },
+    "//": "This is called the Carl Gustaf M4 everywhere but in the U.S. It is the lighter and more portable version of the Carl Gustaf, with Picatinny rails, programmable ammunition, etc.",
+    "description": "The Carl Gustav M3E1 is a breech-loading 84 millimeter man-portable, reusable, multi-role recoilless rifle.  This is a lighter, shorter, and more advanced development of the M3.",
+    "price": 2000000,
+    "price_postapoc": 8000,
+    "material": [ "steel", "plastic" ],
+    "weight": "6900 g",
+    "volume": "5730 ml",
+    "longest_side": "1000 mm",
+    "durability": 7,
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "grip", 1 ],
       [ "mechanism", 4 ],
       [ "sights", 1 ],
       [ "rail mount", 1 ],
       [ "underbarrel mount", 1 ]
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "84x246mm": 1 } } ]
+    ]
   },
   {
     "id": "AT4",
@@ -42,7 +59,8 @@
     "extend": { "flags": [ "FIRE_TWOHAND", "NO_REPAIR" ] },
     "ammo": [ "84x246mm" ],
     "weight": "6803 g",
-    "volume": "3500 ml",
+    "volume": "8670 ml",
+    "longest_side": "1020 mm",
     "price_postapoc": 6000,
     "bashing": 4,
     "dispersion": 200,