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

Code improvements.

Browse Source 
Contributed by Mathael.
This commit is contained in:
MobiusDev
2016-03-28 10:39:18 +00:00
parent fdafe7447e
commit 901d2a858b
10 changed files with 92 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
trunk/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java vendored
View File

@@ -208,13 +208,10 @@ public class Q10338_SeizeYourDestiny extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
if (npc.getId() == HARNAKS_WRAITH)
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(2))
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(2))
{
qs.setCond(3, true);
}
qs.setCond(3, true);
}
return super.onKill(npc, player, isSummon);
}

38
trunk/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java vendored
View File

@@ -84,32 +84,26 @@ public class Q10382_DayOfLiberation extends Quest
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
if (qs.isCreated())
{
case SIZRAK:
htmltext = "sofa_sizraku_q10382_01.htm";
}
else if (qs.isStarted())
{
if (qs.isCond(1))
{
if (qs.isCreated())
{
htmltext = "sofa_sizraku_q10382_01.htm";
}
else if (qs.isStarted())
{
if (qs.isCond(1))
{
htmltext = "sofa_sizraku_q10382_07.html";
}
else if (qs.isCond(2))
{
htmltext = "sofa_sizraku_q10382_08.html";
}
}
else if (qs.isCompleted())
{
htmltext = "sofa_sizraku_q10382_06.html";
}
break;
htmltext = "sofa_sizraku_q10382_07.html";
}
else if (qs.isCond(2))
{
htmltext = "sofa_sizraku_q10382_08.html";
}
}
else if (qs.isCompleted())
{
htmltext = "sofa_sizraku_q10382_06.html";
}
return htmltext;
}

37
trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@@ -283,31 +283,30 @@ public class Q10734_DoOrDie extends Quest
{
return super.onKill(npc, killer, isSummon);
}
if (npc.getId() == TRAINING_DUMMY)
if (qs.isCond(1))
{
if (qs.isCond(1))
if (killer.isMageClass())
{
if (killer.isMageClass())
{
qs.setCond(2, true);
}
else
{
qs.setCond(3, true);
}
qs.setCond(2, true);
}
else if (qs.isCond(6))
else
{
if (killer.isMageClass())
{
qs.setCond(7, true);
}
else
{
qs.setCond(8, true);
}
qs.setCond(3, true);
}
}
else if (qs.isCond(6))
{
if (killer.isMageClass())
{
qs.setCond(7, true);
}
else
{
qs.setCond(8, true);
}
}
return super.onKill(npc, killer, isSummon);
}
}

42
trunk/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java vendored
View File

@@ -101,40 +101,34 @@ public class Q10756_AnInterdimensionalDraft extends Quest
htmltext = getAlreadyCompletedMsg(player);
}
switch (npc.getId())
if (qs.isCreated())
{
case PIO:
htmltext = "33963-01.htm";
}
else if (qs.isStarted())
{
switch (qs.getCond())
{
if (qs.isCreated())
case 1:
{
htmltext = "33963-01.htm";
htmltext = "33963-05.htm";
break;
}
else if (qs.isStarted())
case 2:
{
switch (qs.getCond())
if (qs.isCond(2) && (getQuestItemsCount(player, UNWORLDLY_WIND) >= 30))
{
case 1:
{
htmltext = "33963-05.htm";
break;
}
case 2:
{
if (qs.isCond(2) && (getQuestItemsCount(player, UNWORLDLY_WIND) >= 30))
{
takeItems(player, UNWORLDLY_WIND, 30);
giveItems(player, STEEL_DOOR_GUILD_COIN);
addExpAndSp(player, 174222, 41);
qs.exitQuest(false, true);
htmltext = "33963-07.html";
}
break;
}
takeItems(player, UNWORLDLY_WIND, 30);
giveItems(player, STEEL_DOOR_GUILD_COIN);
addExpAndSp(player, 174222, 41);
qs.exitQuest(false, true);
htmltext = "33963-07.html";
}
break;
}
break;
}
}
return htmltext;
}

6
trunk/dist/game/data/scripts/quests/Q10760_LettersFromTheQueen_OrcBarracs/Q10760_LettersFromTheQueen_OrcBarracs.java vendored
View File

@@ -145,11 +145,7 @@ public class Q10760_LettersFromTheQueen_OrcBarracs extends Quest implements IByp
}
case PIOTUR:
{
if (player.getRace() != Race.ERTHEIA)
{
htmltext = getNoQuestMsg(player);
}
else if (qs.isCreated())
if (qs.isCreated())
{
htmltext = getNoQuestMsg(player);
}