DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-24 15:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2022-11-05 20:42:12 +00:00
parent 3408b038cf bbe654028c
commit 3e73d1c1f9
33 changed files with 198 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/011_Battle/003_Move/002_Move_Usage.rb
View File

@@ -27,8 +27,8 @@ class Battle::Move
#=============================================================================
#
#=============================================================================
# Whether the move is currently in the "charging" turn of a two turn attack.
# Is false if Power Herb or another effect lets a two turn move charge and
# Whether the move is currently in the "charging" turn of a two-turn move.
# Is false if Power Herb or another effect lets a two-turn move charge and
# attack in the same turn.
# user.effects[PBEffects::TwoTurnAttack] is set to the move's ID during the
# charging turn, and is nil during the attack turn.
@@ -52,6 +52,9 @@ class Battle::Move
return 1
end
# For two-turn moves when they charge and attack in the same turn.
def pbQuickChargingMove(user, targets); end
#=============================================================================
# Effect methods per hit
#=============================================================================
@@ -271,6 +274,7 @@ class Battle::Move
# Messages upon being hit
#=============================================================================
def pbEffectivenessMessage(user, target, numTargets = 1)
return if self.is_a?(Battle::Move::FixedDamageMove)
return if target.damageState.disguise || target.damageState.iceFace
if Effectiveness.super_effective?(target.damageState.typeMod)
if numTargets > 1