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

Non quest scripts should use giveItems method.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-29 07:42:22 +00:00
parent a849367e88
commit e335f011e5
6 changed files with 172 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_C6_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java vendored
View File

@@ -114,7 +114,7 @@ public class L2Day extends LongTimeEvent
final int random = getRandom(100);
if (random >= 95)
{
rewardItems(player, MANAGERS.get(npc.getNpcId()), 2);
giveItems(player, MANAGERS.get(npc.getNpcId()), 2);
}
else
{
@@ -122,7 +122,7 @@ public class L2Day extends LongTimeEvent
{
if (random >= holder.getChance())
{
rewardItems(player, holder);
giveItems(player, holder);
break;
}
}
@@ -143,7 +143,7 @@ public class L2Day extends LongTimeEvent
final int random = getRandom(100);
if (random >= 95)
{
rewardItems(player, MANAGERS.get(npc.getNpcId()), 1);
giveItems(player, MANAGERS.get(npc.getNpcId()), 1);
}
else
{
@@ -151,7 +151,7 @@ public class L2Day extends LongTimeEvent
{
if (random >= holder.getChance())
{
rewardItems(player, holder);
giveItems(player, holder);
break;
}
}
@@ -172,7 +172,7 @@ public class L2Day extends LongTimeEvent
final int random = getRandom(100);
if (random >= 95)
{
rewardItems(player, MANAGERS.get(npc.getNpcId()), 1);
giveItems(player, MANAGERS.get(npc.getNpcId()), 1);
}
else
{
@@ -180,7 +180,7 @@ public class L2Day extends LongTimeEvent
{
if (random >= holder.getChance())
{
rewardItems(player, holder);
giveItems(player, holder);
break;
}
}

74
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -2165,6 +2165,80 @@ public class Quest extends ManagedScript
player.sendPacket(su);
}
/**
* Give item/reward to the player
* @param player
* @param itemId
* @param count
*/
public static void giveItems(Player player, int itemId, int count)
{
giveItems(player, itemId, count, 0);
}
/**
* Give item/reward to the player
* @param player
* @param holder
*/
protected static void giveItems(Player player, ItemHolder holder)
{
giveItems(player, holder.getId(), holder.getCount());
}
/**
* @param player
* @param itemId
* @param count
* @param enchantlevel
*/
public static void giveItems(Player player, int itemId, int count, int enchantlevel)
{
if (count <= 0)
{
return;
}
// Add items to player's inventory
final Item item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
if (item == null)
{
return;
}
// set enchant level for item if that item is not adena
if ((enchantlevel > 0) && (itemId != 57))
{
item.setEnchantLevel(enchantlevel);
}
sendItemGetMessage(player, item, count);
}
/**
* @param player
* @param itemId
* @param count
* @param attributeId
* @param attributeLevel
*/
public static void giveItems(Player player, int itemId, int count, byte attributeId, int attributeLevel)
{
if (count <= 0)
{
return;
}
// Add items to player's inventory
final Item item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
if (item == null)
{
return;
}
sendItemGetMessage(player, item, count);
}
/**
* Get a random integer from 0 (inclusive) to {@code max} (exclusive).<br>
* Use this method instead of importing {@link org.l2jmobius.commons.util.Rnd} utility.