More QuestState related cleanups.

This commit is contained in:
MobiusDev
2017-08-15 15:22:42 +00:00
parent 4328a8dc6a
commit e8a760de9c
42 changed files with 109 additions and 159 deletions

View File

@@ -79,7 +79,7 @@ public final class Core extends AbstractNpcAI
}
else
{
final String test = loadGlobalQuestVar("Core_Attacked");
final String test = getGlobalQuestVar("Core_Attacked");
if (test.equalsIgnoreCase("true"))
{
_firstAttacked = true;

View File

@@ -86,7 +86,7 @@ public final class QueenShyeed extends AbstractNpcAI
private void spawnShyeed()
{
final String respawn = loadGlobalQuestVar("Respawn");
final String respawn = getGlobalQuestVar("Respawn");
final long remain = !respawn.isEmpty() ? Long.parseLong(respawn) - System.currentTimeMillis() : 0;
if (remain > 0)
{

View File

@@ -195,7 +195,7 @@ public class AvantGarde extends AbstractNpcAI
{
for (int i = 1; i <= Config.MAX_SUBCLASS; i++)
{
final String qvar = st.getGlobalQuestVar(varName + i);
final String qvar = getGlobalQuestVar(varName + i);
if (!qvar.isEmpty() && (qvar.endsWith(";") || !qvar.equals("0")))
{
activeCertifications++;
@@ -213,7 +213,7 @@ public class AvantGarde extends AbstractNpcAI
for (int i = 1; i <= Config.MAX_SUBCLASS; i++)
{
final String qvarName = varName + i;
final String qvar = st.getGlobalQuestVar(qvarName);
final String qvar = getGlobalQuestVar(qvarName);
if (qvar.endsWith(";"))
{
final String skillIdVar = qvar.replace(";", "");
@@ -224,7 +224,7 @@ public class AvantGarde extends AbstractNpcAI
if (sk != null)
{
player.removeSkill(sk);
st.saveGlobalQuestVar(qvarName, "0");
saveGlobalQuestVar(qvarName, "0");
}
}
else
@@ -255,7 +255,7 @@ public class AvantGarde extends AbstractNpcAI
_log.warning("Somehow " + player.getName() + " deleted a certification book!");
}
}
st.saveGlobalQuestVar(qvarName, "0");
saveGlobalQuestVar(qvarName, "0");
}
else
{

View File

@@ -109,7 +109,7 @@ public final class PriestOfBlessing extends AbstractNpcAI
{
if (player.getAdena() >= PRICE_VOICE)
{
final String value = loadGlobalQuestVar(player.getAccountName() + "_voice");
final String value = getGlobalQuestVar(player.getAccountName() + "_voice");
final long _reuse_time = value == "" ? 0 : Long.parseLong(value);
if (System.currentTimeMillis() > _reuse_time)
@@ -140,7 +140,7 @@ public final class PriestOfBlessing extends AbstractNpcAI
if (player.getAdena() >= _price_hourglass)
{
final String value = loadGlobalQuestVar(player.getAccountName() + "_hg_" + _index);
final String value = getGlobalQuestVar(player.getAccountName() + "_hg_" + _index);
final long _reuse_time = value == "" ? 0 : Long.parseLong(value);
if (System.currentTimeMillis() > _reuse_time)

View File

@@ -245,7 +245,7 @@ public final class SubclassCertification extends AbstractNpcAI
String htmltext;
final String tmp = variable + level + "-" + player.getClassIndex();
final String globalVariable = qs.getGlobalQuestVar(tmp);
final String globalVariable = getGlobalQuestVar(tmp);
if (!globalVariable.equals("") && !globalVariable.equals("0"))
{
@@ -268,7 +268,7 @@ public final class SubclassCertification extends AbstractNpcAI
smsg.addItemName(item);
player.sendPacket(smsg);
qs.saveGlobalQuestVar(tmp, String.valueOf(item.getObjectId()));
saveGlobalQuestVar(tmp, String.valueOf(item.getObjectId()));
htmltext = "GetAbility.html";
}
return htmltext;