Merge pull request #38912 from anothersimulacrum/dt_bullet

CleverRaven · May 3, 2020 · 34906bd · 34906bd
2 parents 9936ba5 + d365c79
commit 34906bd
Show file tree

Hide file tree

Showing 187 changed files with 1,028 additions and 468 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -719,6 +719,11 @@
     "context": [  ],
     "type": "json_flag"
   },
+  {
+    "id": "EFFECT_BULLET_IMMUNE",
+    "context": [  ],
+    "type": "json_flag"
+  },
   {
     "id": "EFFECT_ACID_IMMUNE",
     "context": [  ],

diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json
@@ -17,7 +17,7 @@
     "ammo_type": "10mm",
     "casing": "10mm_casing",
     "range": 14,
-    "damage": { "damage_type": "stab", "amount": 31, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 31, "armor_penetration": 4 },
     "dispersion": 50,
     "recoil": 750,
     "effects": [ "COOKOFF" ]
@@ -29,7 +29,7 @@
     "name": { "str": "10mm Auto FMJ, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
       "recoil": 0.76,
       "dispersion": 1.2
     },
@@ -41,7 +41,7 @@
     "copy-from": "10mm_fmj",
     "type": "AMMO",
     "name": { "str": "10mm Auto FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }

diff --git a/data/json/items/ammo/12mm.json b/data/json/items/ammo/12mm.json
@@ -15,7 +15,7 @@
     "count": 20,
     "stack_size": 40,
     "ammo_type": "12mm",
-    "damage": { "damage_type": "stab", "amount": 50, "armor_penetration": 40 },
+    "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 40 },
     "dispersion": 45,
     "recoil": 100
   }

diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -9,7 +9,7 @@
     "price_postapoc": 1000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
-    "proportional": { "damage": { "damage_type": "stab", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
     "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
   },
   {
@@ -18,7 +18,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -28,7 +28,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -38,7 +38,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -52,7 +52,7 @@
     "price_postapoc": 8000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "range": 20,
-    "damage": { "damage_type": "stab", "amount": 16, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4 },
     "dispersion": 120,
     "effects": [ "COOKOFF", "EXPLOSIVE_20x66", "NEVER_MISFIRES" ]
   },
@@ -67,7 +67,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "range": 20,
-    "damage": { "damage_type": "stab", "amount": 16 },
+    "damage": { "damage_type": "bullet", "amount": 16 },
     "dispersion": 200,
     "recoil": 100,
     "drop": "handflare_lit",
@@ -83,7 +83,7 @@
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
-    "relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
   },
   {
     "id": "20x66_frag",
@@ -95,8 +95,8 @@
     "price_postapoc": 5000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
-    "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
-    "extend": { "effects": [ "FRAG_20x66" ] }
+    "extend": { "effects": [ "FRAG_20x66" ] },
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.25, "armor_penetration": 0.25 } }
   },
   {
     "id": "20x66_inc",
@@ -128,7 +128,7 @@
     "stack_size": 20,
     "ammo_type": "20x66mm",
     "range": 12,
-    "damage": { "damage_type": "stab", "amount": 60 },
+    "damage": { "damage_type": "bullet", "amount": 60 },
     "recoil": 2500,
     "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
   },
@@ -141,7 +141,7 @@
     "price": 1500,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
+    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
     "relative": { "range": 12 },
     "proportional": { "dispersion": 1.3 },
     "delete": { "effects": [ "SHOT" ] }

diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
@@ -11,7 +11,7 @@
     "count": 100,
     "stack_size": 150,
     "recoil": 39,
-    "proportional": { "range": 0.6, "damage": { "damage_type": "stab", "amount": 0.5 }, "dispersion": 1.2 },
+    "proportional": { "range": 0.6, "damage": { "damage_type": "bullet", "amount": 0.5 }, "dispersion": 1.2 },
     "extend": { "effects": [ "NOGIB" ] }
   },
   {
@@ -20,7 +20,7 @@
     "type": "AMMO",
     "name": { "str": ".22 FMJ" },
     "description": ".22 Long Rifle ammunition with 30gr FMJ bullets.  The .22LR round is extremely weak with very low stopping power, short range, and negligible recoil.  It is most useful for rifle training, and hunting small animals.",
-    "relative": { "damage": { "damage_type": "stab", "amount": -1, "armor_penetration": 2 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -1, "armor_penetration": 2 } }
   },
   {
     "id": "22_lr",
@@ -40,7 +40,7 @@
     "ammo_type": "22",
     "casing": "22_casing",
     "range": 13,
-    "damage": { "damage_type": "stab", "amount": 12 },
+    "damage": { "damage_type": "bullet", "amount": 12 },
     "dispersion": 60,
     "recoil": 150,
     "effects": [ "COOKOFF" ]
@@ -54,7 +54,7 @@
     "count": 100,
     "price_postapoc": 400,
     "dispersion": 0,
-    "proportional": { "range": 0.6, "damage": { "damage_type": "stab", "amount": 0.5 }, "recoil": 0.5 },
+    "proportional": { "range": 0.6, "damage": { "damage_type": "bullet", "amount": 0.5 }, "recoil": 0.5 },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
   {
@@ -64,7 +64,7 @@
     "name": { "str": ".22 LR FMJ, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -78,7 +78,7 @@
     "name": { "str": ".22 LR, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -90,7 +90,7 @@
     "copy-from": "22_lr",
     "type": "AMMO",
     "name": { "str": ".22 LR, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -99,7 +99,7 @@
     "copy-from": "22_fmj",
     "type": "AMMO",
     "name": { "str": ".22 FMJ, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }

diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
@@ -17,7 +17,7 @@
     "ammo_type": "223",
     "casing": "223_casing",
     "range": 36,
-    "damage": { "damage_type": "stab", "amount": 44, "armor_penetration": 2 },
+    "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 },
     "dispersion": 30,
     "recoil": 1500,
     "effects": [ "COOKOFF" ]
@@ -31,7 +31,7 @@
     "price": 290,
     "price_postapoc": 900,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "relative": { "damage": { "damage_type": "stab", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
+    "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
     "proportional": { "recoil": 1.1 },
     "extend": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -50,7 +50,7 @@
     "name": { "str": ".223 Remington, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -64,7 +64,7 @@
     "name": { "str": "5.56 NATO, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -78,7 +78,7 @@
     "name": { "str": "5.56 NATO tracer, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
       "recoil": 0.57,
       "dispersion": 1.2
     },
@@ -90,7 +90,7 @@
     "copy-from": "223",
     "type": "AMMO",
     "name": { "str": ".223 Remington, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -99,7 +99,7 @@
     "copy-from": "556",
     "type": "AMMO",
     "name": { "str": "5.56 NATO, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -108,7 +108,7 @@
     "copy-from": "556_incendiary",
     "type": "AMMO",
     "name": { "str": "5.56 NATO tracer, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }

diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
@@ -17,7 +17,7 @@
     "ammo_type": "270win",
     "casing": "270win_casing",
     "range": 65,
-    "damage": { "damage_type": "stab", "amount": 64, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 64, "armor_penetration": 4 },
     "dispersion": 10,
     "recoil": 3800,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
@@ -29,7 +29,7 @@
     "name": { "str": ".270 Winchester JSP, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.7, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 },
       "recoil": 0.7,
       "dispersion": 1.2
     },
@@ -41,7 +41,7 @@
     "copy-from": "270win_jsp",
     "type": "AMMO",
     "name": { "str": ".270 Winchester JSP, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }

diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json
@@ -17,7 +17,7 @@
     "ammo_type": "300",
     "casing": "300_casing",
     "range": 65,
-    "damage": { "damage_type": "stab", "amount": 70, "armor_penetration": 8 },
+    "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 8 },
     "dispersion": 15,
     "recoil": 5300,
     "effects": [ "COOKOFF" ]
@@ -29,7 +29,7 @@
     "name": { "str": ".300 Winchester Magnum, black powder" },
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
       "recoil": 0.76,
       "dispersion": 1.2
     },
@@ -42,7 +42,7 @@
     "type": "AMMO",
     "name": { "str": ".300 Winchester Magnum, reloaded" },
     "description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines.  The cartridge has found use by hunters, military units, and law enforcement departments.  This one has been hand-reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }