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

Fixed champion related issues.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-06-10 05:17:10 +00:00
parent 0850599fec
commit a80a494e6a
54 changed files with 785 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/ChampionMonsters.ini vendored
View File

@@ -56,13 +56,13 @@ ChampionRewardItemID = 6393
# The amount of the specified reward a player will receive if they are awarded the item.
ChampionRewardItemQty = 1
# % Chance to obtain a specified reward item from a higher level Champion mob.
# % Chance to obtain a specified reward item from a lower level Champion mob.
# Default: 0
ChampionRewardLowerLvlItemChance = 0
# % Chance to obtain a specified reward item from a lower level Champion mob.
# % Chance to obtain a specified reward item from a higher level Champion mob.
# Default: 0
ChampionRewardHigherLvlItemChance = 0
ChampionRewardHigherLvlItemChance = 100
# Do you want to enable the vitality calculation when killing champion mobs?
# Be aware that it can lead to huge unbalance on your server, your rate for that mob would

36
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1019,38 +1019,6 @@ public class Attackable extends Npc
}
}
}
// Apply Special Item drop with random(rnd) quantity(qty) for champions.
if (!Config.CHAMPION_ENABLE || !_champion || ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE <= 0) && (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE <= 0)))
{
return;
}
int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY);
final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty);
if ((player.getLevel() <= getLevel()) && (Rnd.get(100) < Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE))
{
if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || Config.AUTO_LOOT || isFlying())
{
player.addItem("ChampionLoot", item.getId(), item.getCount(), this, true); // Give the item(s) to the PlayerInstance that has killed the Attackable
}
else
{
dropItem(player, item);
}
}
else if ((player.getLevel() > getLevel()) && (Rnd.get(100) < Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE))
{
if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || Config.AUTO_LOOT || isFlying())
{
player.addItem("ChampionLoot", item.getId(), item.getCount(), this, true); // Give the item(s) to the PlayerInstance that has killed the Attackable
}
else
{
dropItem(player, item);
}
}
}
/**
@@ -1747,9 +1715,9 @@ public class Attackable extends Npc
public void setChampion(boolean champ)
{
_champion = champ;
if (champ && Config.SHOW_CHAMPION_AURA)
if (Config.SHOW_CHAMPION_AURA)
{
setTeam(Team.RED);
setTeam(champ ? Team.RED : Team.NONE);
}
}

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -1567,6 +1567,15 @@ public class Npc extends Creature
return true;
}
public void setTeam(Team team, boolean broadcast)
{
super.setTeam(team);
if (broadcast)
{
broadcastInfo();
}
}
@Override
public void setTeam(Team team)
{

63
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -702,6 +702,27 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.add(drop);
}
// champion extra drop
if (victim.isChampion())
{
if ((victim.getLevel() < killer.getLevel()) && (Rnd.get(100) < Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE))
{
return calculatedDrops;
}
if ((victim.getLevel() > killer.getLevel()) && (Rnd.get(100) < Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE))
{
return calculatedDrops;
}
// create list
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
calculatedDrops.add(new ItemHolder(Config.CHAMPION_REWARD_ID, Config.CHAMPION_REWARD_QTY));
}
return calculatedDrops;
}
@@ -718,13 +739,19 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
{
case DROP:
{
final Item item = ItemTable.getInstance().getTemplate(dropItem.getItemId());
final int itemId = dropItem.getItemId();
final Item item = ItemTable.getInstance().getTemplate(itemId);
final boolean champion = victim.isChampion();
// chance
double rateChance = 1;
if (Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()) != null)
if (Config.RATE_DROP_CHANCE_BY_ID.get(itemId) != null)
{
rateChance *= Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
rateChance *= Config.RATE_DROP_CHANCE_BY_ID.get(itemId);
if (champion && (itemId == Inventory.ADENA_ID))
{
rateChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
}
}
else if (item.hasExImmediateEffect())
{
@@ -736,15 +763,15 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
}
else
{
rateChance *= Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER;
rateChance *= Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER * (champion ? Config.CHAMPION_REWARDS_CHANCE : 1);
}
// premium chance
if (Config.PREMIUM_SYSTEM_ENABLED && killer.getActingPlayer().hasPremiumStatus())
if (Config.PREMIUM_SYSTEM_ENABLED && (killer.getActingPlayer() != null) && killer.getActingPlayer().hasPremiumStatus())
{
if (Config.PREMIUM_RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId()) != null)
if (Config.PREMIUM_RATE_DROP_CHANCE_BY_ID.get(itemId) != null)
{
rateChance *= Config.PREMIUM_RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
rateChance *= Config.PREMIUM_RATE_DROP_CHANCE_BY_ID.get(itemId);
}
else if (item.hasExImmediateEffect())
{
@@ -765,9 +792,13 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
{
// amount is calculated after chance returned success
double rateAmount = 1;
if (Config.RATE_DROP_AMOUNT_BY_ID.get(dropItem.getItemId()) != null)
if (Config.RATE_DROP_AMOUNT_BY_ID.get(itemId) != null)
{
rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(dropItem.getItemId());
rateAmount *= Config.RATE_DROP_AMOUNT_BY_ID.get(itemId);
if (champion && (itemId == Inventory.ADENA_ID))
{
rateAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
}
}
else if (item.hasExImmediateEffect())
{
@@ -779,15 +810,15 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
}
else
{
rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER;
rateAmount *= Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * (champion ? Config.CHAMPION_REWARDS_AMOUNT : 1);
}
// premium chance
if (Config.PREMIUM_SYSTEM_ENABLED && killer.getActingPlayer().hasPremiumStatus())
if (Config.PREMIUM_SYSTEM_ENABLED && (killer.getActingPlayer() != null) && killer.getActingPlayer().hasPremiumStatus())
{
if (Config.PREMIUM_RATE_DROP_AMOUNT_BY_ID.get(dropItem.getItemId()) != null)
if (Config.PREMIUM_RATE_DROP_AMOUNT_BY_ID.get(itemId) != null)
{
rateAmount *= Config.PREMIUM_RATE_DROP_AMOUNT_BY_ID.get(dropItem.getItemId());
rateAmount *= Config.PREMIUM_RATE_DROP_AMOUNT_BY_ID.get(itemId);
}
else if (item.hasExImmediateEffect())
{
@@ -804,7 +835,7 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
}
// finally
return new ItemHolder(dropItem.getItemId(), (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));
}
break;
}
@@ -813,7 +844,7 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
// chance
double rateChance = Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER;
// premium chance
if (Config.PREMIUM_SYSTEM_ENABLED && killer.getActingPlayer().hasPremiumStatus())
if (Config.PREMIUM_SYSTEM_ENABLED && (killer.getActingPlayer() != null) && killer.getActingPlayer().hasPremiumStatus())
{
rateChance *= Config.PREMIUM_RATE_SPOIL_CHANCE;
}
@@ -824,7 +855,7 @@ public final class NpcTemplate extends CreatureTemplate implements IIdentifiable
// amount is calculated after chance returned success
double rateAmount = Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER;
// premium amount
if (Config.PREMIUM_SYSTEM_ENABLED && killer.getActingPlayer().hasPremiumStatus())
if (Config.PREMIUM_SYSTEM_ENABLED && (killer.getActingPlayer() != null) && killer.getActingPlayer().hasPremiumStatus())
{
rateAmount *= Config.PREMIUM_RATE_SPOIL_AMOUNT;
}