diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java index 3b4f35277b..99f7340a17 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -64,6 +64,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt index 07624c4627..04bacfd903 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt @@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java index 31b18b7cc7..39806ebbfb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java index 3b4f35277b..99f7340a17 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -64,6 +64,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt index 07624c4627..04bacfd903 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt @@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java index 31b18b7cc7..39806ebbfb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java index 3b4f35277b..99f7340a17 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -64,6 +64,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt index 07624c4627..04bacfd903 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt @@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java index 31b18b7cc7..39806ebbfb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java index 446bef4a1f..6f6bb908c9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -64,6 +64,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt index f59d4aeb2c..5ccffdbc91 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt @@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java index c0bbdc2d26..3dcb90fea8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java index a6771f5a69..9652bc123f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -65,6 +65,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt index 024395791e..c7e80e829d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt @@ -35,6 +35,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java index 05b494f43b..83a8726c94 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -145,6 +145,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java index b098d3f33b..143b7b2bf9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -66,6 +66,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt index 301c1ff048..411b25b452 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt @@ -36,6 +36,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java index d898082279..d17424f182 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -145,6 +145,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java index b098d3f33b..143b7b2bf9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -66,6 +66,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt index 301c1ff048..411b25b452 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt @@ -36,6 +36,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java index d898082279..d17424f182 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -145,6 +145,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java index 28fdc4502d..bf8adb0ca6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -67,6 +67,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt index a3b0d0ce19..942f41bb24 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt @@ -37,6 +37,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e5e308af8a..abf8c25817 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java index d898082279..d17424f182 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -145,6 +145,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java index 6d50afa787..a810f0efc0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -63,6 +63,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt index 13b34c8be6..3e606c3a12 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt @@ -33,6 +33,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b16d9f088..2f7fef6e09 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java index c9be09a695..bf520b0596 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java index 6d50afa787..a810f0efc0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -63,6 +63,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt index 13b34c8be6..3e606c3a12 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt @@ -33,6 +33,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b16d9f088..2f7fef6e09 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java index c9be09a695..bf520b0596 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java index 62898b1101..6b10da0ec6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -64,6 +64,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt index a9f91c61ce..2945eb0ea0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt @@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b16d9f088..2f7fef6e09 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java index 9d448e4cac..9b5b2482f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -145,6 +145,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java index 0529a171b8..7051e6f063 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -65,6 +65,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt index 72f4333b00..0abe0429b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt @@ -35,6 +35,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a971e6a88e..2739bde202 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -906,6 +906,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java index 7d6a40a7c4..510d64f7a9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -158,6 +158,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java index 0529a171b8..7051e6f063 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -65,6 +65,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt index 72f4333b00..0abe0429b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt @@ -35,6 +35,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a971e6a88e..2739bde202 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -906,6 +906,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java index 7d6a40a7c4..510d64f7a9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -158,6 +158,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java index e279ed16a8..6e6699e814 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -66,6 +66,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt index 4090d54d70..672a5e3b5f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt @@ -36,6 +36,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a971e6a88e..2739bde202 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -906,6 +906,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java index 302b2a2496..fc76d61d17 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -160,6 +160,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"), diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java index 3b4f35277b..99f7340a17 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -64,6 +64,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); + EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 99a8f24f2e..b764bd44f7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); int leftHeight = 0; int rightHeight = 0; + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -492,6 +494,10 @@ public class NpcViewMod implements IBypassHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index e54f0d7c53..9cd9893616 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler final int start = (page - 1) * 14; final int end = Math.min(list.size() - 1, start + 14); final StringBuilder builder = new StringBuilder(); + final double dropAmountAdenaEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1); @@ -271,6 +272,10 @@ public class DropSearchBoard implements IParseBoardHandler // bonus drop amount effect rateAmount *= dropAmountEffectBonus; + if (item.getId() == Inventory.ADENA_ID) + { + rateAmount *= dropAmountAdenaEffectBonus; + } // bonus drop rate effect rateChance *= dropRateEffectBonus; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java new file mode 100644 index 0000000000..e2c51fb00d --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Mobius + */ +public class BonusDropAdena extends AbstractStatPercentEffect +{ + public BonusDropAdena(StatSet params) + { + super(params, Stat.BONUS_DROP_ADENA); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt index 409cb37e28..45c111a5bc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt @@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected. BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockTarget: Causes the target to become untargetable. Bluff: Rotates the target so you face its back. +BonusDropAdena: Bonus amount for dropped adena. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b16d9f088..2f7fef6e09 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable // bonus drop amount effect rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); + if (itemId == Inventory.ADENA_ID) + { + rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1); + } // finally return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java index 31b18b7cc7..39806ebbfb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -143,6 +143,7 @@ public enum Stat EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), BONUS_SP("bonusSp"), + BONUS_DROP_ADENA("bonusDropAdena"), BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_RATE("bonusDropRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),