Removed deprecated code, renamed "base_damage"/"baseDamage"/"baseDmg" to "power"

2025-12-09 14:14:59 +00:00 · 2023-02-10 21:18:10 +00:00
parent 8a3353973b
commit becce85550
26 changed files with 295 additions and 1024 deletions
--- a/triggering/001_Overworld_BattleStarting.rb
+++ b/triggering/001_Overworld_BattleStarting.rb
@@ -739,103 +739,3 @@ def pbHoneyGather(pkmn)
  return unless rand(100) < chance
  pkmn.item = :HONEY
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This method is slated to be removed in v21.
-def pbNewBattleScene
-  Deprecation.warn_method("pbNewBattleScene", "v21", "BattleCreationHelperMethods.create_battle_scene")
-  return BattleCreationHelperMethods.create_battle_scene
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbPrepareBattle(battle)
-  Deprecation.warn_method("pbPrepareBattle", "v21", "BattleCreationHelperMethods.prepare_battle(battle)")
-  BattleCreationHelperMethods.prepare_battle(battle)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbWildBattleCore(*args)
-  Deprecation.warn_method("pbWildBattleCore", "v21", "WildBattle.start_core(species, level)")
-  return WildBattle.start_core(*args)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbWildBattle(species, level, outcomeVar = 1, canRun = true, canLose = false)
-  Deprecation.warn_method("pbWildBattle", "v21", "WildBattle.start(species, level)")
-  setBattleRule("outcomeVar", outcomeVar) if outcomeVar != 1
-  setBattleRule("cannotRun") if !canRun
-  setBattleRule("canLose") if canLose
-  return WildBattle.start(species, level)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbDoubleWildBattle(species1, level1, species2, level2,
-                       outcomeVar = 1, canRun = true, canLose = false)
-  Deprecation.warn_method("pbDoubleWildBattle", "v21", "WildBattle.start(pkmn1, pkmn2)")
-  setBattleRule("outcomeVar", outcomeVar) if outcomeVar != 1
-  setBattleRule("cannotRun") if !canRun
-  setBattleRule("canLose") if canLose
-  setBattleRule("double")
-  return WildBattle.start(species1, level1, species2, level2)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbTripleWildBattle(species1, level1, species2, level2, species3, level3,
-                       outcomeVar = 1, canRun = true, canLose = false)
-  Deprecation.warn_method("pbTripleWildBattle", "v21", "WildBattle.start(pkmn1, pkmn2, pkmn3)")
-  setBattleRule("outcomeVar", outcomeVar) if outcomeVar != 1
-  setBattleRule("cannotRun") if !canRun
-  setBattleRule("canLose") if canLose
-  setBattleRule("triple")
-  return WildBattle.start(species1, level1, species2, level2, species3, level3)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbTrainerBattleCore(*args)
-  Deprecation.warn_method("pbTrainerBattleCore", "v21", "TrainerBattle.start_core(trainer_type, trainer_name, trainer_version)")
-  return TrainerBattle.start_core(*args)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbTrainerBattle(trainerID, trainerName, endSpeech = nil,
-                    doubleBattle = false, trainerPartyID = 0, canLose = false, outcomeVar = 1)
-  Deprecation.warn_method("pbTrainerBattle", "v21", "TrainerBattle.start(trainer_type, trainer_name, trainer_version)")
-  setBattleRule("outcomeVar", outcomeVar) if outcomeVar != 1
-  setBattleRule("canLose") if canLose
-  setBattleRule("double") if doubleBattle
-  return TrainerBattle.start(trainerID, trainerName, trainerPartyID)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbDoubleTrainerBattle(trainerID1, trainerName1, trainerPartyID1, endSpeech1,
-                          trainerID2, trainerName2, trainerPartyID2 = 0, endSpeech2 = nil,
-                          canLose = false, outcomeVar = 1)
-  Deprecation.warn_method("pbDoubleTrainerBattle", "v21", "TrainerBattle.start(trainer1, trainer2)")
-  setBattleRule("outcomeVar", outcomeVar) if outcomeVar != 1
-  setBattleRule("canLose") if canLose
-  setBattleRule("double")
-  return TrainerBattle.start(trainerID1, trainerName1, trainerPartyID1,
-                             trainerID2, trainerName2, trainerPartyID2)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbTripleTrainerBattle(trainerID1, trainerName1, trainerPartyID1, endSpeech1,
-                          trainerID2, trainerName2, trainerPartyID2, endSpeech2,
-                          trainerID3, trainerName3, trainerPartyID3 = 0, endSpeech3 = nil,
-                          canLose = false, outcomeVar = 1)
-  Deprecation.warn_method("pbTripleTrainerBattle", "v21", "TrainerBattle.start(trainer1, trainer2, trainer3)")
-  setBattleRule("outcomeVar", outcomeVar) if outcomeVar != 1
-  setBattleRule("canLose") if canLose
-  setBattleRule("triple")
-  return TrainerBattle.start(trainerID1, trainerName1, trainerPartyID1,
-                             trainerID2, trainerName2, trainerPartyID2,
-                             trainerID3, trainerName3, trainerPartyID3)
-end
-
-# @deprecated This method is slated to be removed in v21.
-def pbAfterBattle(outcome, can_lose)
-  Deprecation.warn_method("pbAfterBattle", "v21", "BattleCreationHelperMethods.after_battle(outcome, can_lose)")
-  BattleCreationHelperMethods.after_battle(outcome, can_lose)
-end
--- a/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb
+++ b/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb
@@ -14,8 +14,8 @@ class PokemonGlobalMetadata
  attr_accessor :stepcount
  attr_accessor :pcItemStorage
  attr_accessor :mailbox
-  attr_accessor :phoneNumbers   # Deprecated
-  attr_accessor :phoneTime   # Deprecated
+  attr_accessor :phoneNumbers   # Deprecated - to be removed in v22
+  attr_accessor :phoneTime   # Deprecated - to be removed in v22
  attr_accessor :phone
  attr_accessor :partner
  attr_accessor :creditsPlayed
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -357,20 +357,6 @@ 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 do
-    $game_temp.player_new_map_id    = mapid
-    $game_temp.player_new_x         = x
-    $game_temp.player_new_y         = y
-    $game_temp.player_new_direction = direction
-    $scene.transfer_player(false)
-    $game_map.autoplay
-    $game_map.refresh
-  end
-end
-
 EventHandlers.add(:on_player_interact, :diving,
  proc {
    if $PokemonGlobal.diving
@@ -755,20 +741,6 @@ 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 do
-    $game_temp.player_new_map_id    = mapid
-    $game_temp.player_new_x         = xcoord
-    $game_temp.player_new_y         = ycoord
-    $game_temp.player_new_direction = direction
-    $scene.transfer_player(false)
-    $game_map.autoplay
-    $game_map.refresh
-  end
-end
-
 EventHandlers.add(:on_player_interact, :start_surfing,
  proc {
    next if $PokemonGlobal.surfing
--- a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
+++ b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
@@ -562,60 +562,3 @@ EventHandlers.add(:on_player_step_taken, :update_day_care,
    $PokemonGlobal.day_care.update_on_step_taken
  }
 )
-
-#===============================================================================
-# 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
-end