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

Revert "6.0 release"

Browse Source 
This reverts commit a0aea8f030.
This commit is contained in:
infinitefusion
2023-11-12 14:23:52 -05:00
parent a0aea8f030
commit ba7ee9bae2
4753 changed files with 317630 additions and 21175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -401,9 +401,6 @@ def pbTransferUnderwater(mapid, x, y, direction = $game_player.direction)
$game_temp.player_new_x = x
$game_temp.player_new_y = y
$game_temp.player_new_direction = direction
$PokemonGlobal.diving = true
$PokemonGlobal.surfing = false
$scene.transfer_player(false)
$game_map.autoplay
$game_map.refresh
@@ -428,6 +425,7 @@ Events.onAction += proc { |_sender, _e|
end
}
HiddenMoveHandlers::CanUseMove.add(:DIVE, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_DIVE, showmsg)
if $PokemonGlobal.diving
@@ -494,7 +492,7 @@ HiddenMoveHandlers::UseMove.add(:DIVE, proc { |move, pokemon|
HiddenMoveHandlers::CanUseMove.add(:FLASH, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_FLASH, showmsg)
if !GameData::MapMetadata.exists?($game_map.map_id) ||
!(GameData::MapMetadata.get($game_map.map_id).dark_map || darknessEffectOnCurrentMap())
!GameData::MapMetadata.get($game_map.map_id).dark_map
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
end
@@ -827,49 +825,6 @@ Events.onAction += proc { |_sender, _e|
pbSurf
}
#Flowers
Events.onAction += proc { |_sender, _e|
next if !$game_player.pbFacingTerrainTag.flower
if $game_player.pbFacingTerrainTag.flowerRed
if $game_switches[SWITCH_ORICORIO_QUEST_IN_PROGRESS]
oricorioEventPickFlower(:RED)
else
changeOricorioFlower(1)
end
end
if $game_player.pbFacingTerrainTag.flowerYellow
if $game_switches[SWITCH_ORICORIO_QUEST_IN_PROGRESS]
else
changeOricorioFlower(2)
end
end
if $game_player.pbFacingTerrainTag.flowerPink
if $game_switches[SWITCH_ORICORIO_QUEST_IN_PROGRESS]
oricorioEventPickFlower(:PINK)
else
changeOricorioFlower(3)
end
end
if $game_player.pbFacingTerrainTag.flowerBlue
if $game_switches[SWITCH_ORICORIO_QUEST_IN_PROGRESS]
oricorioEventPickFlower(:BLUE)
else
changeOricorioFlower(4)
end
end
}
#Trashcan
Events.onAction += proc { |_sender, _e|
next if !$game_player.pbFacingTerrainTag.trashcan
if $PokemonGlobal.stepcount % 25 == 0
pbMessage(_INTL("Woah! A Pokémon jumped out of the trashcan!"))
pbWildBattle(:TRUBBISH, 10)
$PokemonGlobal.stepcount += 1
end
}
HiddenMoveHandlers::CanUseMove.add(:SURF, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF, showmsg)
if $PokemonGlobal.surfing
@@ -1086,6 +1041,8 @@ HiddenMoveHandlers::UseMove.add(:WATERFALL, proc { |move, pokemon|
next true
})
HiddenMoveHandlers::CanUseMove.add(:ROCKCLIMB, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKCLIMB, showmsg)
if !$game_player.pbFacingTerrainTag.ledge