Fixed TerritoryManagers missing dialogs.

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2020-08-03 14:13:53 +00:00
parent 917c02c7da
commit 7f235e942a
2 changed files with 18 additions and 18 deletions

View File

@@ -96,7 +96,7 @@ public class TerritoryManagers extends AbstractNpcAI
{ {
// L2J Custom for minimum badges required. // L2J Custom for minimum badges required.
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/36490-04.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/36490-04.html");
html.replace("%badge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORNOBLESS)); html.replace("%badge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORNOBLESS));
player.sendPacket(html); player.sendPacket(html);
break; break;
@@ -188,20 +188,20 @@ public class TerritoryManagers extends AbstractNpcAI
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0)) if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0))
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else if (reward[0] != territoryId) else if (reward[0] != territoryId)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0b.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0b.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName()); html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
} }
else if (reward[1] == 0) else if (reward[1] == 0)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else else
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-1.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-1.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName()); html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
html.replace("%badge%", String.valueOf(reward[1])); html.replace("%badge%", String.valueOf(reward[1]));
html.replace("%adena%", String.valueOf(reward[1] * 5000)); html.replace("%adena%", String.valueOf(reward[1] * 5000));
@@ -223,20 +223,20 @@ public class TerritoryManagers extends AbstractNpcAI
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0)) if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0))
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else if (reward[0] != territoryId) else if (reward[0] != territoryId)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0b.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0b.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName()); html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
} }
else if (reward[1] == 0) else if (reward[1] == 0)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else else
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-2.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-2.html");
player.addItem("ReceiveRewards", badgeId, reward[1], npc, true); player.addItem("ReceiveRewards", badgeId, reward[1], npc, true);
player.addAdena("ReceiveRewards", reward[1] * 5000, npc, true); player.addAdena("ReceiveRewards", reward[1] * 5000, npc, true);
TerritoryWarManager.getInstance().resetReward(player); TerritoryWarManager.getInstance().resetReward(player);

View File

@@ -96,7 +96,7 @@ public class TerritoryManagers extends AbstractNpcAI
{ {
// L2J Custom for minimum badges required. // L2J Custom for minimum badges required.
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/36490-04.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/36490-04.html");
html.replace("%badge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORNOBLESS)); html.replace("%badge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORNOBLESS));
player.sendPacket(html); player.sendPacket(html);
break; break;
@@ -188,20 +188,20 @@ public class TerritoryManagers extends AbstractNpcAI
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0)) if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0))
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else if (reward[0] != territoryId) else if (reward[0] != territoryId)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0b.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0b.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName()); html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
} }
else if (reward[1] == 0) else if (reward[1] == 0)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else else
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-1.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-1.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName()); html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
html.replace("%badge%", String.valueOf(reward[1])); html.replace("%badge%", String.valueOf(reward[1]));
html.replace("%adena%", String.valueOf(reward[1] * 5000)); html.replace("%adena%", String.valueOf(reward[1] * 5000));
@@ -223,20 +223,20 @@ public class TerritoryManagers extends AbstractNpcAI
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0)) if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0))
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else if (reward[0] != territoryId) else if (reward[0] != territoryId)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0b.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0b.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName()); html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
} }
else if (reward[1] == 0) else if (reward[1] == 0)
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-0a.html");
} }
else else
{ {
html.setFile(player, "data/scripts/ai/npc/TerritoryManagers/reward-2.html"); html.setFile(player, "data/scripts/ai/others/TerritoryManagers/reward-2.html");
player.addItem("ReceiveRewards", badgeId, reward[1], npc, true); player.addItem("ReceiveRewards", badgeId, reward[1], npc, true);
player.addAdena("ReceiveRewards", reward[1] * 5000, npc, true); player.addAdena("ReceiveRewards", reward[1] * 5000, npc, true);
TerritoryWarManager.getInstance().resetReward(player); TerritoryWarManager.getInstance().resetReward(player);