Merge pull request #78446 from Standing-Storm/ash-breath

[Xedra Evolved] Add Exhalation of Ashes spell to salamanders
CleverRaven · Dec 10, 2024 · ff1d0cd · ff1d0cd
2 parents 5fdef02 + 5b42b8a
commit ff1d0cd
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 10 deletions.
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json
@@ -394,6 +394,42 @@
     "final_casting_time": 75,
     "casting_time_increment": -10
   },
+  {
+    "id": "salamander_ash_breath_spell",
+    "type": "SPELL",
+    "name": "Exhalation of Ashes",
+    "description": "You can breathe out a cloud of thick smoke, concealing your presence or causing humans to choke.",
+    "valid_targets": [ "hostile", "ally", "ground" ],
+    "skill": "deduction",
+    "teachable": false,
+    "spell_class": "SALAMANDER",
+    "flags": [ "LOUD", "NO_PROJECTILE", "NO_HANDS", "NO_LEGS" ],
+    "effect": "attack",
+    "shape": "cone",
+    "difficulty": 2,
+    "max_level": { "math": [ "str_to_level(1)" ] },
+    "min_damage": 0,
+    "max_damage": 0,
+    "min_range": {
+      "math": [ "min((( (u_spell_level('salamander_ash_breath_spell') * 1.1) + 2) * (scaling_factor(u_val('strength') ) )),20)" ]
+    },
+    "max_range": {
+      "math": [ "min((( (u_spell_level('salamander_ash_breath_spell') * 1.1) + 2) * (scaling_factor(u_val('strength') ) )),20)" ]
+    },
+    "min_aoe": 60,
+    "max_aoe": 60,
+    "field_id": "fd_smoke",
+    "min_field_intensity": 3,
+    "max_field_intensity": 3,
+    "field_chance": 1,
+    "energy_source": "MANA",
+    "base_energy_cost": 150,
+    "final_energy_cost": 75,
+    "energy_increment": -5,
+    "base_casting_time": 50,
+    "final_casting_time": 25,
+    "casting_time_increment": -2
+  },
   {
     "id": "salamander_fire_breath",
     "type": "SPELL",
@@ -411,9 +447,12 @@
     "max_level": { "math": [ "str_to_level(1)" ] },
     "min_damage": { "math": [ "( (u_spell_level('salamander_fire_breath') * 2) + 15) * (scaling_factor(u_val('strength') ) )" ] },
     "max_damage": { "math": [ "( (u_spell_level('salamander_fire_breath') * 3) + 30) * (scaling_factor(u_val('strength') ) )" ] },
-    "min_range": { "math": [ "( (u_spell_level('salamander_fire_breath') * 0.2) + 2) * (scaling_factor(u_val('strength') ) )" ] },
-    "max_range": 8,
-    "range_increment": 0.2,
+    "min_range": {
+      "math": [ "min((( (u_spell_level('salamander_fire_breath') * 0.25) + 2) * (scaling_factor(u_val('strength') ) )),8)" ]
+    },
+    "max_range": {
+      "math": [ "min((( (u_spell_level('salamander_fire_breath') * 0.25) + 2) * (scaling_factor(u_val('strength') ) )),8)" ]
+    },
     "min_aoe": { "math": [ "( (u_spell_level('salamander_fire_breath') * 3) + 27) * (scaling_factor(u_val('strength') ) )" ] },
     "max_aoe": 180,
     "field_id": "fd_fire",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json
@@ -117,6 +117,18 @@
     "category": [ "SALAMANDER" ],
     "spells_learned": [ [ "salamander_summon_fire_spirit", 1 ] ]
   },
+  {
+    "type": "mutation",
+    "id": "SALAMANDER_ASH_BREATH",
+    "name": { "str": "Exhalation of Ashes" },
+    "points": 3,
+    "visibility": 0,
+    "ugliness": 0,
+    "description": "Upon gaining this ability the Salamander gains the ability to breathe out a cloud of thick smoke.",
+    "prereqs": [ "SALAMANDER_NO_SMOKE_DAMAGE" ],
+    "category": [ "SALAMANDER" ],
+    "spells_learned": [ [ "salamander_ash_breath_spell", 1 ] ]
+  },
   {
     "type": "mutation",
     "id": "SALAMANDER_FLAME_BREATH",
@@ -125,7 +137,7 @@
     "visibility": 0,
     "ugliness": 0,
     "description": "Upon gaining this ability the Salamander gains the ability to breathe a cone of flames.",
-    "prereqs": [ "SALAMANDER_FLAME_PUNCH" ],
+    "prereqs": [ "SALAMANDER_ASH_BREATH" ],
     "category": [ "SALAMANDER" ],
     "spells_learned": [ [ "salamander_fire_breath", 1 ] ]
   },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_spell_learning_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_spell_learning_eocs.json
@@ -2,7 +2,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_SALAMANDER_SPELL_EXPERIENCE_INCREASER",
-    "//": "Must be near a source of fire or heat.  The game currently can't detect a nearby fire using EoC--once it can that should be added.",
+    "//": "Must be near a source of fire or heat.",
     "recurrence": [ "6 h", "36 h" ],
     "condition": {
       "and": [
@@ -15,6 +15,7 @@
             "SALAMANDER_SMOKE_TELEPORT",
             "SALAMANDER_FLAME_PUNCH",
             "SALAMANDER_SUMMON_FIRE_SPIRIT",
+            "SALAMANDER_ASH_BREATH",
             "SALAMANDER_FLAME_BREATH",
             "SALAMANDER_SUMMON_FIREBIRD",
             "SALAMANDER_INCREASE_SPEED",
@@ -37,11 +38,7 @@
             { "u_has_item": "oil_lamp_clay_on" },
             { "u_has_item": "cigar_lit" },
             { "u_has_item": "cig_lit" },
-            { "u_is_in_field": "fd_hot_air1" },
-            { "u_is_in_field": "fd_hot_air2" },
-            { "u_is_in_field": "fd_hot_air3" },
-            { "u_is_in_field": "fd_hot_air4" },
-            { "u_is_in_field": "fd_fire" },
+            { "math": [ "u_salamander_near_fire == 1" ] },
             { "math": [ "weather('temperature') >= from_fahrenheit( 80 )" ] }
           ]
         }
@@ -62,6 +59,7 @@
         { "math": [ "u_spell_level('salamander_smoke_teleport_spell') < per_to_level(1)" ] },
         { "math": [ "u_spell_level('salamander_flame_punch_spell') < str_to_level(1)" ] },
         { "math": [ "u_spell_level('salamander_summon_fire_spirit') < 35" ] },
+        { "math": [ "u_spell_level('salamander_ash_breath_spell') < str_to_level(1)" ] },
         { "math": [ "u_spell_level('salamander_fire_breath') < str_to_level(1)" ] },
         { "math": [ "u_spell_level('salamander_summon_firebird_spell') < per_to_level(1)" ] },
         { "math": [ "u_spell_level('salamander_increase_speed_spell') < str_to_level(1)" ] },
@@ -85,6 +83,7 @@
         [ "EOC_LEVELER_SALAMANDER_SMOKE_TELEPORT", 8 ],
         [ "EOC_LEVELER_SALAMANDER_FLAME_PUNCH", 8 ],
         [ "EOC_LEVELER_SALAMANDER_SUMMON_FIRE_SPIRIT", 8 ],
+        [ "EOC_LEVELER_SALAMANDER_ASH_BREATH", 9 ],
         [ "EOC_LEVELER_SALAMANDER_FLAME_BREATH", 6 ],
         [ "EOC_LEVELER_SALAMANDER_SUMMON_FIREBIRD", 7 ],
         [ "EOC_LEVELER_SALAMANDER_INCREASE_SPEED", 5 ],
@@ -209,6 +208,24 @@
     ],
     "false_effect": [ { "run_eocs": "EOC_SALAMANDER_SPELL_EXPERIENCE_INCREASER_SELECTOR" } ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_LEVELER_SALAMANDER_ASH_BREATH",
+    "condition": {
+      "and": [
+        { "math": [ "u_spell_level('salamander_ash_breath_spell') >= 0" ] },
+        { "math": [ "u_spell_level('salamander_ash_breath_spell') < str_to_level(1)" ] }
+      ]
+    },
+    "effect": [
+      {
+        "u_message": "Your time spent among the heat and flames has increased your facility with your fae magicks.",
+        "type": "good"
+      },
+      { "math": [ "u_spell_exp('salamander_ash_breath_spell')", "+=", "paraclesian_passive_spell_exp(1)" ] }
+    ],
+    "false_effect": [ { "run_eocs": "EOC_SALAMANDER_SPELL_EXPERIENCE_INCREASER_SELECTOR" } ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_LEVELER_SALAMANDER_FLAME_BREATH",