Quests rework.
This commit is contained in:
@@ -63,8 +63,8 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
||||
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
if (st == null)
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if (qs == null)
|
||||
{
|
||||
return htmltext;
|
||||
}
|
||||
@@ -73,56 +73,74 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
||||
{
|
||||
case "30839-02.html":
|
||||
case "31307-02.html":
|
||||
st.startQuest();
|
||||
{
|
||||
qs.startQuest();
|
||||
break;
|
||||
}
|
||||
case "30839-05.html":
|
||||
st.setCond(2, true);
|
||||
{
|
||||
qs.setCond(2, true);
|
||||
break;
|
||||
}
|
||||
case "31307-05.html":
|
||||
st.setCond(7, true);
|
||||
{
|
||||
qs.setCond(7, true);
|
||||
break;
|
||||
}
|
||||
case "32325-03.html":
|
||||
st.setCond(3, true);
|
||||
st.giveItems(YINSWORD, 1, Elementals.FIRE, 10);
|
||||
{
|
||||
qs.setCond(3, true);
|
||||
giveItems(player, YINSWORD, 1, Elementals.FIRE, 10);
|
||||
break;
|
||||
}
|
||||
case "32326-03.html":
|
||||
st.setCond(8, true);
|
||||
st.giveItems(YANGSWORD, 1, Elementals.EARTH, 10);
|
||||
{
|
||||
qs.setCond(8, true);
|
||||
giveItems(player, YANGSWORD, 1, Elementals.EARTH, 10);
|
||||
break;
|
||||
}
|
||||
case "32325-06.html":
|
||||
if (st.hasQuestItems(YINSWORD))
|
||||
{
|
||||
if (hasQuestItems(player, YINSWORD))
|
||||
{
|
||||
st.takeItems(YINSWORD, 1);
|
||||
takeItems(player, YINSWORD, 1);
|
||||
htmltext = "32325-07.html";
|
||||
}
|
||||
st.giveItems(YINSWORD, 1, Elementals.FIRE, 10);
|
||||
giveItems(player, YINSWORD, 1, Elementals.FIRE, 10);
|
||||
break;
|
||||
}
|
||||
case "32326-06.html":
|
||||
if (st.hasQuestItems(YANGSWORD))
|
||||
{
|
||||
if (hasQuestItems(player, YANGSWORD))
|
||||
{
|
||||
st.takeItems(YANGSWORD, 1);
|
||||
takeItems(player, YANGSWORD, 1);
|
||||
htmltext = "32326-07.html";
|
||||
}
|
||||
st.giveItems(YANGSWORD, 1, Elementals.EARTH, 10);
|
||||
giveItems(player, YANGSWORD, 1, Elementals.EARTH, 10);
|
||||
break;
|
||||
}
|
||||
case "32325-09.html":
|
||||
st.setCond(5, true);
|
||||
{
|
||||
qs.setCond(5, true);
|
||||
BLESSING_OF_FIRE.getSkill().applyEffects(player, player);
|
||||
st.giveItems(YINSWORD, 1, Elementals.FIRE, 10);
|
||||
giveItems(player, YINSWORD, 1, Elementals.FIRE, 10);
|
||||
break;
|
||||
}
|
||||
case "32326-09.html":
|
||||
st.setCond(10, true);
|
||||
{
|
||||
qs.setCond(10, true);
|
||||
BLESSING_OF_EARTH.getSkill().applyEffects(player, player);
|
||||
st.giveItems(YANGSWORD, 1, Elementals.EARTH, 10);
|
||||
giveItems(player, YANGSWORD, 1, Elementals.EARTH, 10);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (Util.isDigit(event))
|
||||
{
|
||||
htmltext = Integer.toString(npc.getId()) + "-1" + event + ".html";
|
||||
st.giveItems(10520 + Integer.valueOf(event), 2);
|
||||
st.addExpAndSp(202160, 20375);
|
||||
st.exitQuest(false, true);
|
||||
giveItems(player, 10520 + Integer.valueOf(event), 2);
|
||||
addExpAndSp(player, 202160, 20375);
|
||||
qs.exitQuest(false, true);
|
||||
}
|
||||
|
||||
return htmltext;
|
||||
@@ -131,8 +149,8 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
||||
@Override
|
||||
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
|
||||
{
|
||||
final QuestState st = getQuestState(player, false);
|
||||
if (st == null)
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if (qs == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -140,33 +158,37 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
||||
switch (npc.getId())
|
||||
{
|
||||
case AIR:
|
||||
if ((st.isCond(8) || st.isCond(10)) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YANGSWORD) && (st.getQuestItemsCount(SOULPIECEAIR) < 6) && (getRandom(100) < 30))
|
||||
{
|
||||
if ((qs.isCond(8) || qs.isCond(10)) && (getItemEquipped(player, Inventory.PAPERDOLL_RHAND) == YANGSWORD) && (getQuestItemsCount(player, SOULPIECEAIR) < 6) && (getRandom(100) < 30))
|
||||
{
|
||||
st.giveItems(SOULPIECEAIR, 1);
|
||||
if (st.getQuestItemsCount(SOULPIECEAIR) >= 6)
|
||||
giveItems(player, SOULPIECEAIR, 1);
|
||||
if (getQuestItemsCount(player, SOULPIECEAIR) >= 6)
|
||||
{
|
||||
st.setCond(st.getCond() + 1, true);
|
||||
qs.setCond(qs.getCond() + 1, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case WATER:
|
||||
if (((st.getCond() >= 3) || (st.getCond() <= 5)) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YINSWORD) && (st.getQuestItemsCount(SOULPIECEWATER) < 6) && (getRandom(100) < 30))
|
||||
{
|
||||
if (((qs.getCond() >= 3) || (qs.getCond() <= 5)) && (getItemEquipped(player, Inventory.PAPERDOLL_RHAND) == YINSWORD) && (getQuestItemsCount(player, SOULPIECEWATER) < 6) && (getRandom(100) < 30))
|
||||
{
|
||||
st.giveItems(SOULPIECEWATER, 1);
|
||||
if (st.getQuestItemsCount(SOULPIECEWATER) >= 6)
|
||||
giveItems(player, SOULPIECEWATER, 1);
|
||||
if (getQuestItemsCount(player, SOULPIECEWATER) >= 6)
|
||||
{
|
||||
st.setCond(st.getCond() + 1, true);
|
||||
qs.setCond(qs.getCond() + 1, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -175,8 +197,8 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
||||
public String onTalk(L2Npc npc, L2PcInstance player)
|
||||
{
|
||||
String htmltext = getNoQuestMsg(player);
|
||||
final QuestState st = getQuestState(player, true);
|
||||
if (st == null)
|
||||
final QuestState qs = getQuestState(player, true);
|
||||
if (qs == null)
|
||||
{
|
||||
return htmltext;
|
||||
}
|
||||
@@ -185,98 +207,134 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
||||
{
|
||||
case HOLLY:
|
||||
{
|
||||
switch (st.getState())
|
||||
switch (qs.getState())
|
||||
{
|
||||
case State.CREATED:
|
||||
{
|
||||
htmltext = (player.getLevel() > 75) ? "30839-01.htm" : "30839-00.html";
|
||||
break;
|
||||
}
|
||||
case State.STARTED:
|
||||
switch (st.getCond())
|
||||
{
|
||||
switch (qs.getCond())
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
htmltext = "30839-03.html";
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
htmltext = "30839-05.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case State.COMPLETED:
|
||||
{
|
||||
htmltext = "30839-0a.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case WEBER:
|
||||
{
|
||||
switch (st.getState())
|
||||
switch (qs.getState())
|
||||
{
|
||||
case State.CREATED:
|
||||
{
|
||||
htmltext = (player.getLevel() > 75) ? "31307-01.htm" : "31307-00.html";
|
||||
break;
|
||||
}
|
||||
case State.STARTED:
|
||||
switch (st.getCond())
|
||||
{
|
||||
switch (qs.getCond())
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
htmltext = "31307-03.html";
|
||||
break;
|
||||
}
|
||||
case 7:
|
||||
{
|
||||
htmltext = "31307-05.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case State.COMPLETED:
|
||||
{
|
||||
htmltext = "31307-0a.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case YIN:
|
||||
{
|
||||
if (st.isStarted())
|
||||
if (qs.isStarted())
|
||||
{
|
||||
switch (st.getCond())
|
||||
switch (qs.getCond())
|
||||
{
|
||||
case 2:
|
||||
{
|
||||
htmltext = "32325-01.html";
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
case 5:
|
||||
{
|
||||
htmltext = "32325-04.html";
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
{
|
||||
htmltext = "32325-08.html";
|
||||
st.takeItems(YINSWORD, 1);
|
||||
st.takeItems(SOULPIECEWATER, -1);
|
||||
takeItems(player, YINSWORD, 1);
|
||||
takeItems(player, SOULPIECEWATER, -1);
|
||||
break;
|
||||
}
|
||||
case 6:
|
||||
{
|
||||
htmltext = "32325-10.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case YANG:
|
||||
{
|
||||
if (st.isStarted())
|
||||
if (qs.isStarted())
|
||||
{
|
||||
switch (st.getCond())
|
||||
switch (qs.getCond())
|
||||
{
|
||||
case 7:
|
||||
{
|
||||
htmltext = "32326-01.html";
|
||||
break;
|
||||
}
|
||||
case 8:
|
||||
case 10:
|
||||
{
|
||||
htmltext = "32326-04.html";
|
||||
break;
|
||||
}
|
||||
case 9:
|
||||
{
|
||||
htmltext = "32326-08.html";
|
||||
st.takeItems(YANGSWORD, 1);
|
||||
st.takeItems(SOULPIECEAIR, -1);
|
||||
takeItems(player, YANGSWORD, 1);
|
||||
takeItems(player, SOULPIECEAIR, -1);
|
||||
break;
|
||||
}
|
||||
case 11:
|
||||
{
|
||||
htmltext = "32326-10.html";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
Reference in New Issue
Block a user