From 496912f2d24aac8ce7c422ef71d735e5770baa87 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:52:20 +0000 Subject: [PATCH] Configurations for Exalted quest rewards. Contributed by CostyKiller. --- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 23 ++++--------------- .../model/olympiad/AbstractOlympiadGame.java | 11 ++++----- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 23 ++++--------------- .../model/olympiad/AbstractOlympiadGame.java | 11 ++++----- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 23 ++++--------------- .../model/olympiad/AbstractOlympiadGame.java | 11 ++++----- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 23 ++++--------------- .../model/olympiad/AbstractOlympiadGame.java | 11 ++++----- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 23 ++++--------------- .../model/olympiad/AbstractOlympiadGame.java | 11 ++++----- .../dist/game/config/General.ini | 4 ++++ .../java/org/l2jmobius/Config.java | 4 ++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 23 ++++--------------- .../model/olympiad/AbstractOlympiadGame.java | 11 ++++----- .../dist/game/config/General.ini | 10 ++++++++ .../java/org/l2jmobius/Config.java | 6 +++++ .../ceremonyofchaos/CeremonyOfChaosEvent.java | 17 ++++++-------- .../model/olympiad/AbstractOlympiadGame.java | 16 +++++-------- 28 files changed, 131 insertions(+), 170 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini index 1592fd5bc7..84f2d6ecf5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini @@ -234,6 +234,10 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,80 +ExaltedForHonorItemMax = 45873,100 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java index cb7ef63863..2f12efa871 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java @@ -470,6 +470,8 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -1986,6 +1988,8 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 84300e92a0..9cc2598d13 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -421,34 +418,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent { final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); - final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } - else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) - { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); - AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) - { - qs2.setCond(4, true); - } - } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 6b13dc9d26..4991fab60f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,9 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -421,18 +418,18 @@ public abstract class AbstractOlympiadGame final QuestState qs1 = player.getQuestState("Q10819_ForHonor"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini index 1592fd5bc7..84f2d6ecf5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini @@ -234,6 +234,10 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,80 +ExaltedForHonorItemMax = 45873,100 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java index db03ddcb24..900895b89f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java @@ -470,6 +470,8 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -1999,6 +2001,8 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 84300e92a0..9cc2598d13 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -421,34 +418,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent { final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); - final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } - else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) - { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); - AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) - { - qs2.setCond(4, true); - } - } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 6b13dc9d26..4991fab60f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,9 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -421,18 +418,18 @@ public abstract class AbstractOlympiadGame final QuestState qs1 = player.getQuestState("Q10819_ForHonor"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini index 1592fd5bc7..84f2d6ecf5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini @@ -234,6 +234,10 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,80 +ExaltedForHonorItemMax = 45873,100 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java index 8a37219a93..d931237289 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -464,6 +464,8 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -1979,6 +1981,8 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 84300e92a0..9cc2598d13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -421,34 +418,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent { final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); - final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } - else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) - { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); - AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) - { - qs2.setCond(4, true); - } - } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index ab81b096b4..e6e471cce5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,9 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -421,18 +418,18 @@ public abstract class AbstractOlympiadGame final QuestState qs1 = player.getQuestState("Q10819_ForHonor"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini index 1592fd5bc7..84f2d6ecf5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini +++ b/L2J_Mobius_5.0_Salvation/dist/game/config/General.ini @@ -234,6 +234,10 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,80 +ExaltedForHonorItemMax = 45873,100 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java index 95d6f48c7b..490936df8a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java @@ -459,6 +459,8 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -1980,6 +1982,8 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 13c2c54550..68a9253ca9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -421,34 +418,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent { final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); - final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } - else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) - { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); - AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) - { - qs2.setCond(4, true); - } - } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index ab81b096b4..e6e471cce5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,9 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -421,18 +418,18 @@ public abstract class AbstractOlympiadGame final QuestState qs1 = player.getQuestState("Q10819_ForHonor"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini index 1592fd5bc7..84f2d6ecf5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/General.ini @@ -234,6 +234,10 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,80 +ExaltedForHonorItemMax = 45873,100 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java index 9275eb8320..75277b0c54 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java @@ -459,6 +459,8 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -1987,6 +1989,8 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 84300e92a0..9cc2598d13 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -421,34 +418,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent { final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); - final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } - else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) - { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); - AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) - { - qs2.setCond(4, true); - } - } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index ab81b096b4..e6e471cce5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,9 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -421,18 +418,18 @@ public abstract class AbstractOlympiadGame final QuestState qs1 = player.getQuestState("Q10819_ForHonor"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini index 1592fd5bc7..84f2d6ecf5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini +++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini @@ -234,6 +234,10 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,80 +ExaltedForHonorItemMax = 45873,100 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java index d1f6414e07..725af92272 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java @@ -460,6 +460,8 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -2026,6 +2028,8 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 84300e92a0..9cc2598d13 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -421,34 +418,24 @@ public class CeremonyOfChaosEvent extends AbstractEvent { final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory"); final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor"); - final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } - else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) - { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); - AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) - { - qs2.setCond(4, true); - } - } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index ab81b096b4..e6e471cce5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,9 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -421,18 +418,18 @@ public abstract class AbstractOlympiadGame final QuestState qs1 = player.getQuestState("Q10819_ForHonor"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } 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 850df0bb43..0b04e5938c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/General.ini @@ -234,6 +234,16 @@ AutoDeleteInvalidQuestData = False # Retail: True StoryQuestRewardBuff = True +# Exalted quests related settings +# Enable logs about exalted quests rewards +# Default: False +ExaltedRewardsLogs = True + +# Exalted default rewarded items with max values. +ExaltedForGloryItemMax = 45872,10 +ExaltedForHonorItemMax = 45873,20 +ExaltedForVictoryItemMax = 80825,30 + # Allow creating multiple non-stackable items at one time? # Default: True MultipleItemDrop = True 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 512eecd5ae..d05cc7a12e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java @@ -460,6 +460,9 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; + public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; + public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; + public static ItemHolder EXALTED_FOR_VICTORY_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; @@ -2044,6 +2047,9 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = General.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = General.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = General.getBoolean("StoryQuestRewardBuff", true); + EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,10").split(",")[0]), Integer.parseInt(General.getString("ExaltedForGloryItemMax", "45872,10").split(",")[1])); + EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,20").split(",")[0]), Integer.parseInt(General.getString("ExaltedForHonorItemMax", "45873,20").split(",")[1])); + EXALTED_FOR_VICTORY_ITEM_MAX = new ItemHolder(Integer.parseInt(General.getString("ExaltedForVictoryItemMax", "80825,30").split(",")[0]), Integer.parseInt(General.getString("ExaltedForVictoryItemMax", "80825,30").split(",")[1])); MULTIPLE_ITEM_DROP = General.getBoolean("MultipleItemDrop", true); FORCE_INVENTORY_UPDATE = General.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = General.getBoolean("LazyCache", true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 84300e92a0..ebf4d9fbd4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import java.util.stream.Collectors; +import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.QuestSound; @@ -77,10 +78,6 @@ public class CeremonyOfChaosEvent extends AbstractEvent { private static final Logger LOGGER = Logger.getLogger(CeremonyOfChaosEvent.class.getName()); - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - private final int _id; private final Instance _instance; private final Set _monsters = ConcurrentHashMap.newKeySet(); @@ -424,27 +421,27 @@ public class CeremonyOfChaosEvent extends AbstractEvent final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) { - AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1); + AbstractScript.giveItems(member.getPlayer(), Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30) + if (AbstractScript.getQuestItemsCount(member.getPlayer(), Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_VICTORY_ITEM_MAX.getCount()) { qs2.setCond(4, true); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 0d9521e0de..b143026636 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -63,10 +63,6 @@ public abstract class AbstractOlympiadGame protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed"; protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team"; - private static final int PROOF_OF_BATTLE_1 = 45872; - private static final int PROOF_OF_BATTLE_2 = 45873; - private static final int PROOF_OF_SETTLEMENT = 80825; - protected long _startTime = 0; protected boolean _aborted = false; protected final int _stadiumId; @@ -423,27 +419,27 @@ public abstract class AbstractOlympiadGame final QuestState qs2 = player.getQuestState("Q10825_ForVictory"); if ((qs != null) && !qs.isCompleted() && qs.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_GLORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_GLORY_ITEM_MAX.getCount()) { qs.setCond(2, true); } } else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1)) { - AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_HONOR_ITEM_MAX.getId()) >= Config.EXALTED_FOR_HONOR_ITEM_MAX.getCount()) { qs1.setCond(2, true); } } else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3)) { - AbstractScript.giveItems(player, PROOF_OF_SETTLEMENT, 1); + AbstractScript.giveItems(player, Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId(), 1); AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); - if (AbstractScript.getQuestItemsCount(player, PROOF_OF_SETTLEMENT) >= 30) + if (AbstractScript.getQuestItemsCount(player, Config.EXALTED_FOR_VICTORY_ITEM_MAX.getId()) >= Config.EXALTED_FOR_VICTORY_ITEM_MAX.getCount()) { qs2.setCond(4, true); }