Skip to content
Snippets Groups Projects
Commit 8b405a00 authored by Zealar's avatar Zealar
Browse files

Fix #264 missing break in Good Works Reward quest

parent 9ec127c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
+ 99
− 159
View file @ 8b405a00
......@@ -18,6 +18,19 @@
*/
package quests.Q00060_GoodWorksReward;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
import quests.Q00211_TrialOfTheChallenger.Q00211_TrialOfTheChallenger;
import quests.Q00212_TrialOfDuty.Q00212_TrialOfDuty;
import quests.Q00213_TrialOfTheSeeker.Q00213_TrialOfTheSeeker;
......@@ -42,19 +55,6 @@ import quests.Q00231_TestOfTheMaestro.Q00231_TestOfTheMaestro;
import quests.Q00232_TestOfTheLord.Q00232_TestOfTheLord;
import quests.Q00233_TestOfTheWarSpirit.Q00233_TestOfTheWarSpirit;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
/**
* Good Work's Reward (60)
* @author ivantotov
......@@ -254,7 +254,8 @@ public final class Q00060_GoodWorksReward extends Quest
if (((q217 != null) && q217.isCompleted()) || ((q218 != null) && q218.isCompleted()) || ((q219 != null) && q219.isCompleted()) || ((q220 != null) && q220.isCompleted()) || ((q221 != null) && q221.isCompleted()))
{
if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted()) || ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted())
|| ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
{
qs.setMemoStateEx(1, 3);
}
......@@ -263,7 +264,8 @@ public final class Q00060_GoodWorksReward extends Quest
qs.setMemoStateEx(1, 2);
}
}
else if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted()) || ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
else if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted())
|| ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
{
qs.setMemoStateEx(1, 2);
}
......@@ -274,7 +276,8 @@ public final class Q00060_GoodWorksReward extends Quest
}
else if (((q217 != null) && q217.isCompleted()) || ((q218 != null) && q218.isCompleted()) || ((q219 != null) && q219.isCompleted()) || ((q220 != null) && q220.isCompleted()) || ((q221 != null) && q221.isCompleted()))
{
if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted()) || ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted())
|| ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
{
qs.setMemoStateEx(1, 2);
}
......@@ -283,7 +286,8 @@ public final class Q00060_GoodWorksReward extends Quest
qs.setMemoStateEx(1, 1);
}
}
else if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted()) || ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
else if (((q222 != null) && q222.isCompleted()) || ((q223 != null) && q223.isCompleted()) || ((q224 != null) && q224.isCompleted()) || ((q225 != null) && q225.isCompleted()) || ((q226 != null) && q226.isCompleted()) || ((q227 != null) && q227.isCompleted())
|| ((q228 != null) && q228.isCompleted()) || ((q229 != null) && q229.isCompleted()) || ((q230 != null) && q230.isCompleted()) || ((q231 != null) && q231.isCompleted()) || ((q232 != null) && q232.isCompleted()) || ((q233 != null) && q233.isCompleted()))
{
qs.setMemoStateEx(1, 1);
}
......@@ -337,158 +341,94 @@ public final class Q00060_GoodWorksReward extends Quest
{
if (qs.isMemoState(10))
{
if ((player.getClassId() == ClassId.warrior))
{
htmltext = "31092-05.html";
}
else if ((player.getClassId() == ClassId.knight))
{
htmltext = "31092-06.html";
}
else if ((player.getClassId() == ClassId.rogue))
{
htmltext = "31092-07.html";
}
else if ((player.getClassId() == ClassId.wizard))
{
htmltext = "31092-08.html";
}
else if ((player.getClassId() == ClassId.cleric))
{
htmltext = "31092-09.html";
}
else if ((player.getClassId() == ClassId.elvenKnight))
{
htmltext = "31092-10.html";
}
else if ((player.getClassId() == ClassId.elvenScout))
{
htmltext = "31092-11.html";
}
else if ((player.getClassId() == ClassId.elvenWizard))
{
htmltext = "31092-12.html";
}
else if ((player.getClassId() == ClassId.oracle))
{
htmltext = "31092-13.html";
}
else if ((player.getClassId() == ClassId.palusKnight))
{
htmltext = "31092-14.html";
}
else if ((player.getClassId() == ClassId.assassin))
{
htmltext = "31092-15.html";
}
else if ((player.getClassId() == ClassId.darkWizard))
{
htmltext = "31092-16.html";
}
else if ((player.getClassId() == ClassId.shillienOracle))
{
htmltext = "31092-17.html";
}
else if ((player.getClassId() == ClassId.orcRaider))
{
htmltext = "31092-18.html";
}
else if ((player.getClassId() == ClassId.orcMonk))
{
htmltext = "31092-19.html";
}
else if ((player.getClassId() == ClassId.orcShaman))
{
htmltext = "31092-20.html";
}
else if ((player.getClassId() == ClassId.scavenger))
{
htmltext = "31092-21.html";
}
else if ((player.getClassId() == ClassId.artisan))
{
htmltext = "31092-22.html";
switch (player.getClassId())
{
case warrior:
return "31092-05.html";
case knight:
return "31092-06.html";
case rogue:
return "31092-07.html";
case wizard:
return "31092-08.html";
case cleric:
return "31092-09.html";
case elvenKnight:
return "31092-10.html";
case elvenScout:
return "31092-11.html";
case elvenWizard:
return "31092-12.html";
case oracle:
return "31092-13.html";
case palusKnight:
return "31092-14.html";
case assassin:
return "31092-15.html";
case darkWizard:
return "31092-16.html";
case shillienOracle:
return "31092-17.html";
case orcRaider:
return "31092-18.html";
case orcMonk:
return "31092-19.html";
case orcShaman:
return "31092-20.html";
case scavenger:
return "31092-21.html";
case artisan:
return "31092-22.html";
}
qs.exitQuest(false, true);
}
break;
}
case "REPLY_5":
{
if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
{
if ((player.getClassId() == ClassId.warrior))
{
htmltext = "31092-05a.html";
}
else if ((player.getClassId() == ClassId.knight))
{
htmltext = "31092-06a.html";
}
else if ((player.getClassId() == ClassId.rogue))
{
htmltext = "31092-07a.html";
}
else if ((player.getClassId() == ClassId.wizard))
{
htmltext = "31092-08a.html";
}
else if ((player.getClassId() == ClassId.cleric))
{
htmltext = "31092-09a.html";
}
else if ((player.getClassId() == ClassId.elvenKnight))
{
htmltext = "31092-10a.html";
}
else if ((player.getClassId() == ClassId.elvenScout))
{
htmltext = "31092-11a.html";
}
else if ((player.getClassId() == ClassId.elvenWizard))
{
htmltext = "31092-12a.html";
}
else if ((player.getClassId() == ClassId.oracle))
{
htmltext = "31092-13a.html";
}
else if ((player.getClassId() == ClassId.palusKnight))
{
htmltext = "31092-14a.html";
}
else if ((player.getClassId() == ClassId.assassin))
{
htmltext = "31092-15a.html";
}
else if ((player.getClassId() == ClassId.darkWizard))
{
htmltext = "31092-16a.html";
}
else if ((player.getClassId() == ClassId.shillienOracle))
{
htmltext = "31092-17a.html";
}
else if ((player.getClassId() == ClassId.orcRaider))
{
htmltext = "31092-18a.html";
}
else if ((player.getClassId() == ClassId.orcMonk))
{
htmltext = "31092-19a.html";
}
else if ((player.getClassId() == ClassId.orcShaman))
{
htmltext = "31092-20a.html";
}
else if ((player.getClassId() == ClassId.scavenger))
{
htmltext = "31092-21a.html";
}
else if ((player.getClassId() == ClassId.artisan))
{
htmltext = "31092-22a.html";
switch (player.getClassId())
{
case warrior:
return "31092-05a.html";
case knight:
return "31092-06a.html";
case rogue:
return "31092-07a.html";
case wizard:
return "31092-08a.html";
case cleric:
return "31092-09a.html";
case elvenKnight:
return "31092-10a.html";
case elvenScout:
return "31092-11a.html";
case elvenWizard:
return "31092-12a.html";
case oracle:
return "31092-13a.html";
case palusKnight:
return "31092-14a.html";
case assassin:
return "31092-15a.html";
case darkWizard:
return "31092-16a.html";
case shillienOracle:
return "31092-17a.html";
case orcRaider:
return "31092-18a.html";
case orcMonk:
return "31092-19a.html";
case orcShaman:
return "31092-20a.html";
case scavenger:
return "31092-21a.html";
case artisan:
return "31092-22a.html";
}
}
break;
}
case "REPLY_6":
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment