Fixed unconditional break switch cases.

This commit is contained in:
MobiusDevelopment 2021-10-18 21:21:12 +00:00
parent 4eb1b64aa7
commit d7a310b070
93 changed files with 127 additions and 32 deletions

View File

@ -169,6 +169,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -194,6 +195,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -226,6 +228,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -169,6 +169,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -194,6 +195,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -226,6 +228,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -211,6 +211,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
case State.CREATED:
{
htmltext = "34230-01.htm";
break;
}
case State.STARTED:
{
@ -314,8 +315,8 @@ public class Q00930_DisparagingThePhantoms extends Quest
{
qs.setCond(4, true);
}
break;
}
break;
}
case 3:
{

View File

@ -171,6 +171,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -196,6 +197,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -228,6 +230,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -167,6 +167,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
case State.CREATED:
{
htmltext = "34267-01.htm";
break;
}
case State.STARTED:
{

View File

@ -145,6 +145,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -134,6 +134,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -133,6 +133,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -110,6 +110,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -121,6 +121,7 @@ public class Q00671_PathToFindingThePast extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -107,6 +107,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -107,6 +107,7 @@ public class Q00673_BelethAmbition extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -211,6 +211,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
case State.CREATED:
{
htmltext = "34230-01.htm";
break;
}
case State.STARTED:
{
@ -314,8 +315,8 @@ public class Q00930_DisparagingThePhantoms extends Quest
{
qs.setCond(4, true);
}
break;
}
break;
}
case 3:
{

View File

@ -171,6 +171,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -196,6 +197,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -228,6 +230,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -139,8 +139,8 @@ public class Q10876_LeadersGrace extends Quest
{
htmltext = "34138-05.html";
}
break;
}
break;
}
case State.COMPLETED:
{

View File

@ -155,8 +155,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07a.html":
{
@ -180,8 +180,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07b.html":
{

View File

@ -167,6 +167,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
case State.CREATED:
{
htmltext = "34267-01.htm";
break;
}
case State.STARTED:
{

View File

@ -145,6 +145,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -134,6 +134,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -133,6 +133,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -110,6 +110,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -121,6 +121,7 @@ public class Q00671_PathToFindingThePast extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -107,6 +107,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -108,6 +108,7 @@ public class Q00673_BelethAmbition extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -211,6 +211,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
case State.CREATED:
{
htmltext = "34230-01.htm";
break;
}
case State.STARTED:
{
@ -314,8 +315,8 @@ public class Q00930_DisparagingThePhantoms extends Quest
{
qs.setCond(4, true);
}
break;
}
break;
}
case 3:
{

View File

@ -171,6 +171,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -196,6 +197,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -228,6 +230,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -139,8 +139,8 @@ public class Q10876_LeadersGrace extends Quest
{
htmltext = "34138-05.html";
}
break;
}
break;
}
case State.COMPLETED:
{

View File

@ -175,8 +175,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07a.html":
{
@ -200,8 +200,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07b.html":
{

View File

@ -167,6 +167,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
case State.CREATED:
{
htmltext = "34267-01.htm";
break;
}
case State.STARTED:
{

View File

@ -145,6 +145,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -134,6 +134,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -133,6 +133,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -110,6 +110,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -121,6 +121,7 @@ public class Q00671_PathToFindingThePast extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -107,6 +107,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -108,6 +108,7 @@ public class Q00673_BelethAmbition extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -211,6 +211,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
case State.CREATED:
{
htmltext = "34230-01.htm";
break;
}
case State.STARTED:
{
@ -314,8 +315,8 @@ public class Q00930_DisparagingThePhantoms extends Quest
{
qs.setCond(4, true);
}
break;
}
break;
}
case 3:
{

View File

@ -171,6 +171,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -196,6 +197,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -228,6 +230,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -139,8 +139,8 @@ public class Q10876_LeadersGrace extends Quest
{
htmltext = "34138-05.html";
}
break;
}
break;
}
case State.COMPLETED:
{

View File

@ -175,8 +175,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07a.html":
{
@ -200,8 +200,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07b.html":
{

View File

@ -167,6 +167,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
case State.CREATED:
{
htmltext = "34267-01.htm";
break;
}
case State.STARTED:
{

View File

@ -145,6 +145,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -134,6 +134,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -140,6 +140,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -110,6 +110,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -121,6 +121,7 @@ public class Q00671_PathToFindingThePast extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -107,6 +107,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -108,6 +108,7 @@ public class Q00673_BelethAmbition extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -211,6 +211,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
case State.CREATED:
{
htmltext = "34230-01.htm";
break;
}
case State.STARTED:
{
@ -314,8 +315,8 @@ public class Q00930_DisparagingThePhantoms extends Quest
{
qs.setCond(4, true);
}
break;
}
break;
}
case 3:
{

View File

@ -171,6 +171,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -196,6 +197,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -228,6 +230,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -139,8 +139,8 @@ public class Q10876_LeadersGrace extends Quest
{
htmltext = "34138-05.html";
}
break;
}
break;
}
case State.COMPLETED:
{

View File

@ -175,8 +175,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07a.html":
{
@ -200,8 +200,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07b.html":
{

View File

@ -278,10 +278,12 @@ public class ClassTransferTalk extends AbstractNpcAI
break;
}
htmltext = "30505-01.html";
break;
}
case RAYMOND:
{
htmltext = "30289-01.html";
break;
}
}
}

View File

@ -329,6 +329,7 @@ public class EvilIncubator extends AbstractInstance
{
st.setCond(13, true);
giveItems(player, SOE, 1);
break;
}
case 13:
{

View File

@ -147,8 +147,8 @@ public class PrisonOfDarkness extends AbstractInstance
break;
}
getTimers().addTimer("CHANGE_POSITION", (60000 * npcVars.getInt("TIME_MULTIPLER", 5)), npc, null);
break;
}
break;
}
case "START_BOSS":
{

View File

@ -167,6 +167,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
case State.CREATED:
{
htmltext = "34267-01.htm";
break;
}
case State.STARTED:
{

View File

@ -172,6 +172,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -134,6 +134,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -140,6 +140,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
break;
}
}
break;
}
case State.COMPLETED:
{

View File

@ -110,6 +110,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -121,6 +121,7 @@ public class Q00671_PathToFindingThePast extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrough.
}
case State.CREATED:
{

View File

@ -107,6 +107,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -108,6 +108,7 @@ public class Q00673_BelethAmbition extends Quest
break;
}
qs.setState(State.CREATED);
// Fallthrought.
}
case State.CREATED:
{

View File

@ -278,6 +278,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
break;
}
htmltext = "31595-08.htm";
break;
}
case 4:
{

View File

@ -211,6 +211,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
case State.CREATED:
{
htmltext = "34230-01.htm";
break;
}
case State.STARTED:
{
@ -314,8 +315,8 @@ public class Q00930_DisparagingThePhantoms extends Quest
{
qs.setCond(4, true);
}
break;
}
break;
}
case 3:
{

View File

@ -171,6 +171,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 2:
{
@ -196,6 +197,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
case 3:
{
@ -228,6 +230,7 @@ public class Q10457_KefensisIllusion extends Quest
break;
}
}
break;
}
}
}

View File

@ -139,8 +139,8 @@ public class Q10876_LeadersGrace extends Quest
{
htmltext = "34138-05.html";
}
break;
}
break;
}
case State.COMPLETED:
{

View File

@ -175,8 +175,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07a.html":
{
@ -200,8 +200,8 @@ public class Q10880_TheLastOneStanding extends Quest
{
htmltext = getNoQuestLevelRewardMsg(player);
}
break;
}
break;
}
case "34054-07b.html":
{

View File

@ -278,10 +278,12 @@ public class ClassTransferTalk extends AbstractNpcAI
break;
}
htmltext = "30505-01.html";
break;
}
case RAYMOND:
{
htmltext = "30289-01.html";
break;
}
}
}

View File

@ -329,6 +329,7 @@ public class EvilIncubator extends AbstractInstance
{
st.setCond(13, true);
giveItems(player, SOE, 1);
break;
}
case 13:
{

View File

@ -147,8 +147,8 @@ public class PrisonOfDarkness extends AbstractInstance
break;
}
getTimers().addTimer("CHANGE_POSITION", (60000 * npcVars.getInt("TIME_MULTIPLER", 5)), npc, null);
break;
}
break;
}
case "START_BOSS":
{

View File

@ -108,8 +108,8 @@ public class ThroneOfHeroesTauti extends AbstractInstance
{
showOnScreenMsg(world, NpcStringId.FIVE_SECONDS, ExShowScreenMessage.TOP_CENTER, 1000, true);
startQuestTimer("ANNOUNCE_4", 1000, null, player);
break;
}
break;
}
case "ANNOUNCE_4":
{

View File

@ -278,10 +278,12 @@ public class ClassTransferTalk extends AbstractNpcAI
break;
}
htmltext = "30505-01.html";
break;
}
case RAYMOND:
{
htmltext = "30289-01.html";
break;
}
}
}

View File

@ -329,6 +329,7 @@ public class EvilIncubator extends AbstractInstance
{
st.setCond(13, true);
giveItems(player, SOE, 1);
break;
}
case 13:
{

View File

@ -147,8 +147,8 @@ public class PrisonOfDarkness extends AbstractInstance
break;
}
getTimers().addTimer("CHANGE_POSITION", (60000 * npcVars.getInt("TIME_MULTIPLER", 5)), npc, null);
break;
}
break;
}
case "START_BOSS":
{

View File

@ -108,8 +108,8 @@ public class ThroneOfHeroesTauti extends AbstractInstance
{
showOnScreenMsg(world, NpcStringId.FIVE_SECONDS, ExShowScreenMessage.TOP_CENTER, 1000, true);
startQuestTimer("ANNOUNCE_4", 1000, null, player);
break;
}
break;
}
case "ANNOUNCE_4":
{

View File

@ -125,6 +125,7 @@ public class Baium extends AbstractNpcAI
case WAITING:
{
setStatus(ALIVE);
break;
}
case ALIVE:
{

View File

@ -125,6 +125,7 @@ public class Baium extends AbstractNpcAI
case WAITING:
{
setStatus(ALIVE);
break;
}
case ALIVE:
{

View File

@ -174,6 +174,7 @@ public class Minigame extends AbstractNpcAI
case "expire":
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIME_IS_UP_AND_YOU_HAVE_FAILED_ANY_MORE_WILL_BE_DIFFICULT);
break;
}
case "end":
{

View File

@ -181,6 +181,7 @@ public class Q10673_SagaOfLegend extends Quest
case State.CREATED:
{
htmltext = "30857-01.htm";
break;
}
case State.STARTED:
{

View File

@ -213,6 +213,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
qs.unset("O");
qs.unset("O2");
qs.unset("N");
break;
}
case "32120-17.html":
{

View File

@ -188,6 +188,7 @@ public class Q10673_SagaOfLegend extends Quest
case State.CREATED:
{
htmltext = "30857-01.htm";
break;
}
case State.STARTED:
{

View File

@ -138,6 +138,7 @@ public class Q10957_TheLifeOfADeathKnight extends Quest
case State.CREATED:
{
htmltext = "34138-01.htm";
break;
}
case State.STARTED:
{

View File

@ -131,6 +131,7 @@ public class Q10958_ExploringNewOpportunities extends Quest
case State.CREATED:
{
htmltext = "34138-01.htm";
break;
}
case State.STARTED:
{

View File

@ -142,6 +142,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
case State.CREATED:
{
htmltext = "34139-01.htm";
break;
}
case State.STARTED:
{

View File

@ -109,8 +109,8 @@ public class Q10974_NewStylishEquipment extends Quest
break;
}
htmltext = "no_sheep_hat.html";
break;
}
break;
}
case "30857-05.html":
{
@ -147,8 +147,8 @@ public class Q10974_NewStylishEquipment extends Quest
break;
}
htmltext = "no_belt.html";
break;
}
break;
}
case "30857-07.html":
{
@ -185,8 +185,8 @@ public class Q10974_NewStylishEquipment extends Quest
break;
}
htmltext = "no_cloak.html";
break;
}
break;
}
case "30857-09.html":
{

View File

@ -172,6 +172,7 @@ public class Q10673_SagaOfLegend extends Quest
case State.CREATED:
{
htmltext = "30857-01.htm";
break;
}
case State.STARTED:
{

View File

@ -136,6 +136,7 @@ public class Q10955_NewLifeLessons extends Quest
case State.CREATED:
{
htmltext = "34210-01.html";
break;
}
case State.STARTED:
{

View File

@ -154,6 +154,7 @@ public class Q10956_WeSylphs extends Quest
case State.CREATED:
{
htmltext = "34210-01.html";
break;
}
case State.STARTED:
{

View File

@ -138,6 +138,7 @@ public class Q10957_TheLifeOfADeathKnight extends Quest
case State.CREATED:
{
htmltext = "34138-01.htm";
break;
}
case State.STARTED:
{

View File

@ -131,6 +131,7 @@ public class Q10958_ExploringNewOpportunities extends Quest
case State.CREATED:
{
htmltext = "34138-01.htm";
break;
}
case State.STARTED:
{

View File

@ -142,6 +142,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
case State.CREATED:
{
htmltext = "34139-01.htm";
break;
}
case State.STARTED:
{

View File

@ -111,8 +111,8 @@ public class Q10974_NewStylishEquipment extends Quest
break;
}
htmltext = "no_sheep_hat.html";
break;
}
break;
}
case "30857-05.html":
{
@ -149,8 +149,8 @@ public class Q10974_NewStylishEquipment extends Quest
break;
}
htmltext = "no_belt.html";
break;
}
break;
}
case "30857-07.html":
{
@ -187,8 +187,8 @@ public class Q10974_NewStylishEquipment extends Quest
break;
}
htmltext = "no_cloak.html";
break;
}
break;
}
case "reward":
{