Sync with L2JServer Jan 26th 2015.

This commit is contained in:
mobius
2015-01-27 01:59:37 +00:00
parent 5d7ab65416
commit bfe682bbe3
63 changed files with 1049 additions and 1306 deletions

View File

@ -22,8 +22,6 @@ import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
* The Valentine Event event AI.
@ -35,6 +33,8 @@ public final class TheValentineEvent extends LongTimeEvent
private static final int NPC = 4301;
// Item
private static final int RECIPE = 20191;
// Misc
private static final String COMPLETED = TheValentineEvent.class.getSimpleName() + "_completed";
private TheValentineEvent()
{
@ -47,24 +47,17 @@ public final class TheValentineEvent extends LongTimeEvent
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, false);
if (st == null)
{
return getNoQuestMsg(player);
}
String htmltext = event;
if (event.equalsIgnoreCase("4301-3.htm"))
{
if (st.isCompleted())
if (player.getVariables().getBoolean(COMPLETED, false))
{
htmltext = "4301-4.htm";
}
else
{
st.giveItems(RECIPE, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.setState(State.COMPLETED);
giveItems(player, RECIPE, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
return htmltext;
@ -73,10 +66,6 @@ public final class TheValentineEvent extends LongTimeEvent
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
if (player.getQuestState(getName()) == null)
{
newQuestState(player);
}
return npc.getId() + ".htm";
}