Merge pull request CleverRaven#60787 from TheShadowFerret/RayGunSpellFix

[Xedra Evolved] Make death rays obtainable, fix wrong spell component IDs for ray gun & death ray
Maleclypse · Sep 6, 2022 · 49242cd · 49242cd
2 parents 38b17b8 + 7ccbe67
commit 49242cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/data/mods/Xedra_Evolved/requirements/spell_components.json b/data/mods/Xedra_Evolved/requirements/spell_components.json
@@ -17,13 +17,13 @@
   {
     "id": "spell_components_battery_gun",
     "type": "requirement",
-    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_W", "level": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ],
     "components": [ [ [ "pipe", 2 ] ], [ [ "cable", 10 ] ], [ [ "element", 1 ] ], [ [ "scrap", 5 ] ], [ [ "duct_tape", 25 ] ] ]
   },
   {
-    "id": "spell_components_battery_gun",
+    "id": "spell_components_ray_gun",
     "type": "requirement",
-    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_W", "level": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 2 }, { "id": "SAW_M_FINE", "level": 1 } ],
     "components": [
       [ [ "pipe", 2 ] ],
       [ [ "pipe_fittings", 1 ] ],
@@ -35,9 +35,9 @@
     ]
   },
   {
-    "id": "spell_components_battery_gun",
+    "id": "spell_components_death_ray",
     "type": "requirement",
-    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_W", "level": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 2 }, { "id": "SAW_M_FINE", "level": 1 } ],
     "components": [
       [ [ "pipe", 2 ] ],
       [ [ "pipe_fittings", 1 ] ],

diff --git a/data/mods/Xedra_Evolved/spells/inventor_spells.json b/data/mods/Xedra_Evolved/spells/inventor_spells.json
@@ -23,7 +23,7 @@
     "difficulty": 5,
     "max_level": 20,
     "flags": [ "SOMATIC", "CONCENTRATE" ],
-    "learn_spells": { "summon_ray_gun": 20, "summon_ray_gun_schematics": 20 },
+    "learn_spells": { "summon_ray_gun_schematics": 20 },
     "spell_class": "INVENTOR",
     "energy_source": "MANA"
   },
@@ -51,7 +51,7 @@
     "difficulty": 6,
     "max_level": 20,
     "flags": [ "SOMATIC", "CONCENTRATE" ],
-    "learn_spells": { "summon_ray_gun_schematics": 20 },
+    "learn_spells": { "summon_death_ray": 20 },
     "spell_class": "INVENTOR",
     "energy_source": "MANA"
   },
@@ -65,7 +65,7 @@
     "min_damage": 1,
     "max_damage": 1,
     "effect": "spawn_item",
-    "effect_str": "ray_gun",
+    "effect_str": "ray_weapon_diagrams",
     "shape": "blast",
     "base_casting_time": 1800000,
     "base_energy_cost": 1850,