[MoM] Merge lasers and photokinetic damage (#69366)

* Initial commit * change photokinetic damage verbs * Add laser turret
CleverRaven · Nov 14, 2023 · 72d4bd6 · 72d4bd6
1 parent edb0334
commit 72d4bd6
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/data/mods/MindOverMatter/damage_types.json b/data/mods/MindOverMatter/damage_types.json
@@ -4,7 +4,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "yellow",
-    "name": "photokinetic",
+    "name": "focused light",
     "skill": "metaphysics",
     "derived_from": [ "heat", 0.8 ],
     "immune_flags": { "character": [ "PHOTOKIN_CHAR_IMMUNE" ], "monster": [ "PHOTOKIN_MONSTER_IMMUNE" ] },
@@ -28,7 +28,7 @@
     "id": "psi_photokinetic_damage",
     "type": "damage_info_order",
     "info_display": "detailed",
-    "verb": "buffeting",
+    "verb": "dazzling",
     "bionic_info": { "order": 999903, "show_type": false },
     "protection_info": { "order": 999903, "show_type": false },
     "pet_prot_info": { "order": 999903, "show_type": false },

diff --git a/data/mods/MindOverMatter/items/ammo.json b/data/mods/MindOverMatter/items/ammo.json
@@ -29,7 +29,7 @@
     "range": 40,
     "dispersion": 0,
     "recoil": 0,
-    "damage": { "damage_type": "heat", "amount": 55, "armor_penetration": 5 }
+    "damage": { "damage_type": "psi_photokinetic_damage", "amount": 55, "armor_penetration": 4 }
   },
   {
     "type": "AMMO",

diff --git a/data/mods/MindOverMatter/items/laser_overrides.json b/data/mods/MindOverMatter/items/laser_overrides.json
@@ -0,0 +1,58 @@
+[
+  {
+    "type": "GUN",
+    "id": "laser_rifle",
+    "copy-from": "laser_rifle",
+    "name": { "str": "A7 laser rifle" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 25, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "bio_laser_gun",
+    "copy-from": "bio_laser_gun",
+    "name": { "str": "laser finger" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 10, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "v29",
+    "copy-from": "v29",
+    "name": { "str": "V29 laser pistol" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 10, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "v29_turret",
+    "copy-from": "v29_turret",
+    "name": { "str": "mounted laser" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 10, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "recon_mech_laser_single",
+    "copy-from": "recon_mech_laser_single",
+    "name": { "str": "salvaged RMES marksman laser" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 30, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "recon_mech_laser",
+    "copy-from": "recon_mech_laser",
+    "name": { "str": "RMES marksman system" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 30, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "gatling_mech_laser_single",
+    "copy-from": "gatling_mech_laser_single",
+    "name": { "str": "salvaged CMES laser cannon" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 20, "armor_penetration": 4 }
+  },
+  {
+    "type": "GUN",
+    "id": "gatling_mech_laser",
+    "copy-from": "gatling_mech_laser",
+    "name": { "str": "CMES laser cannon" },
+    "ranged_damage": { "damage_type": "psi_photokinetic_damage", "amount": 20, "armor_penetration": 4 }
+  }
+]