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/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java
- index 7dd5655..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,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 @@
- 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 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 3553780..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,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 @@
- 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 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 3be81a9..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,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 @@
- 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 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 9afc5f2..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,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 @@
- 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 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 0643899..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,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 @@
- 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 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/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/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);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement