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

Implemented GameData::Metadata and GameData::MapMetadata

Browse Source
This commit is contained in:
Maruno17
2020-11-15 18:59:07 +00:00
parent d8476d1fa4
commit 52ffae9e8a
45 changed files with 803 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/015_Items/001_PItem_Items.rb
View File

@@ -361,14 +361,14 @@ def pbBikeCheck
return false
end
if $PokemonGlobal.bicycle
if pbGetMetadata($game_map.map_id,MapMetadata::BICYCLE_ALWAYS)
if GameData::MapMetadata.get($game_map.map_id).always_bicycle
pbMessage(_INTL("You can't dismount your Bike here."))
return false
end
return true
end
val = pbGetMetadata($game_map.map_id,MapMetadata::BICYCLE)
val = pbGetMetadata($game_map.map_id,MapMetadata::OUTDOOR) if val==nil
val = GameData::MapMetadata.get($game_map.map_id).can_bicycle
val = GameData::MapMetadata.get($game_map.map_id).outdoor_map if val.nil?
if !val
pbMessage(_INTL("Can't use that here."))
return false

13
Data/Scripts/015_Items/004_PItem_Phone.rb
View File

@@ -66,13 +66,14 @@ end
def pbRandomPhoneTrainer
$PokemonGlobal.phoneNumbers = [] if !$PokemonGlobal.phoneNumbers
temparray = []
currentRegion = pbGetMetadata($game_map.map_id,MapMetadata::MAP_POSITION)
currentRegion = GameData::MapMetadata.get($game_map.map_id).town_map_position
return nil if !currentRegion
for num in $PokemonGlobal.phoneNumbers
next if !num[0] || num.length!=8 # if not visible or not a trainer
next if $game_map.map_id==num[6] # Can't call if on same map
callerRegion = pbGetMetadata(num[6],MapMetadata::MAP_POSITION)
callerRegion = GameData::MapMetadata.get(num[6]).town_map_position
# Can't call if in different region
next if callerRegion && currentRegion && callerRegion[0]!=currentRegion[0]
next if !callerRegion || callerRegion[0] != currentRegion[0]
temparray.push(num)
end
return nil if temparray.length==0
@@ -193,9 +194,9 @@ def pbCallTrainer(trtype,trname)
pbMessage(_INTL("The Trainer is close by.\nTalk to the Trainer in person!"))
return
end
callerregion = pbGetMetadata(trainer[6],MapMetadata::MAP_POSITION)
currentregion = pbGetMetadata($game_map.map_id,MapMetadata::MAP_POSITION)
if callerregion && currentregion && callerregion[0]!=currentregion[0]
callerregion = GameData::MapMetadata.get(trainer[6]).town_map_position
currentregion = GameData::MapMetadata.get($game_map.map_id).town_map_position
if !callerregion || !currentregion || callerregion[0] != currentregion[0]
pbMessage(_INTL("The Trainer is out of range."))
return # Can't call if in different region
end