From dbce3481adbc3ec0cabf046c869ec1f00e10dbc0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 1 Jul 2022 23:40:41 +0000 Subject: [PATCH] Adjustments for starter village repeatable quests based on turning in items. Contributed by altronrain. --- .../dist/game/config/General.ini | 5 +++++ .../Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java | 5 +++-- .../quests/Q259_RanchersPlea/Q259_RanchersPlea.java | 8 +++++++- .../quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java | 9 ++++++++- .../Q263_OrcSubjugation/Q263_OrcSubjugation.java | 10 +++++++++- .../Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java | 3 ++- .../Q267_WrathOfVerdure/Q267_WrathOfVerdure.java | 5 +++++ .../Q273_InvadersOfTheHolyLand.java | 8 +++++++- .../quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java | 9 ++++++++- .../Q293_TheHiddenVeins/Q293_TheHiddenVeins.java | 8 +++++++- .../Q296_TarantulasSpiderSilk.java | 10 +++++++++- .../Q306_CrystalsOfFireAndIce.java | 10 +++++++++- .../Q316_DestroyPlagueCarriers.java | 10 +++++++++- .../quests/Q317_CatchTheWind/Q317_CatchTheWind.java | 10 +++++++++- .../java/org/l2jmobius/Config.java | 2 ++ L2J_Mobius_C6_Interlude/dist/game/config/General.ini | 5 +++++ .../Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java | 5 +++-- .../quests/Q259_RanchersPlea/Q259_RanchersPlea.java | 8 +++++++- .../quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java | 9 ++++++++- .../Q263_OrcSubjugation/Q263_OrcSubjugation.java | 10 +++++++++- .../Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java | 3 ++- .../Q267_WrathOfVerdure/Q267_WrathOfVerdure.java | 5 +++++ .../Q273_InvadersOfTheHolyLand.java | 8 +++++++- .../quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java | 9 ++++++++- .../Q293_TheHiddenVeins/Q293_TheHiddenVeins.java | 8 +++++++- .../Q296_TarantulasSpiderSilk.java | 10 +++++++++- .../Q306_CrystalsOfFireAndIce.java | 10 +++++++++- .../Q316_DestroyPlagueCarriers.java | 10 +++++++++- .../quests/Q317_CatchTheWind/Q317_CatchTheWind.java | 10 +++++++++- L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java | 2 ++ 30 files changed, 198 insertions(+), 26 deletions(-) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini index dfe9a1714a..10c097bd3f 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 @@ WearDelay = 5 # 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/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java index 1adead4d95..84e2925ef7 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,6 +16,7 @@ */ 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; @@ -104,8 +105,8 @@ public class Q257_TheGuardIsBusy extends Quest 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; } 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 47e4acbb89..6d0edc3ab3 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 @@ public class Q259_RanchersPlea extends Quest { 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 793b73479b..6da99cf799 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,6 +16,7 @@ */ 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; @@ -116,7 +117,13 @@ public class Q260_HuntTheOrcs extends Quest 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)) 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 a42adf1887..9aff651236 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 @@ public class Q263_OrcSubjugation extends Quest 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 c680365b84..8412251a7d 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,6 +16,7 @@ */ 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; @@ -102,7 +103,7 @@ public class Q265_ChainsOfSlavery extends Quest else { int reward = 12 * shackles; - if (shackles > 10) + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (shackles >= 10)) { reward += 500; } 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 3ab6af6000..18d11b6166 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 @@ public class Q267_WrathOfVerdure extends Quest 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 5f0780f9bd..77333045be 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,6 +16,7 @@ */ 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; @@ -111,7 +112,12 @@ public class Q273_InvadersOfTheHolyLand extends Quest 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); 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 b8e551b336..efe1d4a846 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 @@ public class Q292_BrigandsSweep extends Quest 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 bc9ada7d72..89fe703411 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,6 +16,7 @@ */ 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; @@ -146,9 +147,14 @@ public class Q293_TheHiddenVeins extends Quest 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); // Give newbie reward if player is eligible int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0); 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 6708da55b4..f68da483ad 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 @@ public class Q296_TarantulasSpiderSilk extends Quest { 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/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java index 27db37143a..99ea4c2324 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 @@ public class Q306_CrystalsOfFireAndIce extends Quest 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 e193195fe6..35299781fa 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 @@ public class Q316_DestroyPlagueCarriers extends Quest 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 01ebd6db1a..4be9d70bd9 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 @@ public class Q317_CatchTheWind extends Quest { 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/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java index f6ae79b00a..7636b84489 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java @@ -162,6 +162,7 @@ public class Config 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; @@ -1453,6 +1454,7 @@ public class Config 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_C6_Interlude/dist/game/config/General.ini b/L2J_Mobius_C6_Interlude/dist/game/config/General.ini index 1289df7662..5e8f735b12 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/General.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/General.ini @@ -485,6 +485,11 @@ WearDelay = 5 # 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_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java index 1adead4d95..84e2925ef7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java @@ -16,6 +16,7 @@ */ 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; @@ -104,8 +105,8 @@ public class Q257_TheGuardIsBusy extends Quest 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; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java index 47e4acbb89..6d0edc3ab3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q259_RanchersPlea extends Quest { 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_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java index 793b73479b..6da99cf799 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java @@ -16,6 +16,7 @@ */ 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; @@ -116,7 +117,13 @@ public class Q260_HuntTheOrcs extends Quest 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)) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java index a42adf1887..9aff651236 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q263_OrcSubjugation extends Quest 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_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java index c680365b84..8412251a7d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java @@ -16,6 +16,7 @@ */ 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; @@ -102,7 +103,7 @@ public class Q265_ChainsOfSlavery extends Quest else { int reward = 12 * shackles; - if (shackles > 10) + if (!Config.ALT_VILLAGES_REPEATABLE_QUEST_REWARD && (shackles >= 10)) { reward += 500; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java index 3ab6af6000..18d11b6166 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q267_WrathOfVerdure extends Quest 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_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java index 5f0780f9bd..77333045be 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java @@ -16,6 +16,7 @@ */ 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; @@ -111,7 +112,12 @@ public class Q273_InvadersOfTheHolyLand extends Quest 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); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java index b8e551b336..efe1d4a846 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q292_BrigandsSweep extends Quest 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_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java index bc9ada7d72..89fe703411 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java @@ -16,6 +16,7 @@ */ 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; @@ -146,9 +147,14 @@ public class Q293_TheHiddenVeins extends Quest 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); // Give newbie reward if player is eligible int newPlayerRewardsReceived = player.getVariables().getInt(PlayerVariables.NEW_PLAYERS_REWARDS_RECEIVED, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java index 6708da55b4..f68da483ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q296_TarantulasSpiderSilk extends Quest { 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_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java index 27db37143a..99ea4c2324 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q306_CrystalsOfFireAndIce extends Quest 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_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java index e193195fe6..35299781fa 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q316_DestroyPlagueCarriers extends Quest 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_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java index 01ebd6db1a..4be9d70bd9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java +++ b/L2J_Mobius_C6_Interlude/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 @@ public class Q317_CatchTheWind extends Quest { 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_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index 4fa750f3be..5e40299f8c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -178,6 +178,7 @@ public class Config 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; @@ -1505,6 +1506,7 @@ public class Config 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);