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

More bugfixes (and one Gen 8 addition) (#155)

Browse Source 
* Added comment indicating unused method pbRefreshSceneMap
* Removed superfluous ending of Beak Blast's effect
* Fixed crash when playing an animation in the animation player
* Added SwSh Terrain effects
This commit is contained in:
Golisopod-User
2022-01-12 03:06:01 +05:30
committed by GitHub
parent 767a47d90f
commit ff465a78a6
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -109,11 +109,20 @@ def pbPrepareBattle(battle)
battle.showAnims = ($PokemonSystem.battlescene == 0)
battle.showAnims = battleRules["battleAnims"] if !battleRules["battleAnims"].nil?
# Terrain
battle.defaultTerrain = battleRules["defaultTerrain"] if !battleRules["defaultTerrain"].nil?
if battleRules["defaultTerrain"].nil? && Settings::OVERWORLD_WEATHERS_SET_TERRAINS
case $game_screen.weather_type
when :Storm
battle.defaultTerrain = :Electric
when :Fog
battle.defaultTerrain = :Misty
end
else
battle.defaultTerrain = battleRules["defaultTerrain"]
end
# Weather
if battleRules["defaultWeather"].nil?
case GameData::Weather.get($game_screen.weather_type).category
when :Rain
when :Rain, :Storm
battle.defaultWeather = :Rain
when :Hail
battle.defaultWeather = :Hail