Made Player Transfer event command not cancel surfing/diving, so pbTransferSurfing and pbTransferUnderwater are deprecated.

This commit is contained in:
Maruno17
2021-11-21 19:10:16 +00:00
parent ddb95a8bb6
commit c8b574ed7c
6 changed files with 41 additions and 7 deletions

View File

@@ -67,9 +67,9 @@ class Scene_Map
Graphics.frame_reset
end
def transfer_player(cancelVehicles=true)
def transfer_player(cancel_swimming = true)
$game_temp.player_transferring = false
pbCancelVehicles($game_temp.player_new_map_id) if cancelVehicles
pbCancelVehicles($game_temp.player_new_map_id, cancel_swimming)
autofade($game_temp.player_new_map_id)
pbBridgeOff
@spritesetGlobal.playersprite.clearShadows
@@ -124,7 +124,7 @@ class Scene_Map
$game_system.update
$game_screen.update
break unless $game_temp.player_transferring
transfer_player
transfer_player(false)
break if $game_temp.transition_processing
end
updateSpritesets
@@ -167,7 +167,7 @@ class Scene_Map
$game_system.update
$game_screen.update
break unless $game_temp.player_transferring
transfer_player
transfer_player(false)
break if $game_temp.transition_processing
end
updateSpritesets

View File

@@ -576,9 +576,9 @@ def pbUpdateVehicle
end
end
def pbCancelVehicles(destination=nil)
$PokemonGlobal.surfing = false
$PokemonGlobal.diving = false
def pbCancelVehicles(destination = nil, cancel_swimming = true)
$PokemonGlobal.surfing = false if cancel_swimming
$PokemonGlobal.diving = false if cancel_swimming
$PokemonGlobal.bicycle = false if !destination || !pbCanUseBike?(destination)
pbUpdateVehicle
end

View File

@@ -329,31 +329,37 @@ end
#===============================================================================
# Deprecated methods
#===============================================================================
# @deprecated This method is slated to be removed in v21.
def pbAddDependency2(event_id, name, common_event_id)
Deprecation.warn_method('pbAddDependency2', 'v21', 'Followers.add(event_id, name, common_event_id)')
Followers.add(event_id, name, common_event_id)
end
# @deprecated This method is slated to be removed in v21.
def pbAddDependency(event)
Deprecation.warn_method('pbAddDependency', 'v21', 'Followers.add_event(event)')
Followers.add_event(event)
end
# @deprecated This method is slated to be removed in v21.
def pbRemoveDependency2(name)
Deprecation.warn_method('pbRemoveDependency2', 'v21', 'Followers.remove(name)')
Followers.remove(name)
end
# @deprecated This method is slated to be removed in v21.
def pbRemoveDependency(event)
Deprecation.warn_method('pbRemoveDependency', 'v21', 'Followers.remove_event(event)')
Followers.remove_event(event)
end
# @deprecated This method is slated to be removed in v21.
def pbRemoveDependencies
Deprecation.warn_method('pbRemoveDependencies', 'v21', 'Followers.clear')
Followers.clear
end
# @deprecated This method is slated to be removed in v21.
def pbGetDependency(name)
Deprecation.warn_method('pbGetDependency', 'v21', 'Followers.get(name)')
Followers.get(name)

View File

@@ -367,7 +367,9 @@ def pbSurfacing
return false
end
# @deprecated This method is slated to be removed in v21.
def pbTransferUnderwater(mapid,x,y,direction=$game_player.direction)
Deprecation.warn_method('pbTransferUnderwater', 'v21', '"Transfer Player" event command')
pbFadeOutIn {
$game_temp.player_new_map_id = mapid
$game_temp.player_new_x = x
@@ -778,7 +780,9 @@ def pbEndSurf(_xOffset,_yOffset)
return false
end
# @deprecated This method is slated to be removed in v21.
def pbTransferSurfing(mapid,xcoord,ycoord,direction=$game_player.direction)
Deprecation.warn_method('pbTransferSurfing', 'v21', '"Transfer Player" event command')
pbFadeOutIn {
$game_temp.player_new_map_id = mapid
$game_temp.player_new_x = xcoord

View File

@@ -518,46 +518,55 @@ Events.onStepTaken += proc { |_sender,_e|
#===============================================================================
# Deprecated methods
#===============================================================================
# @deprecated This method is slated to be removed in v21.
def pbDayCareDeposited
Deprecation.warn_method('pbDayCareDeposited', 'v21', 'DayCare.count')
return DayCare.count
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareGetDeposited(index, name_var, cost_var)
Deprecation.warn_method('pbDayCareGetDeposited', 'v21', 'DayCare.get_details(index, name_var, cost_var)')
DayCare.get_details(index, name_var, cost_var)
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareGetLevelGain(index, name_var, level_var)
Deprecation.warn_method('pbDayCareGetLevelGain', 'v21', 'DayCare.get_level_gain(index, name_var, level_var)')
DayCare.get_level_gain(index, name_var, level_var)
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareDeposit(party_index)
Deprecation.warn_method('pbDayCareDeposit', 'v21', 'DayCare.deposit(party_index)')
DayCare.deposit(party_index)
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareWithdraw(index)
Deprecation.warn_method('pbDayCareWithdraw', 'v21', 'DayCare.withdraw(index)')
DayCare.withdraw(index)
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareChoose(text, choice_var)
Deprecation.warn_method('pbDayCareChoose', 'v21', 'DayCare.choose(text, choice_var)')
DayCare.choose(text, choice_var)
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareGetCompatibility(compat_var)
Deprecation.warn_method('pbDayCareGetCompatibility', 'v21', 'DayCare.get_compatibility(compat_var)')
DayCare.get_compatibility(compat_var)
end
# @deprecated This method is slated to be removed in v21.
def pbEggGenerated?
Deprecation.warn_method('pbEggGenerated?', 'v21', 'DayCare.egg_generated?')
return DayCare.egg_generated?
end
# @deprecated This method is slated to be removed in v21.
def pbDayCareGenerateEgg
Deprecation.warn_method('pbDayCareGenerateEgg', 'v21', 'DayCare.collect_egg')
DayCare.collect_egg

View File

@@ -336,77 +336,92 @@ end
# Deprecated methods
#===============================================================================
class PokemonBag
# @deprecated This method is slated to be removed in v21.
def pbQuantity(item)
Deprecation.warn_method('pbQuantity', 'v21', '$bag.quantity(item)')
return quantity(item)
end
# @deprecated This method is slated to be removed in v21.
def pbHasItem?(item)
Deprecation.warn_method('pbHasItem?', 'v21', '$bag.has?(item)')
return has?(item)
end
# @deprecated This method is slated to be removed in v21.
def pbCanStore?(item, quantity = 1)
Deprecation.warn_method('pbCanStore?', 'v21', '$bag.can_add?(item, quantity)')
return can_add?(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreItem(item, quantity = 1)
Deprecation.warn_method('pbStoreItem', 'v21', '$bag.add(item, quantity)')
return add(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreAllOrNone(item, quantity = 1)
Deprecation.warn_method('pbStoreAllOrNone', 'v21', '$bag.add_all(item, quantity)')
return add_all(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbChangeItem(old_item, new_item)
Deprecation.warn_method('pbChangeItem', 'v21', '$bag.replace_item(old_item, new_item)')
return replace_item(old_item, new_item)
end
# @deprecated This method is slated to be removed in v21.
def pbDeleteItem(item, quantity = 1)
Deprecation.warn_method('pbDeleteItem', 'v21', '$bag.remove(item, quantity)')
return remove(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbIsRegistered?(item)
Deprecation.warn_method('pbIsRegistered?', 'v21', '$bag.registered?(item)')
return registered?(item)
end
# @deprecated This method is slated to be removed in v21.
def pbRegisterItem(item)
Deprecation.warn_method('pbRegisterItem', 'v21', '$bag.register(item)')
register(item)
end
# @deprecated This method is slated to be removed in v21.
def pbUnregisterItem(item)
Deprecation.warn_method('pbUnregisterItem', 'v21', '$bag.unregister(item)')
unregister(item)
end
end
# @deprecated This method is slated to be removed in v21.
def pbQuantity(item)
Deprecation.warn_method('pbQuantity', 'v21', '$bag.quantity(item)')
return $bag.quantity(item)
end
# @deprecated This method is slated to be removed in v21.
def pbHasItem?(item)
Deprecation.warn_method('pbHasItem?', 'v21', '$bag.has?(item)')
return $bag.has?(item)
end
# @deprecated This method is slated to be removed in v21.
def pbCanStore?(item, quantity = 1)
Deprecation.warn_method('pbCanStore?', 'v21', '$bag.can_add?(item, quantity)')
return $bag.can_add?(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreItem(item, quantity = 1)
Deprecation.warn_method('pbStoreItem', 'v21', '$bag.add(item, quantity)')
return $bag.add(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreAllOrNone(item, quantity = 1)
Deprecation.warn_method('pbStoreAllOrNone', 'v21', '$bag.add_all(item, quantity)')
return $bag.add_all(item, quantity)