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 crash upon gaining a Pokémon after starting a new game, fixed default player's potentially being longer than allowed

Browse Source
This commit is contained in:
Maruno17
2021-04-27 21:34:07 +01:00
parent 853ce8e9e5
commit e1ae094ff4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/003_Game processing/001_StartGame.rb
View File

@@ -49,6 +49,8 @@ module Game
$MapFactory = PokemonMapFactory.new($data_system.start_map_id) $MapFactory = PokemonMapFactory.new($data_system.start_map_id)
$game_player.moveto($data_system.start_x, $data_system.start_y) $game_player.moveto($data_system.start_x, $data_system.start_y)
$game_player.refresh $game_player.refresh
$PokemonEncounters = PokemonEncounters.new
$PokemonEncounters.setup($game_map.map_id)
$game_map.autoplay $game_map.autoplay
$game_map.update $game_map.update
end end

10
Data/Scripts/019_Utilities/001_Utilities.rb
View File

@@ -247,18 +247,20 @@ end
def pbSuggestTrainerName(gender) def pbSuggestTrainerName(gender)
userName = pbGetUserName() userName = pbGetUserName()
userName = userName.gsub(/\s+.*$/,"") userName = userName.gsub(/\s+.*$/,"")
if userName.length>0 && userName.length<7 if userName.length>0 && userName.length<Settings::MAX_PLAYER_NAME_SIZE
userName[0,1] = userName[0,1].upcase userName[0,1] = userName[0,1].upcase
return userName return userName
end end
userName = userName.gsub(/\d+$/,"") userName = userName.gsub(/\d+$/,"")
if userName.length>0 && userName.length<7 if userName.length>0 && userName.length<Settings::MAX_PLAYER_NAME_SIZE
userName[0,1] = userName[0,1].upcase userName[0,1] = userName[0,1].upcase
return userName return userName
end end
return System.user_name.capitalize userName = System.user_name.capitalize
userName = userName[0, Settings::MAX_PLAYER_NAME_SIZE]
return userName
# Unreachable # Unreachable
#return getRandomNameEx(gender, nil, 1, Settings::MAX_PLAYER_NAME_SIZE) # return getRandomNameEx(gender, nil, 1, Settings::MAX_PLAYER_NAME_SIZE)
end end
def pbGetUserName def pbGetUserName