mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
#==============================================================================#
|
||||
module Settings
|
||||
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
|
||||
GAME_VERSION = '6.2.0'
|
||||
GAME_VERSION_NUMBER = "6.2.0"
|
||||
GAME_VERSION = '6.2.1'
|
||||
GAME_VERSION_NUMBER = "6.2.1"
|
||||
|
||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||
|
||||
@@ -10,7 +10,7 @@ class PokeRadar_UI
|
||||
|
||||
ICON_LINE_END = 450
|
||||
|
||||
GRAPHICS_Z = 99999
|
||||
GRAPHICS_Z = 99998
|
||||
|
||||
def initialize(seenPokemon = [], unseenPokemon = [], rarePokemon = [])
|
||||
@seen_pokemon = seenPokemon
|
||||
|
||||
@@ -27,7 +27,7 @@ Events.onWildPokemonCreate+=proc {|sender,e|
|
||||
if player_on_hidden_ability_map || isAlwaysHiddenAbilityMap($game_map.map_id)
|
||||
pokemon=e[0]
|
||||
chosenAbility = pokemon.getAbilityList.sample #format: [[:ABILITY, index],...]
|
||||
#pokemon.ability = chosenAbility[0]
|
||||
pokemon.ability = chosenAbility[0]
|
||||
pokemon.ability_index = chosenAbility[1]
|
||||
end
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ def migrateOldSavesToCharacterCustomization()
|
||||
$Trainer.unlocked_hairstyles = [Settings::DEFAULT_OUTFIT_MALE, Settings::DEFAULT_OUTFIT_FEMALE]
|
||||
end
|
||||
|
||||
if !$Trainer.clothes || !$Trainer.hair || !$Trainer.hat
|
||||
if !$Trainer.clothes || !$Trainer.hair #|| !$Trainer.hat
|
||||
setupStartingOutfit()
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user