lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed quest 10292 warnings.

Browse Source 
Contributed by Stayway.
This commit is contained in:
MobiusDev 2017-08-15 14:26:08 +00:00
parent 9df61af146
commit f272130180
1 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java vendored
View File

@ -29,7 +29,7 @@ import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo;
/**
* Seven Signs, Girl of Doubt (10292)
* @author Adry_85
* @author Adry_85 / Stayway (Rework Helios)
*/
public final class Q10292_SevenSignsGirlOfDoubt extends Quest
{
@ -49,12 +49,8 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final int CREATURE_OF_THE_DUSK2 = 27424;
private static final int[] MOBS =
{
22801, // Cruel Pincer Golem
22802, // Cruel Pincer Golem
22803, // Cruel Pincer Golem
22804, // Horrifying Jackhammer Golem
22805, // Horrifying Jackhammer Golem
22806, // Horrifying Jackhammer Golem
18906, // Farm Bandit
18907, // Beast Devourer
};
public Q10292_SevenSignsGirlOfDoubt()
@ -72,8 +68,8 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, false);
if (st == null)
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
return null;
}
@ -83,31 +79,27 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
{
case "32593-04.htm":
case "32593-06.htm":
{
htmltext = event;
break;
}
case "32593-05.htm":
{
st.startQuest();
htmltext = event;
break;
}
case "32597-02.html":
case "32597-06.html":
{
htmltext = event;
break;
}
case "32593-05.htm":
{
qs.startQuest();
htmltext = event;
break;
}
case "32597-07.html":
{
st.setCond(2, true);
qs.setCond(2, true);
htmltext = event;
break;
}
case "32784-02.html":
{
if (st.isCond(2))
if (qs.isCond(2))
{
htmltext = event;
}
@ -115,16 +107,16 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case "32784-03.html":
{
if (st.isCond(2))
if (qs.isCond(2))
{
st.setCond(3, true);
qs.setCond(3, true);
htmltext = event;
}
break;
}
case "32784-06.html":
{
if (st.isCond(4) && hasItem(player, ELCADIAS_MARK))
if (qs.isCond(4) && hasItem(player, ELCADIAS_MARK))
{
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
htmltext = event;
@ -133,10 +125,10 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case "32784-08.html":
{
if (st.isCond(4) && hasItem(player, ELCADIAS_MARK))
if (qs.isCond(4) && hasItem(player, ELCADIAS_MARK))
{
takeItem(player, ELCADIAS_MARK);
st.setCond(5, true);
qs.setCond(5, true);
htmltext = event;
}
break;
@ -144,7 +136,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
case "32784-12.html":
case "32784-13.html":
{
if (st.isCond(6))
if (qs.isCond(6))
{
htmltext = event;
}
@ -152,16 +144,16 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case "32784-14.html":
{
if (st.isCond(6))
if (qs.isCond(6))
{
st.setCond(7, true);
qs.setCond(7, true);
htmltext = event;
}
break;
}
case "SPAWN":
{
if (st.isCond(5))
if (qs.isCond(5))
{
isBusy = true;
final L2Npc creature1 = addSpawn(CREATURE_OF_THE_DUSK1, 89440, -238016, -9632, 335, false, 0, false, player.getInstanceId());
@ -172,7 +164,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
{
creature1.deleteMe();
creature2.deleteMe();
st.unset("ex");
qs.unset("ex");
isBusy = false;
}, 60000);
}
@ -180,16 +172,16 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case "30832-02.html":
{
if (st.isCond(7))
if (qs.isCond(7))
{
st.setCond(8, true);
qs.setCond(8, true);
htmltext = event;
}
break;
}
case "30832-03.html":
{
if (st.isCond(8))
if (qs.isCond(8))
{
htmltext = event;
}
@ -204,22 +196,22 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
{
if (CommonUtil.contains(MOBS, npc.getId()))
{
final QuestState st = getRandomPartyMemberState(player, 3, 3, npc);
if ((st != null) && giveItemRandomly(st.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true))
final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc);
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true))
{
st.setCond(4, true);
qs.setCond(4, true);
}
}
else
{
final QuestState st = getQuestState(player, false);
if ((st != null) && st.isCond(5))
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(5))
{
final int value = st.getInt("ex") + 1;
st.set("ex", value);
final int value = qs.getInt("ex") + 1;
qs.set("ex", value);
if (value == 2)
{
st.setCond(6, true);
qs.setCond(6, true);
}
}
}
@ -229,21 +221,21 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{
case WOOD:
{
if (st.isCompleted())
if (qs.isCompleted())
{
htmltext = "32593-02.html";
}
else if (st.isCreated())
else if (qs.isCreated())
{
htmltext = "32593-01.htm";
}
else if (st.isStarted())
else if (qs.isStarted())
{
htmltext = "32593-07.html";
}
@ -251,11 +243,11 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case FRANZ:
{
if (st.isCond(1))
if (qs.isCond(1))
{
htmltext = "32597-01.html";
}
else if (st.isCond(2))
else if (qs.isCond(2))
{
htmltext = "32597-03.html";
}
@ -263,7 +255,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case ELCADIA:
{
switch (st.getCond())
switch (qs.getCond())
{
case 2:
{
@ -315,7 +307,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
else
{
addExpAndSp(player, 10000000, 1000000);
st.exitQuest(false, true);
qs.exitQuest(false, true);
htmltext = "32784-16.html";
}
break;
@ -325,11 +317,11 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
}
case HARDIN:
{
if (st.isCond(7))
if (qs.isCond(7))
{
htmltext = "30832-01.html";
}
else if (st.isCond(8))
else if (qs.isCond(8))
{
htmltext = "30832-04.html";
}