Tidied up some function codes, added missing ones

2025-12-09 14:14:59 +00:00 · 2021-09-06 21:26:59 +01:00
parent c670c63bf5
commit 27be1cb330
6 changed files with 336 additions and 77 deletions
--- a/Data/Scripts/011_Battle/002_Move/006_MoveEffects_BattlerStats.rb
+++ b/Data/Scripts/011_Battle/002_Move/006_MoveEffects_BattlerStats.rb
@@ -18,6 +18,16 @@ class PokeBattle_Move_RaiseUserAttack2 < PokeBattle_StatUpMove
  end
 end

+#===============================================================================
+# Increases the user's Attack by 3 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserAttack3 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:ATTACK, 3]
+  end
+end
+
 #===============================================================================
 # If this move KO's the target, increases the user's Attack by 3 stages.
 # (Fell Stinger)
@@ -140,6 +150,16 @@ class PokeBattle_Move_RaiseUserSpAtk3 < PokeBattle_StatUpMove
  end
 end

+#===============================================================================
+# Increases the user's Special Defense by 1 stage.
+#===============================================================================
+class PokeBattle_Move_RaiseUserSpDef1 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:SPECIAL_DEFENSE, 1]
+  end
+end
+
 #===============================================================================
 # Increases the user's Special Defense by 1 stage.
 # Charges up user's next attack if it is Electric-type. (Charge)
@@ -167,6 +187,16 @@ class PokeBattle_Move_RaiseUserSpDef2 < PokeBattle_StatUpMove
  end
 end

+#===============================================================================
+# Increases the user's Special Defense by 3 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserSpDef3 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:SPECIAL_DEFENSE, 3]
+  end
+end
+
 #===============================================================================
 # Increases the user's Speed by 1 stage. (Flame Charge)
 #===============================================================================
@@ -206,6 +236,46 @@ class PokeBattle_Move_RaiseUserSpeed2LowerUserWeight < PokeBattle_StatUpMove
  end
 end

+#===============================================================================
+# Increases the user's Speed by 3 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserSpeed3 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:SPEED, 3]
+  end
+end
+
+#===============================================================================
+# Increases the user's accuracy by 1 stage.
+#===============================================================================
+class PokeBattle_Move_RaiseUserAccuracy1 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:ACCURACY, 1]
+  end
+end
+
+#===============================================================================
+# Increases the user's accuracy by 2 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserAccuracy2 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:ACCURACY, 2]
+  end
+end
+
+#===============================================================================
+# Increases the user's accuracy by 3 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserAccuracy3 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:ACCURACY, 3]
+  end
+end
+
 #===============================================================================
 # Increases the user's evasion by 1 stage. (Double Team)
 #===============================================================================
@@ -216,6 +286,16 @@ class PokeBattle_Move_RaiseUserEvasion1 < PokeBattle_StatUpMove
  end
 end

+#===============================================================================
+# Increases the user's evasion by 2 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserEvasion2 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:EVASION, 2]
+  end
+end
+
 #===============================================================================
 # Increases the user's evasion by 2 stages. Minimizes the user. (Minimize)
 #===============================================================================
@@ -231,6 +311,16 @@ class PokeBattle_Move_RaiseUserEvasion2MinimizeUser < PokeBattle_StatUpMove
  end
 end

+#===============================================================================
+# Increases the user's evasion by 3 stages.
+#===============================================================================
+class PokeBattle_Move_RaiseUserEvasion3 < PokeBattle_StatUpMove
+  def initialize(battle, move)
+    super
+    @statUp = [:EVASION, 3]
+  end
+end
+
 #===============================================================================
 # Increases the user's critical hit rate. (Focus Energy)
 #===============================================================================
@@ -494,6 +584,26 @@ class PokeBattle_Move_StartRaiseUserAtk1WhenDamaged < PokeBattle_Move
  end
 end

+#===============================================================================
+# Decreases the user's Attack by 1 stage.
+#===============================================================================
+class PokeBattle_Move_LowerUserAttack1 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:ATTACK, 1]
+  end
+end
+
+#===============================================================================
+# Decreases the user's Attack by 2 stages.
+#===============================================================================
+class PokeBattle_Move_LowerUserAttack2 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:ATTACK, 2]
+  end
+end
+
 #===============================================================================
 # Decreases the user's Defense by 1 stage. (Clanging Scales)
 #===============================================================================
@@ -504,6 +614,26 @@ class PokeBattle_Move_LowerUserDefense1 < PokeBattle_StatDownMove
  end
 end

+#===============================================================================
+# Decreases the user's Defense by 2 stages.
+#===============================================================================
+class PokeBattle_Move_LowerUserDefense2 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:DEFENSE, 2]
+  end
+end
+
+#===============================================================================
+# Decreases the user's Special Attack by 1 stage.
+#===============================================================================
+class PokeBattle_Move_LowerUserSpAtk1 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPECIAL_ATTACK, 1]
+  end
+end
+
 #===============================================================================
 # Decreases the user's Special Attack by 2 stages.
 #===============================================================================
@@ -514,6 +644,26 @@ class PokeBattle_Move_LowerUserSpAtk2 < PokeBattle_StatDownMove
  end
 end

+#===============================================================================
+# Decreases the user's Special Defense by 1 stage.
+#===============================================================================
+class PokeBattle_Move_LowerUserSpDef1 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPECIAL_DEFENSE, 1]
+  end
+end
+
+#===============================================================================
+# Decreases the user's Special Defense by 2 stages.
+#===============================================================================
+class PokeBattle_Move_LowerUserSpDef2 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPECIAL_DEFENSE, 2]
+  end
+end
+
 #===============================================================================
 # Decreases the user's Speed by 1 stage. (Hammer Arm, Ice Hammer)
 #===============================================================================
@@ -524,6 +674,16 @@ class PokeBattle_Move_LowerUserSpeed1 < PokeBattle_StatDownMove
  end
 end

+#===============================================================================
+# Decreases the user's Speed by 2 stages.
+#===============================================================================
+class PokeBattle_Move_LowerUserSpeed2 < PokeBattle_StatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPEED, 2]
+  end
+end
+
 #===============================================================================
 # Decreases the user's Attack and Defense by 1 stage each. (Superpower)
 #===============================================================================
@@ -558,6 +718,43 @@ class PokeBattle_Move_LowerUserDefSpDefSpd1 < PokeBattle_StatDownMove
  end
 end

+#===============================================================================
+# Increases the user's and allies' Attack by 1 stage. (Howl (Gen 8+))
+#===============================================================================
+class PokeBattle_Move_RaiseTargetAttack1 < PokeBattle_Move
+  def canSnatch?; return true; end
+
+  def pbMoveFailed?(user, targets)
+    return false if damagingMove?
+    failed = true
+    targets.each do |b|
+      next if b.pbCanRaiseStatStage?(:ATTACK, user, self)
+      failed = false
+      break
+    end
+    if failed
+      @battle.pbDisplay(_INTL("But it failed!"))
+      return true
+    end
+    return false
+  end
+
+  def pbFailsAgainstTarget?(user, target, show_message)
+    return false if damagingMove?
+    return !target.pbCanRaiseStatStage?(:ATTACK, user, self, show_message)
+  end
+
+  def pbEffectAgainstTarget(user, target)
+    return if damagingMove?
+    target.pbRaiseStatStage(:ATTACK, 1, user)
+  end
+
+  def pbAdditionalEffect(user, target)
+    return if !target.pbCanRaiseStatStage?(:ATTACK, user, self)
+    target.pbRaiseStatStage(:ATTACK, 1, user)
+  end
+end
+
 #===============================================================================
 # Increases the target's Attack by 2 stages. Confuses the target. (Swagger)
 #===============================================================================
@@ -616,6 +813,22 @@ class PokeBattle_Move_RaiseTargetSpAtk1ConfuseTarget < PokeBattle_Move
  end
 end

+#===============================================================================
+# Increases target's Special Defense by 1 stage. (Aromatic Mist)
+#===============================================================================
+class PokeBattle_Move_RaiseTargetSpDef1 < PokeBattle_Move
+  def ignoresSubstitute?(user); return true; end
+
+  def pbFailsAgainstTarget?(user, target, show_message)
+    return true if !target.pbCanRaiseStatStage?(:SPECIAL_DEFENSE, user, self, show_message)
+    return false
+  end
+
+  def pbEffectAgainstTarget(user,target)
+    target.pbRaiseStatStage(:SPECIAL_DEFENSE,1,user)
+  end
+end
+
 #===============================================================================
 # Increases one random stat of the target by 2 stages (except HP). (Acupressure)
 #===============================================================================
@@ -699,6 +912,16 @@ class PokeBattle_Move_LowerTargetAttack2 < PokeBattle_TargetStatDownMove
  end
 end

+#===============================================================================
+# Decreases the target's Attack by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetAttack3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:ATTACK, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's Defense by 1 stage.
 #===============================================================================
@@ -730,6 +953,16 @@ class PokeBattle_Move_LowerTargetDefense2 < PokeBattle_TargetStatDownMove
  end
 end

+#===============================================================================
+# Decreases the target's Defense by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetDefense3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:DEFENSE, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's Special Attack by 1 stage.
 #===============================================================================
@@ -789,6 +1022,16 @@ class PokeBattle_Move_LowerTargetSpAtk2IfCanAttract < PokeBattle_TargetStatDownM
  end
 end

+#===============================================================================
+# Decreases the target's Special Attack by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetSpAtk3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPECIAL_ATTACK, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's Special Defense by 1 stage.
 #===============================================================================
@@ -809,6 +1052,16 @@ class PokeBattle_Move_LowerTargetSpDef2 < PokeBattle_TargetStatDownMove
  end
 end

+#===============================================================================
+# Decreases the target's Special Defense by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetSpDef3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPECIAL_DEFENSE, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's Speed by 1 stage.
 #===============================================================================
@@ -870,6 +1123,16 @@ class PokeBattle_Move_LowerTargetSpeed2 < PokeBattle_TargetStatDownMove
  end
 end

+#===============================================================================
+# Decreases the target's Speed by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetSpeed3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:SPEED, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's accuracy by 1 stage.
 #===============================================================================
@@ -880,6 +1143,26 @@ class PokeBattle_Move_LowerTargetAccuracy1 < PokeBattle_TargetStatDownMove
  end
 end

+#===============================================================================
+# Decreases the target's accuracy by 2 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetAccuracy2 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:ACCURACY, 2]
+  end
+end
+
+#===============================================================================
+# Decreases the target's accuracy by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetAccuracy3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:ACCURACY, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's evasion by 1 stage. (Sweet Scent (Gen 5-))
 #===============================================================================
@@ -1001,6 +1284,16 @@ class PokeBattle_Move_LowerTargetEvasion2 < PokeBattle_TargetStatDownMove
  end
 end

+#===============================================================================
+# Decreases the target's evasion by 3 stages.
+#===============================================================================
+class PokeBattle_Move_LowerTargetEvasion3 < PokeBattle_TargetStatDownMove
+  def initialize(battle, move)
+    super
+    @statDown = [:EVASION, 3]
+  end
+end
+
 #===============================================================================
 # Decreases the target's Attack and Defense by 1 stage each. (Tickle)
 #===============================================================================
@@ -1057,59 +1350,6 @@ class PokeBattle_Move_LowerPoisonedTargetAtkSpAtkSpd1 < PokeBattle_Move
  end
 end

-#===============================================================================
-# Increases target's Special Defense by 1 stage. (Aromatic Mist)
-#===============================================================================
-class PokeBattle_Move_RaiseAllySpDef1 < PokeBattle_Move
-  def ignoresSubstitute?(user); return true; end
-
-  def pbFailsAgainstTarget?(user, target, show_message)
-    return true if !target.pbCanRaiseStatStage?(:SPECIAL_DEFENSE, user, self, show_message)
-    return false
-  end
-
-  def pbEffectAgainstTarget(user,target)
-    target.pbRaiseStatStage(:SPECIAL_DEFENSE,1,user)
-  end
-end
-
-#===============================================================================
-# Increases the user's and allies' Attack by 1 stage. (Howl (Gen 8+))
-#===============================================================================
-class PokeBattle_Move_RaiseUserAndAlliesAttack1 < PokeBattle_Move
-  def canSnatch?; return true; end
-
-  def pbMoveFailed?(user, targets)
-    return false if damagingMove?
-    failed = true
-    targets.each do |b|
-      next if b.pbCanRaiseStatStage?(:ATTACK, user, self)
-      failed = false
-      break
-    end
-    if failed
-      @battle.pbDisplay(_INTL("But it failed!"))
-      return true
-    end
-    return false
-  end
-
-  def pbFailsAgainstTarget?(user, target, show_message)
-    return false if damagingMove?
-    return !target.pbCanRaiseStatStage?(:ATTACK, user, self, show_message)
-  end
-
-  def pbEffectAgainstTarget(user, target)
-    return if damagingMove?
-    target.pbRaiseStatStage(:ATTACK, 1, user)
-  end
-
-  def pbAdditionalEffect(user, target)
-    return if !target.pbCanRaiseStatStage?(:ATTACK, user, self)
-    target.pbRaiseStatStage(:ATTACK, 1, user)
-  end
-end
-
 #===============================================================================
 # Raises the Attack and Defense of all user's allies by 1 stage each. Bypasses
 # protections, including Crafty Shield. Fails if there is no ally. (Coaching)