More abilities, refactor custom triggers to be typed.
All checks were successful
Build / Build (push) Successful in 48s
All checks were successful
Build / Build (push) Successful in 48s
This commit is contained in:
@@ -14,14 +14,10 @@ public class Whirlpool : Script
|
||||
{
|
||||
var turns = move.Battle.Random.GetInt(4, 6);
|
||||
var damagePercent = 0.125f;
|
||||
var parameters = new Dictionary<StringKey, object?>
|
||||
{
|
||||
{ "number_of_turns", turns },
|
||||
{ "damage_percent", damagePercent },
|
||||
};
|
||||
move.RunScriptHook(x => x.CustomTrigger(CustomTriggers.Whirlpool, parameters));
|
||||
turns = parameters.GetValueOrDefault("number_of_turns", turns) as int? ?? turns;
|
||||
damagePercent = parameters.GetValueOrDefault("damage_percent", damagePercent) as float? ?? damagePercent;
|
||||
var args = new CustomTriggers.WhirlpoolArgs(move, target, hit, turns, damagePercent);
|
||||
move.RunScriptHook(x => x.CustomTrigger(CustomTriggers.Whirlpool, args));
|
||||
turns = args.Turns;
|
||||
damagePercent = args.DamagePercent;
|
||||
whirlpoolEffect.AddTargetedPokemon(target, turns, damagePercent);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user