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

Fixes issue with gym randomizer when wiping out in a gym

Browse Source
This commit is contained in:
infinitefusion
2023-11-14 20:29:02 -05:00
parent 3943ce1684
commit 1acc5ef4f7
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/010_Data/002_PBS data/013_Trainer.rb
View File

@@ -154,7 +154,9 @@ module GameData
end end
if $game_switches[SWITCH_RANDOM_GYM_PERSIST_TEAMS] && $PokemonGlobal.randomGymTrainersHash != nil if $game_switches[SWITCH_RANDOM_GYM_PERSIST_TEAMS] && $PokemonGlobal.randomGymTrainersHash != nil
if $PokemonGlobal.randomGymTrainersHash[trainerId] != nil && $PokemonGlobal.randomGymTrainersHash[trainerId].length >= $PokemonGlobal.randomTrainersHash[trainerId].length if $PokemonGlobal.randomGymTrainersHash[trainerId] != nil && $PokemonGlobal.randomGymTrainersHash[trainerId].length >= $PokemonGlobal.randomTrainersHash[trainerId].length
return getSpecies($PokemonGlobal.randomGymTrainersHash[trainerId][pokemonIndex]) newSpecies = getSpecies($PokemonGlobal.randomGymTrainersHash[trainerId][pokemonIndex])
return newSpecies if newSpecies
return species
end end
end end
new_species = generateRandomGymSpecies(species) new_species = generateRandomGymSpecies(species)

1
Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb
View File

@@ -82,6 +82,7 @@ end
# Blacking out animation # Blacking out animation
#=============================================================================== #===============================================================================
def pbStartOver(gameover=false) def pbStartOver(gameover=false)
$game_variables[VAR_CURRENT_GYM_TYPE]=-1
if pbInBugContest? if pbInBugContest?
pbBugContestStartOver pbBugContestStartOver
return return

4
Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
View File

@@ -127,7 +127,7 @@ def bstOk(newspecies, oldPokemonSpecies, bst_range = 50)
end end
def gymLeaderOk(newspecies) def gymLeaderOk(newspecies)
return true if $game_variables[152] == -1 #not in a gym return true if $game_variables[VAR_CURRENT_GYM_TYPE] == -1 #not in a gym
leaderType = getLeaderType() leaderType = getLeaderType()
if leaderType == nil if leaderType == nil
return true return true
@@ -138,7 +138,7 @@ def gymLeaderOk(newspecies)
end end
def getLeaderType() def getLeaderType()
currentGym = $game_variables[152] currentGym = $game_variables[VAR_CURRENT_GYM_TYPE]
if currentGym > $game_variables[151].length if currentGym > $game_variables[151].length
return nil return nil
else else

1
Data/Scripts/050_AddOns/GameplayUtils.rb
View File

@@ -209,7 +209,6 @@ def playPokeFluteAnimation
end end
def restoreDefaultCharacterSprite(charset_number=0) def restoreDefaultCharacterSprite(charset_number=0)
meta = GameData::Metadata.get_player($Trainer.character_ID)
$game_player.setDefaultCharName(nil, 0, false) $game_player.setDefaultCharName(nil, 0, false)
Graphics.update Graphics.update
Input.update Input.update