From 5eb505ae9affcb2fd5f10a2e77d1f56f907bf52c Mon Sep 17 00:00:00 2001 From: Owlfren <92111586+Owlfren@users.noreply.github.com> Date: Sun, 14 Nov 2021 21:06:42 +0100 Subject: [PATCH] Crystalize Mana Unification (#52466) * Crystalize Mana Unification The two spells is now joined into a single one with variable outcomes based on the Mana Solidification trait. * FIx of missing spaces Co-authored-by: Binrui Dong * FIx of missing spaces Co-authored-by: Binrui Dong Co-authored-by: Binrui Dong --- data/mods/Magiclysm/Spells/classless.json | 59 +++++++++++++++++++-- data/mods/Magiclysm/traits/manatouched.json | 2 +- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/data/mods/Magiclysm/Spells/classless.json b/data/mods/Magiclysm/Spells/classless.json index 1af1f5db38fe6..044a823feadbd 100644 --- a/data/mods/Magiclysm/Spells/classless.json +++ b/data/mods/Magiclysm/Spells/classless.json @@ -6,21 +6,70 @@ "description": "Crystallizes mana into solid form", "valid_targets": [ "self" ], "spell_class": "NONE", - "flags": [ "PERMANENT", "NO_LEGS", "CONCENTRATE" ], + "flags": [ "NO_LEGS", "CONCENTRATE" ], "difficulty": 3, "min_damage": 1, "max_damage": 1, "duration_increment": 1, - "effect": "spawn_item", - "effect_str": "crystallized_mana", + "effect": "effect_on_condition", + "effect_str": "eoc_crystal_spawn", "shape": "blast", "energy_source": "MANA", "base_energy_cost": 1000, "final_energy_cost": 1000, - "base_casting_time": 720000, - "final_casting_time": 720000, + "base_casting_time": 600000, + "final_casting_time": 600000, "extra_effects": [ { "id": "mana_fatigue" } ] }, + { + "type": "effect_on_condition", + "id": "eoc_crystal_spawn", + "effect": { "u_cast_spell": { "id": "crystallize_mana_crystal_5" } }, + "false_effect": { "u_cast_spell": { "id": "crystallize_mana_1" } }, + "condition": { "u_has_trait": "MANA_CRYST_MANA" } + }, + { + "id": "crystallize_mana_1", + "type": "SPELL", + "name": "Crystallize Mana (1)", + "description": "Mana Crystal Spawner. If you can see this you probably debugged it in.", + "valid_targets": [ "self" ], + "spell_class": "NONE", + "flags": [ "PERMANENT", "NO_LEGS", "CONCENTRATE" ], + "difficulty": 1, + "min_damage": 1, + "max_damage": 1, + "duration_increment": 1, + "effect": "spawn_item", + "effect_str": "crystallized_mana", + "shape": "blast", + "energy_source": "MANA", + "base_energy_cost": 0, + "final_energy_cost": 0, + "base_casting_time": 0, + "final_casting_time": 0 + }, + { + "id": "crystallize_mana_crystal_5", + "type": "SPELL", + "name": "Crystallize Mana (5)", + "description": "Mana Crystal Spawner. If you can see this you probably debugged it in.", + "valid_targets": [ "self" ], + "spell_class": "NONE", + "flags": [ "PERMANENT", "NO_LEGS", "CONCENTRATE" ], + "effect": "spawn_item", + "effect_str": "crystallized_mana", + "difficulty": 1, + "min_damage": 5, + "max_damage": 5, + "duration_increment": 1, + "shape": "blast", + "energy_source": "MANA", + "base_energy_cost": 0, + "final_energy_cost": 0, + "base_casting_time": 0, + "final_casting_time": 0 + }, { "id": "mana_fatigue", "type": "SPELL", diff --git a/data/mods/Magiclysm/traits/manatouched.json b/data/mods/Magiclysm/traits/manatouched.json index 86cc4bc36f84a..28d3e085c183d 100644 --- a/data/mods/Magiclysm/traits/manatouched.json +++ b/data/mods/Magiclysm/traits/manatouched.json @@ -32,7 +32,7 @@ "category": [ "MANATOUCHED" ], "threshreq": [ "THRESH_MANA" ], "description": "Your internal ley lines have become much easier for you to control, resulting in you being able to naturally create crystallized mana.", - "spells_learned": [ [ "manatouched_crystal", 5 ] ] + "spells_learned": [ [ "crystallize_mana", 1 ] ] }, { "type": "mutation",