missedmigrations, riot bot, blacklist more, missed casings, (#37888)

CleverRaven · Feb 10, 2020 · 61272b3 · 61272b3
1 parent 59efb9a
commit 61272b3
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 40 deletions.
diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
@@ -396,5 +396,20 @@
     "id": [ "bp_shot_flechette" ],
     "type": "MIGRATION",
     "replace": "bp_shot_dart"
+  },
+  {
+    "id": [ "84x246mm_he", "RPG-7_ammo" ],
+    "type": "MIGRATION",
+    "replace": "rocket_he"
+  },
+  {
+    "id": [ "84x246mm_hedp", "m235_tpa", "RPG-7_pg7vr", "RPG-7_tbg7v", "RPG-7_og7v" ],
+    "type": "MIGRATION",
+    "replace": "rocket_hedp"
+  },
+  {
+    "id": [ "84x246mm_smoke" ],
+    "type": "MIGRATION",
+    "replace": "rocket_smoke"
   }
 ]
diff --git a/data/mods/Generic_Guns/ammo/gg_casings_migration.json b/data/mods/Generic_Guns/ammo/gg_casings_migration.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": [ "40x46mm_m118_casing", "40x46mm_m199_casing", "40x53mm_m169_casing" ],
+    "id": [ "40x46mm_m118_casing", "40x46mm_m199_casing", "40x46mm_m195_casing", "40x46mm_m212casing", "40x53mm_m169_casing" ],
     "type": "MIGRATION",
     "replace": "grenade_casing"
   },
@@ -34,7 +34,7 @@
     "replace": "shot_casing"
   },
   {
-    "id": [ "22_casing", "32_casing" ],
+    "id": [ "22_casing", "22_casing_new", "32_casing" ],
     "type": "MIGRATION",
     "replace": "pistol_tiny_casing"
   },
@@ -43,6 +43,7 @@
       "223_casing",
       "270win_casing",
       "300blk_casing",
+      "308_casing",
       "4570_casing",
       "545_casing",
       "762_51_casing",
@@ -57,5 +58,20 @@
     "id": [ "50_casing", "700nx_casing" ],
     "type": "MIGRATION",
     "replace": "rifle_huge_casing"
+  },
+  {
+    "id": [ "ammolink308", "ammolink223" ],
+    "type": "MIGRATION",
+    "replace": "ammolinkrifle"
+  },
+  {
+    "id": "ammolink40mm",
+    "type": "MIGRATION",
+    "replace": "ammolinkgrenade"
+  },
+  {
+    "id": "ammolink50",
+    "type": "MIGRATION",
+    "replace": "ammolinkrifle_huge"
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -30,7 +30,7 @@
     "replace": "grenade_pistol"
   },
   {
-    "id": [ "mgl", "rm802", "triple_launcher_simple" ],
+    "id": [ "mgl", "rm802", "triple_launcher_simple", "pseudo_m203" ],
     "type": "MIGRATION",
     "replace": "grenade_revolver"
   },
@@ -288,12 +288,12 @@
     "replace": "rifle_sporter"
   },
   {
-    "id": [ "AT4" ],
+    "id": [ "AT4", "LAW_Packed", "LAW" ],
     "type": "MIGRATION",
     "replace": "rocket_disposable"
   },
   {
-    "id": [ "m202_flash", "m3_carlgustav" ],
+    "id": [ "m202_flash", "m3_carlgustav", "RPG", "surv_rocket_launcher" ],
     "type": "MIGRATION",
     "replace": "rocket_recoilless"
   },

diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
@@ -4,9 +4,28 @@
     "lemat_revolver_shotgun",
     "llink",
     "dias",
+    "M6_shotgun",
+    "ksg_aux_shotgun",
+    "combination_gun_shotgun",
+    "combination_gun_shotgun_pipe",
     "belt_clip",
     "retool_ar15_300blk",
     "ts12_aux_shotgun",
-    "ts12_aux_shotgun2"
+    "ts12_aux_shotgun2",
+    "lwfeed",
+    "lead_barrel_big",
+    "lead_barrel_heavy_duty",
+    "lead_glm",
+    "lead_u_shotgun",
+    "lead_barrel_small",
+    "lead_laser_sight",
+    "lead_red_dot_sight",
+    "lead_rifle_scope",
+    "lead_acog_scope",
+    "lead_holo_sight",
+    "lead_stabilizer",
+    "lead_grip",
+    "lead_bipod",
+    "inter_bayonet"
   ]
 }
diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": [ "m203", "m320_mod", "pipe_launcher40mm", "lead_glm", "pipe_launcher40mm" ],
+    "id": [ "m203", "m320_mod", "pipe_launcher40mm" ],
     "type": "MIGRATION",
     "replace": "grenade_under"
   },
@@ -10,43 +10,13 @@
     "replace": "grenade_under_mod"
   },
   {
-    "id": [
-      "masterkey",
-      "rm121aux",
-      "u_shotgun",
-      "lead_u_shotgun",
-      "M6_shotgun",
-      "ts12_aux_shotgun",
-      "ksg_aux_shotgun",
-      "combination_gun_shotgun",
-      "combination_gun_shotgun_pipe"
-    ],
+    "id": [ "masterkey", "rm121aux", "u_shotgun" ],
     "type": "MIGRATION",
     "replace": "shotgun_under"
   },
   {
     "id": [ "masterkey_mod", "rm121aux_mod", "u_shotgun_mod" ],
     "type": "MIGRATION",
     "replace": "shotgun_under_mod"
-  },
-  {
-    "id": [ "lead_laser_sight" ],
-    "type": "MIGRATION",
-    "replace": "laser_sight"
-  },
-  {
-    "id": [ "lead_grip" ],
-    "type": "MIGRATION",
-    "replace": "grip"
-  },
-  {
-    "id": [ "lead_bipod" ],
-    "type": "MIGRATION",
-    "replace": "bipod"
-  },
-  {
-    "id": [ "inter_bayonet" ],
-    "type": "MIGRATION",
-    "replace": "knife_combat"
   }
 ]
diff --git a/data/mods/Generic_Guns/items/gg_items_blacklist.json b/data/mods/Generic_Guns/items/gg_items_blacklist.json
@@ -0,0 +1,16 @@
+{
+  "type": "ITEM_BLACKLIST",
+  "items": [
+    "l_HFPack",
+    "l_car_223_kit",
+    "l_mbr_223_kit",
+    "l_dsr_223_kit",
+    "l_lmg_223_kit",
+    "l_mbr_223_kit",
+    "lwfeed",
+    "lead_barrel_big",
+    "lead_barrel_heavy_duty",
+    "mn_classic_kit",
+    "mn_ebr_kit"
+  ]
+}
diff --git a/..._Guns/firearms/gg_firearms_blacklist.json → ...uns/magazines/gg_magazines_blacklist.json b/..._Guns/firearms/gg_firearms_blacklist.json → ...uns/magazines/gg_magazines_blacklist.json
@@ -1,6 +1,6 @@
 {
   "type": "ITEM_BLACKLIST",
   "items": [
-    "l_HFPack"
+    "m74_clip"
   ]
 }
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -204,7 +204,6 @@
       "hk417mag_10rd",
       "hk417_makeshiftmag",
       "ar10_makeshiftmag",
-      "m74_clip",
       "762x39_clip",
       "762R_clip"
     ],

diff --git a/data/mods/Generic_Guns/robots/active_bots.json b/data/mods/Generic_Guns/robots/active_bots.json
@@ -147,5 +147,35 @@
         "no_ammo_sound": "a chk!"
       }
     ]
+  },
+  {
+    "id": "mon_turret_riot",
+    "copy-from": "mon_turret_riot",
+    "type": "MONSTER",
+    "name": { "str": "riot control platform" },
+    "description": "These TALON-derived riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs.  They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'.  In the days before the cataclysm, massive stockrooms of the things were put into circulation.  On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.",
+    "default_faction": "cop_bot",
+    "starting_ammo": { "grenade_ammo_beanbag": 6 },
+    "special_attacks": [
+      {
+        "//": "For later: needs the ability to preferentially target legs and arms",
+        "type": "gun",
+        "cooldown": 1,
+        "move_cost": 150,
+        "gun_type": "grenade_revolver",
+        "ammo_type": "grenade_ammo_beanbag",
+        "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
+        "fake_dex": 12,
+        "ranges": [ [ 0, 30, "DEFAULT" ] ],
+        "require_targeting_npc": true,
+        "require_targeting_monster": true,
+        "laser_lock": false,
+        "targeting_cost": 200,
+        "targeting_timeout_extend": -10,
+        "targeting_sound": "\"Universal curfew is in effect.  Please return to your home.  This unit is authorized to open fire.\"",
+        "targeting_volume": 50,
+        "no_ammo_sound": "a chk!"
+      }
+    ]
   }
 ]