Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/.gitignore b/L2J_Mobius_C4_ScionsOfDestiny/.gitignore
- new file mode 100644
- index 0000000..ae3c172
- --- /dev/null
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/.gitignore
- @@ -0,0 +1 @@
- +/bin/
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini
- index b462ee8..c3729b6 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini
- @@ -461,6 +461,11 @@
- # Default: 10
- WearPrice = 10
- +# Disable additional adena rewards for starter villages repeatable quests based on turning in items
- +# True = additional reward for 10+ items not given on quest turn in, False = get additional reward for 10+ items on quest turn in
- +# ATTENTION: enabling this option greatly decrease adena income capabilities on low levels.
- +# Default: False
- +AltVillagesRepQuestReward = False
- # ---------------------------------------------------------------------------
- # Enable/Disable features
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java
- index 87bb409..a2e5b6f 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java
- @@ -66,7 +66,7 @@
- case "31371-02.htm":
- {
- st.takeItems(MUNITIONS_BOX, 1);
- - st.rewardExpAndSp(79787, 0);
- + st.rewardExpAndSp(79761, 0);
- st.playSound(QuestState.SOUND_FINISH);
- st.exitQuest(false);
- break;
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java
- index cc30bc9..c3e7119 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q101_SwordOfSolidarity extends Quest
- @@ -86,18 +87,22 @@
- st.takeItems(BROKEN_SWORD_HANDLE, 1);
- st.giveItems(SWORD_OF_SOLIDARITY, 1);
- st.giveItems(LESSER_HEALING_POT, 100);
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- if (player.isMageClass())
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- st.giveItems(ECHO_BATTLE, 10);
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java
- index ebbb082..5c73209 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q102_SeaOfSporesFever extends Quest
- @@ -54,6 +55,9 @@
- private static final int ECHO_SOLITUDE = 4414;
- private static final int ECHO_FEAST = 4415;
- private static final int ECHO_CELEBRATION = 4416;
- + // Newbie Rewards
- + private static final int SPIRITSHOT_FOR_BEGINNERS = 5790;
- + private static final int SOULSHOT_FOR_BEGINNERS = 5789;
- public Q102_SeaOfSporesFever()
- {
- @@ -155,6 +159,25 @@
- st.rewardItems(SOULSHOT_NO_GRADE, 1000);
- }
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- + {
- + st.showQuestionMark(26);
- + if (player.isMageClass())
- + {
- + st.playTutorialVoice("tutorial_voice_027");
- + st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- + }
- + else
- + {
- + st.playTutorialVoice("tutorial_voice_026");
- + st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- + }
- + }
- +
- st.giveItems(LESSER_HEALING_POT, 100);
- st.giveItems(ECHO_BATTLE, 10);
- st.giveItems(ECHO_LOVE, 10);
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java
- index 6a1c03f..ba9bdde 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q103_SpiritOfCraftsman extends Quest
- @@ -134,19 +135,22 @@
- {
- st.giveItems(SOULSHOT_NO_GRADE, 1000);
- }
- -
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- if (player.isMageClass())
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java
- index 6f42fa2..11dd4c7 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java
- @@ -23,6 +23,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q104_SpiritOfMirrors extends Quest
- @@ -139,19 +140,22 @@
- {
- st.giveItems(SOULSHOT_NO_GRADE, 1000);
- }
- -
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- if (player.isMageClass())
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java
- index 9e62f88..be8087b 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q105_SkirmishWithTheOrcs extends Quest
- @@ -51,6 +52,7 @@
- private static final int SOULSHOT_FOR_BEGINNERS = 5789;
- private static final int RED_SUNSET_STAFF = 754;
- private static final int RED_SUNSET_SWORD = 981;
- + private static final int LESSER_HEALING_POT = 1060;
- private static final int ECHO_BATTLE = 4412;
- private static final int ECHO_LOVE = 4413;
- private static final int ECHO_SOLITUDE = 4414;
- @@ -153,22 +155,26 @@
- {
- st.giveItems(RED_SUNSET_SWORD, 1);
- }
- -
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- if (player.isMageClass())
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- + st.rewardItems(LESSER_HEALING_POT, 100);
- st.giveItems(ECHO_BATTLE, 10);
- st.giveItems(ECHO_LOVE, 10);
- st.giveItems(ECHO_SOLITUDE, 10);
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java
- index fd7d5e0..1d53ebf 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q106_ForgottenTruth extends Quest
- @@ -138,19 +139,22 @@
- {
- st.giveItems(SOULSHOT_NO_GRADE, 1000);
- }
- -
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- if (player.isMageClass())
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- - st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- + st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java
- index 01c4cb2..7b09733 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q107_MercilessPunishment extends Quest
- @@ -38,7 +39,6 @@
- private static final int LETTER_TO_ELF = 1558;
- // Rewards
- private static final int BUTCHER_SWORD = 1510;
- - private static final int SPIRITSHOT_FOR_BEGINNERS = 5790;
- private static final int SOULSHOT_FOR_BEGINNERS = 5789;
- private static final int ECHO_BATTLE = 4412;
- private static final int ECHO_LOVE = 4413;
- @@ -162,20 +162,14 @@
- st.giveItems(BUTCHER_SWORD, 1);
- st.giveItems(LESSER_HEALING_POTION, 100);
- -
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- - if (player.isMageClass())
- - {
- - st.playTutorialVoice("tutorial_voice_027");
- - st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- - }
- - else
- - {
- - st.playTutorialVoice("tutorial_voice_026");
- - st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- - }
- + st.playTutorialVoice("tutorial_voice_026");
- + st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- st.giveItems(ECHO_BATTLE, 10);
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java
- index 984ca25..7d0bad2 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java
- @@ -22,6 +22,7 @@
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
- public class Q108_JumbleTumbleDiamondFuss extends Quest
- @@ -184,19 +185,22 @@
- st.takeItems(STAR_DIAMOND, -1);
- st.giveItems(SILVERSMITH_HAMMER, 1);
- st.giveItems(LESSER_HEALING_POTION, 100);
- -
- - if (player.isNewbie())
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- if (player.isMageClass())
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- - st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- + st.giveItems(SOULSHOT_FOR_BEGINNERS, 7000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java
- index de61ca9..7e70bea 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java
- @@ -140,7 +140,7 @@
- {
- st.setCond(2);
- }
- - else if (st.isCond(2) && st.dropItems(PLAGUE_DUST, 1, 5, 400000))
- + else if (st.isCond(3) && st.dropItems(PLAGUE_DUST, 1, 5, 400000))
- {
- st.setCond(4);
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java
- index 640367b..a0ecb58 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java
- @@ -16,11 +16,14 @@
- */
- package quests.Q257_TheGuardIsBusy;
- +import org.l2jmobius.Config;
- +import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- public class Q257_TheGuardIsBusy extends Quest
- {
- @@ -102,28 +105,31 @@
- st.takeItems(ORC_NECKLACE, -1);
- st.takeItems(WEREWOLF_FANG, -1);
- - int reward = (10 * amulets) + (20 * (necklaces + fangs));
- - if ((amulets + necklaces + fangs) >= 10)
- + int reward = (5 * amulets) + (10 * fangs) + (15 * necklaces);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && ((amulets + necklaces + fangs) >= 10))
- {
- reward += 1000;
- }
- st.rewardItems(57, reward);
- -
- - if (player.isNewbie() && (st.getInt("Reward") == 0))
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (st.getInt("Reward") == 0) && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- st.set("Reward", "1");
- - if (player.isMageClass())
- + if (player.isMageClass() && (player.getRace() != Race.ORC))
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java
- index d827e3e..867abe2 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q259_RanchersPlea;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- @@ -141,7 +142,12 @@
- {
- htmltext = "30497-05.htm";
- st.takeItems(GIANT_SPIDER_SKIN, -1);
- - st.rewardItems(ADENA, ((count >= 10) ? 250 : 0) + (count * 25));
- + int reward = count * 25;
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (count >= 10))
- + {
- + reward += 250;
- + }
- + st.rewardItems(ADENA, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java
- index d5b3032..93ab129 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java
- @@ -16,12 +16,14 @@
- */
- package quests.Q260_HuntTheOrcs;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- public class Q260_HuntTheOrcs extends Quest
- {
- @@ -37,6 +39,9 @@
- // Items
- private static final int ORC_AMULET = 1114;
- private static final int ORC_NECKLACE = 1115;
- + // Newbie Items
- + private static final int SPIRITSHOT_FOR_BEGINNERS = 5790;
- + private static final int SOULSHOT_FOR_BEGINNERS = 5789;
- public Q260_HuntTheOrcs()
- {
- @@ -112,7 +117,33 @@
- htmltext = "30221-05.htm";
- st.takeItems(ORC_AMULET, -1);
- st.takeItems(ORC_NECKLACE, -1);
- - st.rewardItems(57, (amulet * 5) + (necklace * 15));
- + int reward = (amulet * 5) + (necklace * 15);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && ((amulet + necklace) >= 10))
- + {
- + reward += 1000;
- + }
- +
- + st.rewardItems(57, reward);
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (st.getInt("Reward") == 0) && (newPlayerRewardsReceived < 2))
- + {
- + st.showQuestionMark(26);
- + st.set("Reward", "1");
- +
- + if (player.isMageClass())
- + {
- + st.playTutorialVoice("tutorial_voice_027");
- + st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- + }
- + else
- + {
- + st.playTutorialVoice("tutorial_voice_026");
- + st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- + }
- + }
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java
- index 9f95a28..25d5068 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q263_OrcSubjugation;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- @@ -102,7 +103,14 @@
- htmltext = "30346-05.htm";
- st.takeItems(ORC_AMULET, -1);
- st.takeItems(ORC_NECKLACE, -1);
- - st.rewardItems(57, (amulet * 20) + (necklace * 30));
- + int reward = (amulet * 20) + (necklace * 30);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && ((amulet + necklace) >= 10))
- + {
- + reward += 1000;
- + }
- +
- + st.rewardItems(57, reward);
- +
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java
- index f221541..2bfe030 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java
- @@ -16,12 +16,14 @@
- */
- package quests.Q265_ChainsOfSlavery;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- public class Q265_ChainsOfSlavery extends Quest
- {
- @@ -101,7 +103,7 @@
- else
- {
- int reward = 12 * shackles;
- - if (shackles > 10)
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (shackles >= 10))
- {
- reward += 500;
- }
- @@ -109,8 +111,9 @@
- htmltext = "30357-05.htm";
- st.takeItems(SHACKLE, -1);
- st.rewardItems(57, reward);
- -
- - if (player.isNewbie() && (st.getInt("Reward") == 0))
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (st.getInt("Reward") == 0) && (newPlayerRewardsReceived < 2))
- {
- st.showQuestionMark(26);
- st.set("Reward", "1");
- @@ -119,11 +122,13 @@
- {
- st.playTutorialVoice("tutorial_voice_027");
- st.giveItems(SPIRITSHOT_FOR_BEGINNERS, 3000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- else
- {
- st.playTutorialVoice("tutorial_voice_026");
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java
- index 156d988..eb94b18 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q267_WrathOfVerdure;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- @@ -98,6 +99,10 @@
- htmltext = "31853-05.htm";
- st.takeItems(GOBLIN_CLUB, -1);
- st.rewardItems(SILVERY_LEAF, count);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (count >= 10))
- + {
- + st.rewardItems(57, 600);
- + }
- }
- else
- {
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java
- index 66488fd..9ac3147 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java
- @@ -16,12 +16,14 @@
- */
- package quests.Q273_InvadersOfTheHolyLand;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- public class Q273_InvadersOfTheHolyLand extends Quest
- {
- @@ -110,15 +112,23 @@
- htmltext = "30566-06.htm";
- }
- - final int reward = (black * 3) + (red * 10) + ((black >= 10) ? ((red >= 1) ? 1800 : 1500) : 0);
- + int reward = (black * 5) + (red * 50);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD)
- + {
- + reward += ((black >= 10) ? ((red >= 1) ? 1800 : 1500) : 0);
- + }
- +
- st.takeItems(BLACK_SOULSTONE, -1);
- st.takeItems(RED_SOULSTONE, -1);
- st.rewardItems(57, reward);
- - if (player.isNewbie() && (st.getInt("Reward") == 0))
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (st.getInt("Reward") == 0) && (newPlayerRewardsReceived < 2))
- {
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- st.playTutorialVoice("tutorial_voice_026");
- st.set("Reward", "1");
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- break;
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java
- index a81e21f..c9b973b 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q292_BrigandsSweep;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- @@ -148,7 +149,13 @@
- st.takeItems(SUSPICIOUS_CONTRACT, -1);
- }
- - st.rewardItems(57, ((12 * goblinNecklaces) + (36 * goblinPendants) + (33 * goblinLordPendants) + (countAll >= 10 ? 1000 : 0) + ((hasContract) ? 1120 : 0)));
- + int reward = (12 * goblinNecklaces) + (36 * goblinPendants) + (33 * goblinLordPendants) + ((hasContract) ? 1120 : 0);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (countAll >= 10))
- + {
- + reward += 1000;
- + }
- +
- + st.rewardItems(57, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java
- index 82c11b2..458325e 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java
- @@ -16,12 +16,14 @@
- */
- package quests.Q293_TheHiddenVeins;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.quest.State;
- +import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- public class Q293_TheHiddenVeins extends Quest
- {
- @@ -145,15 +147,23 @@
- htmltext = "30535-05.htm";
- }
- - final int reward = (chrysoliteOres * 5) + (hiddenVeinMaps * 500) + ((chrysoliteOres >= 10) ? 2000 : 0);
- st.takeItems(CHRYSOLITE_ORE, -1);
- st.takeItems(HIDDEN_VEIN_MAP, -1);
- + int reward = (chrysoliteOres * 10) + (hiddenVeinMaps * 1000);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (chrysoliteOres >= 10))
- + {
- + reward += 2000;
- + }
- +
- st.rewardItems(57, reward);
- - if (player.isNewbie() && (st.getInt("Reward") == 0))
- + // Give newbie reward if player is eligible
- + int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- + if (player.isNewbie() && (st.getInt("Reward") == 0) && (newPlayerRewardsReceived < 2))
- {
- st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
- st.playTutorialVoice("tutorial_voice_026");
- st.set("Reward", "1");
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, ++newPlayerRewardsReceived);
- }
- }
- break;
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java
- index d87c3c7..7ec48c4 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java
- @@ -93,9 +93,18 @@
- }
- else
- {
- - htmltext = "30534-05.htm";
- st.takeItems(BAT_FANG, -1);
- - st.giveItems(RING_OF_RACCOON, 1);
- +
- + if (!st.hasQuestItems(RING_OF_RACCOON))
- + {
- + htmltext = "30534-05.htm";
- + st.giveItems(RING_OF_RACCOON, 1);
- + }
- + else
- + {
- + htmltext = "30534-06.htm";
- + st.rewardItems(57, 2400);
- + }
- st.rewardExpAndSp(0, 600);
- st.playSound(QuestState.SOUND_FINISH);
- st.exitQuest(true);
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java
- index 3418ec4..4190ec5 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q296_TarantulasSpiderSilk;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- @@ -123,7 +124,14 @@
- {
- htmltext = "30519-05.htm";
- st.takeItems(TARANTULA_SPIDER_SILK, -1);
- - st.rewardItems(57, ((count >= 10) ? 2000 : 0) + (count * 30));
- +
- + int reward = count * 20;
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (count >= 10))
- + {
- + reward += 2000;
- + }
- +
- + st.rewardItems(57, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java
- index 10571bb..5d22ee8 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java
- @@ -32,6 +32,8 @@
- private static final int FRUIT_BASKET = 7136;
- private static final int AVELLAN_SPICE = 7137;
- private static final int HONEY_POUCH = 7138;
- + // Reward resources
- + private static final int VARNISH = 1865;
- public Q299_GatherIngredientsForPie()
- {
- @@ -93,7 +95,14 @@
- {
- htmltext = "30620-7.htm";
- st.takeItems(FRUIT_BASKET, 1);
- - st.rewardItems(57, 25000);
- + if (getRandom(100) < 70)
- + {
- + st.rewardItems(57, 25000);
- + }
- + else
- + {
- + st.giveItems(VARNISH, 50);
- + }
- st.playSound(QuestState.SOUND_FINISH);
- st.exitQuest(true);
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java
- index f151544..ce90799 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q306_CrystalsOfFireAndIce;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- @@ -102,7 +103,14 @@
- htmltext = "30004-05.htm";
- st.takeItems(FLAME_SHARD, -1);
- st.takeItems(ICE_SHARD, -1);
- - st.rewardItems(57, (30 * totalItems) + ((totalItems > 10) ? 5000 : 0));
- +
- + int reward = totalItems * 60;
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (totalItems >= 10))
- + {
- + reward += 5000;
- + }
- +
- + st.rewardItems(57, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java
- index 72ce607..33d53f9 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q316_DestroyPlagueCarriers;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.enums.Race;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- @@ -106,7 +107,14 @@
- htmltext = "30155-07.htm";
- st.takeItems(WERERAT_FANG, -1);
- st.takeItems(VAROOL_FOULCLAW_FANG, -1);
- - st.rewardItems(57, (ratFangs * 30) + (varoolFangs * 10000) + ((ratFangs > 10) ? 5000 : 0));
- +
- + int reward = (ratFangs * 60) + (varoolFangs * 10000);
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (ratFangs >= 10))
- + {
- + reward += 5000;
- + }
- +
- + st.rewardItems(57, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java
- index 67b258c..258430b 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java
- @@ -16,6 +16,7 @@
- */
- package quests.Q317_CatchTheWind;
- +import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.model.actor.Npc;
- import org.l2jmobius.gameserver.model.actor.Player;
- import org.l2jmobius.gameserver.model.quest.Quest;
- @@ -87,7 +88,14 @@
- {
- htmltext = "30361-07.htm";
- st.takeItems(WIND_SHARD, -1);
- - st.rewardItems(57, (40 * shards) + (shards >= 10 ? 2988 : 0));
- +
- + int reward = 30 * shards;
- + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (shards >= 10))
- + {
- + reward += 2988;
- + }
- +
- + st.rewardItems(57, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java
- index adf43f5..0eff840 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java
- @@ -91,7 +91,7 @@
- st.takeItems(RED_CROSS_BADGE, -1);
- st.takeItems(BLUE_CROSS_BADGE, -1);
- st.takeItems(BLACK_CROSS_BADGE, -1);
- - st.rewardItems(57, ((redBadges * 46) + (blueBadges * 52) + (blackBadges * 58) + ((badgesSum >= 10) ? 4320 : 0)));
- + st.rewardItems(57, ((redBadges * 60) + (blueBadges * 65) + (blackBadges * 70) + ((badgesSum >= 10) ? 4320 : 0)));
- if (badgesSum >= 100)
- {
- if (!st.hasQuestItems(BLACK_LION_MARK))
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java
- index cd58d6e..07ebbcf 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java
- @@ -108,7 +108,7 @@
- st.takeItems(MONSTER_EYE_CARCASS, -1);
- st.takeItems(MONSTER_EYE_LENS, -1);
- st.takeItems(BASILISK_GIZZARD, -1);
- - st.rewardItems(57, (25 * carcasses) + (1000 * lenses) + (60 * gizzards) + ((all >= 10) ? 618 : 0));
- + st.rewardItems(57, (30 * carcasses) + (2000 * lenses) + (75 * gizzards) + ((all >= 10) ? 618 : 0));
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java
- index 3f447d9..4f94fc7 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java
- @@ -91,7 +91,7 @@
- st.takeItems(MEDUSA_VENOM, -1);
- st.takeItems(WYRM_TOOTH, -1);
- - int reward = (harpyFeather * 78) + (medusaVenom * 88) + (wyrmTooth * 92);
- + int reward = (harpyFeather * 80) + (medusaVenom * 90) + (wyrmTooth * 100);
- if ((harpyFeather + medusaVenom + wyrmTooth) > 10)
- {
- reward += 3100;
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java
- index 693697f..f1fc82f 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java
- @@ -51,12 +51,15 @@
- private static final int GLASS_JAGUAR = 20250;
- private static final int DEMONS_TUNIC_ID = 441;
- private static final int DEMONS_STOCKINGS_ID = 472;
- - private static final int SCROLL_OF_ESCAPE_ID = 736;
- private static final int NECKLACE_OF_GRACE_ID = 931;
- private static final int SPELLBOOK_ICEBOLT_ID = 1049;
- private static final int SPELLBOOK_BATTLEHEAL_ID = 1050;
- + private static final int DEMONS_TUNIC_FABRIC_ID = 1979;
- + private static final int DEMONS_STOCKINGS_PATTERN_ID = 1980;
- private static final int DEMONS_BOOTS_ID = 2435;
- private static final int DEMONS_GLOVES_ID = 2459;
- + private static final int DEMONS_BOOTS_FABRIC_ID = 2952;
- + private static final int DEMONS_GLOVES_FABRIC_ID = 2953;
- private static final int WISH_POTION_ID = 3467;
- private static final int ANCIENT_CROWN_ID = 3468;
- private static final int CERTIFICATE_OF_ROYALTY_ID = 3469;
- @@ -432,7 +435,23 @@
- }
- else
- {
- - st.giveItems(SCROLL_OF_ESCAPE_ID, 1);
- + final int dropChance = getRandom(100) + 1;
- + if (dropChance <= 25)
- + {
- + st.giveItems(DEMONS_TUNIC_FABRIC_ID, 1);
- + }
- + else if (dropChance <= 50)
- + {
- + st.giveItems(DEMONS_STOCKINGS_PATTERN_ID, 1);
- + }
- + else if (dropChance <= 75)
- + {
- + st.giveItems(DEMONS_BOOTS_FABRIC_ID, 1);
- + }
- + else
- + {
- + st.giveItems(DEMONS_GLOVES_FABRIC_ID, 1);
- + }
- }
- st.getPlayer().getTarget().decayMe();
- htmltext = "30742-01.htm";
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java
- index 81c07d4..26bf4cc 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java
- @@ -102,51 +102,51 @@
- // @formatter:on
- private static final Request[] REQUESTS1 =
- {
- - new Request(3727, 3769, 40, 2090, "C: 40 Totems of Kadesh").addDrop(20578, 80).addDrop(20579, 83),
- - new Request(3728, 3770, 50, 6340, "C: 50 Jade Necklaces of Timak").addDrop(20586, 89).addDrop(20588, 100),
- - new Request(3729, 3771, 50, 9480, "C: 50 Enchanted Golem Shards").addDrop(20565, 100),
- - new Request(3730, 3772, 30, 9110, "C: 30 Pieces Monster Eye Meat").addDrop(20556, 50),
- - new Request(3731, 3773, 40, 8690, "C: 40 Eggs of Dire Wyrm").addDrop(20557, 80),
- - new Request(3732, 3774, 100, 9480, "C: 100 Claws of Guardian Basilisk").addDrop(20550, 150),
- - new Request(3733, 3775, 50, 11280, "C: 50 Revenant Chains").addDrop(20552, 100),
- - new Request(3734, 3776, 30, 9640, "C: 30 Windsus Tusks").addDrop(WINDSUS, 50),
- - new Request(3735, 3777, 100, 9180, "C: 100 Skulls of Grandis").addDrop(20554, 200),
- - new Request(3736, 3778, 50, 5160, "C: 50 Taik Obsidian Amulets").addDrop(20631, 100).addDrop(20632, 93),
- - new Request(3737, 3779, 30, 3140, "C: 30 Heads of Karul Bugbear").addDrop(20600, 50),
- - new Request(3738, 3780, 40, 3160, "C: 40 Ivory Charms of Tamlin").addDrop(20601, 62).addDrop(20602, 80),
- - new Request(3739, 3781, 1, 6370, "B: Situation Preparation - Leto Chief").addSpawn(20582, 27157, 10).addDrop(27157, 100),
- - new Request(3740, 3782, 50, 19080, "B: 50 Enchanted Gargoyle Horns").addDrop(20567, 50),
- - new Request(3741, 3783, 50, 17730, "B: 50 Coiled Serpent Totems").addDrop(20269, 93).addDrop(BREKA_ORC_WARRIOR, 100),
- - new Request(3742, 3784, 1, 5790, "B: Situation Preparation - Sorcerer Catch of Leto").addSpawn(20581, 27156, 10).addDrop(27156, 100),
- - new Request(3743, 3785, 1, 8560, "B: Situation Preparation - Timak Raider Kaikee").addSpawn(20586, 27158, 10).addDrop(27158, 100),
- - new Request(3744, 3786, 30, 8320, "B: 30 Kronbe Venom Sacs").addDrop(20603, 50),
- - new Request(3745, 3787, 30, 30310, "A: 30 Eva's Charm").addDrop(20562, 50),
- - new Request(3746, 3788, 1, 27540, "A: Titan's Tablet").addSpawn(20554, 27160, 10).addDrop(27160, 100),
- - new Request(3747, 3789, 1, 20560, "A: Book of Shunaiman").addSpawn(20600, 27164, 10).addDrop(27164, 100)
- + new Request(3727, 3769, 40, 4500, "C: 40 Totems of Kadesh").addDrop(20578, 80).addDrop(20579, 83),
- + new Request(3728, 3770, 50, 7500, "C: 50 Jade Necklaces of Timak").addDrop(20586, 89).addDrop(20588, 100),
- + new Request(3729, 3771, 50, 7300, "C: 50 Enchanted Golem Shards").addDrop(20565, 100),
- + new Request(3730, 3772, 30, 5500, "C: 30 Pieces Monster Eye Meat").addDrop(20556, 50),
- + new Request(3731, 3773, 40, 5000, "C: 40 Eggs of Dire Wyrm").addDrop(20557, 80),
- + new Request(3732, 3774, 100, 6500, "C: 100 Claws of Guardian Basilisk").addDrop(20550, 150),
- + new Request(3733, 3775, 50, 4400, "C: 50 Revenant Chains").addDrop(20552, 100),
- + new Request(3734, 3776, 30, 5200, "C: 30 Windsus Tusks").addDrop(WINDSUS, 50),
- + new Request(3735, 3777, 100, 7600, "C: 100 Skulls of Grandis").addDrop(20554, 200),
- + new Request(3736, 3778, 50, 4900, "C: 50 Taik Obsidian Amulets").addDrop(20631, 100).addDrop(20632, 93),
- + new Request(3737, 3779, 30, 7600, "C: 30 Heads of Karul Bugbear").addDrop(20600, 50),
- + new Request(3738, 3780, 40, 7200, "C: 40 Ivory Charms of Tamlin").addDrop(20601, 62).addDrop(20602, 80),
- + new Request(3739, 3781, 1, 4500, "B: Situation Preparation - Leto Chief").addSpawn(20582, 27157, 10).addDrop(27157, 100),
- + new Request(3740, 3782, 50, 9500, "B: 50 Enchanted Gargoyle Horns").addDrop(20567, 50),
- + new Request(3741, 3783, 50, 5800, "B: 50 Coiled Serpent Totems").addDrop(20269, 93).addDrop(BREKA_ORC_WARRIOR, 100),
- + new Request(3742, 3784, 1, 4500, "B: Situation Preparation - Sorcerer Catch of Leto").addSpawn(20581, 27156, 10).addDrop(27156, 100),
- + new Request(3743, 3785, 1, 7000, "B: Situation Preparation - Timak Raider Kaikee").addSpawn(20586, 27158, 10).addDrop(27158, 100),
- + new Request(3744, 3786, 30, 10000, "B: 30 Kronbe Venom Sacs").addDrop(20603, 50),
- + new Request(3745, 3787, 30, 18000, "A: 30 Eva's Charm").addDrop(20562, 50),
- + new Request(3746, 3788, 1, 12000, "A: Titan's Tablet").addSpawn(20554, 27160, 10).addDrop(27160, 100),
- + new Request(3747, 3789, 1, 15000, "A: Book of Shunaiman").addSpawn(20600, 27164, 10).addDrop(27164, 100)
- };
- private static final Request[] REQUESTS2 =
- {
- - new Request(3748, 3790, 40, 6850, "C: 40 Rotting Tree Spores").addDrop(20558, 67),
- - new Request(3749, 3791, 40, 7250, "C: 40 Trisalim Venom Sacs").addDrop(20560, 66).addDrop(20561, 75),
- - new Request(3750, 3792, 50, 7160, "C: 50 Totems of Taik Orc").addDrop(20633, 53).addDrop(20634, 99),
- - new Request(3751, 3793, 40, 6580, "C: 40 Harit Barbed Necklaces").addDrop(20641, 88).addDrop(20642, 88).addDrop(20643, 91),
- - new Request(3752, 3794, 20, 10100, "C: 20 Coins of Ancient Empire").addDrop(20661, 50).addSpawn(20661, 27149, 5).addDrop(20662, 52).addSpawn(20662, 27149, 5).addDrop(27149, 300),
- - new Request(3753, 3795, 30, 13000, "C: 30 Skins of Farkran").addDrop(20667, 90),
- - new Request(3754, 3796, 40, 7660, "C: 40 Tempest Shards").addDrop(20589, 49).addSpawn(20589, 27149, 5).addDrop(27149, 500),
- - new Request(3755, 3797, 40, 7660, "C: 40 Tsunami Shards").addDrop(20590, 51).addSpawn(20590, 27149, 5).addDrop(27149, 500),
- - new Request(3756, 3798, 40, 11260, "C: 40 Manes of Pan Ruem").addDrop(20592, 80).addDrop(20598, 100),
- - new Request(3757, 3799, 40, 7660, "C: 40 Hamadryad Shard").addDrop(20594, 64).addSpawn(20594, 27149, 5).addDrop(27149, 500),
- - new Request(3758, 3800, 30, 8810, "C: 30 Manes of Vanor Silenos").addDrop(20682, 70).addDrop(20683, 85).addDrop(20684, 90),
- - new Request(3759, 3801, 30, 7350, "C: 30 Totems of Tarlk Bugbears").addDrop(TARLK_BUGBEAR_WARRIOR, 63),
- - new Request(3760, 3802, 1, 8760, "B: Situation Preparation - Overlord Okun of Timak").addSpawn(20588, 27159, 10).addDrop(27159, 100),
- - new Request(3761, 3803, 1, 9380, "B: Situation Preparation - Overlord Kakran of Taik").addSpawn(20634, 27161, 10).addDrop(27161, 100),
- - new Request(3762, 3804, 40, 17820, "B: 40 Narcissus Soulstones").addDrop(20639, 86).addSpawn(20639, 27149, 5).addDrop(27149, 500),
- - new Request(3763, 3805, 20, 17540, "B: 20 Eyes of Deprived").addDrop(20664, 77),
- - new Request(3764, 3806, 20, 14160, "B: 20 Unicorn Horns").addDrop(20593, 68).addDrop(20599, 86),
- - new Request(3765, 3807, 1, 15960, "B: Golden Mane of Silenos").addSpawn(20686, 27163, 10).addDrop(27163, 100),
- - new Request(3766, 3808, 20, 39100, "A: 20 Skulls of Executed Person").addDrop(20659, 73),
- - new Request(3767, 3809, 1, 39550, "A: Bust of Travis").addSpawn(20662, 27162, 10).addDrop(27162, 100),
- - new Request(3768, 3810, 10, 41200, "A: 10 Swords of Cadmus").addDrop(20676, 64)
- + new Request(3748, 3790, 40, 6200, "C: 40 Rotting Tree Spores").addDrop(20558, 67),
- + new Request(3749, 3791, 40, 5900, "C: 40 Trisalim Venom Sacs").addDrop(20560, 66).addDrop(20561, 75),
- + new Request(3750, 3792, 50, 7200, "C: 50 Totems of Taik Orc").addDrop(20633, 53).addDrop(20634, 99),
- + new Request(3751, 3793, 40, 7200, "C: 40 Harit Barbed Necklaces").addDrop(20641, 88).addDrop(20642, 88).addDrop(20643, 91),
- + new Request(3752, 3794, 20, 8700, "C: 20 Coins of Ancient Empire").addDrop(20661, 50).addSpawn(20661, 27149, 5).addDrop(20662, 52).addSpawn(20662, 27149, 5).addDrop(27149, 300),
- + new Request(3753, 3795, 30, 11600, "C: 30 Skins of Farkran").addDrop(20667, 90),
- + new Request(3754, 3796, 40, 6200, "C: 40 Tempest Shards").addDrop(20589, 49).addSpawn(20589, 27149, 5).addDrop(27149, 500),
- + new Request(3755, 3797, 40, 7800, "C: 40 Tsunami Shards").addDrop(20590, 51).addSpawn(20590, 27149, 5).addDrop(27149, 500),
- + new Request(3756, 3798, 40, 7800, "C: 40 Manes of Pan Ruem").addDrop(20592, 80).addDrop(20598, 100),
- + new Request(3757, 3799, 40, 7000, "C: 40 Hamadryad Shard").addDrop(20594, 64).addSpawn(20594, 27149, 5).addDrop(27149, 500),
- + new Request(3758, 3800, 30, 7100, "C: 30 Manes of Vanor Silenos").addDrop(20682, 70).addDrop(20683, 85).addDrop(20684, 90),
- + new Request(3759, 3801, 30, 13400, "C: 30 Totems of Tarlk Bugbears").addDrop(TARLK_BUGBEAR_WARRIOR, 63),
- + new Request(3760, 3802, 1, 8200, "B: Situation Preparation - Overlord Okun of Timak").addSpawn(20588, 27159, 10).addDrop(27159, 100),
- + new Request(3761, 3803, 1, 5300, "B: Situation Preparation - Overlord Kakran of Taik").addSpawn(20634, 27161, 10).addDrop(27161, 100),
- + new Request(3762, 3804, 40, 8800, "B: 40 Narcissus Soulstones").addDrop(20639, 86).addSpawn(20639, 27149, 5).addDrop(27149, 500),
- + new Request(3763, 3805, 20, 11000, "B: 20 Eyes of Deprived").addDrop(20664, 77),
- + new Request(3764, 3806, 20, 8800, "B: 20 Unicorn Horns").addDrop(20593, 68).addDrop(20599, 86),
- + new Request(3765, 3807, 1, 5500, "B: Golden Mane of Silenos").addSpawn(20686, 27163, 10).addDrop(27163, 100),
- + new Request(3766, 3808, 20, 16000, "A: 20 Skulls of Executed Person").addDrop(20659, 73),
- + new Request(3767, 3809, 1, 18000, "A: Bust of Travis").addSpawn(20662, 27162, 10).addDrop(27162, 100),
- + new Request(3768, 3810, 10, 18000, "A: 10 Swords of Cadmus").addDrop(20676, 64)
- };
- public Q335_TheSongOfTheHunter()
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java
- index d064bb0..25bd07c 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java
- @@ -56,7 +56,7 @@
- case "30892-05.htm":
- {
- final int pelts = st.getQuestItemsCount(ALLIGATOR_PELT);
- - int reward = pelts * 60;
- + int reward = pelts * 40;
- if (pelts > 10)
- {
- reward += 3430;
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java
- index 05f7b65..716529e 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java
- @@ -91,7 +91,7 @@
- {
- if (orbs > 0)
- {
- - st.giveItems(57, orbs * 120);
- + st.giveItems(57, orbs * 125);
- st.takeItems(ORB, -1);
- }
- else
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java
- index 3e7ddf0..17d8209 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java
- @@ -44,6 +44,21 @@
- DROPLIST.put(20991, new int[][]{{ALLIGATOR_TOOTH, 1, 0, 600000},{TORN_MAP_FRAGMENT, 1, 0, 100000}}); // Swamp Tribe
- // @formatter:on
- }
- + private static final int[][] ADDITIONAL_REWARDS =
- + {
- + // @formatter:off
- + {736, 15}, // SoE
- + {1061, 20}, // Healing Potion
- + {734, 15}, // Haste Potion
- + {735, 15}, // Alacrity Potion
- + {1878, 35}, // Braided Hemp
- + {1875, 15}, // Stone of Purity
- + {1879, 15}, // Cokes
- + {1880, 15}, // Steel
- + {956, 1}, // Enchant Armor D
- + {955, 1}, // Enchant Weapon D
- + // @formatter:on
- + };
- public Q354_ConquestOfAlligatorIsland()
- {
- @@ -84,10 +99,11 @@
- final int amount = st.getQuestItemsCount(ALLIGATOR_TOOTH);
- if (amount > 0)
- {
- - int reward = (amount * 220) + 3100;
- + int reward = amount * 300;
- if (amount >= 100)
- {
- - reward += 7600;
- + final int[] add_reward = ADDITIONAL_REWARDS[Integer.parseInt(event)];
- + st.rewardItems(add_reward[0], add_reward[1]);
- htmltext = "30895-05b.htm";
- }
- else
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java
- index 88f3cdd..c4615d4 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java
- @@ -87,7 +87,7 @@
- {
- htmltext = "30181-4.htm";
- - int reward = 2800 + (count * 120);
- + int reward = count * 232;
- if (count >= 100)
- {
- htmltext = "30181-4a.htm";
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java
- index f8b8e94..b0fcfd7 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java
- @@ -57,11 +57,11 @@
- st.startQuest();
- break;
- }
- - case "30717-17.htm":
- + case "30717-16.htm":
- {
- st.takeItems(HERB_SPORE, -1);
- st.takeItems(CARN_SPORE, -1);
- - st.rewardItems(57, 20950);
- + st.rewardItems(57, 44000);
- st.playSound(QuestState.SOUND_FINISH);
- st.exitQuest(true);
- break;
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java
- index 6f65212..049d702 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java
- @@ -190,10 +190,10 @@
- {
- htmltext = "30095-05.htm";
- - final int reward = st.getQuestItemsCount(PIRATE_TREASURE_CHEST) * 400;
- + final int reward = st.getQuestItemsCount(PIRATE_TREASURE_CHEST) * 1600;
- st.takeItems(PIRATE_TREASURE_CHEST, -1);
- - st.rewardItems(57, reward + 19800);
- + st.rewardItems(57, reward);
- }
- break;
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java
- index 395b683..51d9c2e 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java
- @@ -128,8 +128,8 @@
- {
- // @formatter:off
- {1, 100, 1},
- - {2, 45, 3},
- - {3, 15, 5}
- + {2, 45, 2},
- + {3, 15, 3}
- // @formatter:on
- };
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java
- index 5af07d2..4aca831 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java
- @@ -100,13 +100,19 @@
- {98, 852}, // Moonstone Earring
- {100, 401} // Drake Leather Armor
- };
- - private static final int[][] _rewards_100_lose =
- + private static final int[][] _rewards_100_lose_Baxt =
- {
- {50, 951}, // Scroll: Enchant Weapon (C)
- {80, 500}, // Great Helmet
- {98, 2437}, // Drake Leather Boots
- {100, 135} // Samurai Longsword
- };
- + private static final int[][] _rewards_100_lose_Cliff =
- + {
- + {70, 951}, // Scroll: Enchant Weapon (C)
- + {89, 500}, // Divine Boots
- + {100, 2437}, // Katana
- + };
- // @formatter:on
- public Q384_WarehouseKeepersPastime()
- @@ -246,10 +252,6 @@
- if (chance < reward[0])
- {
- st.giveItems(reward[1], 1);
- - if (reward[1] == 2437)
- - {
- - st.giveItems(2463, 1);
- - }
- break;
- }
- }
- @@ -257,14 +259,32 @@
- else if (winningLines == 0)
- {
- htmltext = getHtmlText(npcId + "-25.htm");
- -
- - final int chance = getRandom(100);
- - for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_lose : _rewards_100_lose))
- + if (npcId == 30685)
- {
- - if (chance < reward[0])
- + final int chance = getRandom(100);
- + for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_lose : _rewards_100_lose_Baxt))
- {
- - st.giveItems(reward[1], 1);
- - break;
- + if (chance < reward[0])
- + {
- + st.giveItems(reward[1], 1);
- + if (reward[1] == 2437)
- + {
- + st.giveItems(2463, 1);
- + }
- + break;
- + }
- + }
- + }
- + else
- + {
- + final int chance = getRandom(100);
- + for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_lose : _rewards_100_lose_Cliff))
- + {
- + if (chance < reward[0])
- + {
- + st.giveItems(reward[1], 1);
- + break;
- + }
- }
- }
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java
- index 63bd7f4..0e655f5 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java
- @@ -62,7 +62,7 @@
- REWARDS.put("asofe", new int[]{4043, 13, 6400});
- REWARDS.put("thon", new int[]{4044, 13, 6400});
- REWARDS.put("enria", new int[]{4042, 6, 13600});
- - REWARDS.put("mold", new int[]{4041, 3, 17200});
- + REWARDS.put("mold", new int[]{4041, 6, 17200});
- // @formatter:on
- }
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
- index 2f23cff..b584ee4 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
- @@ -156,6 +156,7 @@
- public static boolean ALLOW_WEAR;
- public static int WEAR_DELAY;
- public static int WEAR_PRICE;
- + public static boolean ALT_VILLAGES_REPEATABLE_QUEST_REWARD;
- public static boolean ALLOW_LOTTERY;
- public static boolean ALLOW_RACE;
- public static boolean ALLOW_RENTPET;
- @@ -1424,6 +1425,7 @@
- ALLOW_WEAR = generalConfig.getBoolean("AllowWear", false);
- WEAR_DELAY = generalConfig.getInt("WearDelay", 5);
- WEAR_PRICE = generalConfig.getInt("WearPrice", 10);
- + ALT_VILLAGES_REPEATABLE_QUEST_REWARD = generalConfig.getBoolean("AltVillagesRepQuestReward", false);
- ALLOW_LOTTERY = generalConfig.getBoolean("AllowLottery", false);
- ALLOW_RACE = generalConfig.getBoolean("AllowRace", false);
- ALLOW_RENTPET = generalConfig.getBoolean("AllowRentPet", false);
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
- index 7b23297..b966282 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
- @@ -541,6 +541,7 @@
- if (Config.ALT_GAME_NEW_CHAR_ALWAYS_IS_NEWBIE)
- {
- player.setNewbie(true);
- + player.getVariables().set(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0);
- }
- // Add the player in the characters table of the database
- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
- index 58bd39b..86440e7 100644
- --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
- +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
- @@ -38,6 +38,9 @@
- private static final String DELETE_QUERY = "DELETE FROM character_variables WHERE charId = ?";
- private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)";
- + // Public variable names
- + public static final String NEW_PLAYERS_REWARDS_RECEIVED = "NEW_PLAYERS_REWARDS_RECEIVED";
- +
- private final int _objectId;
- public PlayerVariables(int objectId)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement