Merge pull request #79143 from John-Candlebury/afs-fix-irradiants

Aftershock: Fix Irradiant weapon attack
CleverRaven · Jan 14, 2025 · 3e8c1a5 · 3e8c1a5
2 parents ca1949d + 06c15f1
commit 3e8c1a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/data/mods/Aftershock/items/gun/advanced.json b/data/mods/Aftershock/items/gun/advanced.json
@@ -23,6 +23,7 @@
     "ranged_damage": { "damage_type": "bullet", "amount": 2500, "armor_penetration": 400 },
     "ammo_effects": [ "PLASMA", "EMP", "LOW_RANGE_VAPORIZATION" ],
     "skill": "rifle",
+    "range": 40,
     "extend": { "flags": [ "NO_TURRET" ] },
     "energy_drain": "0 kJ"
   },

diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json
@@ -772,14 +772,12 @@
     "speed": 150,
     "color": "pink",
     "extend": { "flags": [ "FIREPROOF" ] },
-    "starting_ammo": { "plasma": 100 },
     "special_attacks": [
       {
         "type": "gun",
         "cooldown": 1,
         "gun_type": "irradiant_gun",
         "move_cost": 100,
-        "ammo_type": "plasma",
         "fake_skills": [ [ "gun", 10 ], [ "rifle", 5 ] ],
         "fake_dex": 10,
         "ranges": [ [ 0, 40, "DEFAULT" ] ],