mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-11-03 00:06:01 +00:00
Release 6.9.0
This commit is contained in:
@@ -35,6 +35,10 @@ class ContactsAppScreen
|
||||
contacts_list_by_location[_INTL("Favorites")] << trainer
|
||||
else
|
||||
location = trainer.location
|
||||
if trainer.location_map_id
|
||||
translated_location = pbGetMessage(MessageTypes::MapNames, trainer.location_map_id)
|
||||
location = translated_location if translated_location && translated_location != ""
|
||||
end
|
||||
contacts_list_by_location[location] ||= []
|
||||
contacts_list_by_location[location] << trainer
|
||||
end
|
||||
|
||||
@@ -357,7 +357,7 @@ class PokeRadarAppScene < PokeNavAppScene
|
||||
end
|
||||
|
||||
def showAreaName
|
||||
map_name = getMapName($game_map.map_id)
|
||||
map_name = pbGetMapNameFromId($game_map.map_id)
|
||||
text = _INTL("{1}", map_name)
|
||||
encounter_type = get_encounter_type_name
|
||||
if encounter_type && !encounter_type.empty?
|
||||
@@ -389,8 +389,10 @@ class PokeRadarAppScene < PokeNavAppScene
|
||||
return _INTL("Grass")
|
||||
when :WaterMorning, :WaterDay, :WaterNight
|
||||
return _INTL("Water")
|
||||
when :TallGrass
|
||||
when :TallGrass, :TallGrassNight
|
||||
return _INTL("Tall Grass")
|
||||
when :Puddle
|
||||
return _INTL("Shallow Water")
|
||||
else
|
||||
return encounter_type.to_s
|
||||
end
|
||||
@@ -401,7 +403,7 @@ end
|
||||
def getTerrainType
|
||||
encounter_type = $PokemonEncounters.encounter_type
|
||||
case encounter_type
|
||||
when :Land, :Land1, :Land2, :Land3, :LandMorning, :LandDay, :LandNight, :TallGrass
|
||||
when :Land, :Land1, :Land2, :Land3, :Land4, :LandMorning, :LandDay, :LandNight, :TallGrass, :TallGrassNight
|
||||
return :Grass
|
||||
else
|
||||
return encounter_type
|
||||
|
||||
Reference in New Issue
Block a user