From 01bd285cec57c4c6dfb26b5856cdcbdfae7c22a8 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 19 Sep 2021 22:00:01 +0000 Subject: [PATCH] Resume auto play upon enter game configuration. --- L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini | 4 ++++ L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java | 2 ++ .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- L2J_Mobius_8.2_Homunculus/dist/game/config/General.ini | 4 ++++ L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/Config.java | 2 ++ .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 2 ++ .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 2 ++ .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 2 ++ .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- 18 files changed, 42 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini index 03a065ef63..533eedf234 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini @@ -671,6 +671,10 @@ EnableAutoSkill = True # Default: True EnableAutoItem = True +# Resume auto play upon enter game. +# Retail: False +ResumeAutoPlay = False + # --------------------------------------------------------------------------- # Developer Settings diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java index 73aeead223..5fb85e66fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java @@ -587,6 +587,7 @@ public class Config public static boolean ENABLE_AUTO_POTION; public static boolean ENABLE_AUTO_SKILL; public static boolean ENABLE_AUTO_ITEM; + public static boolean RESUME_AUTO_PLAY; // -------------------------------------------------- // FloodProtector Settings @@ -2166,6 +2167,7 @@ public class Config ENABLE_AUTO_POTION = General.getBoolean("EnableAutoPotion", true); ENABLE_AUTO_SKILL = General.getBoolean("EnableAutoSkill", true); ENABLE_AUTO_ITEM = General.getBoolean("EnableAutoItem", true); + RESUME_AUTO_PLAY = General.getBoolean("ResumeAutoPlay", false); // Load FloodProtector config file final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0039ea5105..f38b2ccea6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14323,7 +14323,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = settings.get(1) == 1; + final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_8.2_Homunculus/dist/game/config/General.ini b/L2J_Mobius_8.2_Homunculus/dist/game/config/General.ini index a7d09a29b9..0cd8f228e0 100644 --- a/L2J_Mobius_8.2_Homunculus/dist/game/config/General.ini +++ b/L2J_Mobius_8.2_Homunculus/dist/game/config/General.ini @@ -666,6 +666,10 @@ EnableAutoSkill = True # Default: True EnableAutoItem = True +# Resume auto play upon enter game. +# Retail: False +ResumeAutoPlay = False + # --------------------------------------------------------------------------- # Developer Settings diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/Config.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/Config.java index 6a2783cd14..892cd835a5 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/Config.java @@ -585,6 +585,7 @@ public class Config public static boolean ENABLE_AUTO_POTION; public static boolean ENABLE_AUTO_SKILL; public static boolean ENABLE_AUTO_ITEM; + public static boolean RESUME_AUTO_PLAY; // -------------------------------------------------- // FloodProtector Settings @@ -2162,6 +2163,7 @@ public class Config ENABLE_AUTO_POTION = General.getBoolean("EnableAutoPotion", true); ENABLE_AUTO_SKILL = General.getBoolean("EnableAutoSkill", true); ENABLE_AUTO_ITEM = General.getBoolean("EnableAutoItem", true); + RESUME_AUTO_PLAY = General.getBoolean("ResumeAutoPlay", false); // Load FloodProtector config file final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE); diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9e4e2b0074..3d4e538d3c 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14393,7 +14393,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = settings.get(1) == 1; + final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/config/General.ini b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/config/General.ini index a7d09a29b9..0cd8f228e0 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/config/General.ini +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/config/General.ini @@ -666,6 +666,10 @@ EnableAutoSkill = True # Default: True EnableAutoItem = True +# Resume auto play upon enter game. +# Retail: False +ResumeAutoPlay = False + # --------------------------------------------------------------------------- # Developer Settings diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java index c83e324e53..29c4fa4c9d 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java @@ -585,6 +585,7 @@ public class Config public static boolean ENABLE_AUTO_POTION; public static boolean ENABLE_AUTO_SKILL; public static boolean ENABLE_AUTO_ITEM; + public static boolean RESUME_AUTO_PLAY; // -------------------------------------------------- // FloodProtector Settings @@ -2162,6 +2163,7 @@ public class Config ENABLE_AUTO_POTION = General.getBoolean("EnableAutoPotion", true); ENABLE_AUTO_SKILL = General.getBoolean("EnableAutoSkill", true); ENABLE_AUTO_ITEM = General.getBoolean("EnableAutoItem", true); + RESUME_AUTO_PLAY = General.getBoolean("ResumeAutoPlay", false); // Load FloodProtector config file final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE); diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d2ff06632e..a060198061 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14430,7 +14430,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = settings.get(1) == 1; + final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini index 37fef061a6..09454a473c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini @@ -666,6 +666,10 @@ EnableAutoSkill = True # Default: True EnableAutoItem = True +# Resume auto play upon enter game. +# Retail: False +ResumeAutoPlay = False + # --------------------------------------------------------------------------- # Developer Settings diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index 3df3f8e45c..5c42c56d19 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -610,6 +610,7 @@ public class Config public static boolean ENABLE_AUTO_POTION; public static boolean ENABLE_AUTO_SKILL; public static boolean ENABLE_AUTO_ITEM; + public static boolean RESUME_AUTO_PLAY; // -------------------------------------------------- // FloodProtector Settings @@ -2078,6 +2079,7 @@ public class Config ENABLE_AUTO_POTION = General.getBoolean("EnableAutoPotion", true); ENABLE_AUTO_SKILL = General.getBoolean("EnableAutoSkill", true); ENABLE_AUTO_ITEM = General.getBoolean("EnableAutoItem", true); + RESUME_AUTO_PLAY = General.getBoolean("ResumeAutoPlay", false); // Load FloodProtector config file final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8dfa210fc5..7a83c1fee6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14303,7 +14303,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = settings.get(1) == 1; + final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini index aa40430588..af3872ec34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini @@ -666,6 +666,10 @@ EnableAutoSkill = True # Default: True EnableAutoItem = True +# Resume auto play upon enter game. +# Retail: False +ResumeAutoPlay = False + # --------------------------------------------------------------------------- # Developer Settings diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java index 2d3ca78659..b777468e6b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -610,6 +610,7 @@ public class Config public static boolean ENABLE_AUTO_POTION; public static boolean ENABLE_AUTO_SKILL; public static boolean ENABLE_AUTO_ITEM; + public static boolean RESUME_AUTO_PLAY; public static int SHARING_LOCATION_COST; public static int TELEPORT_SHARE_LOCATION_COST; @@ -2108,8 +2109,7 @@ public class Config ENABLE_AUTO_POTION = General.getBoolean("EnableAutoPotion", true); ENABLE_AUTO_SKILL = General.getBoolean("EnableAutoSkill", true); ENABLE_AUTO_ITEM = General.getBoolean("EnableAutoItem", true); - - // Share Location + RESUME_AUTO_PLAY = General.getBoolean("ResumeAutoPlay", false); SHARING_LOCATION_COST = General.getInt("ShareLocationLcoinCost", 1); TELEPORT_SHARE_LOCATION_COST = General.getInt("ShareLocationLcoinCost", 1); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3910b2d655..9b3aa7fb8c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14563,7 +14563,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = settings.get(1) == 1; + final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini index 32cdff03b1..b60a49a76f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini @@ -666,6 +666,10 @@ EnableAutoSkill = True # Default: True EnableAutoItem = True +# Resume auto play upon enter game. +# Retail: False +ResumeAutoPlay = False + # --------------------------------------------------------------------------- # Purge Settings diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java index 56a02f0838..b12e929db7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java @@ -610,6 +610,7 @@ public class Config public static boolean ENABLE_AUTO_POTION; public static boolean ENABLE_AUTO_SKILL; public static boolean ENABLE_AUTO_ITEM; + public static boolean RESUME_AUTO_PLAY; public static int SHARING_LOCATION_COST; public static int TELEPORT_SHARE_LOCATION_COST; @@ -2111,6 +2112,7 @@ public class Config ENABLE_AUTO_POTION = General.getBoolean("EnableAutoPotion", true); ENABLE_AUTO_SKILL = General.getBoolean("EnableAutoSkill", true); ENABLE_AUTO_ITEM = General.getBoolean("EnableAutoItem", true); + RESUME_AUTO_PLAY = General.getBoolean("ResumeAutoPlay", false); SUBJUGATION_TOPIC_BODY = General.getString("SubjugationTopicBody", "Reward for being in the top of the best players in clearing the lands of Aden"); SUBJUGATION_TOPIC_HEADER = General.getString("SubjugationTopicHeader", "Purge reward"); SHARING_LOCATION_COST = General.getInt("ShareLocationLcoinCost", 1); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d2c8a3765f..47e154367e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14640,7 +14640,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = settings.get(1) == 1; + final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1;