DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 06:34:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved global/map metadata constants and schema into modules

Browse Source
This commit is contained in:
Maruno17
2020-10-16 22:05:38 +01:00
parent 71a4d09224
commit e82b5409fb
25 changed files with 170 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Data/Scripts/013_Overworld/011_PField_FieldMoves.rb
View File

@@ -302,7 +302,7 @@ HiddenMoveHandlers::UseMove.add(:DIG,proc { |move,pokemon|
# Dive
#===============================================================================
def pbDive
divemap = pbGetMetadata($game_map.map_id,MetadataDiveMap)
divemap = pbGetMetadata($game_map.map_id,MapMetadata::DIVE_MAP)
return false if !divemap
move = getID(PBMoves,:DIVE)
movefinder = pbCheckMove(move)
@@ -336,7 +336,7 @@ def pbSurfacing
divemap = nil
meta = pbLoadMetadata
for i in 0...meta.length
if meta[i] && meta[i][MetadataDiveMap] && meta[i][MetadataDiveMap]==$game_map.map_id
if meta[i] && meta[i][MapMetadata::DIVE_MAP] && meta[i][MapMetadata::DIVE_MAP]==$game_map.map_id
divemap = i; break
end
end
@@ -360,7 +360,7 @@ def pbSurfacing
$PokemonGlobal.diving = false
pbUpdateVehicle
$scene.transfer_player(false)
surfbgm = pbGetMetadata(0,MetadataSurfBGM)
surfbgm = pbGetMetadata(0,Metadata::SURF_BGM)
(surfbgm) ? pbBGMPlay(surfbgm) : $game_map.autoplayAsCue
$game_map.refresh
}
@@ -389,7 +389,7 @@ Events.onAction += proc { |_sender,_e|
divemap = nil
meta = pbLoadMetadata
for i in 0...meta.length
if meta[i] && meta[i][MetadataDiveMap] && meta[i][MetadataDiveMap]==$game_map.map_id
if meta[i] && meta[i][MapMetadata::DIVE_MAP] && meta[i][MapMetadata::DIVE_MAP]==$game_map.map_id
divemap = i; break
end
end
@@ -409,7 +409,7 @@ HiddenMoveHandlers::CanUseMove.add(:DIVE,proc { |move,pkmn,showmsg|
divemap = nil
meta = pbLoadMetadata
for i in 0...meta.length
if meta[i] && meta[i][MetadataDiveMap] && meta[i][MetadataDiveMap]==$game_map.map_id
if meta[i] && meta[i][MapMetadata::DIVE_MAP] && meta[i][MapMetadata::DIVE_MAP]==$game_map.map_id
divemap = i; break
end
end
@@ -418,7 +418,7 @@ HiddenMoveHandlers::CanUseMove.add(:DIVE,proc { |move,pkmn,showmsg|
next false
end
else
if !pbGetMetadata($game_map.map_id,MetadataDiveMap)
if !pbGetMetadata($game_map.map_id,MapMetadata::DIVE_MAP)
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
end
@@ -436,12 +436,12 @@ HiddenMoveHandlers::UseMove.add(:DIVE,proc { |move,pokemon|
divemap = nil
meta = pbLoadMetadata
for i in 0...meta.length
if meta[i] && meta[i][MetadataDiveMap] && meta[i][MetadataDiveMap]==$game_map.map_id
if meta[i] && meta[i][MapMetadata::DIVE_MAP] && meta[i][MapMetadata::DIVE_MAP]==$game_map.map_id
divemap = i; break
end
end
else
divemap = pbGetMetadata($game_map.map_id,MetadataDiveMap)
divemap = pbGetMetadata($game_map.map_id,MapMetadata::DIVE_MAP)
end
next false if !divemap
if !pbHiddenMoveAnimation(pokemon)
@@ -469,7 +469,7 @@ HiddenMoveHandlers::UseMove.add(:DIVE,proc { |move,pokemon|
#===============================================================================
HiddenMoveHandlers::CanUseMove.add(:FLASH,proc { |move,pkmn,showmsg|
next false if !pbCheckHiddenMoveBadge(BADGE_FOR_FLASH,showmsg)
if !pbGetMetadata($game_map.map_id,MetadataDarkMap)
if !pbGetMetadata($game_map.map_id,MapMetadata::DARK_MAP)
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
end
@@ -509,7 +509,7 @@ HiddenMoveHandlers::CanUseMove.add(:FLY,proc { |move,pkmn,showmsg|
pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
next false
end
if !pbGetMetadata($game_map.map_id,MetadataOutdoor)
if !pbGetMetadata($game_map.map_id,MapMetadata::OUTDOOR)
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
end
@@ -715,7 +715,7 @@ def pbSurf
pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
pbCancelVehicles
pbHiddenMoveAnimation(movefinder)
surfbgm = pbGetMetadata(0,MetadataSurfBGM)
surfbgm = pbGetMetadata(0,Metadata::SURF_BGM)
pbCueBGM(surfbgm,0.5) if surfbgm
pbStartSurfing
return true
@@ -768,7 +768,7 @@ end
Events.onAction += proc { |_sender,_e|
next if $PokemonGlobal.surfing
next if pbGetMetadata($game_map.map_id,MetadataBicycleAlways)
next if pbGetMetadata($game_map.map_id,MapMetadata::BICYCLE_ALWAYS)
next if !PBTerrain.isSurfable?(pbFacingTerrainTag)
next if !$game_map.passable?($game_player.x,$game_player.y,$game_player.direction,$game_player)
pbSurf
@@ -784,7 +784,7 @@ HiddenMoveHandlers::CanUseMove.add(:SURF,proc { |move,pkmn,showmsg|
pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
next false
end
if pbGetMetadata($game_map.map_id,MetadataBicycleAlways)
if pbGetMetadata($game_map.map_id,MapMetadata::BICYCLE_ALWAYS)
pbMessage(_INTL("Let's enjoy cycling!")) if showmsg
next false
end
@@ -802,7 +802,7 @@ HiddenMoveHandlers::UseMove.add(:SURF,proc { |move,pokemon|
if !pbHiddenMoveAnimation(pokemon)
pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))
end
surfbgm = pbGetMetadata(0,MetadataSurfBGM)
surfbgm = pbGetMetadata(0,Metadata::SURF_BGM)
pbCueBGM(surfbgm,0.5) if surfbgm
pbStartSurfing
next true
@@ -865,12 +865,12 @@ HiddenMoveHandlers::UseMove.add(:SWEETSCENT,proc { |move,pokemon|
# Teleport
#===============================================================================
HiddenMoveHandlers::CanUseMove.add(:TELEPORT,proc { |move,pkmn,showmsg|
if !pbGetMetadata($game_map.map_id,MetadataOutdoor)
if !pbGetMetadata($game_map.map_id,MapMetadata::OUTDOOR)
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
end
healing = $PokemonGlobal.healingSpot
healing = pbGetMetadata(0,MetadataHome) if !healing # Home
healing = pbGetMetadata(0,Metadata::HOME) if !healing # Home
if !healing
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
@@ -884,7 +884,7 @@ HiddenMoveHandlers::CanUseMove.add(:TELEPORT,proc { |move,pkmn,showmsg|
HiddenMoveHandlers::ConfirmUseMove.add(:TELEPORT,proc { |move,pkmn|
healing = $PokemonGlobal.healingSpot
healing = pbGetMetadata(0,MetadataHome) if !healing # Home
healing = pbGetMetadata(0,Metadata::HOME) if !healing # Home
next false if !healing
mapname = pbGetMapNameFromId(healing[0])
next pbConfirmMessage(_INTL("Want to return to the healing spot used last in {1}?",mapname))
@@ -892,7 +892,7 @@ HiddenMoveHandlers::ConfirmUseMove.add(:TELEPORT,proc { |move,pkmn|
HiddenMoveHandlers::UseMove.add(:TELEPORT,proc { |move,pokemon|
healing = $PokemonGlobal.healingSpot
healing = pbGetMetadata(0,MetadataHome) if !healing # Home
healing = pbGetMetadata(0,Metadata::HOME) if !healing # Home
next false if !healing
if !pbHiddenMoveAnimation(pokemon)
pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))