lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of BonusDropAdena effect.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-10-21 00:14:25 +00:00
parent 4083dd2dee
commit f532bad2fb
105 changed files with 735 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -64,6 +64,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -143,6 +143,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -64,6 +64,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -143,6 +143,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -64,6 +64,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -143,6 +143,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -64,6 +64,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -143,6 +143,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -65,6 +65,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -35,6 +35,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -145,6 +145,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -66,6 +66,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -36,6 +36,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -145,6 +145,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -66,6 +66,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -36,6 +36,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -145,6 +145,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -67,6 +67,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -37,6 +37,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -890,6 +890,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -145,6 +145,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -63,6 +63,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -33,6 +33,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -143,6 +143,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -63,6 +63,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -33,6 +33,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -143,6 +143,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -64,6 +64,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -34,6 +34,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -891,6 +891,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -145,6 +145,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -65,6 +65,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -35,6 +35,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -906,6 +906,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -158,6 +158,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -65,6 +65,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -35,6 +35,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -906,6 +906,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -158,6 +158,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -66,6 +66,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

5
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -169,6 +169,7 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14; final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14); final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder(); 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

31
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAdena.java vendored Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt vendored
View File

@@ -36,6 +36,7 @@ BlockResurrection: Blocked target from getting ressurected.
BlockSkill: Blocks usage of given skill magic types. Identity Crysis. BlockSkill: Blocks usage of given skill magic types. Identity Crysis.
BlockTarget: Causes the target to become untargetable. BlockTarget: Causes the target to become untargetable.
Bluff: Rotates the target so you face its back. Bluff: Rotates the target so you face its back.
BonusDropAdena: Bonus amount for dropped adena. (l2jmobius)
BonusDropAmount: Bonus amount for dropped items. (l2jmobius) BonusDropAmount: Bonus amount for dropped items. (l2jmobius)
BonusDropRate: Bonus chance for dropping items. (l2jmobius) BonusDropRate: Bonus chance for dropping items. (l2jmobius)
BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius) BonusSpoilRate: Bonus chance for acquiring spoil items. (l2jmobius)

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -906,6 +906,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// bonus drop amount effect // bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1); rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
if (itemId == Inventory.ADENA_ID)
{
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_ADENA, 1);
}
// finally // finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount)); return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));

1
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
View File

@@ -160,6 +160,7 @@ public enum Stat
EXPSP_RATE("rExp"), EXPSP_RATE("rExp"),
BONUS_EXP("bonusExp"), BONUS_EXP("bonusExp"),
BONUS_SP("bonusSp"), BONUS_SP("bonusSp"),
BONUS_DROP_ADENA("bonusDropAdena"),
BONUS_DROP_AMOUNT("bonusDropAmount"), BONUS_DROP_AMOUNT("bonusDropAmount"),
BONUS_DROP_RATE("bonusDropRate"), BONUS_DROP_RATE("bonusDropRate"),
BONUS_SPOIL_RATE("bonusSpoilRate"), BONUS_SPOIL_RATE("bonusSpoilRate"),

1
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@@ -64,6 +64,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new); EffectHandler.getInstance().registerHandler("BlockSkill", BlockSkill::new);
EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new); EffectHandler.getInstance().registerHandler("BlockTarget", BlockTarget::new);
EffectHandler.getInstance().registerHandler("Bluff", Bluff::new); EffectHandler.getInstance().registerHandler("Bluff", Bluff::new);
EffectHandler.getInstance().registerHandler("BonusDropAdena", BonusDropAdena::new);
EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new); EffectHandler.getInstance().registerHandler("BonusDropAmount", BonusDropAmount::new);
EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new); EffectHandler.getInstance().registerHandler("BonusDropRate", BonusDropRate::new);
EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new); EffectHandler.getInstance().registerHandler("BonusSpoilRate", BonusSpoilRate::new);

6
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder; 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.items.Item;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -385,6 +386,7 @@ public class NpcViewMod implements IBypassHandler
final DecimalFormat chanceFormat = new DecimalFormat("0.00##"); final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int leftHeight = 0; int leftHeight = 0;
int rightHeight = 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 dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1); final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_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 // bonus drop amount effect
rateAmount *= dropAmountEffectBonus; rateAmount *= dropAmountEffectBonus;
if (item.getId() == Inventory.ADENA_ID)
{
rateAmount *= dropAmountAdenaEffectBonus;
}
// bonus drop rate effect // bonus drop rate effect
rateChance *= dropRateEffectBonus; rateChance *= dropRateEffectBonus;
} }

Some files were not shown because too many files have changed in this diff Show More