From 243ae0bd521d728843da89b9a9323e2767ab982d Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 10 May 2018 13:08:51 +0000 Subject: [PATCH] Dropped AltFreeTeleport config. Contributed by proGenitor. --- L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini | 4 ---- L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java | 2 -- .../gameserver/model/teleporter/TeleportHolder.java | 2 +- L2J_Mobius_2.5_Underground/dist/game/config/Character.ini | 4 ---- L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java | 2 -- .../gameserver/model/teleporter/TeleportHolder.java | 2 +- L2J_Mobius_3.0_Helios/dist/game/config/Character.ini | 4 ---- L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java | 2 -- .../gameserver/model/teleporter/TeleportHolder.java | 2 +- .../dist/game/config/Character.ini | 4 ---- .../java/com/l2jmobius/Config.java | 2 -- .../gameserver/model/teleporter/TeleportHolder.java | 2 +- .../dist/game/config/Character.ini | 8 ++------ .../java/com/l2jmobius/Config.java | 2 -- .../gameserver/model/teleporter/TeleportHolder.java | 2 +- .../dist/game/config/Character.ini | 8 ++------ .../java/com/l2jmobius/Config.java | 2 -- .../gameserver/model/teleporter/TeleportHolder.java | 2 +- 18 files changed, 10 insertions(+), 46 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini index 0a9c17d342..bfb70cb6e2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini @@ -752,10 +752,6 @@ PetitioningAllowed = True MaxPetitionsPerPlayer = 5 MaxPetitionsPending = 25 -# Free teleporting around the world. -# Default: False -AltFreeTeleporting = False - # Max player level for free teleporting around the world. # Default: 76 MaxFreeTeleportLevel = 76 diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java index 496bb4ffeb..6cf7e28376 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java @@ -274,7 +274,6 @@ public final class Config public static boolean PETITIONING_ALLOWED; public static int MAX_PETITIONS_PER_PLAYER; public static int MAX_PETITIONS_PENDING; - public static boolean ALT_GAME_FREE_TELEPORT; public static int MAX_FREE_TELEPORT_LEVEL; public static int DELETE_DAYS; public static String PARTY_XP_CUTOFF_METHOD; @@ -1739,7 +1738,6 @@ public final class Config PETITIONING_ALLOWED = Character.getBoolean("PetitioningAllowed", true); MAX_PETITIONS_PER_PLAYER = Character.getInt("MaxPetitionsPerPlayer", 5); MAX_PETITIONS_PENDING = Character.getInt("MaxPetitionsPending", 25); - ALT_GAME_FREE_TELEPORT = Character.getBoolean("AltFreeTeleporting", false); MAX_FREE_TELEPORT_LEVEL = Character.getInt("MaxFreeTeleportLevel", 76); DELETE_DAYS = Character.getInt("DeleteCharAfterDays", 1); PARTY_XP_CUTOFF_METHOD = Character.getString("PartyXpCutoffMethod", "level").toLowerCase(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index ca0b46378f..f8dfd518a6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -270,7 +270,7 @@ public final class TeleportHolder */ private boolean shouldPayFee(L2PcInstance player, TeleportLocation loc) { - return (_type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (_type != TeleportType.NORMAL) || (((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); } /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini index 90ecbd24ad..d15ef8025b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini @@ -752,10 +752,6 @@ PetitioningAllowed = True MaxPetitionsPerPlayer = 5 MaxPetitionsPending = 25 -# Free teleporting around the world. -# Default: False -AltFreeTeleporting = False - # Max player level for free teleporting around the world. # Default: 76 MaxFreeTeleportLevel = 76 diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java index fa3d52fcc0..9886002578 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java @@ -280,7 +280,6 @@ public final class Config public static boolean PETITIONING_ALLOWED; public static int MAX_PETITIONS_PER_PLAYER; public static int MAX_PETITIONS_PENDING; - public static boolean ALT_GAME_FREE_TELEPORT; public static int MAX_FREE_TELEPORT_LEVEL; public static int DELETE_DAYS; public static String PARTY_XP_CUTOFF_METHOD; @@ -1754,7 +1753,6 @@ public final class Config PETITIONING_ALLOWED = Character.getBoolean("PetitioningAllowed", true); MAX_PETITIONS_PER_PLAYER = Character.getInt("MaxPetitionsPerPlayer", 5); MAX_PETITIONS_PENDING = Character.getInt("MaxPetitionsPending", 25); - ALT_GAME_FREE_TELEPORT = Character.getBoolean("AltFreeTeleporting", false); MAX_FREE_TELEPORT_LEVEL = Character.getInt("MaxFreeTeleportLevel", 76); DELETE_DAYS = Character.getInt("DeleteCharAfterDays", 1); PARTY_XP_CUTOFF_METHOD = Character.getString("PartyXpCutoffMethod", "level").toLowerCase(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 8e39c90a12..84fb8d0f96 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -270,7 +270,7 @@ public final class TeleportHolder */ private boolean shouldPayFee(L2PcInstance player, TeleportLocation loc) { - return (_type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (_type != TeleportType.NORMAL) || (((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); } /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini index 90ecbd24ad..d15ef8025b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini @@ -752,10 +752,6 @@ PetitioningAllowed = True MaxPetitionsPerPlayer = 5 MaxPetitionsPending = 25 -# Free teleporting around the world. -# Default: False -AltFreeTeleporting = False - # Max player level for free teleporting around the world. # Default: 76 MaxFreeTeleportLevel = 76 diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java index af324c258a..f3d4ecb885 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java @@ -280,7 +280,6 @@ public final class Config public static boolean PETITIONING_ALLOWED; public static int MAX_PETITIONS_PER_PLAYER; public static int MAX_PETITIONS_PENDING; - public static boolean ALT_GAME_FREE_TELEPORT; public static int MAX_FREE_TELEPORT_LEVEL; public static int DELETE_DAYS; public static String PARTY_XP_CUTOFF_METHOD; @@ -1762,7 +1761,6 @@ public final class Config PETITIONING_ALLOWED = Character.getBoolean("PetitioningAllowed", true); MAX_PETITIONS_PER_PLAYER = Character.getInt("MaxPetitionsPerPlayer", 5); MAX_PETITIONS_PENDING = Character.getInt("MaxPetitionsPending", 25); - ALT_GAME_FREE_TELEPORT = Character.getBoolean("AltFreeTeleporting", false); MAX_FREE_TELEPORT_LEVEL = Character.getInt("MaxFreeTeleportLevel", 76); DELETE_DAYS = Character.getInt("DeleteCharAfterDays", 1); PARTY_XP_CUTOFF_METHOD = Character.getString("PartyXpCutoffMethod", "level").toLowerCase(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 8e39c90a12..84fb8d0f96 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -270,7 +270,7 @@ public final class TeleportHolder */ private boolean shouldPayFee(L2PcInstance player, TeleportLocation loc) { - return (_type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (_type != TeleportType.NORMAL) || (((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini index 01021f4ab4..3fb21311bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini @@ -752,10 +752,6 @@ PetitioningAllowed = True MaxPetitionsPerPlayer = 5 MaxPetitionsPending = 25 -# Free teleporting around the world. -# Default: False -AltFreeTeleporting = False - # Max player level for free teleporting around the world. # Default: 76 MaxFreeTeleportLevel = 76 diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java index 06fb9dc857..d3576748eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java @@ -280,7 +280,6 @@ public final class Config public static boolean PETITIONING_ALLOWED; public static int MAX_PETITIONS_PER_PLAYER; public static int MAX_PETITIONS_PENDING; - public static boolean ALT_GAME_FREE_TELEPORT; public static int MAX_FREE_TELEPORT_LEVEL; public static int DELETE_DAYS; public static String PARTY_XP_CUTOFF_METHOD; @@ -1761,7 +1760,6 @@ public final class Config PETITIONING_ALLOWED = Character.getBoolean("PetitioningAllowed", true); MAX_PETITIONS_PER_PLAYER = Character.getInt("MaxPetitionsPerPlayer", 5); MAX_PETITIONS_PENDING = Character.getInt("MaxPetitionsPending", 25); - ALT_GAME_FREE_TELEPORT = Character.getBoolean("AltFreeTeleporting", false); MAX_FREE_TELEPORT_LEVEL = Character.getInt("MaxFreeTeleportLevel", 76); DELETE_DAYS = Character.getInt("DeleteCharAfterDays", 1); PARTY_XP_CUTOFF_METHOD = Character.getString("PartyXpCutoffMethod", "level").toLowerCase(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 8e39c90a12..84fb8d0f96 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -270,7 +270,7 @@ public final class TeleportHolder */ private boolean shouldPayFee(L2PcInstance player, TeleportLocation loc) { - return (_type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (_type != TeleportType.NORMAL) || (((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini index 5433f1a393..c783212cb0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini @@ -701,13 +701,9 @@ PetitioningAllowed = True MaxPetitionsPerPlayer = 5 MaxPetitionsPending = 25 -# Free teleporting around the world. -# Default: False -AltFreeTeleporting = False - # Max player level for free teleporting around the world. -# Default: 0 (Disabled) -MaxFreeTeleportLevel = 0 +# Retail on Classic 2.0: 40 +MaxFreeTeleportLevel = 40 # Max player level for free newbie buffs. # Default: 0 (Disabled) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java index 80726c414d..a9a27e5645 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java @@ -279,7 +279,6 @@ public final class Config public static boolean PETITIONING_ALLOWED; public static int MAX_PETITIONS_PER_PLAYER; public static int MAX_PETITIONS_PENDING; - public static boolean ALT_GAME_FREE_TELEPORT; public static int MAX_FREE_TELEPORT_LEVEL; public static int MAX_NEWBIE_BUFF_LEVEL; public static int DELETE_DAYS; @@ -1685,7 +1684,6 @@ public final class Config PETITIONING_ALLOWED = Character.getBoolean("PetitioningAllowed", true); MAX_PETITIONS_PER_PLAYER = Character.getInt("MaxPetitionsPerPlayer", 5); MAX_PETITIONS_PENDING = Character.getInt("MaxPetitionsPending", 25); - ALT_GAME_FREE_TELEPORT = Character.getBoolean("AltFreeTeleporting", false); MAX_FREE_TELEPORT_LEVEL = Character.getInt("MaxFreeTeleportLevel", 0); MAX_NEWBIE_BUFF_LEVEL = Character.getInt("MaxNewbieBuffLevel", 0); DELETE_DAYS = Character.getInt("DeleteCharAfterDays", 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index ca0b46378f..f8dfd518a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -270,7 +270,7 @@ public final class TeleportHolder */ private boolean shouldPayFee(L2PcInstance player, TeleportLocation loc) { - return (_type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (_type != TeleportType.NORMAL) || (((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); } /** diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini index 5433f1a393..c783212cb0 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini @@ -701,13 +701,9 @@ PetitioningAllowed = True MaxPetitionsPerPlayer = 5 MaxPetitionsPending = 25 -# Free teleporting around the world. -# Default: False -AltFreeTeleporting = False - # Max player level for free teleporting around the world. -# Default: 0 (Disabled) -MaxFreeTeleportLevel = 0 +# Retail on Classic 2.0: 40 +MaxFreeTeleportLevel = 40 # Max player level for free newbie buffs. # Default: 0 (Disabled) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java index 69b2000ecc..785717e1f2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java @@ -279,7 +279,6 @@ public final class Config public static boolean PETITIONING_ALLOWED; public static int MAX_PETITIONS_PER_PLAYER; public static int MAX_PETITIONS_PENDING; - public static boolean ALT_GAME_FREE_TELEPORT; public static int MAX_FREE_TELEPORT_LEVEL; public static int MAX_NEWBIE_BUFF_LEVEL; public static int DELETE_DAYS; @@ -1689,7 +1688,6 @@ public final class Config PETITIONING_ALLOWED = Character.getBoolean("PetitioningAllowed", true); MAX_PETITIONS_PER_PLAYER = Character.getInt("MaxPetitionsPerPlayer", 5); MAX_PETITIONS_PENDING = Character.getInt("MaxPetitionsPending", 25); - ALT_GAME_FREE_TELEPORT = Character.getBoolean("AltFreeTeleporting", false); MAX_FREE_TELEPORT_LEVEL = Character.getInt("MaxFreeTeleportLevel", 0); MAX_NEWBIE_BUFF_LEVEL = Character.getInt("MaxNewbieBuffLevel", 0); DELETE_DAYS = Character.getInt("DeleteCharAfterDays", 1); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index ca0b46378f..f8dfd518a6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -270,7 +270,7 @@ public final class TeleportHolder */ private boolean shouldPayFee(L2PcInstance player, TeleportLocation loc) { - return (_type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (_type != TeleportType.NORMAL) || (((player.getLevel() > Config.MAX_FREE_TELEPORT_LEVEL) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); } /**