DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 21:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs relating to followers from previous commit, fixed error in Safari Battles from previous commit

Browse Source
This commit is contained in:
Maruno17
2021-12-11 01:44:44 +00:00
parent 2e3d479752
commit b9d69b780b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb
View File

@@ -47,7 +47,7 @@ class Battle::FakeBattler
end end
def opposes?(i) def opposes?(i)
i = i.index if i.is_a?(FakeBattler) i = i.index if i.is_a?(Battle::FakeBattler)
return (@index&1)!=(i&1) return (@index&1)!=(i&1)
end end

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

@@ -257,7 +257,7 @@ HiddenMoveHandlers::CanUseMove.add(:DIG,proc { |move,pkmn,showmsg|
pbMessage(_INTL("Can't use that here.")) if showmsg pbMessage(_INTL("Can't use that here.")) if showmsg
next false next false
end end
if $game_player.can_map_transfer_with_follower? if !$game_player.can_map_transfer_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
next false next false
end end
@@ -501,7 +501,7 @@ HiddenMoveHandlers::UseMove.add(:FLASH,proc { |move,pokemon|
def pbCanFly?(pkmn = nil, show_messages = false) def pbCanFly?(pkmn = nil, show_messages = false)
return false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_FLY, show_messages) return false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_FLY, show_messages)
return false if !$DEBUG && !pkmn && !$player.get_pokemon_with_move(:FLY) return false if !$DEBUG && !pkmn && !$player.get_pokemon_with_move(:FLY)
if $game_player.can_map_transfer_with_follower? if !$game_player.can_map_transfer_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) if show_messages pbMessage(_INTL("It can't be used when you have someone with you.")) if show_messages
return false return false
end end
@@ -731,7 +731,7 @@ HiddenMoveHandlers::UseMove.add(:STRENGTH,proc { |move,pokemon|
#=============================================================================== #===============================================================================
def pbSurf def pbSurf
return false if $game_player.pbFacingEvent return false if $game_player.pbFacingEvent
return false if $game_player.can_ride_vehicle_with_follower? return false if !$game_player.can_ride_vehicle_with_follower?
move = :SURF move = :SURF
movefinder = $player.get_pokemon_with_move(move) movefinder = $player.get_pokemon_with_move(move)
if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF,false) || (!$DEBUG && !movefinder) if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF,false) || (!$DEBUG && !movefinder)
@@ -808,7 +808,7 @@ HiddenMoveHandlers::CanUseMove.add(:SURF,proc { |move,pkmn,showmsg|
pbMessage(_INTL("You're already surfing.")) if showmsg pbMessage(_INTL("You're already surfing.")) if showmsg
next false next false
end end
if $game_player.can_ride_vehicle_with_follower? if !$game_player.can_ride_vehicle_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
next false next false
end end
@@ -904,7 +904,7 @@ HiddenMoveHandlers::CanUseMove.add(:TELEPORT,proc { |move,pkmn,showmsg|
pbMessage(_INTL("Can't use that here.")) if showmsg pbMessage(_INTL("Can't use that here.")) if showmsg
next false next false
end end
if $game_player.can_map_transfer_with_follower? if !$game_player.can_map_transfer_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
next false next false
end end

2
Data/Scripts/013_Items/001_Item_Utilities.rb
View File

@@ -454,7 +454,7 @@ def pbBikeCheck
pbMessage(_INTL("Can't use that here.")) pbMessage(_INTL("Can't use that here."))
return false return false
end end
if $game_player.can_ride_vehicle_with_follower? if !$game_player.can_ride_vehicle_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) pbMessage(_INTL("It can't be used when you have someone with you."))
return false return false
end end

6
Data/Scripts/013_Items/002_Item_Effects.rb
View File

@@ -21,7 +21,7 @@ ItemHandlers::UseFromBag.add(:HONEY,proc { |item|
}) })
ItemHandlers::UseFromBag.add(:ESCAPEROPE,proc { |item| ItemHandlers::UseFromBag.add(:ESCAPEROPE,proc { |item|
if $game_player.can_map_transfer_with_follower? if !$game_player.can_map_transfer_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) pbMessage(_INTL("It can't be used when you have someone with you."))
next 0 next 0
end end
@@ -77,7 +77,7 @@ ItemHandlers::ConfirmUseInField.add(:ESCAPEROPE,proc { |item|
pbMessage(_INTL("Can't use that here.")) pbMessage(_INTL("Can't use that here."))
next false next false
end end
if $game_player.can_map_transfer_with_follower? if !$game_player.can_map_transfer_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) pbMessage(_INTL("It can't be used when you have someone with you."))
next false next false
end end
@@ -168,7 +168,7 @@ ItemHandlers::UseInField.add(:ESCAPEROPE,proc { |item|
pbMessage(_INTL("Can't use that here.")) pbMessage(_INTL("Can't use that here."))
next false next false
end end
if $game_player.can_map_transfer_with_follower? if !$game_player.can_map_transfer_with_follower?
pbMessage(_INTL("It can't be used when you have someone with you.")) pbMessage(_INTL("It can't be used when you have someone with you."))
next false next false
end end