DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some Vs animations not playing for double battles against 1 trainer, fixed typo in Grassy Glide's effect

Browse Source
This commit is contained in:
Maruno17
2022-07-08 13:44:04 +01:00
parent 3314477f08
commit 8ae07a6d15
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb
View File

@@ -649,7 +649,7 @@ end
class Battle::Move::HigherPriorityInGrassyTerrain < Battle::Move
def pbPriority(user)
ret = super
ret += 1 if @battle.field.terrain == :Grass && user.affectedByTerrain?
ret += 1 if @battle.field.terrain == :Grassy && user.affectedByTerrain?
return ret
end
end

6
Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb
View File

@@ -195,7 +195,7 @@ end
#===============================================================================
SpecialBattleIntroAnimations.register("vs_trainer_animation", 60, # Priority 60
proc { |battle_type, foe, location| # Condition
next false if battle_type != 1 # Single trainer battle
next false if battle_type.even? || foe.length != 1 # Trainer battle against 1 trainer
tr_type = foe[0].trainer_type
next pbResolveBitmap("Graphics/Transitions/hgss_vs_#{tr_type}") &&
pbResolveBitmap("Graphics/Transitions/hgss_vsBar_#{tr_type}")
@@ -218,7 +218,7 @@ SpecialBattleIntroAnimations.register("vs_trainer_animation", 60, # Priority 6
#===============================================================================
SpecialBattleIntroAnimations.register("vs_elite_four_animation", 60, # Priority 60
proc { |battle_type, foe, location| # Condition
next false if battle_type != 1 # Single trainer battle
next false if battle_type.even? || foe.length != 1 # Trainer battle against 1 trainer
tr_type = foe[0].trainer_type
next pbResolveBitmap("Graphics/Transitions/vsE4_#{tr_type}") &&
pbResolveBitmap("Graphics/Transitions/vsE4Bar_#{tr_type}")
@@ -274,7 +274,7 @@ SpecialBattleIntroAnimations.register("vs_admin_animation", 60, # Priority 60
##### Tweaked by Maruno #####
SpecialBattleIntroAnimations.register("alternate_vs_trainer_animation", 50, # Priority 50
proc { |battle_type, foe, location| # Condition
next false if battle_type != 1 # Single trainer battle
next false if battle_type.even? || foe.length != 1 # Trainer battle against 1 trainer
tr_type = foe[0].trainer_type
next pbResolveBitmap("Graphics/Transitions/vsTrainer_#{tr_type}") &&
pbResolveBitmap("Graphics/Transitions/vsBar_#{tr_type}")