From d13e57f1d5664f482980d779463e74463b8eb21c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 9 Jan 2023 00:02:32 +0000 Subject: [PATCH] Addition of HuntPass premium item configurations. --- L2J_Mobius_10.3_MasterClass/dist/game/config/HuntPass.ini | 7 ++++--- .../java/org/l2jmobius/Config.java | 8 +++++--- .../clientpackets/huntpass/RequestHuntPassBuyPremium.java | 3 +-- .../dist/game/config/HuntPass.ini | 5 +++-- .../java/org/l2jmobius/Config.java | 8 +++++--- .../clientpackets/huntpass/RequestHuntPassBuyPremium.java | 3 +-- .../dist/game/config/HuntPass.ini | 5 +++-- .../java/org/l2jmobius/Config.java | 8 +++++--- .../clientpackets/huntpass/RequestHuntPassBuyPremium.java | 3 +-- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/config/HuntPass.ini b/L2J_Mobius_10.3_MasterClass/dist/game/config/HuntPass.ini index ace1be050c..63e6e5a7b3 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/config/HuntPass.ini +++ b/L2J_Mobius_10.3_MasterClass/dist/game/config/HuntPass.ini @@ -8,9 +8,10 @@ EnabledHuntPass = False DayOfMonth = 1 # Pass Premium Cost. -# Retail is 8000 Einhasad Coin. -PremiumCost = 8000 +# Retail is Hunt Pass - Additional Reward Coupon (60309). +PremiumItemId = 60309 +PremiumItemCount = 1 # Please take caution when changing anything. # Required Points per Window or step. -PointsForstep = 3000 +PointsForStep = 300000 diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java index a9e4ba1feb..6a076a0706 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java @@ -917,7 +917,8 @@ public class Config // HuntPass public static boolean ENABLE_HUNT_PASS; public static int HUNT_PASS_PERIOD; - public static int HUNT_PASS_PREMIUM_COST; + public static int HUNT_PASS_PREMIUM_ITEM_ID; + public static int HUNT_PASS_PREMIUM_ITEM_COUNT; public static int HUNT_PASS_POINTS_FOR_STEP; // GrandBoss Settings @@ -2661,8 +2662,9 @@ public class Config // Load HuntPass (if exists) final PropertiesParser huntPassConfig = new PropertiesParser(HUNT_PASS_CONFIG_FILE); ENABLE_HUNT_PASS = huntPassConfig.getBoolean("EnabledHuntPass", true); - HUNT_PASS_PREMIUM_COST = huntPassConfig.getInt("PremiumCost", 3600); - HUNT_PASS_POINTS_FOR_STEP = huntPassConfig.getInt("PointsForstep", 2400); + HUNT_PASS_PREMIUM_ITEM_ID = huntPassConfig.getInt("PremiumItemId", 60309); + HUNT_PASS_PREMIUM_ITEM_COUNT = huntPassConfig.getInt("PremiumItemCount", 1); + HUNT_PASS_POINTS_FOR_STEP = huntPassConfig.getInt("PointsForStep", 300000); HUNT_PASS_PERIOD = huntPassConfig.getInt("DayOfMonth", 1); // Gracia Seeds diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java index e0ec02c0d7..5cb75c8455 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java @@ -21,7 +21,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.ReadablePacket; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; @@ -57,7 +56,7 @@ public class RequestHuntPassBuyPremium implements ClientPacket return; } - if (!player.destroyItemByItemId("RequestHuntPassBuyPremium", Inventory.EINHASAD_COIN_ID, Config.HUNT_PASS_PREMIUM_COST, player, true)) + if (!player.destroyItemByItemId("RequestHuntPassBuyPremium", Config.HUNT_PASS_PREMIUM_ITEM_ID, Config.HUNT_PASS_PREMIUM_ITEM_COUNT, player, true)) { player.sendPacket(SystemMessageId.NOT_ENOUGH_MONEY_TO_USE_THE_FUNCTION); return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/HuntPass.ini b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/HuntPass.ini index c1cac51f14..ee8ba9d437 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/HuntPass.ini +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/HuntPass.ini @@ -9,8 +9,9 @@ DayOfMonth = 16 # Pass Premium Cost. # Retail is 3600 L-Coin. -PremiumCost = 3600 +PremiumItemId = 91663 +PremiumItemCount = 3600 # Please take caution when changing anything. # Required Points per Window or step. -PointsForstep = 2400 +PointsForStep = 2400 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java index 33004c8362..b1f0079ee8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java @@ -951,7 +951,8 @@ public class Config // HuntPass public static boolean ENABLE_HUNT_PASS; public static int HUNT_PASS_PERIOD; - public static int HUNT_PASS_PREMIUM_COST; + public static int HUNT_PASS_PREMIUM_ITEM_ID; + public static int HUNT_PASS_PREMIUM_ITEM_COUNT; public static int HUNT_PASS_POINTS_FOR_STEP; // Achivement Box @@ -2694,8 +2695,9 @@ public class Config // Load HuntPass (if exists) final PropertiesParser huntPassConfig = new PropertiesParser(HUNT_PASS_CONFIG_FILE); ENABLE_HUNT_PASS = huntPassConfig.getBoolean("EnabledHuntPass", true); - HUNT_PASS_PREMIUM_COST = huntPassConfig.getInt("PremiumCost", 3600); - HUNT_PASS_POINTS_FOR_STEP = huntPassConfig.getInt("PointsForstep", 2400); + HUNT_PASS_PREMIUM_ITEM_ID = huntPassConfig.getInt("PremiumItemId", 91663); + HUNT_PASS_PREMIUM_ITEM_COUNT = huntPassConfig.getInt("PremiumItemCount", 3600); + HUNT_PASS_POINTS_FOR_STEP = huntPassConfig.getInt("PointsForStep", 2400); HUNT_PASS_PERIOD = huntPassConfig.getInt("DayOfMonth", 1); // Load ArchivementBox (if exists) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java index 40ea495195..5cb75c8455 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java @@ -21,7 +21,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.ReadablePacket; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; @@ -57,7 +56,7 @@ public class RequestHuntPassBuyPremium implements ClientPacket return; } - if (!player.destroyItemByItemId("RequestHuntPassBuyPremium", Inventory.LCOIN_ID, Config.HUNT_PASS_PREMIUM_COST, player, true)) + if (!player.destroyItemByItemId("RequestHuntPassBuyPremium", Config.HUNT_PASS_PREMIUM_ITEM_ID, Config.HUNT_PASS_PREMIUM_ITEM_COUNT, player, true)) { player.sendPacket(SystemMessageId.NOT_ENOUGH_MONEY_TO_USE_THE_FUNCTION); return; diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/HuntPass.ini b/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/HuntPass.ini index c1cac51f14..ee8ba9d437 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/HuntPass.ini +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/HuntPass.ini @@ -9,8 +9,9 @@ DayOfMonth = 16 # Pass Premium Cost. # Retail is 3600 L-Coin. -PremiumCost = 3600 +PremiumItemId = 91663 +PremiumItemCount = 3600 # Please take caution when changing anything. # Required Points per Window or step. -PointsForstep = 2400 +PointsForStep = 2400 diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java index 33004c8362..b1f0079ee8 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java @@ -951,7 +951,8 @@ public class Config // HuntPass public static boolean ENABLE_HUNT_PASS; public static int HUNT_PASS_PERIOD; - public static int HUNT_PASS_PREMIUM_COST; + public static int HUNT_PASS_PREMIUM_ITEM_ID; + public static int HUNT_PASS_PREMIUM_ITEM_COUNT; public static int HUNT_PASS_POINTS_FOR_STEP; // Achivement Box @@ -2694,8 +2695,9 @@ public class Config // Load HuntPass (if exists) final PropertiesParser huntPassConfig = new PropertiesParser(HUNT_PASS_CONFIG_FILE); ENABLE_HUNT_PASS = huntPassConfig.getBoolean("EnabledHuntPass", true); - HUNT_PASS_PREMIUM_COST = huntPassConfig.getInt("PremiumCost", 3600); - HUNT_PASS_POINTS_FOR_STEP = huntPassConfig.getInt("PointsForstep", 2400); + HUNT_PASS_PREMIUM_ITEM_ID = huntPassConfig.getInt("PremiumItemId", 91663); + HUNT_PASS_PREMIUM_ITEM_COUNT = huntPassConfig.getInt("PremiumItemCount", 3600); + HUNT_PASS_POINTS_FOR_STEP = huntPassConfig.getInt("PointsForStep", 2400); HUNT_PASS_PERIOD = huntPassConfig.getInt("DayOfMonth", 1); // Load ArchivementBox (if exists) diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java index 40ea495195..5cb75c8455 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassBuyPremium.java @@ -21,7 +21,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.ReadablePacket; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; @@ -57,7 +56,7 @@ public class RequestHuntPassBuyPremium implements ClientPacket return; } - if (!player.destroyItemByItemId("RequestHuntPassBuyPremium", Inventory.LCOIN_ID, Config.HUNT_PASS_PREMIUM_COST, player, true)) + if (!player.destroyItemByItemId("RequestHuntPassBuyPremium", Config.HUNT_PASS_PREMIUM_ITEM_ID, Config.HUNT_PASS_PREMIUM_ITEM_COUNT, player, true)) { player.sendPacket(SystemMessageId.NOT_ENOUGH_MONEY_TO_USE_THE_FUNCTION); return;