Added class GameData::Stat

2026-01-23 14:56:00 +00:00 · 2021-03-04 22:59:48 +00:00
parent 934e38662a
commit ff0c2f00c8
46 changed files with 1301 additions and 1202 deletions
--- a/Data/Scripts/015_Items/001_PItem_Items.rb
+++ b/Data/Scripts/015_Items/001_PItem_Items.rb
@@ -264,49 +264,37 @@ end
 #===============================================================================
 # Change EVs
 #===============================================================================
-def pbJustRaiseEffortValues(pkmn,ev,evgain)
-  totalev = 0
-  for i in 0...6
-    totalev += pkmn.ev[i]
-  end
-  if totalev+evgain>Pokemon::EV_LIMIT
-    evgain = Pokemon::EV_LIMIT-totalev
-  end
-  if pkmn.ev[ev]+evgain>Pokemon::EV_STAT_LIMIT
-    evgain = Pokemon::EV_STAT_LIMIT-pkmn.ev[ev]
-  end
-  if evgain>0
-    pkmn.ev[ev] += evgain
+def pbJustRaiseEffortValues(pkmn, stat, evGain)
+  stat = GameData::Stat.get(stat).id
+  evTotal = 0
+  GameData::Stat.each_main { |s| evTotal += pkmn.ev[s.id] }
+  evGain = evGain.clamp(0, Pokemon::EV_STAT_LIMIT - pkmn.ev[stat])
+  evGain = evGain.clamp(0, Pokemon::EV_LIMIT - evTotal)
+  if evGain > 0
+    pkmn.ev[stat] += evGain
    pkmn.calcStats
  end
-  return evgain
+  return evGain
 end

-def pbRaiseEffortValues(pkmn,ev,evgain=10,evlimit=true)
-  return 0 if evlimit && pkmn.ev[ev]>=100
-  totalev = 0
-  for i in 0...6
-    totalev += pkmn.ev[i]
-  end
-  if totalev+evgain>Pokemon::EV_LIMIT
-    evgain = Pokemon::EV_LIMIT-totalev
-  end
-  if pkmn.ev[ev]+evgain>Pokemon::EV_STAT_LIMIT
-    evgain = Pokemon::EV_STAT_LIMIT-pkmn.ev[ev]
-  end
-  if evlimit && pkmn.ev[ev]+evgain>100
-    evgain = 100-pkmn.ev[ev]
-  end
-  if evgain>0
-    pkmn.ev[ev] += evgain
+def pbRaiseEffortValues(pkmn, stat, evGain = 10, ev_limit = true)
+  stat = GameData::Stat.get(stat).id
+  return 0 if ev_limit && pkmn.ev[stat] >= 100
+  evTotal = 0
+  GameData::Stat.each_main { |s| evTotal += pkmn.ev[s.id] }
+  evGain = evGain.clamp(0, Pokemon::EV_STAT_LIMIT - pkmn.ev[stat])
+  evGain = evGain.clamp(0, 100 - pkmn.ev[stat]) if ev_limit
+  evGain = evGain.clamp(0, Pokemon::EV_LIMIT - evTotal)
+  if evGain > 0
+    pkmn.ev[stat] += evGain
    pkmn.calcStats
  end
-  return evgain
+  return evGain
 end

-def pbRaiseHappinessAndLowerEV(pkmn,scene,ev,messages)
+def pbRaiseHappinessAndLowerEV(pkmn,scene,stat,messages)
  h = pkmn.happiness<255
-  e = pkmn.ev[ev]>0
+  e = pkmn.ev[stat]>0
  if !h && !e
    scene.pbDisplay(_INTL("It won't have any effect."))
    return false
@@ -315,8 +303,8 @@ def pbRaiseHappinessAndLowerEV(pkmn,scene,ev,messages)
    pkmn.changeHappiness("evberry")
  end
  if e
-    pkmn.ev[ev] -= 10
-    pkmn.ev[ev] = 0 if pkmn.ev[ev]<0
+    pkmn.ev[stat] -= 10
+    pkmn.ev[stat] = 0 if pkmn.ev[stat]<0
    pkmn.calcStats
  end
  scene.pbRefresh
--- a/Data/Scripts/015_Items/002_PItem_ItemEffects.rb
+++ b/Data/Scripts/015_Items/002_PItem_ItemEffects.rb
@@ -654,7 +654,7 @@ ItemHandlers::UseOnPokemon.add(:PPMAX,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:HPUP,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::HP)==0
+  if pbRaiseEffortValues(pkmn,:HP)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -665,7 +665,7 @@ ItemHandlers::UseOnPokemon.add(:HPUP,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:PROTEIN,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::ATTACK)==0
+  if pbRaiseEffortValues(pkmn,:ATTACK)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -675,7 +675,7 @@ ItemHandlers::UseOnPokemon.add(:PROTEIN,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:IRON,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::DEFENSE)==0
+  if pbRaiseEffortValues(pkmn,:DEFENSE)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -685,7 +685,7 @@ ItemHandlers::UseOnPokemon.add(:IRON,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:CALCIUM,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::SPATK)==0
+  if pbRaiseEffortValues(pkmn,:SPECIAL_ATTACK)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -695,7 +695,7 @@ ItemHandlers::UseOnPokemon.add(:CALCIUM,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:ZINC,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::SPDEF)==0
+  if pbRaiseEffortValues(pkmn,:SPECIAL_DEFENSE)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -705,7 +705,7 @@ ItemHandlers::UseOnPokemon.add(:ZINC,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:CARBOS,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::SPEED)==0
+  if pbRaiseEffortValues(pkmn,:SPEED)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -715,7 +715,7 @@ ItemHandlers::UseOnPokemon.add(:CARBOS,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:HEALTHWING,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::HP,1,false)==0
+  if pbRaiseEffortValues(pkmn,:HP,1,false)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -726,7 +726,7 @@ ItemHandlers::UseOnPokemon.add(:HEALTHWING,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:MUSCLEWING,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::ATTACK,1,false)==0
+  if pbRaiseEffortValues(pkmn,:ATTACK,1,false)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -736,7 +736,7 @@ ItemHandlers::UseOnPokemon.add(:MUSCLEWING,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:RESISTWING,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::DEFENSE,1,false)==0
+  if pbRaiseEffortValues(pkmn,:DEFENSE,1,false)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -746,7 +746,7 @@ ItemHandlers::UseOnPokemon.add(:RESISTWING,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:GENIUSWING,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::SPATK,1,false)==0
+  if pbRaiseEffortValues(pkmn,:SPECIAL_ATTACK,1,false)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -756,7 +756,7 @@ ItemHandlers::UseOnPokemon.add(:GENIUSWING,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:CLEVERWING,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::SPDEF,1,false)==0
+  if pbRaiseEffortValues(pkmn,:SPECIAL_DEFENSE,1,false)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -766,7 +766,7 @@ ItemHandlers::UseOnPokemon.add(:CLEVERWING,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:SWIFTWING,proc { |item,pkmn,scene|
-  if pbRaiseEffortValues(pkmn,PBStats::SPEED,1,false)==0
+  if pbRaiseEffortValues(pkmn,:SPEED,1,false)==0
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
  end
@@ -786,7 +786,7 @@ ItemHandlers::UseOnPokemon.add(:RARECANDY,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:POMEGBERRY,proc { |item,pkmn,scene|
-  next pbRaiseHappinessAndLowerEV(pkmn,scene,PBStats::HP,[
+  next pbRaiseHappinessAndLowerEV(pkmn,scene,:HP,[
     _INTL("{1} adores you! Its base HP fell!",pkmn.name),
     _INTL("{1} became more friendly. Its base HP can't go lower.",pkmn.name),
     _INTL("{1} became more friendly. However, its base HP fell!",pkmn.name)
@@ -794,7 +794,7 @@ ItemHandlers::UseOnPokemon.add(:POMEGBERRY,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:KELPSYBERRY,proc { |item,pkmn,scene|
-  next pbRaiseHappinessAndLowerEV(pkmn,scene,PBStats::ATTACK,[
+  next pbRaiseHappinessAndLowerEV(pkmn,scene,:ATTACK,[
     _INTL("{1} adores you! Its base Attack fell!",pkmn.name),
     _INTL("{1} became more friendly. Its base Attack can't go lower.",pkmn.name),
     _INTL("{1} became more friendly. However, its base Attack fell!",pkmn.name)
@@ -802,7 +802,7 @@ ItemHandlers::UseOnPokemon.add(:KELPSYBERRY,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:QUALOTBERRY,proc { |item,pkmn,scene|
-  next pbRaiseHappinessAndLowerEV(pkmn,scene,PBStats::DEFENSE,[
+  next pbRaiseHappinessAndLowerEV(pkmn,scene,:DEFENSE,[
     _INTL("{1} adores you! Its base Defense fell!",pkmn.name),
     _INTL("{1} became more friendly. Its base Defense can't go lower.",pkmn.name),
     _INTL("{1} became more friendly. However, its base Defense fell!",pkmn.name)
@@ -810,7 +810,7 @@ ItemHandlers::UseOnPokemon.add(:QUALOTBERRY,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:HONDEWBERRY,proc { |item,pkmn,scene|
-  next pbRaiseHappinessAndLowerEV(pkmn,scene,PBStats::SPATK,[
+  next pbRaiseHappinessAndLowerEV(pkmn,scene,:SPECIAL_ATTACK,[
     _INTL("{1} adores you! Its base Special Attack fell!",pkmn.name),
     _INTL("{1} became more friendly. Its base Special Attack can't go lower.",pkmn.name),
     _INTL("{1} became more friendly. However, its base Special Attack fell!",pkmn.name)
@@ -818,7 +818,7 @@ ItemHandlers::UseOnPokemon.add(:HONDEWBERRY,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:GREPABERRY,proc { |item,pkmn,scene|
-  next pbRaiseHappinessAndLowerEV(pkmn,scene,PBStats::SPDEF,[
+  next pbRaiseHappinessAndLowerEV(pkmn,scene,:SPECIAL_DEFENSE,[
     _INTL("{1} adores you! Its base Special Defense fell!",pkmn.name),
     _INTL("{1} became more friendly. Its base Special Defense can't go lower.",pkmn.name),
     _INTL("{1} became more friendly. However, its base Special Defense fell!",pkmn.name)
@@ -826,7 +826,7 @@ ItemHandlers::UseOnPokemon.add(:GREPABERRY,proc { |item,pkmn,scene|
 })

 ItemHandlers::UseOnPokemon.add(:TAMATOBERRY,proc { |item,pkmn,scene|
-  next pbRaiseHappinessAndLowerEV(pkmn,scene,PBStats::SPEED,[
+  next pbRaiseHappinessAndLowerEV(pkmn,scene,:SPEED,[
     _INTL("{1} adores you! Its base Speed fell!",pkmn.name),
     _INTL("{1} became more friendly. Its base Speed can't go lower.",pkmn.name),
     _INTL("{1} became more friendly. However, its base Speed fell!",pkmn.name)
--- a/Data/Scripts/015_Items/003_PItem_BattleItemEffects.rb
+++ b/Data/Scripts/015_Items/003_PItem_BattleItemEffects.rb
@@ -201,39 +201,39 @@ ItemHandlers::CanUseInBattle.add(:YELLOWFLUTE,proc { |item,pokemon,battler,move,
 })

 ItemHandlers::CanUseInBattle.add(:XATTACK,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
-  next pbBattleItemCanRaiseStat?(PBStats::ATTACK,battler,scene,showMessages)
+  next pbBattleItemCanRaiseStat?(:ATTACK,battler,scene,showMessages)
 })

 ItemHandlers::CanUseInBattle.copy(:XATTACK,:XATTACK2,:XATTACK3,:XATTACK6)

 ItemHandlers::CanUseInBattle.add(:XDEFENSE,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
-  next pbBattleItemCanRaiseStat?(PBStats::DEFENSE,battler,scene,showMessages)
+  next pbBattleItemCanRaiseStat?(:DEFENSE,battler,scene,showMessages)
 })

 ItemHandlers::CanUseInBattle.copy(:XDEFENSE,
   :XDEFENSE2,:XDEFENSE3,:XDEFENSE6,:XDEFEND,:XDEFEND2,:XDEFEND3,:XDEFEND6)

 ItemHandlers::CanUseInBattle.add(:XSPATK,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
-  next pbBattleItemCanRaiseStat?(PBStats::SPATK,battler,scene,showMessages)
+  next pbBattleItemCanRaiseStat?(:SPECIAL_ATTACK,battler,scene,showMessages)
 })

 ItemHandlers::CanUseInBattle.copy(:XSPATK,
   :XSPATK2,:XSPATK3,:XSPATK6,:XSPECIAL,:XSPECIAL2,:XSPECIAL3,:XSPECIAL6)

 ItemHandlers::CanUseInBattle.add(:XSPDEF,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
-  next pbBattleItemCanRaiseStat?(PBStats::SPDEF,battler,scene,showMessages)
+  next pbBattleItemCanRaiseStat?(:SPECIAL_DEFENSE,battler,scene,showMessages)
 })

 ItemHandlers::CanUseInBattle.copy(:XSPDEF,:XSPDEF2,:XSPDEF3,:XSPDEF6)

 ItemHandlers::CanUseInBattle.add(:XSPEED,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
-  next pbBattleItemCanRaiseStat?(PBStats::SPEED,battler,scene,showMessages)
+  next pbBattleItemCanRaiseStat?(:SPEED,battler,scene,showMessages)
 })

 ItemHandlers::CanUseInBattle.copy(:XSPEED,:XSPEED2,:XSPEED3,:XSPEED6)

 ItemHandlers::CanUseInBattle.add(:XACCURACY,proc { |item,pokemon,battler,move,firstAction,battle,scene,showMessages|
-  next pbBattleItemCanRaiseStat?(PBStats::ACCURACY,battler,scene,showMessages)
+  next pbBattleItemCanRaiseStat?(:ACCURACY,battler,scene,showMessages)
 })

 ItemHandlers::CanUseInBattle.copy(:XACCURACY,:XACCURACY2,:XACCURACY3,:XACCURACY6)
@@ -523,138 +523,138 @@ ItemHandlers::BattleUseOnBattler.add(:YELLOWFLUTE,proc { |item,battler,scene|
 ItemHandlers::BattleUseOnBattler.copy(:YELLOWFLUTE,:PERSIMBERRY)

 ItemHandlers::BattleUseOnBattler.add(:XATTACK,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ATTACK,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
+  battler.pbRaiseStatStage(:ATTACK,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XATTACK2,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ATTACK,2,battler)
+  battler.pbRaiseStatStage(:ATTACK,2,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XATTACK3,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ATTACK,3,battler)
+  battler.pbRaiseStatStage(:ATTACK,3,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XATTACK6,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ATTACK,6,battler)
+  battler.pbRaiseStatStage(:ATTACK,6,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XDEFENSE,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::DEFENSE,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
+  battler.pbRaiseStatStage(:DEFENSE,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XDEFENSE,:XDEFEND)

 ItemHandlers::BattleUseOnBattler.add(:XDEFENSE2,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::DEFENSE,2,battler)
+  battler.pbRaiseStatStage(:DEFENSE,2,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XDEFENSE2,:XDEFEND2)

 ItemHandlers::BattleUseOnBattler.add(:XDEFENSE3,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::DEFENSE,3,battler)
+  battler.pbRaiseStatStage(:DEFENSE,3,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XDEFENSE3,:XDEFEND3)

 ItemHandlers::BattleUseOnBattler.add(:XDEFENSE6,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::DEFENSE,6,battler)
+  battler.pbRaiseStatStage(:DEFENSE,6,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XDEFENSE6,:XDEFEND6)

 ItemHandlers::BattleUseOnBattler.add(:XSPATK,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPATK,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
+  battler.pbRaiseStatStage(:SPECIAL_ATTACK,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XSPATK,:XSPECIAL)

 ItemHandlers::BattleUseOnBattler.add(:XSPATK2,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPATK,2,battler)
+  battler.pbRaiseStatStage(:SPECIAL_ATTACK,2,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XSPATK2,:XSPECIAL2)

 ItemHandlers::BattleUseOnBattler.add(:XSPATK3,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPATK,3,battler)
+  battler.pbRaiseStatStage(:SPECIAL_ATTACK,3,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XSPATK3,:XSPECIAL3)

 ItemHandlers::BattleUseOnBattler.add(:XSPATK6,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPATK,6,battler)
+  battler.pbRaiseStatStage(:SPECIAL_ATTACK,6,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.copy(:XSPATK6,:XSPECIAL6)

 ItemHandlers::BattleUseOnBattler.add(:XSPDEF,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPDEF,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
+  battler.pbRaiseStatStage(:SPECIAL_DEFENSE,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPDEF2,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPDEF,2,battler)
+  battler.pbRaiseStatStage(:SPECIAL_DEFENSE,2,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPDEF3,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPDEF,3,battler)
+  battler.pbRaiseStatStage(:SPECIAL_DEFENSE,3,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPDEF6,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPDEF,6,battler)
+  battler.pbRaiseStatStage(:SPECIAL_DEFENSE,6,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPEED,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPEED,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
+  battler.pbRaiseStatStage(:SPEED,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPEED2,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPEED,2,battler)
+  battler.pbRaiseStatStage(:SPEED,2,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPEED3,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPEED,3,battler)
+  battler.pbRaiseStatStage(:SPEED,3,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XSPEED6,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::SPEED,6,battler)
+  battler.pbRaiseStatStage(:SPEED,6,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XACCURACY,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ACCURACY,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
+  battler.pbRaiseStatStage(:ACCURACY,(Settings::X_STAT_ITEMS_RAISE_BY_TWO_STAGES) ? 2 : 1,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XACCURACY2,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ACCURACY,2,battler)
+  battler.pbRaiseStatStage(:ACCURACY,2,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XACCURACY3,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ACCURACY,3,battler)
+  battler.pbRaiseStatStage(:ACCURACY,3,battler)
  battler.pokemon.changeHappiness("battleitem")
 })

 ItemHandlers::BattleUseOnBattler.add(:XACCURACY6,proc { |item,battler,scene|
-  battler.pbRaiseStatStage(PBStats::ACCURACY,6,battler)
+  battler.pbRaiseStatStage(:ACCURACY,6,battler)
  battler.pokemon.changeHappiness("battleitem")
 })