From 062f53700399a9db53e9b40751d799ffd80552db Mon Sep 17 00:00:00 2001
From: xban1x <urban.lavbic@gmail.com>
Date: Sat, 5 Oct 2013 12:26:02 +0000
Subject: [PATCH] BETA: DP-Part for [L6238]. * Reviewed by: Zoey76,
UnAfraid, Nos, jurchiks
---
.../scripts/ai/npc/Alexandria/Alexandria.java | 35 ++++++++++---------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
index cbee5418c7..6c2b62c417 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java
@@ -28,6 +28,7 @@ import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.QuestItemHolder;
/**
* Alexandria (Armor Merchant) AI.
@@ -49,25 +50,25 @@ public final class Alexandria extends AbstractNpcAI
new ItemHolder(9817, 50),
};
// Agathions
- private static final ItemHolder[] LITTLE_DEVILS = new ItemHolder[]
+ private static final QuestItemHolder[] LITTLE_DEVILS = new QuestItemHolder[]
{
- new ItemHolder(10321, 10408, 600),
- new ItemHolder(10322, 0, 10),
- new ItemHolder(10323, 0, 10),
- new ItemHolder(10324, 0, 5),
- new ItemHolder(10325, 0, 5),
- new ItemHolder(10326, 0, 370),
+ new QuestItemHolder(10321, 600, 10408),
+ new QuestItemHolder(10322, 10),
+ new QuestItemHolder(10323, 10),
+ new QuestItemHolder(10324, 5),
+ new QuestItemHolder(10325, 5),
+ new QuestItemHolder(10326, 370),
};
- private static final ItemHolder[] LITTLE_ANGELS = new ItemHolder[]
+ private static final QuestItemHolder[] LITTLE_ANGELS = new QuestItemHolder[]
{
- new ItemHolder(10315, 10408, 600),
- new ItemHolder(10316, 0, 10),
- new ItemHolder(10317, 0, 10),
- new ItemHolder(10318, 0, 5),
- new ItemHolder(10319, 0, 5),
- new ItemHolder(10320, 0, 370),
+ new QuestItemHolder(10315, 600, 10408),
+ new QuestItemHolder(10316, 10),
+ new QuestItemHolder(10317, 10),
+ new QuestItemHolder(10318, 5),
+ new QuestItemHolder(10319, 5),
+ new QuestItemHolder(10320, 370),
};
- private static final Map<String, List<ItemHolder>> AGATHIONS = new HashMap<>();
+ private static final Map<String, List<QuestItemHolder>> AGATHIONS = new HashMap<>();
static
{
AGATHIONS.put("littleAngel", Arrays.asList(LITTLE_ANGELS));
@@ -116,13 +117,13 @@ public final class Alexandria extends AbstractNpcAI
takeItems(player, item);
}
giveItems(player, agathion.getId(), 1);
- if (agathion.getObjectId() == 0)
+ if (agathion.getCount() == 0)
{
htmltext = "30098-03.html";
}
else
{
- giveItems(player, agathion.getObjectId(), 1);
+ giveItems(player, (int) agathion.getCount(), 1);
htmltext = "30098-03a.html";
}
}
--
GitLab