From 689b1f09df7e3e6e12effa97dbbb8a5da4d3204d Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 16 Oct 2022 13:49:01 -0400 Subject: [PATCH] shinies glitter balls fix --- Data/Map363.rxdata | Bin 25453 -> 25453 bytes Data/MapInfos.rxdata | Bin 37278 -> 37278 bytes .../001_Battler/001_PokeBattle_Battler.rb | 4 ++++ .../005_Battle scene/009_Scene_Animations.rb | 6 ++++-- Data/Scripts/014_Pokemon/001_Pokemon.rb | 3 ++- Data/Scripts/050_AddOns/New Balls.rb | 2 +- Data/System.rxdata | Bin 28878 -> 28877 bytes 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Data/Map363.rxdata b/Data/Map363.rxdata index 0bc59c2fea96d262eb75d3b652f49e613b03d53c..783cb82c1e0861ad485fbf2e734adebf83d2f916 100644 GIT binary patch literal 25453 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 literal 25453 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 l{?Y*cOaZbJsjsFB03&$}mH+?% delta 43 wcmbQYm}%Z(rVUCgj3JYiS&A4#Hcw-zU}1FI%+DEV3#2mLxY>bJsjsFB03@FbhyVZp diff --git a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb index 16e92671b..d976db834 100644 --- a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb +++ b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb @@ -189,6 +189,10 @@ class PokeBattle_Battler end alias isShiny? shiny? + def glitter? + return @pokemon.glitter + end + def owned? return false if !@battle.wildBattle? return $Trainer.owned?(displaySpecies) diff --git a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb b/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb index 11dc06775..f07780a22 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb @@ -129,8 +129,10 @@ class PokeBattle_Scene sendOutAnims.each { |a| a[0].dispose; a[1].dispose } # Play shininess animations for shiny Pokémon sendOuts.each do |b| - next if !@battle.showAnims || !@battle.battlers[b[0]].shiny? - pbCommonAnimation("Shiny",@battle.battlers[b[0]]) + next if !@battle.showAnims || + if @battle.battlers[b[0]].shiny? || @battle.battlers[b[0]].glitter? + pbCommonAnimation("Shiny",@battle.battlers[b[0]]) + end end end diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index 4d1e48e8e..e40ed84d2 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -31,6 +31,7 @@ class Pokemon # This Pokémon's shininess (true, false, nil). Is recalculated if made nil. # @param value [Boolean, nil] whether this Pokémon is shiny #attr_writer :shiny + attr_accessor :glitter attr_accessor :head_shiny attr_accessor :body_shiny attr_accessor :debug_shiny @@ -1221,7 +1222,7 @@ class Pokemon @ivMaxed = {} @ev = {} @hiddenPowerType = nil - + @glitter=nil GameData::Stat.each_main do |s| @iv[s.id] = rand(IV_STAT_LIMIT + 1) @ev[s.id] = 0 diff --git a/Data/Scripts/050_AddOns/New Balls.rb b/Data/Scripts/050_AddOns/New Balls.rb index f81c1adb4..cfa29a3e8 100644 --- a/Data/Scripts/050_AddOns/New Balls.rb +++ b/Data/Scripts/050_AddOns/New Balls.rb @@ -50,7 +50,7 @@ BallHandlers::ModifyCatchRate.add(:SHINYBALL,proc{|ball,catchRate,battle,pokemon next catchRate }) BallHandlers::OnCatch.add(:SHINYBALL,proc{|ball,battle,pokemon| - pokemon.makeShiny + pokemon.glitter=true }) #PERFECTBALL 29 diff --git a/Data/System.rxdata b/Data/System.rxdata index b0aadc1d2b0e917445506f47692bb4f1995ac893..9e1e8ea88b8614b2790077714f5395a2df56f7b5 100644 GIT binary patch delta 26 icmX^2kn!w8#tl&tEX)rUn{1Aka0_M3-n=YVgBbvv?h0Z6 delta 27 jcmX^6kn!9@#tl&ttSpPJMzCy-lW+@VRNuTbSA!V