This commit is contained in:
@@ -10,13 +10,19 @@ public class FlareBlitz : Script
|
||||
if (battleData == null)
|
||||
return;
|
||||
|
||||
var hitData = move.GetHitData(target, hit);
|
||||
var recoilDamage = hitData.Damage * (1 / 3);
|
||||
|
||||
var triggerArgs = new CustomTriggers.ModifyRecoilArgs(move, target, hit, hitData.Damage, recoilDamage);
|
||||
move.RunScriptHook(x => x.CustomTrigger(CustomTriggers.ModifyRecoil, triggerArgs));
|
||||
if (triggerArgs.Prevent)
|
||||
return;
|
||||
|
||||
if (battleData.Battle.Random.EffectChance(10, move, target, hit))
|
||||
{
|
||||
target.SetStatus("burned", false);
|
||||
}
|
||||
|
||||
var hitData = move.GetHitData(target, hit);
|
||||
var recoilDamage = hitData.Damage * (1 / 3);
|
||||
move.User.Damage(recoilDamage, DamageSource.Misc);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,10 @@ public class MultiHitMove : Script
|
||||
< 85 => 4,
|
||||
_ => 5,
|
||||
};
|
||||
var triggerArgs = new CustomTriggers.Modify2_5HitMoveArgs(choice, (byte)newHits);
|
||||
choice.RunScriptHook(x => x.CustomTrigger(CustomTriggers.Modify2_5HitMove, triggerArgs));
|
||||
newHits = triggerArgs.NumberOfHits;
|
||||
|
||||
numberOfHits = (byte)newHits;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,3 @@
|
||||
using PkmnLib.Static.Utils;
|
||||
|
||||
namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
|
||||
|
||||
[Script(ScriptCategory.Move, "recoil")]
|
||||
@@ -23,6 +21,12 @@ public class Recoil : Script
|
||||
return;
|
||||
var hitData = move.GetHitData(target, hit);
|
||||
var recoilDamage = (uint)(hitData.Damage * _recoilPercentage);
|
||||
|
||||
var triggerArgs = new CustomTriggers.ModifyRecoilArgs(move, target, hit, hitData.Damage, recoilDamage);
|
||||
move.RunScriptHook(x => x.CustomTrigger(CustomTriggers.ModifyRecoil, triggerArgs));
|
||||
if (triggerArgs.Prevent)
|
||||
return;
|
||||
|
||||
move.User.Damage(recoilDamage, DamageSource.Misc);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user