Index: java/net/sf/l2j/gameserver/handler/itemhandlers/QuestItems.java
===================================================================
--- java/net/sf/l2j/gameserver/handler/itemhandlers/QuestItems.java (revision 1376)
+++ java/net/sf/l2j/gameserver/handler/itemhandlers/QuestItems.java (working copy)
@@ -19,10 +19,13 @@
package net.sf.l2j.gameserver.handler.itemhandlers;
+import net.sf.l2j.gameserver.cache.HtmCache;
import net.sf.l2j.gameserver.handler.IItemHandler;
import net.sf.l2j.gameserver.model.L2ItemInstance;
import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
import net.sf.l2j.gameserver.model.actor.instance.L2PlayableInstance;
+import net.sf.l2j.gameserver.serverpackets.ActionFailed;
+import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
import net.sf.l2j.gameserver.serverpackets.RadarControl;
import net.sf.l2j.gameserver.serverpackets.ShowMiniMap;
@@ -30,12 +33,12 @@
* This class ...
* @author Kerberos
* @version 0.1 11/28/07
- * Created for quest item: Map - Forest of the Dead.
+ * Created for items that aren't consumed after use
*/
-public class ForestMap implements IItemHandler
+public class QuestItems implements IItemHandler
{
- private static final int[] FOREST_MAP = {7063};
+ private static final int[] ITEMS = {7063,7064};
public void useItem(L2PlayableInstance playable, L2ItemInstance item)
{
@@ -49,6 +52,25 @@
activeChar.sendPacket(new ShowMiniMap(1665));
activeChar.sendPacket(new RadarControl(0, 1, 51995, -51265, -3104));
break;
+ case 7064:
+ String filename = "data/jscript/quest/23_LidiasHeart/i7064.htm";
+ String content = HtmCache.getInstance().getHtm(filename);
+ if (content == null)
+ {
+ NpcHtmlMessage html = new NpcHtmlMessage(1);
+ html.setHtml("<html><body>My Text is missing:<br>"+filename+"</body></html>");
+ activeChar.sendPacket(html);
+
+ activeChar.sendPacket( new ActionFailed() );
+ }
+ else
+ {
+ NpcHtmlMessage itemReply = new NpcHtmlMessage(5);
+ itemReply.setHtml(content);
+ activeChar.sendPacket(itemReply);
+ }
+ activeChar.sendPacket( new ActionFailed() );
+ break;
}
}
@@ -57,6 +79,6 @@
*/
public int[] getItemIds()
{
- return FOREST_MAP;
+ return ITEMS;
}
}
\ No newline at end of file
Index: java/net/sf/l2j/gameserver/handler/itemhandlers/ForestMap.java
===================================================================
--- java/net/sf/l2j/gameserver/handler/itemhandlers/ForestMap.java (revision 1370)
+++ java/net/sf/l2j/gameserver/handler/itemhandlers/ForestMap.java (working copy)
@@ -1,62 +0,0 @@
-/*
- * 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 2, 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-package net.sf.l2j.gameserver.handler.itemhandlers;
-
-import net.sf.l2j.gameserver.handler.IItemHandler;
-import net.sf.l2j.gameserver.model.L2ItemInstance;
-import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
-import net.sf.l2j.gameserver.model.actor.instance.L2PlayableInstance;
-import net.sf.l2j.gameserver.serverpackets.RadarControl;
-import net.sf.l2j.gameserver.serverpackets.ShowMiniMap;
-
-/**
- * This class ...
- * @author Kerberos
- * @version 0.1 11/28/07
- * Created for quest item: Map - Forest of the Dead.
- */
-
-public class ForestMap implements IItemHandler
-{
- private static final int[] FOREST_MAP = {7063};
-
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance)) return;
- L2PcInstance activeChar = (L2PcInstance)playable;
- int itemId = item.getItemId();
-
- switch (itemId)
- {
- case 7063:
- activeChar.sendPacket(new ShowMiniMap(1665));
- activeChar.sendPacket(new RadarControl(0, 1, 51995, -51265, -3104));
- break;
- }
- }
-
- /**
- * @see net.sf.l2j.gameserver.handler.IItemHandler#getItemIds()
- */
- public int[] getItemIds()
- {
- return FOREST_MAP;
- }
-}
\ No newline at end of file
Index: D:/projectl2j/L2_GameServer_It_1283/java/net/sf/l2j/gameserver/GameServer.java
===================================================================
--- D:/projectl2j/L2_GameServer_It_1283/java/net/sf/l2j/gameserver/GameServer.java (revision 1376)
+++ D:/projectl2j/L2_GameServer_It_1283/java/net/sf/l2j/gameserver/GameServer.java (working copy)
@@ -131,12 +131,12 @@
import net.sf.l2j.gameserver.handler.itemhandlers.ExtractableItems;
import net.sf.l2j.gameserver.handler.itemhandlers.Firework;
import net.sf.l2j.gameserver.handler.itemhandlers.FishShots;
-import net.sf.l2j.gameserver.handler.itemhandlers.ForestMap;
import net.sf.l2j.gameserver.handler.itemhandlers.Harvester;
import net.sf.l2j.gameserver.handler.itemhandlers.MercTicket;
import net.sf.l2j.gameserver.handler.itemhandlers.MysteryPotion;
import net.sf.l2j.gameserver.handler.itemhandlers.PaganKeys;
import net.sf.l2j.gameserver.handler.itemhandlers.Potions;
+import net.sf.l2j.gameserver.handler.itemhandlers.QuestItems;
import net.sf.l2j.gameserver.handler.itemhandlers.Recipes;
import net.sf.l2j.gameserver.handler.itemhandlers.Remedy;
import net.sf.l2j.gameserver.handler.itemhandlers.RollingDice;
@@ -456,7 +456,7 @@
_itemHandler.registerItemHandler(new Book());
_itemHandler.registerItemHandler(new Remedy());
_itemHandler.registerItemHandler(new Scrolls());
- _itemHandler.registerItemHandler(new ForestMap());
+ _itemHandler.registerItemHandler(new QuestItems());
_itemHandler.registerItemHandler(new CrystalCarol());
_itemHandler.registerItemHandler(new SoulCrystals());
_itemHandler.registerItemHandler(new SevenSignsRecord());