lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retail like builder HTML debugging.

Browse Source
This commit is contained in:
MobiusDev
2018-05-04 00:45:48 +00:00
parent 9a2c032428
commit 672645e672
875 changed files with 2911 additions and 2697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/FortuneTelling/FortuneTelling.java vendored
View File

@@ -51,7 +51,7 @@ public class FortuneTelling extends AbstractNpcAI
else
{
takeItems(player, Inventory.ADENA_ID, COST);
htmltext = getHtm(player.getHtmlPrefix(), "fortune.htm").replace("%fortune%", String.valueOf(getRandom(1800309, 1800695)));
htmltext = getHtm(player, "fortune.htm").replace("%fortune%", String.valueOf(getRandom(1800309, 1800695)));
}
return htmltext;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java vendored
View File

@@ -692,7 +692,7 @@ public final class Beleth extends AbstractNpcAI
html = "32470b.htm";
}
return HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/default/" + html);
return HtmCache.getInstance().getHtm(player, "data/html/default/" + html);
}
@Override

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java vendored
View File

@@ -112,7 +112,7 @@ public final class CastleAmbassador extends AbstractNpcAI
if (htmltext != null)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
packet.setHtml(getHtm(player, htmltext));
packet.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
player.sendPacket(packet);
}
@@ -147,7 +147,7 @@ public final class CastleAmbassador extends AbstractNpcAI
}
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
packet.setHtml(getHtm(player, htmltext));
packet.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
player.sendPacket(packet);
return null;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -139,7 +139,7 @@ public final class CastleChamberlain extends AbstractNpcAI
private NpcHtmlMessage getHtmlPacket(L2PcInstance player, L2Npc npc, String htmlFile)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), htmlFile));
packet.setHtml(getHtm(player, htmlFile));
return packet;
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java vendored
View File

@@ -69,15 +69,15 @@ public final class CastleMercenaryManager extends AbstractNpcAI
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (castle.getName().equals("aden"))
{
html.setHtml(getHtm(player.getHtmlPrefix(), "mercmanager-aden-limit.html"));
html.setHtml(getHtm(player, "mercmanager-aden-limit.html"));
}
else if (castle.getName().equals("rune"))
{
html.setHtml(getHtm(player.getHtmlPrefix(), "mercmanager-rune-limit.html"));
html.setHtml(getHtm(player, "mercmanager-rune-limit.html"));
}
else
{
html.setHtml(getHtm(player.getHtmlPrefix(), "mercmanager-limit.html"));
html.setHtml(getHtm(player, "mercmanager-limit.html"));
}
html.replace("%feud_name%", String.valueOf(1001000 + castle.getResidenceId()));
player.sendPacket(html);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java vendored
View File

@@ -65,7 +65,7 @@ public final class CastleWarehouse extends AbstractNpcAI
}
case "warehouse-04.html":
{
htmltext = !npc.isMyLord(player) ? "warehouse-no.html" : getHtm(player.getHtmlPrefix(), "warehouse-04.html").replace("%blood%", Integer.toString(player.getClan().getBloodAllianceCount()));
htmltext = !npc.isMyLord(player) ? "warehouse-no.html" : getHtm(player, "warehouse-04.html").replace("%blood%", Integer.toString(player.getClan().getBloodAllianceCount()));
break;
}
case "Receive":

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java vendored
View File

@@ -97,7 +97,7 @@ public final class FortressSiegeManager extends AbstractNpcAI
if (clan.getFortId() == fortress.getResidenceId())
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "FortressSiegeManager-12.html"));
html.setHtml(getHtm(player, "FortressSiegeManager-12.html"));
html.replace("%clanName%", fortress.getOwnerClan().getName());
return html.getHtml();
}
@@ -167,7 +167,7 @@ public final class FortressSiegeManager extends AbstractNpcAI
if (clan.getFortId() == fortress.getResidenceId())
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "FortressSiegeManager-12.html"));
html.setHtml(getHtm(player, "FortressSiegeManager-12.html"));
html.replace("%clanName%", fortress.getOwnerClan().getName());
return html.getHtml();
}
@@ -205,7 +205,7 @@ public final class FortressSiegeManager extends AbstractNpcAI
return "FortressSiegeManager.html";
}
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "FortressSiegeManager-01.html"));
html.setHtml(getHtm(player, "FortressSiegeManager-01.html"));
html.replace("%clanName%", fortress.getOwnerClan().getName());
html.replace("%objectId%", npc.getObjectId());
return html.getHtml();

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java vendored
View File

@@ -99,7 +99,7 @@ public final class ManorManager extends AbstractNpcAI
}
return "manager.htm";
}
return getHtm(player.getHtmlPrefix(), "data/html/npcdefault.htm");
return getHtm(player, "data/html/npcdefault.htm");
}
// @formatter:off

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java vendored
View File

@@ -103,7 +103,7 @@ public final class MercenaryCaptain extends AbstractNpcAI
case "36481-03.html":
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "36481-03.html"));
html.setHtml(getHtm(player, "36481-03.html"));
html.replace("%strider%", String.valueOf(TerritoryWarManager.MINTWBADGEFORSTRIDERS));
html.replace("%gstrider%", String.valueOf(TerritoryWarManager.MINTWBADGEFORBIGSTRIDER));
player.sendPacket(html);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java vendored
View File

@@ -171,7 +171,7 @@ public final class PriestOfBlessing extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
String content = getHtm(player.getHtmlPrefix(), "32783.htm");
String content = getHtm(player, "32783.htm");
content = content.replace("%donate%", Util.formatAdena(PRICE_HOURGLASS[getHGIndex(player.getLevel())]));
return content;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java vendored
View File

@@ -184,7 +184,7 @@ public final class SubclassCertification extends AbstractNpcAI
private String replaceHtml(L2PcInstance player, String htmlFile, boolean replaceClass, String levelToReplace)
{
String htmltext = getHtm(player.getHtmlPrefix(), htmlFile);
String htmltext = getHtm(player, htmlFile);
if (replaceClass)
{
htmltext = htmltext.replace("%class%", ClassListData.getInstance().getClass(player.getActiveClass()).getClientCode());

19
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java vendored
View File

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

22
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@@ -115,9 +115,9 @@ public final class WyvernManager extends AbstractNpcAI
player.mount(WYVERN, 0, true);
return "wyvernmanager-04.html";
}
return replacePart(player.getHtmlPrefix(), "wyvernmanager-06.html");
return replacePart(player, "wyvernmanager-06.html");
}
return replacePart(player.getHtmlPrefix(), "wyvernmanager-05.html");
return replacePart(player, "wyvernmanager-05.html");
}
private boolean isOwnerClan(L2Npc npc, L2PcInstance player)
@@ -207,14 +207,14 @@ public final class WyvernManager extends AbstractNpcAI
}
}
private String replaceAll(L2Npc npc, String htmlPrefix)
private String replaceAll(L2Npc npc, L2PcInstance player)
{
return replacePart(htmlPrefix, "wyvernmanager-01.html").replace("%residence_name%", getResidenceName(npc));
return replacePart(player, "wyvernmanager-01.html").replace("%residence_name%", getResidenceName(npc));
}
private String replacePart(String htmlPrefix, String htmlFile)
private String replacePart(L2PcInstance player, String htmlFile)
{
return getHtm(htmlPrefix, htmlFile).replace("%wyvern_fee%", String.valueOf(WYVERN_FEE)).replace("%strider_level%", String.valueOf(STRIDER_LVL));
return getHtm(player, htmlFile).replace("%wyvern_fee%", String.valueOf(WYVERN_FEE)).replace("%strider_level%", String.valueOf(STRIDER_LVL));
}
@Override
@@ -231,7 +231,7 @@ public final class WyvernManager extends AbstractNpcAI
}
else if (Config.ALLOW_WYVERN_ALWAYS)
{
htmltext = replaceAll(npc, player.getHtmlPrefix());
htmltext = replaceAll(npc, player);
}
else if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
{
@@ -239,13 +239,13 @@ public final class WyvernManager extends AbstractNpcAI
}
else
{
htmltext = replaceAll(npc, player.getHtmlPrefix());
htmltext = replaceAll(npc, player);
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player.getHtmlPrefix(), "wyvernmanager-03.html") : replacePart(player.getHtmlPrefix(), "wyvernmanager-03b.html");
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@@ -288,7 +288,7 @@ public final class WyvernManager extends AbstractNpcAI
{
if (Config.ALLOW_WYVERN_ALWAYS)
{
htmltext = replaceAll(npc, player.getHtmlPrefix());
htmltext = replaceAll(npc, player);
}
else
{
@@ -298,7 +298,7 @@ public final class WyvernManager extends AbstractNpcAI
}
else
{
htmltext = replaceAll(npc, player.getHtmlPrefix());
htmltext = replaceAll(npc, player);
}
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -304,7 +304,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
if (npcId == MESSENGER)
{
final String main = (_rainbow.getOwnerId() > 0) ? "messenger_yetti001.htm" : "messenger_yetti001a.htm";
html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/scripts/conquerablehalls/RainbowSpringsChateau/" + main);
html = HtmCache.getInstance().getHtm(player, "data/scripts/conquerablehalls/RainbowSpringsChateau/" + main);
html = html.replace("%time%", _registrationEnds);
if (_rainbow.getOwnerId() > 0)
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java vendored
View File

@@ -130,7 +130,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
if (!checkIsAttacker(player.getClan()))
{
final L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
String content = getHtm(player.getHtmlPrefix(), "messenger_initial.htm");
String content = getHtm(player, "messenger_initial.htm");
content = content.replaceAll("%clanName%", (clan == null) ? "no owner" : clan.getName());
content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId()));
html = content;
@@ -327,7 +327,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
else
{
html = getHtm(player.getHtmlPrefix(), "messenger_registeredclans.htm");
html = getHtm(player, "messenger_registeredclans.htm");
int i = 0;
for (Entry<Integer, ClanData> clanData : _data.entrySet())
{
@@ -750,7 +750,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
private void sendRegistrationPageDate(L2PcInstance player)
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setHtml(getHtm(player.getHtmlPrefix(), "siege_date.htm"));
msg.setHtml(getHtm(player, "siege_date.htm"));
msg.replace("%nextSiege%", _hall.getSiegeDate().getTime().toString());
player.sendPacket(msg);
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java vendored
View File

@@ -68,7 +68,7 @@ public final class FactionSystem extends AbstractNpcAI
{
final String htmltext = null;
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "onlinelimit.html"));
packet.setHtml(getHtm(player, "onlinelimit.html"));
packet.replace("%name%", player.getName());
packet.replace("%more%", Config.FACTION_GOOD_TEAM_NAME);
packet.replace("%less%", Config.FACTION_EVIL_TEAM_NAME);
@@ -95,7 +95,7 @@ public final class FactionSystem extends AbstractNpcAI
{
final String htmltext = null;
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "onlinelimit.html"));
packet.setHtml(getHtm(player, "onlinelimit.html"));
packet.replace("%name%", player.getName());
packet.replace("%more%", Config.FACTION_EVIL_TEAM_NAME);
packet.replace("%less%", Config.FACTION_GOOD_TEAM_NAME);
@@ -133,7 +133,7 @@ public final class FactionSystem extends AbstractNpcAI
{
final String htmltext = null;
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "manager.html"));
packet.setHtml(getHtm(player, "manager.html"));
packet.replace("%name%", player.getName());
packet.replace("%good%", Config.FACTION_GOOD_TEAM_NAME);
packet.replace("%evil%", Config.FACTION_EVIL_TEAM_NAME);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java vendored
View File

@@ -377,7 +377,7 @@ public final class Race extends Event
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
final String content = getHtm(activeChar.getHtmlPrefix(), "admin_menu.htm");
final String content = getHtm(activeChar, "admin_menu.htm");
html.setHtml(content);
activeChar.sendPacket(html);
}

22
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java vendored
View File

@@ -72,40 +72,40 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan
final int team2Count = TvTEvent.getTeamsPlayerCounts()[1];
if (player.isCursedWeaponEquipped())
{
htmltext = getHtm(player.getHtmlPrefix(), "CursedWeaponEquipped.html");
htmltext = getHtm(player, "CursedWeaponEquipped.html");
}
else if (OlympiadManager.getInstance().isRegistered(player))
{
htmltext = getHtm(player.getHtmlPrefix(), "Olympiad.html");
htmltext = getHtm(player, "Olympiad.html");
}
else if (player.getKarma() > 0)
{
htmltext = getHtm(player.getHtmlPrefix(), "Karma.html");
htmltext = getHtm(player, "Karma.html");
}
else if ((playerLevel < Config.TVT_EVENT_MIN_LVL) || (playerLevel > Config.TVT_EVENT_MAX_LVL))
{
htmltext = getHtm(player.getHtmlPrefix(), "Level.html");
htmltext = getHtm(player, "Level.html");
htmltext = htmltext.replaceAll("%min%", String.valueOf(Config.TVT_EVENT_MIN_LVL));
htmltext = htmltext.replaceAll("%max%", String.valueOf(Config.TVT_EVENT_MAX_LVL));
}
else if ((team1Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS) && (team2Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS))
{
htmltext = getHtm(player.getHtmlPrefix(), "TeamsFull.html");
htmltext = getHtm(player, "TeamsFull.html");
htmltext = htmltext.replaceAll("%max%", String.valueOf(Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS));
}
else if ((Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.TVT_ID, player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP))
{
htmltext = getHtm(player.getHtmlPrefix(), "IPRestriction.html");
htmltext = getHtm(player, "IPRestriction.html");
htmltext = htmltext.replaceAll("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP)));
}
else if (TvTEvent.needParticipationFee() && !TvTEvent.hasParticipationFee(player))
{
htmltext = getHtm(player.getHtmlPrefix(), "ParticipationFee.html");
htmltext = getHtm(player, "ParticipationFee.html");
htmltext = htmltext.replaceAll("%fee%", TvTEvent.getParticipationFee());
}
else if (TvTEvent.addParticipant(player))
{
htmltext = getHtm(player.getHtmlPrefix(), "Registered.html");
htmltext = getHtm(player, "Registered.html");
}
break;
}
@@ -117,7 +117,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan
{
AntiFeedManager.getInstance().removePlayer(AntiFeedManager.TVT_ID, player);
}
htmltext = getHtm(player.getHtmlPrefix(), "Unregistered.html");
htmltext = getHtm(player, "Unregistered.html");
}
else
{
@@ -137,7 +137,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan
{
final boolean isParticipant = TvTEvent.isPlayerParticipant(player.getObjectId());
final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
htmltext = getHtm(player.getHtmlPrefix(), (!isParticipant ? "Participation.html" : "RemoveParticipation.html"));
htmltext = getHtm(player, (!isParticipant ? "Participation.html" : "RemoveParticipation.html"));
htmltext = htmltext.replaceAll("%objectId%", String.valueOf(npc.getObjectId()));
htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
htmltext = htmltext.replaceAll("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
@@ -198,7 +198,7 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan
{
final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
final int[] teamsPointsCounts = TvTEvent.getTeamsPoints();
String htmltext = getHtm(player.getHtmlPrefix(), "Status.html");
String htmltext = getHtm(player, "Status.html");
htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
htmltext = htmltext.replaceAll("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
htmltext = htmltext.replaceAll("%team1points%", String.valueOf(teamsPointsCounts[0]));

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java vendored
View File

@@ -84,7 +84,7 @@ public final class Wedding extends AbstractNpcAI
{
player.setMarryRequest(false);
partner.setMarryRequest(false);
htmltext = getHtm(player.getHtmlPrefix(), "Ask.html");
htmltext = getHtm(player, "Ask.html");
htmltext = htmltext.replaceAll("%player%", partner.getName());
}
return htmltext;
@@ -105,7 +105,7 @@ public final class Wedding extends AbstractNpcAI
sendHtml(partner, "Ask.html", "%player%", player.getName());
htmltext = getHtm(player.getHtmlPrefix(), "Requested.html");
htmltext = getHtm(player, "Requested.html");
htmltext = htmltext.replaceAll("%player%", partner.getName());
}
break;
@@ -176,13 +176,13 @@ public final class Wedding extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final String htmltext = getHtm(player.getHtmlPrefix(), "Start.html");
final String htmltext = getHtm(player, "Start.html");
return htmltext.replaceAll("%fee%", String.valueOf(Config.WEDDING_PRICE));
}
private String sendHtml(L2PcInstance player, String fileName, String regex, String replacement)
{
String html = getHtm(player.getHtmlPrefix(), fileName);
String html = getHtm(player, fileName);
if ((regex != null) && (replacement != null))
{
html = html.replaceAll(regex, replacement);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java vendored
View File

@@ -56,7 +56,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
if (staticObject.getType() == 2)
{
final String filename = (staticObject.getId() == 24230101) ? "data/html/signboards/tomb_of_crystalgolem.htm" : "data/html/signboards/pvp_signboard.htm";
final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
final String content = HtmCache.getInstance().getHtm(activeChar, filename);
final NpcHtmlMessage html = new NpcHtmlMessage(staticObject.getObjectId());
if (content == null)

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java vendored
View File

@@ -36,7 +36,7 @@ public class L2DoorInstanceActionShift implements IActionShiftHandler
activeChar.sendPacket(new StaticObject(door, activeChar.isGM()));
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/doorinfo.htm");
html.setFile(activeChar, "data/html/admin/doorinfo.htm");
html.replace("%class%", target.getClass().getSimpleName());
html.replace("%hp%", String.valueOf((int) door.getCurrentHp()));
html.replace("%hpmax%", String.valueOf(door.getMaxHp()));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@@ -64,7 +64,7 @@ public class L2NpcActionShift implements IActionShiftHandler
activeChar.setTarget(target);
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npcinfo.htm");
html.setFile(activeChar, "data/html/admin/npcinfo.htm");
html.replace("%objid%", String.valueOf(target.getObjectId()));
html.replace("%class%", target.getClass().getSimpleName());

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java vendored
View File

@@ -90,7 +90,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
{
if (!st.hasMoreTokens())
{
final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-add.htm");
final String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-add.htm");
Util.sendCBHtml(activeChar, content);
break;
}
@@ -191,7 +191,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
}
if (!st.hasMoreTokens())
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-edit.htm");
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
final String announcementId = "" + announce.getId();
final String announcementType = announce.getType().name();
String announcementInital = "0";
@@ -417,7 +417,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
final IAnnouncement announce = AnnouncementsTable.getInstance().getAnnounce(id);
if (announce != null)
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-show.htm");
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
final String announcementId = "" + announce.getId();
final String announcementType = announce.getType().name();
String announcementInital = "0";
@@ -457,7 +457,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
}
}
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/announces-list.htm");
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-list.htm");
final PageResult result = HtmlUtil.createPage(AnnouncementsTable.getInstance().getAllAnnouncements(), page, 8, currentPage ->
{
return "<td align=center><button action=\"bypass admin_announces list " + currentPage + "\" value=\"" + (currentPage + 1) + "\" width=35 height=20 back=\"L2UI_CT1.Button_DF_Down\" fore=\"L2UI_CT1.Button_DF\"></td>";

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java vendored
View File

@@ -69,7 +69,7 @@ public class AdminClan implements IAdminCommandHandler
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/claninfo.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/claninfo.htm"));
html.replace("%clan_name%", clan.getName());
html.replace("%clan_leader%", clan.getLeaderName());
html.replace("%clan_level%", String.valueOf(clan.getLevel()));
@@ -116,7 +116,7 @@ public class AdminClan implements IAdminCommandHandler
case "admin_clan_show_pending":
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/clanchanges.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/clanchanges.htm"));
final StringBuilder sb = new StringBuilder();
for (L2Clan clan : ClanTable.getInstance().getClans())
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java vendored
View File

@@ -90,7 +90,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
final Collection<CursedWeapon> cws = cwm.getCursedWeapons();
final StringBuilder replyMSG = new StringBuilder(cws.size() * 300);
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/cwinfo.htm");
adminReply.setFile(activeChar, "data/html/admin/cwinfo.htm");
for (CursedWeapon cw : cwm.getCursedWeapons())
{
itemId = cw.getItemId();

18
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -954,7 +954,7 @@ public class AdminEditChar implements IAdminCommandHandler
players.sort(Comparator.comparingLong(L2PcInstance::getUptime));
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charlist.htm");
html.setFile(activeChar, "data/html/admin/charlist.htm");
final PageResult result = HtmlUtil.createPage(players, page, 20, i ->
{
@@ -1039,7 +1039,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/" + filename);
adminReply.setFile(activeChar, "data/html/admin/" + filename);
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%clan%", String.valueOf(player.getClan() != null ? "<a action=\"bypass -h admin_clan_info " + player.getObjectId() + "\">" + player.getClan().getName() + "</a>" : null));
@@ -1148,7 +1148,7 @@ public class AdminEditChar implements IAdminCommandHandler
int CharactersFound = 0;
String name;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charfind.htm");
adminReply.setFile(activeChar, "data/html/admin/charfind.htm");
final StringBuilder replyMSG = new StringBuilder(1000);
@@ -1228,7 +1228,7 @@ public class AdminEditChar implements IAdminCommandHandler
String name, ip = "0.0.0.0";
final StringBuilder replyMSG = new StringBuilder(1000);
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/ipfind.htm");
adminReply.setFile(activeChar, "data/html/admin/ipfind.htm");
final List<L2PcInstance> players = new ArrayList<>(L2World.getInstance().getPlayers());
players.sort(Comparator.comparingLong(L2PcInstance::getUptime));
@@ -1323,7 +1323,7 @@ public class AdminEditChar implements IAdminCommandHandler
chars.values().stream().forEachOrdered(replyMSG::add);
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/accountinfo.htm");
adminReply.setFile(activeChar, "data/html/admin/accountinfo.htm");
adminReply.replace("%account%", player.getAccountName());
adminReply.replace("%player%", characterName);
adminReply.replace("%characters%", replyMSG.toString());
@@ -1382,7 +1382,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/dualbox.htm");
adminReply.setFile(activeChar, "data/html/admin/dualbox.htm");
adminReply.replace("%multibox%", String.valueOf(multibox));
adminReply.replace("%results%", results.toString());
adminReply.replace("%strict%", "");
@@ -1436,7 +1436,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/dualbox.htm");
adminReply.setFile(activeChar, "data/html/admin/dualbox.htm");
adminReply.replace("%multibox%", String.valueOf(multibox));
adminReply.replace("%results%", results.toString());
adminReply.replace("%strict%", "strict_");
@@ -1520,7 +1520,7 @@ public class AdminEditChar implements IAdminCommandHandler
private void gatherSummonInfo(L2Summon target, L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/petinfo.htm");
html.setFile(activeChar, "data/html/admin/petinfo.htm");
final String name = target.getName();
html.replace("%name%", name == null ? "N/A" : name);
html.replace("%level%", Integer.toString(target.getLevel()));
@@ -1559,7 +1559,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
boolean color = true;
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/partyinfo.htm");
html.setFile(activeChar, "data/html/admin/partyinfo.htm");
final StringBuilder text = new StringBuilder(400);
for (L2PcInstance member : target.getParty().getMembers())
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@@ -120,7 +120,7 @@ public class AdminEventEngine implements IAdminCommandHandler
final DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "/data/events/" + eventName)));
final BufferedReader inbr = new BufferedReader(new InputStreamReader(in));
adminReply.setFile("en", "data/html/mods/EventEngine/Participation.htm");
adminReply.setFile(null, "data/html/mods/EventEngine/Participation.htm");
adminReply.replace("%eventName%", eventName);
adminReply.replace("%eventCreator%", inbr.readLine());
adminReply.replace("%eventInfo%", inbr.readLine());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java vendored
View File

@@ -149,7 +149,7 @@ public class AdminEvents implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/gm_events.htm");
html.setFile(activeChar, "data/html/admin/gm_events.htm");
final StringBuilder cList = new StringBuilder(500);
for (Quest event : QuestManager.getInstance().getScripts().values())
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java vendored
View File

@@ -99,7 +99,7 @@ public class AdminExpSp implements IAdminCommandHandler
return;
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/expsp.htm");
adminReply.setFile(activeChar, "data/html/admin/expsp.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%xp%", String.valueOf(player.getExp()));

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java vendored
View File

@@ -151,7 +151,7 @@ public class AdminFortSiege implements IAdminCommandHandler
{
int i = 0;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/forts.htm");
adminReply.setFile(activeChar, "data/html/admin/forts.htm");
final List<Fort> forts = FortManager.getInstance().getForts();
final StringBuilder cList = new StringBuilder(forts.size() * 100);
@@ -178,7 +178,7 @@ public class AdminFortSiege implements IAdminCommandHandler
private void showFortSiegePage(L2PcInstance activeChar, Fort fort)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/fort.htm");
adminReply.setFile(activeChar, "data/html/admin/fort.htm");
adminReply.replace("%fortName%", fort.getName());
adminReply.replace("%fortId%", String.valueOf(fort.getResidenceId()));
activeChar.sendPacket(adminReply);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGamePoints.java vendored
View File

@@ -107,7 +107,7 @@ public class AdminGamePoints implements IAdminCommandHandler
private void openGamePointsMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/game_points.htm");
html.setFile(activeChar, "data/html/admin/game_points.htm");
activeChar.sendPacket(html);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java vendored
View File

@@ -67,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/graciaseeds.htm");
html.setFile(activeChar, "data/html/admin/graciaseeds.htm");
// Seed of destruction
html.replace("%sodstage%", String.valueOf(SoDManager.getInstance().getSoDState()));
html.replace("%sodtiatkill%", String.valueOf(SoDManager.getInstance().getSoDTiatKilled()));

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -74,7 +74,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/grandboss.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm"));
activeChar.sendPacket(html);
}
break;
@@ -302,7 +302,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time"));
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), htmlPatch));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, htmlPatch));
html.replace("%bossStatus%", text);
html.replace("%bossColor%", textColor);
html.replace("%respawnTime%", bossStatus == deadStatus ? bossRespawn : "Already respawned!");

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java vendored
View File

@@ -83,7 +83,7 @@ public class AdminHellbound implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/hellbound.htm");
html.setFile(activeChar, "data/html/admin/hellbound.htm");
html.replace("%hbstage%", String.valueOf(HellboundEngine.getInstance().getLevel()));
html.replace("%trust%", String.valueOf(HellboundEngine.getInstance().getTrust()));
html.replace("%maxtrust%", String.valueOf(HellboundEngine.getInstance().getMaxTrust()));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java vendored
View File

@@ -92,7 +92,7 @@ public class AdminHtml implements IAdminCommandHandler
String content = null;
if (!reload)
{
content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), path);
content = HtmCache.getInstance().getHtm(activeChar, path);
}
else
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java vendored
View File

@@ -166,7 +166,7 @@ public class AdminLogin implements IAdminCommandHandler
private void showMainPage(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/login.htm");
html.setFile(activeChar, "data/html/admin/login.htm");
html.replace("%server_name%", LoginServerThread.getInstance().getServerName());
html.replace("%status%", LoginServerThread.getInstance().getStatusString());
html.replace("%clock%", getServerTypeName(Config.SERVER_LIST_TYPE));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java vendored
View File

@@ -34,7 +34,7 @@ public final class AdminManor implements IAdminCommandHandler
{
final CastleManorManager manor = CastleManorManager.getInstance();
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/manor.htm");
msg.setFile(activeChar, "data/html/admin/manor.htm");
msg.replace("%status%", manor.getCurrentModeName());
msg.replace("%change%", manor.getNextModeChange());

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@@ -220,7 +220,7 @@ public final class AdminPForge implements IAdminCommandHandler
private void showValuesPage(L2PcInstance activeChar, String[] opCodes, String format)
{
String sendBypass = null;
String valuesHtml = HtmCache.getInstance().getHtmForce(activeChar.getHtmlPrefix(), "data/html/admin/pforge/values.htm");
String valuesHtml = HtmCache.getInstance().getHtmForce(activeChar, "data/html/admin/pforge/values.htm");
if (opCodes.length == 3)
{
valuesHtml = valuesHtml.replace("%opformat%", "chd");
@@ -251,7 +251,7 @@ public final class AdminPForge implements IAdminCommandHandler
valuesHtml = valuesHtml.replace("%format%", format);
sendBypass += " " + format;
final String editorTemplate = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/pforge/inc/editor.htm");
final String editorTemplate = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/pforge/inc/editor.htm");
if (editorTemplate != null)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java vendored
View File

@@ -48,7 +48,7 @@ public class AdminPcCondOverride implements IAdminCommandHandler
case "admin_exceptions":
{
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/cond_override.htm");
msg.setFile(activeChar, "data/html/admin/cond_override.htm");
final StringBuilder sb = new StringBuilder();
for (PcCondOverride ex : PcCondOverride.values())
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java vendored
View File

@@ -105,7 +105,7 @@ public class AdminPremium implements IAdminCommandHandler
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/premium_menu.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/premium_menu.htm"));
activeChar.sendPacket(html);
return true;
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java vendored
View File

@@ -77,7 +77,7 @@ public class AdminPunishment implements IAdminCommandHandler
{
if (!st.hasMoreTokens())
{
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/punishment.htm");
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/punishment.htm");
if (content != null)
{
content = content.replaceAll("%punishments%", Util.implode(PunishmentType.values(), ";"));
@@ -118,7 +118,7 @@ public class AdminPunishment implements IAdminCommandHandler
key = findCharId(key);
}
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/punishment-info.htm");
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/punishment-info.htm");
if (content != null)
{
final StringBuilder sb = new StringBuilder();
@@ -174,7 +174,7 @@ public class AdminPunishment implements IAdminCommandHandler
{
target = activeChar.getTarget().getActingPlayer();
}
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/punishment-player.htm");
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/punishment-player.htm");
if (content != null)
{
content = content.replaceAll("%player_name%", target.getName());

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java vendored
View File

@@ -166,7 +166,7 @@ public class AdminQuest implements IAdminCommandHandler
}
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
msg.setFile(activeChar, "data/html/admin/npc-quests.htm");
msg.replace("%quests%", sb.toString());
msg.replace("%objid%", character.getObjectId());
msg.replace("%questName%", "");
@@ -271,7 +271,7 @@ public class AdminQuest implements IAdminCommandHandler
}
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
msg.setFile(activeChar, "data/html/admin/npc-quests.htm");
msg.replace("%quests%", sb.toString());
msg.replace("%questName%", "<table><tr><td width=\"50\" align=\"left\"><a action=\"bypass -h admin_script_load " + quest.getName() + "\">Reload</a></td> <td width=\"150\" align=\"center\"><a action=\"bypass -h admin_quest_info " + quest.getName() + "\">" + quest.getName() + "</a></td> <td width=\"50\" align=\"right\"><a action=\"bypass -h admin_script_unload " + quest.getName() + "\">Unload</a></tr></td></table>");
activeChar.sendPacket(msg);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java vendored
View File

@@ -123,7 +123,7 @@ public class AdminScan implements IAdminCommandHandler
private void sendNpcList(L2PcInstance activeChar, int radius)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/scan.htm");
html.setFile(activeChar, "data/html/admin/scan.htm");
final StringBuilder sb = new StringBuilder();
for (L2Character character : L2World.getInstance().getVisibleObjects(activeChar, L2Character.class, radius))
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java vendored
View File

@@ -53,7 +53,7 @@ public class AdminServerInfo implements IAdminCommandHandler
final NpcHtmlMessage html = new NpcHtmlMessage();
final Runtime RunTime = Runtime.getRuntime();
final int mb = 1024 * 1024;
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/serverinfo.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/serverinfo.htm"));
html.replace("%os_name%", System.getProperty("os.name"));
html.replace("%os_ver%", System.getProperty("os.version"));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java vendored
View File

@@ -106,7 +106,7 @@ public class AdminShutdown implements IAdminCommandHandler
final Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, h);
cal.set(Calendar.MINUTE, m);
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
adminReply.setFile(activeChar, "data/html/admin/shutdown.htm");
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
adminReply.replace("%time%", format.format(cal.getTime()));

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java vendored
View File

@@ -373,7 +373,7 @@ public class AdminSiege implements IAdminCommandHandler
{
int i = 0;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/castles.htm");
adminReply.setFile(activeChar, "data/html/admin/castles.htm");
final StringBuilder cList = new StringBuilder(500);
for (Castle castle : CastleManager.getInstance().getCastles())
{
@@ -449,7 +449,7 @@ public class AdminSiege implements IAdminCommandHandler
private void showSiegePage(L2PcInstance activeChar, String castleName)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/castle.htm");
adminReply.setFile(activeChar, "data/html/admin/castle.htm");
adminReply.replace("%castleName%", castleName);
activeChar.sendPacket(adminReply);
}
@@ -462,7 +462,7 @@ public class AdminSiege implements IAdminCommandHandler
private void showSiegeTimePage(L2PcInstance activeChar, Castle castle)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/castlesiegetime.htm");
adminReply.setFile(activeChar, "data/html/admin/castlesiegetime.htm");
adminReply.replace("%castleName%", castle.getName());
adminReply.replace("%time%", castle.getSiegeDate().getTime().toString());
final Calendar newDay = Calendar.getInstance();
@@ -508,7 +508,7 @@ public class AdminSiege implements IAdminCommandHandler
private void showClanHallPage(L2PcInstance activeChar, ClanHall clanhall)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/clanhall.htm");
adminReply.setFile(activeChar, "data/html/admin/clanhall.htm");
adminReply.replace("%clanhallName%", clanhall.getName());
adminReply.replace("%clanhallId%", String.valueOf(clanhall.getId()));
final L2Clan owner = ClanTable.getInstance().getClan(clanhall.getOwnerId());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -343,7 +343,7 @@ public class AdminSkill implements IAdminCommandHandler
}
final L2PcInstance player = target.getActingPlayer();
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charskills.htm");
adminReply.setFile(activeChar, "data/html/admin/charskills.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java vendored
View File

@@ -173,7 +173,7 @@ public class AdminTerritoryWar implements IAdminCommandHandler
private void showSiegeTimePage(L2PcInstance activeChar)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/territorywartime.htm");
adminReply.setFile(activeChar, "data/html/admin/territorywartime.htm");
adminReply.replace("%time%", TerritoryWarManager.getInstance().getTWStart().getTime().toString());
activeChar.sendPacket(adminReply);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java vendored
View File

@@ -112,7 +112,7 @@ public class AdminZone implements IAdminCommandHandler
private static void showHtml(L2PcInstance activeChar)
{
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/zone.htm");
final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm");
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setHtml(htmContent);
adminReply.replace("%PEACE%", (activeChar.isInsideZone(ZoneId.PEACE) ? "<font color=\"LEVEL\">YES</font>" : "NO"));

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java vendored
View File

@@ -227,7 +227,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler
}
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/zone_editor.htm");
msg.setFile(activeChar, "data/html/admin/zone_editor.htm");
msg.replace("%zones%", sb.toString());
activeChar.sendPacket(msg);
}
@@ -506,7 +506,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler
private void buildHtmlWindow(final L2PcInstance activeChar, final int page)
{
final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/zone_editor_create.htm");
msg.setFile(activeChar, "data/html/admin/zone_editor_create.htm");
final ZoneNodeHolder holder = _zones.computeIfAbsent(activeChar.getObjectId(), key -> new ZoneNodeHolder());
final AtomicInteger position = new AtomicInteger(page * 20);
final PageResult result = HtmlUtil.createPage(holder.getNodes(), page, 20, i ->

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/BuyShadowItem.java vendored
View File

@@ -41,19 +41,19 @@ public class BuyShadowItem implements IBypassHandler
final NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
if (activeChar.getLevel() < 40)
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/common/shadow_item-lowlevel.htm");
html.setFile(activeChar, "data/html/common/shadow_item-lowlevel.htm");
}
else if ((activeChar.getLevel() >= 40) && (activeChar.getLevel() < 46))
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/common/shadow_item_d.htm");
html.setFile(activeChar, "data/html/common/shadow_item_d.htm");
}
else if ((activeChar.getLevel() >= 46) && (activeChar.getLevel() < 52))
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/common/shadow_item_c.htm");
html.setFile(activeChar, "data/html/common/shadow_item_c.htm");
}
else if (activeChar.getLevel() >= 52)
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/common/shadow_item_b.htm");
html.setFile(activeChar, "data/html/common/shadow_item_b.htm");
}
html.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(html);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java vendored
View File

@@ -76,7 +76,7 @@ public class ClanWarehouse implements IBypassHandler
if (Config.ENABLE_WAREHOUSESORTING_CLAN)
{
final NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/WhSortedC.htm");
msg.setFile(activeChar, "data/html/mods/WhSortedC.htm");
msg.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(msg);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java vendored
View File

@@ -46,7 +46,7 @@ public class Link implements IBypassHandler
final String filename = "data/html/" + htmlPath;
final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0);
html.setFile(activeChar.getHtmlPrefix(), filename);
html.setFile(activeChar, filename);
html.replace("%objectId%", String.valueOf(target != null ? target.getObjectId() : 0));
activeChar.sendPacket(html);
return true;

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java vendored
View File

@@ -100,7 +100,7 @@ public class Loto implements IBypassHandler
if (val == 0) // 0 - first buy lottery ticket window
{
filename = (npc.getHtmlPath(npcId, 1));
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
}
else if ((val >= 1) && (val <= 21)) // 1-20 - buttons, 21 - second buy lottery ticket window
{
@@ -118,7 +118,7 @@ public class Loto implements IBypassHandler
}
filename = (npc.getHtmlPath(npcId, 5));
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
int count = 0;
int found = 0;
@@ -241,17 +241,17 @@ public class Loto implements IBypassHandler
player.sendPacket(iu);
filename = (npc.getHtmlPath(npcId, 6));
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
}
else if (val == 23) // 23 - current lottery jackpot
{
filename = (npc.getHtmlPath(npcId, 3));
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
}
else if (val == 24) // 24 - Previous winning numbers/Prize claim
{
filename = (npc.getHtmlPath(npcId, 4));
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
final int lotonumber = Lottery.getInstance().getId();
String message = "";
@@ -309,7 +309,7 @@ public class Loto implements IBypassHandler
else if (val == 25) // 25 - lottery instructions
{
filename = (npc.getHtmlPath(npcId, 2));
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
}
else if (val > 25) // >25 - check lottery ticket by item object id
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -140,7 +140,7 @@ public class NpcViewMod implements IBypassHandler
public static void sendNpcView(L2PcInstance activeChar, L2Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/Info.htm");
html.setFile(activeChar, "data/html/mods/NpcView/Info.htm");
html.replace("%name%", npc.getName());
html.replace("%hpGauge%", HtmlUtil.getHpGauge(250, (long) npc.getCurrentHp(), npc.getMaxHp(), false));
html.replace("%mpGauge%", HtmlUtil.getMpGauge(250, (long) npc.getCurrentMp(), npc.getMaxMp(), false));
@@ -434,7 +434,7 @@ public class NpcViewMod implements IBypassHandler
bodySb.append("</td>");
bodySb.append("</tr></table>");
String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm");
String html = HtmCache.getInstance().getHtm(activeChar, "data/html/mods/NpcView/DropList.htm");
if (html == null)
{
LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found.");

30
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java vendored
View File

@@ -95,20 +95,20 @@ public class OlympiadManagerLink implements IBypassHandler
final NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
if (activeChar.isCursedWeaponEquipped())
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_cursed_weapon.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_cursed_weapon.htm");
activeChar.sendPacket(html);
return false;
}
if (activeChar.getClassIndex() != 0)
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_sub.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_sub.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
return false;
}
if (!activeChar.isNoble() || (activeChar.getClassId().level() < 3))
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_thirdclass.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_thirdclass.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
return false;
@@ -122,7 +122,7 @@ public class OlympiadManagerLink implements IBypassHandler
{
if (!OlympiadManager.getInstance().isRegistered(activeChar))
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_desc2a.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_desc2a.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
html.replace("%olympiad_period%", String.valueOf(Olympiad.getInstance().getPeriod()));
html.replace("%olympiad_cycle%", String.valueOf(Olympiad.getInstance().getCurrentCycle()));
@@ -131,7 +131,7 @@ public class OlympiadManagerLink implements IBypassHandler
}
else
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_unregister.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_unregister.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
}
@@ -158,7 +158,7 @@ public class OlympiadManagerLink implements IBypassHandler
}
}
}
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_registered.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_registered.htm");
if (Config.ALT_OLY_REG_DISPLAY > 0)
{
html.replace("%listClassed%", classed < Config.ALT_OLY_REG_DISPLAY ? FEWER_THAN : MORE_THAN);
@@ -178,7 +178,7 @@ public class OlympiadManagerLink implements IBypassHandler
case 3: // There are %points% Grand Olympiad points granted for this event. | TODO: cleanup (not used anymore)
{
final int points = Olympiad.getInstance().getNoblePoints(activeChar.getObjectId());
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm");
html.replace("%points%", String.valueOf(points));
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
@@ -199,13 +199,13 @@ public class OlympiadManagerLink implements IBypassHandler
passes = Olympiad.getInstance().getNoblessePasses(activeChar, false);
if (passes > 0)
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_settle.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_settle.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
}
else
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_nopoints2.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_nopoints2.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
}
@@ -224,7 +224,7 @@ public class OlympiadManagerLink implements IBypassHandler
case 9: // Your Grand Olympiad Score from the previous period is %points% point(s) | TODO: cleanup (not used anymore)
{
final int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId());
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm");
html.replace("%points%", String.valueOf(point));
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
@@ -305,13 +305,13 @@ public class OlympiadManagerLink implements IBypassHandler
if (buffCount > 0)
{
html.setFile(activeChar.getHtmlPrefix(), buffCount == Config.ALT_OLY_MAX_BUFFS ? Olympiad.OLYMPIAD_HTML_PATH + "olympiad_buffs.htm" : Olympiad.OLYMPIAD_HTML_PATH + "olympiad_5buffs.htm");
html.setFile(activeChar, buffCount == Config.ALT_OLY_MAX_BUFFS ? Olympiad.OLYMPIAD_HTML_PATH + "olympiad_buffs.htm" : Olympiad.OLYMPIAD_HTML_PATH + "olympiad_5buffs.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
}
else
{
html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "olympiad_nobuffs.htm");
html.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "olympiad_nobuffs.htm");
html.replace("%objectId%", String.valueOf(target.getObjectId()));
activeChar.sendPacket(html);
target.decayMe();
@@ -332,7 +332,7 @@ public class OlympiadManagerLink implements IBypassHandler
if (((classId >= 88) && (classId <= 118)) || ((classId >= 131) && (classId <= 134)) || (classId == 136))
{
final List<String> names = Olympiad.getInstance().getClassLeaderBoard(classId);
reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "olympiad_ranking.htm");
reply.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "olympiad_ranking.htm");
int index = 1;
for (String name : names)
{
@@ -364,11 +364,11 @@ public class OlympiadManagerLink implements IBypassHandler
if (Hero.getInstance().isUnclaimedHero(activeChar.getObjectId()))
{
Hero.getInstance().claimHero(activeChar);
reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "hero_receive.htm");
reply.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "hero_receive.htm");
}
else
{
reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "hero_notreceive.htm");
reply.setFile(activeChar, Olympiad.OLYMPIAD_HTML_PATH + "hero_notreceive.htm");
}
activeChar.sendPacket(reply);
break;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java vendored
View File

@@ -61,7 +61,7 @@ public class PlayerHelp implements IBypassHandler
html = new NpcHtmlMessage();
}
html.setFile(activeChar.getHtmlPrefix(), "data/html/help/" + cmd[0]);
html.setFile(activeChar, "data/html/help/" + cmd[0]);
activeChar.sendPacket(html);
}
catch (Exception e)

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java vendored
View File

@@ -60,7 +60,7 @@ public class PrivateWarehouse implements IBypassHandler
if (Config.ENABLE_WAREHOUSESORTING_PRIVATE)
{
final NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/WhSortedP.htm");
msg.setFile(activeChar, "data/html/mods/WhSortedP.htm");
msg.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(msg);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -193,7 +193,7 @@ public class QuestLink implements IBypassHandler
if (player.getAllActiveQuests().size() > 40)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fullquest.html");
html.setFile(player, "data/html/fullquest.html");
player.sendPacket(html);
return;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java vendored
View File

@@ -44,14 +44,14 @@ public class TerritoryStatus implements IBypassHandler
{
if (npc.getCastle().getOwnerId() > 0)
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/territorystatus.htm");
html.setFile(activeChar, "data/html/territorystatus.htm");
final L2Clan clan = ClanTable.getInstance().getClan(npc.getCastle().getOwnerId());
html.replace("%clanname%", clan.getName());
html.replace("%clanleadername%", clan.getLeaderName());
}
else
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/territorynoclan.htm");
html.setFile(activeChar, "data/html/territorynoclan.htm");
}
}
html.replace("%castlename%", npc.getCastle().getName());

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -139,9 +139,9 @@ public class DropSearchBoard implements IParseBoardHandler
@Override
public boolean parseCommunityBoardCommand(String command, L2PcInstance player)
{
final String navigation = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), NAVIGATION_PATH);
final String navigation = HtmCache.getInstance().getHtm(player, NAVIGATION_PATH);
String[] params = command.split(" ");
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/CommunityBoard/Custom/dropsearch/main.html");
String html = HtmCache.getInstance().getHtm(player, "data/html/CommunityBoard/Custom/dropsearch/main.html");
switch (params[0])
{
case "_bbs_search_item":

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java vendored
View File

@@ -59,7 +59,7 @@ public class FavoriteBoard implements IParseBoardHandler
if (command.startsWith("_bbsgetfav"))
{
// Load Favorite links
final String list = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/favorite_list.html");
final String list = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/favorite_list.html");
final StringBuilder sb = new StringBuilder();
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement(SELECT_FAVORITES))
@@ -77,7 +77,7 @@ public class FavoriteBoard implements IParseBoardHandler
sb.append(link);
}
}
String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/favorite.html");
String html = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/favorite.html");
html = html.replaceAll("%fav_list%", sb.toString());
CommunityBoardHandler.separateAndSend(html, activeChar);
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FriendsBoard.java vendored
View File

@@ -46,7 +46,7 @@ public class FriendsBoard implements IParseBoardHandler
{
CommunityBoardHandler.getInstance().addBypass(activeChar, "Friends List", command);
final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/friends_list.html");
final String html = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/friends_list.html");
CommunityBoardHandler.separateAndSend(html, activeChar);
}
@@ -54,7 +54,7 @@ public class FriendsBoard implements IParseBoardHandler
{
CommunityBoardHandler.getInstance().addBypass(activeChar, "Ignore list", command);
final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/friends_block_list.html");
final String html = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/friends_block_list.html");
CommunityBoardHandler.separateAndSend(html, activeChar);
}

18
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java vendored
View File

@@ -118,13 +118,13 @@ public final class HomeBoard implements IParseBoardHandler
}
String returnHtml = null;
final String navigation = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), NAVIGATION_PATH);
final String navigation = HtmCache.getInstance().getHtm(activeChar, NAVIGATION_PATH);
if (command.equals("_bbshome") || command.equals("_bbstop"))
{
final String customPath = Config.CUSTOM_CB_ENABLED ? "Custom/" : "";
CommunityBoardHandler.getInstance().addBypass(activeChar, "Home", command);
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/" + customPath + "home.html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/" + customPath + "home.html");
if (!Config.CUSTOM_CB_ENABLED)
{
returnHtml = returnHtml.replaceAll("%fav_count%", Integer.toString(getFavoriteCount(activeChar)));
@@ -138,7 +138,7 @@ public final class HomeBoard implements IParseBoardHandler
final String path = command.replace("_bbstop;", "");
if ((path.length() > 0) && path.endsWith(".html"))
{
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/" + customPath + path);
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/" + customPath + path);
}
}
else if (command.startsWith("_bbsmultisell"))
@@ -147,7 +147,7 @@ public final class HomeBoard implements IParseBoardHandler
final String[] buypassOptions = fullBypass.split(",");
final int multisellId = Integer.parseInt(buypassOptions[0]);
final String page = buypassOptions[1];
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/Custom/" + page + ".html");
MultisellData.getInstance().separateAndSend(multisellId, activeChar, null, false);
}
else if (command.startsWith("_bbsexcmultisell"))
@@ -156,13 +156,13 @@ public final class HomeBoard implements IParseBoardHandler
final String[] buypassOptions = fullBypass.split(",");
final int multisellId = Integer.parseInt(buypassOptions[0]);
final String page = buypassOptions[1];
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/Custom/" + page + ".html");
MultisellData.getInstance().separateAndSend(multisellId, activeChar, null, true);
}
else if (command.startsWith("_bbssell"))
{
final String page = command.replace("_bbssell;", "");
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/Custom/" + page + ".html");
activeChar.sendPacket(new BuyList(BuyListData.getInstance().getBuyList(423), activeChar.getAdena(), 0));
activeChar.sendPacket(new ExBuySellList(activeChar, false));
}
@@ -221,7 +221,7 @@ public final class HomeBoard implements IParseBoardHandler
}
}
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/Custom/" + page + ".html");
}
else if (command.startsWith("_bbsheal"))
{
@@ -245,7 +245,7 @@ public final class HomeBoard implements IParseBoardHandler
activeChar.sendMessage("You used heal!");
}
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/" + page + ".html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/Custom/" + page + ".html");
}
else if (command.startsWith("_bbspremium"))
{
@@ -261,7 +261,7 @@ public final class HomeBoard implements IParseBoardHandler
activeChar.destroyItemByItemId("CB_Premium", Config.COMMUNITY_PREMIUM_COIN_ID, Config.COMMUNITY_PREMIUM_PRICE_PER_DAY * premiumDays, activeChar, true);
PremiumManager.getInstance().addPremiumTime(activeChar.getAccountName(), premiumDays, TimeUnit.DAYS);
activeChar.sendMessage("Your account will now have premium status until " + new SimpleDateFormat("dd.MM.yyyy HH:mm").format(PremiumManager.getInstance().getPremiumExpiration(activeChar.getAccountName())) + ".");
returnHtml = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/Custom/premium/thankyou.html");
returnHtml = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/Custom/premium/thankyou.html");
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomepageBoard.java vendored
View File

@@ -41,7 +41,7 @@ public class HomepageBoard implements IParseBoardHandler
@Override
public boolean parseCommunityBoardCommand(String command, L2PcInstance activeChar)
{
CommunityBoardHandler.separateAndSend(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/homepage.html"), activeChar);
CommunityBoardHandler.separateAndSend(HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/homepage.html"), activeChar);
return true;
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/MailBoard.java vendored
View File

@@ -43,7 +43,7 @@ public class MailBoard implements IWriteBoardHandler
{
CommunityBoardHandler.getInstance().addBypass(activeChar, "Mail Command", command);
final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/mail.html");
final String html = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/mail.html");
CommunityBoardHandler.separateAndSend(html, activeChar);
return true;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/MemoBoard.java vendored
View File

@@ -44,7 +44,7 @@ public class MemoBoard implements IWriteBoardHandler
{
CommunityBoardHandler.getInstance().addBypass(activeChar, "Memo Command", command);
final String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/memo.html");
final String html = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/memo.html");
CommunityBoardHandler.separateAndSend(html, activeChar);
return true;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java vendored
View File

@@ -56,7 +56,7 @@ public class RegionBoard implements IWriteBoardHandler
{
CommunityBoardHandler.getInstance().addBypass(activeChar, "Region", command);
final String list = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/region_list.html");
final String list = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/region_list.html");
final StringBuilder sb = new StringBuilder();
final List<Castle> castles = CastleManager.getInstance().getCastles();
for (int i = 0; i < REGIONS.length; i++)
@@ -71,7 +71,7 @@ public class RegionBoard implements IWriteBoardHandler
sb.append(link);
}
String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/region.html");
String html = HtmCache.getInstance().getHtm(activeChar, "data/html/CommunityBoard/region.html");
html = html.replace("%region_list%", sb.toString());
CommunityBoardHandler.separateAndSend(html, activeChar);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Book.java vendored
View File

@@ -40,7 +40,7 @@ public class Book implements IItemHandler
final int itemId = item.getId();
final String filename = "data/html/help/" + itemId + ".htm";
final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
final String content = HtmCache.getInstance().getHtm(activeChar, filename);
if (content == null)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Bypass.java vendored
View File

@@ -39,7 +39,7 @@ public class Bypass implements IItemHandler
final int itemId = item.getId();
final String filename = "data/html/item/" + itemId + ".htm";
final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
final String content = HtmCache.getInstance().getHtm(activeChar, filename);
final NpcHtmlMessage html = new NpcHtmlMessage(0, item.getId());
if (content == null)
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java vendored
View File

@@ -172,7 +172,7 @@ public class JailHandler implements IPunishmentHandler
// Open a Html message to inform the player
final NpcHtmlMessage msg = new NpcHtmlMessage();
String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/jail_in.htm");
String content = HtmCache.getInstance().getHtm(player, "html/jail_in.htm");
if (content != null)
{
content = content.replaceAll("%reason%", task != null ? task.getReason() : "");
@@ -208,7 +208,7 @@ public class JailHandler implements IPunishmentHandler
// Open a Html message to inform the player
final NpcHtmlMessage msg = new NpcHtmlMessage();
final String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "html/jail_out.htm");
final String content = HtmCache.getInstance().getHtm(player, "html/jail_out.htm");
if (content != null)
{
msg.setHtml(content);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java vendored
View File

@@ -77,7 +77,7 @@ public class SiegeStatus implements IUserCommandHandler
}
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/siege/siege_status.htm");
html.setFile(activeChar, "data/html/siege/siege_status.htm");
html.replace("%kill_count%", clan.getSiegeKills());
html.replace("%death_count%", clan.getSiegeDeaths());
html.replace("%member_list%", sb.toString());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java vendored
View File

@@ -92,7 +92,7 @@ public class ChangePassword implements IVoicedCommandHandler
else
{
// showHTML(activeChar);
String html = HtmCache.getInstance().getHtm("en", "data/html/mods/ChangePassword.htm");
String html = HtmCache.getInstance().getHtm(null, "data/html/mods/ChangePassword.htm");
if (html == null)
{
html = "<html><body><br><br><center><font color=LEVEL>404:</font> File Not Found</center></body></html>";

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java vendored
View File

@@ -47,7 +47,7 @@ public class Lang implements IVoicedCommandHandler
html.append("<button value=\"" + lang.toUpperCase() + "\" action=\"bypass -h voice .lang " + lang + "\" width=60 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><br>");
}
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/LanguageSelect.htm");
msg.setFile(activeChar, "data/html/mods/Lang/LanguageSelect.htm");
msg.replace("%list%", html.toString());
activeChar.sendPacket(msg);
return true;
@@ -59,11 +59,11 @@ public class Lang implements IVoicedCommandHandler
final String lang = st.nextToken().trim();
if (activeChar.setLang(lang))
{
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Ok.htm");
msg.setFile(activeChar, "data/html/mods/Lang/Ok.htm");
activeChar.sendPacket(msg);
return true;
}
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Error.htm");
msg.setFile(activeChar, "data/html/mods/Lang/Error.htm");
activeChar.sendPacket(msg);
return true;
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@@ -372,11 +372,11 @@ public abstract class Chamber extends AbstractInstance
{
if (player.getParty() == null)
{
htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_party.html");
htmltext = getHtm(player, "data/scripts/instances/ChambersOfDelusion/no_party.html");
}
else if (player.getParty().getLeaderObjectId() != player.getObjectId())
{
htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_leader.html");
htmltext = getHtm(player, "data/scripts/instances/ChambersOfDelusion/no_leader.html");
}
else if (hasQuestItems(player, DELUSION_MARK))
{
@@ -386,18 +386,18 @@ public abstract class Chamber extends AbstractInstance
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_item.html");
htmltext = getHtm(player, "data/scripts/instances/ChambersOfDelusion/no_item.html");
}
}
else if (event.equals("go_out"))
{
if (player.getParty() == null)
{
htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_party.html");
htmltext = getHtm(player, "data/scripts/instances/ChambersOfDelusion/no_party.html");
}
else if (player.getParty().getLeaderObjectId() != player.getObjectId())
{
htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_leader.html");
htmltext = getHtm(player, "data/scripts/instances/ChambersOfDelusion/no_leader.html");
}
else
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java vendored
View File

@@ -168,7 +168,7 @@ public final class Q00061_LawEnforcement extends Quest
{
if (player.getClassId() == ClassId.INSPECTOR)
{
return getHtm(player.getHtmlPrefix(), "32222-01.htm").replace("%name%", player.getName());
return getHtm(player, "32222-01.htm").replace("%name%", player.getName());
}
htmltext = "32222-04.htm";
}
@@ -220,7 +220,7 @@ public final class Q00061_LawEnforcement extends Quest
{
if (qs.isMemoState(4))
{
return getHtm(player.getHtmlPrefix(), "32469-01.html").replace("%name%", player.getName());
return getHtm(player, "32469-01.html").replace("%name%", player.getName());
}
if (qs.isMemoState(5))
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java vendored
View File

@@ -590,7 +590,7 @@ public final class Q00065_CertifiedSoulBreaker extends Quest
{
if (memoState == 1)
{
htmltext = getHtm(player.getHtmlPrefix(), "32138-01.html");
htmltext = getHtm(player, "32138-01.html");
htmltext = htmltext.replaceAll("%name1%", player.getName());
}
else if (memoState == 2)

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java vendored
View File

@@ -74,7 +74,7 @@ public final class Q00178_IconicTrinity extends Quest
case "32256-12.html":
case "32256-13.html":
{
htmltext = getHtm(player.getHtmlPrefix(), event);
htmltext = getHtm(player, event);
htmltext = htmltext.replaceAll("%name1%", player.getName());
break;
}
@@ -170,7 +170,7 @@ public final class Q00178_IconicTrinity extends Quest
{
qs.setMemoState(4);
qs.setCond(2, true);
htmltext = getHtm(player.getHtmlPrefix(), event);
htmltext = getHtm(player, event);
htmltext = htmltext.replaceAll("%name1%", player.getName());
}
break;
@@ -246,7 +246,7 @@ public final class Q00178_IconicTrinity extends Quest
{
qs.setMemoState(7);
qs.setCond(3, true);
htmltext = getHtm(player.getHtmlPrefix(), event);
htmltext = getHtm(player, event);
htmltext = htmltext.replaceAll("%name1%", player.getName());
}
break;
@@ -332,7 +332,7 @@ public final class Q00178_IconicTrinity extends Quest
{
qs.setMemoState(10);
qs.setCond(4, true);
htmltext = getHtm(player.getHtmlPrefix(), event);
htmltext = getHtm(player, event);
htmltext = htmltext.replaceAll("%name1%", player.getName());
}
break;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java vendored
View File

@@ -1579,7 +1579,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
private String getHtml(L2PcInstance player, String htmlName, int i0, int i1, int i2, int i3, int i4)
{
String html = getHtm(player.getHtmlPrefix(), htmlName);
String html = getHtm(player, htmlName);
html = html.replace("<?reply1?>", LINKS.get(i0));
html = html.replace("<?reply2?>", LINKS.get(i1));
html = html.replace("<?reply3?>", LINKS.get(i2));

28
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java vendored
View File

@@ -208,7 +208,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
case 18:
{
selectBingoNumber(qs, (ask - 10) + 1);
return fillBoard(player, qs, getHtm(player.getHtmlPrefix(), "30182-13.html"));
return fillBoard(player, qs, getHtm(player, "30182-13.html"));
}
case 19:
case 20:
@@ -276,7 +276,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
case 18:
{
selectBingoNumber(qs, (ask - 9));
return fillBoard(player, qs, getHtm(player.getHtmlPrefix(), "30685-13.html"));
return fillBoard(player, qs, getHtm(player, "30685-13.html"));
}
case 19:
case 20:
@@ -319,38 +319,38 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
if (i3 == 2)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-14.html");
html = getHtm(player, npcId + "-14.html");
}
else if (i3 == 3)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-16.html");
html = getHtm(player, npcId + "-16.html");
}
else if (i3 == 4)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-18.html");
html = getHtm(player, npcId + "-18.html");
}
else if (i3 == 5)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-20.html");
html = getHtm(player, npcId + "-20.html");
}
return fillBoard(player, qs, html);
}
i3 = getBingoSelectCount(qs);
if (i3 == 1)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-15.html");
html = getHtm(player, npcId + "-15.html");
}
else if (i3 == 2)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-17.html");
html = getHtm(player, npcId + "-17.html");
}
else if (i3 == 3)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-19.html");
html = getHtm(player, npcId + "-19.html");
}
else if (i3 == 4)
{
html = getHtm(player.getHtmlPrefix(), npcId + "-21.html");
html = getHtm(player, npcId + "-21.html");
}
return fillBoard(player, qs, html);
}
@@ -393,20 +393,20 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
if ((i3 == 3) && ((getBingoSelectCount(qs)) == 6))
{
reward(player, qs, i3);
html = getHtm(player.getHtmlPrefix(), npcId + "-22.html");
html = getHtm(player, npcId + "-22.html");
}
else if ((i3 == 0) && (getBingoSelectCount(qs) == 6))
{
reward(player, qs, i3);
html = getHtm(player.getHtmlPrefix(), npcId + "-24.html");
html = getHtm(player, npcId + "-24.html");
}
else
{
html = getHtm(player.getHtmlPrefix(), npcId + "-23.html");
html = getHtm(player, npcId + "-23.html");
}
return colorBoard(player, qs, html);
}
return fillBoard(player, qs, getHtm(player.getHtmlPrefix(), npcId + "-25.html"));
return fillBoard(player, qs, getHtm(player, npcId + "-25.html"));
}
private void reward(L2PcInstance player, QuestState qs, int i3)

26
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java vendored
View File

@@ -192,7 +192,7 @@ public final class Q00386_StolenDignity extends Quest
case 18:
{
selectBingoNumber(qs, (ask - 10) + 1);
return fillBoard(player, qs, getHtm(player.getHtmlPrefix(), "30843-13.html"));
return fillBoard(player, qs, getHtm(player, "30843-13.html"));
}
case 19:
{
@@ -282,38 +282,38 @@ public final class Q00386_StolenDignity extends Quest
if (i3 == 2)
{
html = getHtm(player.getHtmlPrefix(), "30843-14.html");
html = getHtm(player, "30843-14.html");
}
else if (i3 == 3)
{
html = getHtm(player.getHtmlPrefix(), "30843-16.html");
html = getHtm(player, "30843-16.html");
}
else if (i3 == 4)
{
html = getHtm(player.getHtmlPrefix(), "30843-18.html");
html = getHtm(player, "30843-18.html");
}
else if (i3 == 5)
{
html = getHtm(player.getHtmlPrefix(), "30843-20.html");
html = getHtm(player, "30843-20.html");
}
return fillBoard(player, qs, html);
}
i3 = getBingoSelectCount(qs);
if (i3 == 1)
{
html = getHtm(player.getHtmlPrefix(), "30843-15.html");
html = getHtm(player, "30843-15.html");
}
else if (i3 == 2)
{
html = getHtm(player.getHtmlPrefix(), "30843-17.html");
html = getHtm(player, "30843-17.html");
}
else if (i3 == 3)
{
html = getHtm(player.getHtmlPrefix(), "30843-19.html");
html = getHtm(player, "30843-19.html");
}
else if (i3 == 4)
{
html = getHtm(player.getHtmlPrefix(), "30843-21.html");
html = getHtm(player, "30843-21.html");
}
return fillBoard(player, qs, html);
}
@@ -356,20 +356,20 @@ public final class Q00386_StolenDignity extends Quest
if ((i3 == 3) && (getBingoSelectCount(qs) == 6))
{
reward(player, qs, 4);
html = getHtm(player.getHtmlPrefix(), "30843-22.html");
html = getHtm(player, "30843-22.html");
}
else if ((i3 == 0) && (getBingoSelectCount(qs) == 6))
{
reward(player, qs, 10);
html = getHtm(player.getHtmlPrefix(), "30843-24.html");
html = getHtm(player, "30843-24.html");
}
else
{
html = getHtm(player.getHtmlPrefix(), "30843-23.html");
html = getHtm(player, "30843-23.html");
}
return colorBoard(player, qs, html);
}
return fillBoard(player, qs, getHtm(player.getHtmlPrefix(), "30843-25.html"));
return fillBoard(player, qs, getHtm(player, "30843-25.html"));
}
private void reward(L2PcInstance player, QuestState qs, int count)

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java vendored
View File

@@ -347,7 +347,7 @@ public final class Q00419_GetAPet extends Quest
}
}
htmltext = getHtm(player.getHtmlPrefix(), htmltext);
htmltext = getHtm(player, htmltext);
htmltext = htmltext.replace("<?reply1?>", LINKS.get(linkId + replyOffset1));
htmltext = htmltext.replace("<?reply2?>", LINKS.get(linkId + replyOffset2));
htmltext = htmltext.replace("<?reply3?>", LINKS.get(linkId + replyOffset3));

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java vendored
View File

@@ -214,12 +214,12 @@ public final class Q00454_CompletelyLost extends Quest
{
qs.startQuest();
qs.setMemoState(1);
htmltext = getHtm(player.getHtmlPrefix(), "32738-04a.htm");
htmltext = getHtm(player, "32738-04a.htm");
htmltext = htmltext.replaceAll("leader", leader.getName());
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "32738-01b.htm");
htmltext = getHtm(player, "32738-01b.htm");
htmltext = htmltext.replaceAll("leader", leader.getName());
}
}
@@ -476,13 +476,13 @@ public final class Q00454_CompletelyLost extends Quest
final L2PcInstance leader = npc.getVariables().getObject("leader", L2PcInstance.class);
if (leader.isInParty() && leader.getParty().containsPlayer(player))
{
htmltext = getHtm(player.getHtmlPrefix(), "32738-01a.htm");
htmltext = getHtm(player, "32738-01a.htm");
htmltext = htmltext.replaceAll("leader", leader.getName());
htmltext = htmltext.replaceAll("name", player.getName());
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "32738-01b.htm");
htmltext = getHtm(player, "32738-01b.htm");
htmltext = htmltext.replaceAll("leader", leader.getName());
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java vendored
View File

@@ -214,7 +214,7 @@ public class Q00458_PerfectForm extends Quest
if (overHitHtml)
{
htmltext = getHtm(player.getHtmlPrefix(), htmltext);
htmltext = getHtm(player, htmltext);
htmltext = htmltext.replace("<?number?>", String.valueOf(overHits));
}
return htmltext;

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java vendored
View File

@@ -129,12 +129,12 @@ public class Q00463_IMustBeaGenius extends Quest
final int number = getRandom(51) + 550;
qs.set("number", String.valueOf(number));
qs.set("chance", String.valueOf(getRandom(4)));
htmltext = getHtm(player.getHtmlPrefix(), event).replace("%num%", String.valueOf(number));
htmltext = getHtm(player, event).replace("%num%", String.valueOf(number));
break;
}
case "32069-05.htm":
{
htmltext = getHtm(player.getHtmlPrefix(), event).replace("%num%", qs.get("number"));
htmltext = getHtm(player, event).replace("%num%", qs.get("number"));
break;
}
case "reward":

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java vendored
View File

@@ -110,7 +110,7 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest
if (!BANDIT_STRONGHOLD.isWaitingBattle())
{
htmltext = getHtm(player.getHtmlPrefix(), "35437-09.html");
htmltext = getHtm(player, "35437-09.html");
htmltext = htmltext.replaceAll("%nextSiege%", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(BANDIT_STRONGHOLD.getSiegeDate().getTime()));
}
else if ((clan == null) || (clan.getLevel() < 4))
@@ -133,7 +133,7 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest
{
if (!BANDIT_STRONGHOLD.isWaitingBattle())
{
htmltext = getHtm(player.getHtmlPrefix(), "35437-03.html");
htmltext = getHtm(player, "35437-03.html");
htmltext = htmltext.replaceAll("%nextSiege%", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(BANDIT_STRONGHOLD.getSiegeDate().getTime()));
}
else

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java vendored
View File

@@ -203,18 +203,18 @@ public final class Q00511_AwlUnderFoot extends Quest
}
if (party.getLeader() != player)
{
return getHtm(player.getHtmlPrefix(), "FortressWarden-04.htm").replace("%leader%", party.getLeader().getName());
return getHtm(player, "FortressWarden-04.htm").replace("%leader%", party.getLeader().getName());
}
for (L2PcInstance partyMember : party.getMembers())
{
final QuestState st = getQuestState(partyMember, false);
if ((st == null) || (st.getInt("cond") < 1))
{
return getHtm(player.getHtmlPrefix(), "FortressWarden-05.htm").replace("%player%", partyMember.getName());
return getHtm(player, "FortressWarden-05.htm").replace("%player%", partyMember.getName());
}
if (!Util.checkIfInRange(1000, player, partyMember, true))
{
return getHtm(player.getHtmlPrefix(), "FortressWarden-06.htm").replace("%player%", partyMember.getName());
return getHtm(player, "FortressWarden-06.htm").replace("%player%", partyMember.getName());
}
}
return null;
@@ -254,7 +254,7 @@ public final class Q00511_AwlUnderFoot extends Quest
{
if ((partyMember.getClan() == null) || (partyMember.getClan().getFortId() == 0) || (partyMember.getClan().getFortId() != fortress.getResidenceId()))
{
return getHtm(player.getHtmlPrefix(), "FortressWarden-05.htm").replace("%player%", partyMember.getName());
return getHtm(player, "FortressWarden-05.htm").replace("%player%", partyMember.getName());
}
}
return null;
@@ -311,7 +311,7 @@ public final class Q00511_AwlUnderFoot extends Quest
getQuestState(partyMember, true);
}
}
return getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
return getHtm(player, "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
}
@Override

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java vendored
View File

@@ -88,11 +88,11 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
{
if ((minutesToSiege > 0) && (minutesToSiege < MINUTES_TO_SIEGE))
{
htmltext = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), PATH_TO_HTML);
htmltext = HtmCache.getInstance().getHtm(player, PATH_TO_HTML);
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), event);
htmltext = getHtm(player, event);
htmltext = htmltext.replace("%next_siege%", getSiegeDate());
}
break;
@@ -137,7 +137,7 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
}
else if ((clan.getFortId() == ClanHallSiegeEngine.BEAST_FARM) && (minutesToSiege > 0) && (minutesToSiege < MINUTES_TO_SIEGE))
{
htmltext = HtmCache.getInstance().getHtm(talker.getHtmlPrefix(), PATH_TO_HTML);
htmltext = HtmCache.getInstance().getHtm(talker, PATH_TO_HTML);
}
else
{
@@ -146,7 +146,7 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
}
else
{
htmltext = getHtm(talker.getHtmlPrefix(), "35627-02.html");
htmltext = getHtm(talker, "35627-02.html");
htmltext = htmltext.replace("%next_siege%", getSiegeDate());
}
}

18
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java vendored
View File

@@ -324,7 +324,7 @@ public final class Q00662_AGameOfCards extends Quest
if ((i9 % 32) < 31)
{
htmltext = getHtm(player.getHtmlPrefix(), "30845-12.html");
htmltext = getHtm(player, "30845-12.html");
}
else if ((i9 % 32) == 31)
{
@@ -442,7 +442,7 @@ public final class Q00662_AGameOfCards extends Quest
rewardItems(player, 729, 1);
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-13.html");
htmltext = getHtm(player, "30845-13.html");
}
else if (i6 == 30)
{
@@ -450,7 +450,7 @@ public final class Q00662_AGameOfCards extends Quest
rewardItems(player, 951, 2);
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-14.html");
htmltext = getHtm(player, "30845-14.html");
}
else if ((i6 == 21) || (i6 == 12))
{
@@ -459,34 +459,34 @@ public final class Q00662_AGameOfCards extends Quest
rewardItems(player, 955, 1);
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-15.html");
htmltext = getHtm(player, "30845-15.html");
}
else if (i6 == 20)
{
rewardItems(player, 951, 2);
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-16.html");
htmltext = getHtm(player, "30845-16.html");
}
else if (i6 == 11)
{
rewardItems(player, 951, 1);
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-17.html");
htmltext = getHtm(player, "30845-17.html");
}
else if (i6 == 10)
{
rewardItems(player, 956, 2);
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-18.html");
htmltext = getHtm(player, "30845-18.html");
}
else if (i6 == 0)
{
qs.set("ExMemoState", 0);
qs.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-19.html");
htmltext = getHtm(player, "30845-19.html");
}
}
@@ -583,7 +583,7 @@ public final class Q00662_AGameOfCards extends Quest
final int i2 = (i0 % 10000) / 100;
final int i3 = (i0 % 1000000) / 10000;
final int i4 = (i0 % 100000000) / 1000000;
htmltext = getHtm(player.getHtmlPrefix(), "30845-11a.html");
htmltext = getHtm(player, "30845-11a.html");
if ((i9 % 2) < 1)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java vendored
View File

@@ -775,7 +775,7 @@ public class Q00663_SeductiveWhispers extends Quest
private String getHtml(L2PcInstance player, String htmlName, int card1pic, int card2pic, int winCount, int card1)
{
String html = getHtm(player.getHtmlPrefix(), htmlName);
String html = getHtm(player, htmlName);
html = html.replace("<?card1pic?>", Integer.toString(card1pic));
html = html.replace("<?card2pic?>", Integer.toString(card2pic));
html = html.replace("<?name?>", player.getName());

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java vendored
View File

@@ -101,7 +101,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "32245-10.html").replace("%itemcount%", st.get("submitted_gems"));
htmltext = getHtm(player, "32245-10.html").replace("%itemcount%", st.get("submitted_gems"));
}
}
break;
@@ -115,7 +115,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
final int finalCount = submittedCount + broughtCount;
takeItems(player, RED_GEM, broughtCount);
st.set("submitted_gems", Integer.toString(finalCount));
htmltext = getHtm(player.getHtmlPrefix(), "32245-08.html").replace("%itemcount%", Integer.toString(finalCount));
htmltext = getHtm(player, "32245-08.html").replace("%itemcount%", Integer.toString(finalCount));
}
break;
}
@@ -174,7 +174,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
}
else if (st.getInt("submitted_gems") > 0)
{
htmltext = getHtm(player.getHtmlPrefix(), "32245-07.html").replace("%itemcount%", st.get("submitted_gems"));
htmltext = getHtm(player, "32245-07.html").replace("%itemcount%", st.get("submitted_gems"));
}
else
{

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java vendored
View File

@@ -569,7 +569,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
if (party.getLeader() != player)
{
return getHtm(player.getHtmlPrefix(), "CastleWarden-10.html").replace("%leader%", party.getLeader().getName());
return getHtm(player, "CastleWarden-10.html").replace("%leader%", party.getLeader().getName());
}
for (L2PcInstance partyMember : party.getMembers())
@@ -579,18 +579,18 @@ public class Q00727_HopeWithinTheDarkness extends Quest
// Check if each party member has quest
if ((qs == null) || qs.isCreated())
{
return getHtm(player.getHtmlPrefix(), "CastleWarden-12.html").replace("%player%", partyMember.getName());
return getHtm(player, "CastleWarden-12.html").replace("%player%", partyMember.getName());
}
if ((player.getClan() == null) || (player.getClan().getCastleId() != castle.getResidenceId()))
{
return getHtm(player.getHtmlPrefix(), "CastleWarden-11.html").replace("%player%", partyMember.getName());
return getHtm(player, "CastleWarden-11.html").replace("%player%", partyMember.getName());
}
// Check if each party member not very far from leader
if (!Util.checkIfInRange(1000, player, partyMember, true))
{
return getHtm(player.getHtmlPrefix(), "CastleWarden-17.html").replace("%player%", partyMember.getName());
return getHtm(player, "CastleWarden-17.html").replace("%player%", partyMember.getName());
}
}
@@ -653,7 +653,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
partyMember.getQuestState(getName()).setCond(2);
}
return getHtm(player.getHtmlPrefix(), "CastleWarden-13.html").replace("%clan%", player.getClan().getName());
return getHtm(player, "CastleWarden-13.html").replace("%clan%", player.getClan().getName());
}
// Spawns npcs and bosses