Sync with L2JServer Jan 26th 2015.
This commit is contained in:
@ -22,7 +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;
|
||||
|
||||
/**
|
||||
* Heavy Medals event AI.
|
||||
@ -65,28 +64,22 @@ public final class HeavyMedal 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;
|
||||
int level = checkLevel(st);
|
||||
int level = checkLevel(player);
|
||||
|
||||
if (event.equalsIgnoreCase("game"))
|
||||
{
|
||||
htmltext = st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level] ? "31229-no.htm" : "31229-game.htm";
|
||||
htmltext = getQuestItemsCount(player, GLITTERING_MEDAL) < MEDALS[level] ? "31229-no.htm" : "31229-game.htm";
|
||||
}
|
||||
else if (event.equalsIgnoreCase("heads") || event.equalsIgnoreCase("tails"))
|
||||
{
|
||||
if (st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level])
|
||||
if (getQuestItemsCount(player, GLITTERING_MEDAL) < MEDALS[level])
|
||||
{
|
||||
htmltext = "31229-" + event.toLowerCase() + "-10.htm";
|
||||
}
|
||||
else
|
||||
{
|
||||
st.takeItems(GLITTERING_MEDAL, MEDALS[level]);
|
||||
takeItems(player, GLITTERING_MEDAL, MEDALS[level]);
|
||||
|
||||
if (getRandom(100) > WIN_CHANCE)
|
||||
{
|
||||
@ -96,10 +89,10 @@ public final class HeavyMedal extends LongTimeEvent
|
||||
{
|
||||
if (level > 0)
|
||||
{
|
||||
st.takeItems(BADGES[level - 1], -1);
|
||||
takeItems(player, BADGES[level - 1], -1);
|
||||
}
|
||||
st.giveItems(BADGES[level], 1);
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
giveItems(player, BADGES[level], 1);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
level++;
|
||||
}
|
||||
htmltext = "31229-" + event.toLowerCase() + "-" + String.valueOf(level) + ".htm";
|
||||
@ -122,22 +115,22 @@ public final class HeavyMedal extends LongTimeEvent
|
||||
return npc.getId() + ".htm";
|
||||
}
|
||||
|
||||
public int checkLevel(QuestState st)
|
||||
public int checkLevel(L2PcInstance player)
|
||||
{
|
||||
int _lev = 0;
|
||||
if (st.hasQuestItems(6402))
|
||||
if (hasQuestItems(player, 6402))
|
||||
{
|
||||
_lev = 4;
|
||||
}
|
||||
else if (st.hasQuestItems(6401))
|
||||
else if (hasQuestItems(player, 6401))
|
||||
{
|
||||
_lev = 3;
|
||||
}
|
||||
else if (st.hasQuestItems(6400))
|
||||
else if (hasQuestItems(player, 6400))
|
||||
{
|
||||
_lev = 2;
|
||||
}
|
||||
else if (st.hasQuestItems(6399))
|
||||
else if (hasQuestItems(player, 6399))
|
||||
{
|
||||
_lev = 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user