From 66ee5937bcd9fe4f8b95d9779c9d92eecdb860d3 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 18 Apr 2021 16:30:17 +0100 Subject: [PATCH] Fixed Beak Blast/Shell Trap always failing, typo in Brick Break --- .../011_Battle/001_Battler/007_Battler_UseMove.rb | 3 ++- .../011_Battle/002_Move/007_Move_Effects_100-17F.rb | 10 +--------- .../001_Overworld_Weather.rb | 0 .../002_Overworld_Overlays.rb | 0 .../003_Overworld_MapTransitionAnims.rb | 0 .../001_Overworld_BattleStarting.rb | 0 .../002_Overworld_BattleIntroAnim.rb | 0 .../003_Overworld_WildEncounters.rb | 0 .../004_Overworld_EncounterModifiers.rb | 0 .../005_Overworld_RoamingPokemon.rb | 0 .../001_UI_SplashesAndTitleScreen.rb | 0 .../002_UI_Controls.rb | 0 .../003_UI_EggHatching.rb | 0 .../004_UI_Evolution.rb | 0 .../005_UI_Trading.rb | 0 .../006_UI_HallOfFame.rb | 0 .../007_UI_Credits.rb | 0 17 files changed, 3 insertions(+), 10 deletions(-) rename Data/Scripts/012_Overworld/{001_Visuals => 001_Overworld visuals}/001_Overworld_Weather.rb (100%) rename Data/Scripts/012_Overworld/{001_Visuals => 001_Overworld visuals}/002_Overworld_Overlays.rb (100%) rename Data/Scripts/012_Overworld/{001_Visuals => 001_Overworld visuals}/003_Overworld_MapTransitionAnims.rb (100%) rename Data/Scripts/012_Overworld/{002_Battles => 002_Battle triggering}/001_Overworld_BattleStarting.rb (100%) rename Data/Scripts/012_Overworld/{002_Battles => 002_Battle triggering}/002_Overworld_BattleIntroAnim.rb (100%) rename Data/Scripts/012_Overworld/{002_Battles => 002_Battle triggering}/003_Overworld_WildEncounters.rb (100%) rename Data/Scripts/012_Overworld/{002_Battles => 002_Battle triggering}/004_Overworld_EncounterModifiers.rb (100%) rename Data/Scripts/012_Overworld/{002_Battles => 002_Battle triggering}/005_Overworld_RoamingPokemon.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/001_UI_SplashesAndTitleScreen.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/002_UI_Controls.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/003_UI_EggHatching.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/004_UI_Evolution.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/005_UI_Trading.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/006_UI_HallOfFame.rb (100%) rename Data/Scripts/016_UI/{001_Non-interactive => 001_Non-interactive UI}/007_UI_Credits.rb (100%) diff --git a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb b/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb index a6e4d60ab..95175646d 100644 --- a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb +++ b/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb @@ -76,7 +76,6 @@ class PokeBattle_Battler @effects[PBEffects::Grudge] = false @effects[PBEffects::MoveNext] = false @effects[PBEffects::Quash] = 0 - @effects[PBEffects::ShellTrap] = false # Encore's effect ends if the encored move is no longer available if @effects[PBEffects::Encore]>0 && pbEncoredMoveIndex<0 @effects[PBEffects::Encore] = 0 @@ -116,8 +115,10 @@ class PokeBattle_Battler @effects[PBEffects::ChoiceBand] = @lastRegularMoveUsed end end + @effects[PBEffects::BeakBlast] = false @effects[PBEffects::Charge] = 0 if @effects[PBEffects::Charge]==1 @effects[PBEffects::GemConsumed] = nil + @effects[PBEffects::ShellTrap] = false @battle.eachBattler { |b| b.pbContinualAbilityChecks } # Trace, end primordial weathers end diff --git a/Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb b/Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb index 24e77fda7..a6b515ae8 100644 --- a/Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb +++ b/Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb @@ -174,7 +174,7 @@ class PokeBattle_Move_10A < PokeBattle_Move def pbEffectGeneral(user) if user.pbOpposingSide.effects[PBEffects::LightScreen]>0 user.pbOpposingSide.effects[PBEffects::LightScreen] = 0 - @battle.pbDisplayP(_INTL("{1}'s Light Screen wore off!",user.pbOpposingTeam)) + @battle.pbDisplay(_INTL("{1}'s Light Screen wore off!",user.pbOpposingTeam)) end if user.pbOpposingSide.effects[PBEffects::Reflect]>0 user.pbOpposingSide.effects[PBEffects::Reflect] = 0 @@ -2538,14 +2538,6 @@ class PokeBattle_Move_172 < PokeBattle_Move @battle.pbCommonAnimation("BeakBlast",user) @battle.pbDisplay(_INTL("{1} started heating up its beak!",user.pbThis)) end - - def pbMoveFailed?(user,targets) - if !user.effects[PBEffects::BeakBlast] - @battle.pbDisplay(_INTL("But it failed!")) - return true - end - return false - end end diff --git a/Data/Scripts/012_Overworld/001_Visuals/001_Overworld_Weather.rb b/Data/Scripts/012_Overworld/001_Overworld visuals/001_Overworld_Weather.rb similarity index 100% rename from Data/Scripts/012_Overworld/001_Visuals/001_Overworld_Weather.rb rename to Data/Scripts/012_Overworld/001_Overworld visuals/001_Overworld_Weather.rb diff --git a/Data/Scripts/012_Overworld/001_Visuals/002_Overworld_Overlays.rb b/Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb similarity index 100% rename from Data/Scripts/012_Overworld/001_Visuals/002_Overworld_Overlays.rb rename to Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb diff --git a/Data/Scripts/012_Overworld/001_Visuals/003_Overworld_MapTransitionAnims.rb b/Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb similarity index 100% rename from Data/Scripts/012_Overworld/001_Visuals/003_Overworld_MapTransitionAnims.rb rename to Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb diff --git a/Data/Scripts/012_Overworld/002_Battles/001_Overworld_BattleStarting.rb b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb similarity index 100% rename from Data/Scripts/012_Overworld/002_Battles/001_Overworld_BattleStarting.rb rename to Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb diff --git a/Data/Scripts/012_Overworld/002_Battles/002_Overworld_BattleIntroAnim.rb b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb similarity index 100% rename from Data/Scripts/012_Overworld/002_Battles/002_Overworld_BattleIntroAnim.rb rename to Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb diff --git a/Data/Scripts/012_Overworld/002_Battles/003_Overworld_WildEncounters.rb b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb similarity index 100% rename from Data/Scripts/012_Overworld/002_Battles/003_Overworld_WildEncounters.rb rename to Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb diff --git a/Data/Scripts/012_Overworld/002_Battles/004_Overworld_EncounterModifiers.rb b/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb similarity index 100% rename from Data/Scripts/012_Overworld/002_Battles/004_Overworld_EncounterModifiers.rb rename to Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb diff --git a/Data/Scripts/012_Overworld/002_Battles/005_Overworld_RoamingPokemon.rb b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb similarity index 100% rename from Data/Scripts/012_Overworld/002_Battles/005_Overworld_RoamingPokemon.rb rename to Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/001_UI_SplashesAndTitleScreen.rb b/Data/Scripts/016_UI/001_Non-interactive UI/001_UI_SplashesAndTitleScreen.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/001_UI_SplashesAndTitleScreen.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/001_UI_SplashesAndTitleScreen.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/002_UI_Controls.rb b/Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/002_UI_Controls.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/003_UI_EggHatching.rb b/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/003_UI_EggHatching.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/004_UI_Evolution.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/005_UI_Trading.rb b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/005_UI_Trading.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/006_UI_HallOfFame.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb diff --git a/Data/Scripts/016_UI/001_Non-interactive/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb similarity index 100% rename from Data/Scripts/016_UI/001_Non-interactive/007_UI_Credits.rb rename to Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb