Separately store Mystic Tavern random instance value.

Thanks to CostyKiller.
This commit is contained in:
MobiusDevelopment 2020-03-23 18:07:32 +00:00
parent 881d39318d
commit f3cb8dfed3
7 changed files with 21 additions and 21 deletions

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }

View File

@ -158,7 +158,7 @@ public class MysticTavern extends AbstractNpcAI
{ {
return "34200-not-available.html"; return "34200-not-available.html";
} }
npc.setScriptValue(getRandom(availableInstances.size())); player.getVariables().set("MysticTarvernRnd", getRandomEntry(availableInstances));
startQuestTimer("npcRoute", 3000, npc, player); startQuestTimer("npcRoute", 3000, npc, player);
} }
break; break;
@ -326,7 +326,7 @@ public class MysticTavern extends AbstractNpcAI
} }
case "enter_instance": case "enter_instance":
{ {
switch (npc.getScriptValue()) switch (player.getVariables().getInt("MysticTarvernRnd", 0))
{ {
case INSTANCE_FREYA: case INSTANCE_FREYA:
{ {
@ -344,7 +344,7 @@ public class MysticTavern extends AbstractNpcAI
// break; // break;
// } // }
} }
npc.setScriptValue(0); player.getVariables().remove("MysticTarvernRnd");
break; break;
} }
} }