Skip to content

Commit

Permalink
Merge pull request #77660 from Standing-Storm/fix-night-wind-talker
Browse files Browse the repository at this point in the history 
[Xedra Evolved] Fix talker errors with a couple lilin spells
  • Loading branch information
@Night-Pryanik
Night-Pryanik authored Nov 8, 2024
2 parents 11efb63 + 5e4e745 commit 7166775
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 27 deletions.
55 changes: 30 additions & 25 deletions data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,27 +259,32 @@
{
"type": "effect_on_condition",
"id": "EOC_LILIN_AOE_LINE_DISEASE",
"condition": { "math": [ "n_vitamin('lilin_ruach_vitamin')", ">=", "240" ] },
"condition": "has_alpha",
"effect": [
{ "math": [ "n_vitamin('lilin_ruach_vitamin')", "-=", "240" ] },
{ "npc_message": "You summon a wind filled with pestilence.", "type": "neutral" },
{
"u_add_effect": "effect_lilin_supernatural_disease",
"duration": [
{
"math": [
"1 + ( (u_vitamin('lilin_ruach_vitamin') * 0.09) * ( (u_has_trait('INFIMMUNE') * 0.25) + 1) * ( (u_has_trait('DISIMMUNE') * 0.25) + 1) * ( (u_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
]
},
"if": { "math": [ "n_vitamin('lilin_ruach_vitamin')", ">=", "240" ] },
"then": [
{ "math": [ "n_vitamin('lilin_ruach_vitamin')", "-=", "240" ] },
{ "npc_message": "You summon a wind filled with pestilence.", "type": "neutral" },
{
"math": [
"15 + ( (u_vitamin('lilin_ruach_vitamin') * 0.24) * ( (u_has_trait('INFIMMUNE') * 0.25) + 1) * ( (u_has_trait('DISIMMUNE') * 0.25) + 1) * ( (u_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
"u_add_effect": "effect_lilin_supernatural_disease",
"duration": [
{
"math": [
"1 + ( (n_vitamin('lilin_ruach_vitamin') * 0.09) * ( (n_has_trait('INFIMMUNE') * 0.25) + 1) * ( (n_has_trait('DISIMMUNE') * 0.25) + 1) * ( (n_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
]
},
{
"math": [
"15 + ( (n_vitamin('lilin_ruach_vitamin') * 0.24) * ( (n_has_trait('INFIMMUNE') * 0.25) + 1) * ( (n_has_trait('DISIMMUNE') * 0.25) + 1) * ( (n_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
]
}
]
}
]
],
"else": [ { "npc_message": "You don't have enough ruach to summon the miasma!", "type": "bad" } ]
}
],
"false_effect": { "npc_message": "You don't have enough ruach to summon the miasma!", "type": "bad" }
]
},
{
"type": "effect_on_condition",
Expand All @@ -293,12 +298,12 @@
"duration": [
{
"math": [
"1 + ( (u_vitamin('lilin_ruach_vitamin') * 0.03) * ( (u_has_trait('INFIMMUNE') * 0.25) + 1) * ( (u_has_trait('DISIMMUNE') * 0.25) + 1) * ( (u_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
"1 + ( (n_vitamin('lilin_ruach_vitamin') * 0.03) * ( (n_has_trait('INFIMMUNE') * 0.25) + 1) * ( (n_has_trait('DISIMMUNE') * 0.25) + 1) * ( (n_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
]
},
{
"math": [
"15 + ( (u_vitamin('lilin_ruach_vitamin') * 0.09) * ( (u_has_trait('INFIMMUNE') * 0.25) + 1) * ( (u_has_trait('DISIMMUNE') * 0.25) + 1) * ( (u_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
"15 + ( (n_vitamin('lilin_ruach_vitamin') * 0.09) * ( (n_has_trait('INFIMMUNE') * 0.25) + 1) * ( (n_has_trait('DISIMMUNE') * 0.25) + 1) * ( (n_has_trait('LILIN_DISEASE_DAMAGE_STRIKES') * 0.35) + 1) )"
]
}
]
Expand All @@ -308,44 +313,44 @@
"then": [
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(4,8) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"amount": { "math": [ "rng(4,8) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"bodypart": "head"
},
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(4,8) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"amount": { "math": [ "rng(4,8) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"bodypart": "arm_l"
},
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(4,8) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"amount": { "math": [ "rng(4,8) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"bodypart": "arm_r"
},
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(4,8) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"amount": { "math": [ "rng(4,8) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"bodypart": "torso"
},
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(4,8) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"amount": { "math": [ "rng(4,8) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"bodypart": "leg_r"
},
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(4,8) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"amount": { "math": [ "rng(4,8) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] },
"bodypart": "leg_l"
}
],
"else": [
{
"u_deal_damage": "biological",
"amount": { "math": [ "rng(10,35) * max( (u_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] }
"amount": { "math": [ "rng(10,35) * max( (n_vitamin('lilin_ruach_vitamin') / 3000), 1)" ] }
}
]
}
],
"false_effect": { "npc_message": "You don't have enough ruach to summon the miasma!", "type": "bad" }
"false_effect": { "npc_message": "You don't have enough ruach to enhance the miasma around <u_name>!", "type": "bad" }
},
{
"type": "effect_on_condition",
Expand Down
3 changes: 1 addition & 2 deletions data/mods/Xedra_Evolved/spells/lilin_spells.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@
"name": "Unleash the Night-Wind",
"description": "Summon a miasma filled with pestilence to infect your enemies. This supernatural disease can even strike zombies or stranger creatures.",
"message": "",
"//": "Need to target a specific target in order to display the values in the UI. Hopefully someday we'll be able to target arbitrary ground areas with EoC-based spells",
"valid_targets": [ "hostile", "ally" ],
"valid_targets": [ "hostile", "ally", "ground" ],
"flags": [ "SILENT", "NO_FAIL", "RANDOM_DURATION" ],
"spell_class": "LILIN_TRAITS",
"max_level": 1,
Expand Down

0 comments on commit 7166775

Please sign in to comment.