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

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java vendored
View File

@@ -87,7 +87,7 @@ public final class Kekropus extends AbstractNpcAI
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "34222-01.html"));
packet.setHtml(getHtm(player, "34222-01.html"));
packet.replace("%min%", Integer.toString(Config.HELIOS_MIN_PLAYER));
packet.replace("%minlvl%", Integer.toString(Config.HELIOS_MIN_PLAYER_LVL));
player.sendPacket(packet);
@@ -104,7 +104,7 @@ public final class Kekropus extends AbstractNpcAI
if (members.size() < Config.HELIOS_MIN_PLAYER)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "34222-01.html"));
packet.setHtml(getHtm(player, "34222-01.html"));
packet.replace("%min%", Integer.toString(Config.HELIOS_MIN_PLAYER));
packet.replace("%minlvl%", Integer.toString(Config.HELIOS_MIN_PLAYER_LVL));
player.sendPacket(packet);
@@ -115,7 +115,7 @@ public final class Kekropus extends AbstractNpcAI
if (member.getLevel() < Config.HELIOS_MIN_PLAYER_LVL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "34222-01.html"));
packet.setHtml(getHtm(player, "34222-01.html"));
packet.replace("%min%", Integer.toString(Config.HELIOS_MIN_PLAYER));
packet.replace("%minlvl%", Integer.toString(Config.HELIOS_MIN_PLAYER_LVL));
player.sendPacket(packet);

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java vendored
View File

@@ -279,7 +279,7 @@ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReade
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/scripts/ai/areas/ImperialTomb/FourSepulchers/Gatekeeper-no.html");
html.setFile(player, "data/scripts/ai/areas/ImperialTomb/FourSepulchers/Gatekeeper-no.html");
html.replace("%npcname%", npc.getName());
player.sendPacket(html);
}
@@ -668,7 +668,7 @@ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReade
private void showHtmlFile(L2PcInstance player, String file, L2Npc npc, L2PcInstance member)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/scripts/ai/areas/ImperialTomb/FourSepulchers/" + file);
html.setFile(player, "data/scripts/ai/areas/ImperialTomb/FourSepulchers/" + file);
if (member != null)
{
html.replace("%member%", member.getName());

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@@ -116,7 +116,7 @@ public final class Hardin extends AbstractNpcAI
}
classes.append("<br><br><br><br><br>"); // prettify
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "33870-reawake_list.html"));
html.setHtml(getHtm(player, "33870-reawake_list.html"));
html.replace("%CLASS_LIST%", classes.toString());
player.sendPacket(html);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@@ -891,7 +891,7 @@ public final class Raina extends AbstractNpcAI
private NpcHtmlMessage getNpcHtmlMessage(L2PcInstance player, L2Npc npc, String fileName)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
final String text = getHtm(player.getHtmlPrefix(), fileName);
final String text = getHtm(player, fileName);
if (text == null)
{
LOGGER.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName);

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java vendored
View File

@@ -118,7 +118,7 @@ public final class Trandon extends AbstractNpcAI
final int level = SUB_SKILL_LEVELS[index];
if (player.getLevel() < level)
{
htmltext = getHtm(player.getHtmlPrefix(), "33490-16.html").replace("%level%", String.valueOf(level));
htmltext = getHtm(player, "33490-16.html").replace("%level%", String.valueOf(level));
}
else if (player.getVariables().hasVariable(getSubSkillVariableName(player, level)))
{
@@ -126,7 +126,7 @@ public final class Trandon extends AbstractNpcAI
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "33490-18.html");
htmltext = getHtm(player, "33490-18.html");
htmltext = htmltext.replace("%level%", String.valueOf(level));
htmltext = htmltext.replace("%index%", String.valueOf(index));
}
@@ -242,17 +242,17 @@ public final class Trandon extends AbstractNpcAI
final PlayerVariables vars = player.getVariables();
if (vars.hasVariable(getDualSkillVariableName(level)))
{
htmltext = getHtm(player.getHtmlPrefix(), "33490-27.html");
htmltext = getHtm(player, "33490-27.html");
}
else if ((player.getLevel() < level) || (player.getStat().getBaseLevel() < level))
{
htmltext = getHtm(player.getHtmlPrefix(), "33490-28.html");
htmltext = getHtm(player, "33490-28.html");
}
else
{
vars.set(getDualSkillVariableName(level), true);
giveItems(player, DUAL_CERTIFICATE, 1);
htmltext = getHtm(player.getHtmlPrefix(), "33490-29.html");
htmltext = getHtm(player, "33490-29.html");
}
htmltext = htmltext.replace("%level%", String.valueOf(level));
break;

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WharfGludioAirships/FortuneTelling/FortuneTelling.java vendored
View File

@@ -50,7 +50,7 @@ public final 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;
}

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java vendored
View File

@@ -492,7 +492,7 @@ public class Anakim extends AbstractNpcAI
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "31101-02.html"));
packet.setHtml(getHtm(player, "31101-02.html"));
packet.replace("%min%", Integer.toString(Config.ANAKIM_MIN_PLAYERS));
player.sendPacket(packet);
return null;
@@ -509,7 +509,7 @@ public class Anakim extends AbstractNpcAI
if ((members.size() < Config.ANAKIM_MIN_PLAYERS) || (members.size() > Config.ANAKIM_MAX_PLAYERS))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "31101-02.html"));
packet.setHtml(getHtm(player, "31101-02.html"));
packet.replace("%min%", Integer.toString(Config.ANAKIM_MIN_PLAYERS));
player.sendPacket(packet);
return null;
@@ -520,7 +520,7 @@ public class Anakim extends AbstractNpcAI
if ((member.getLevel() < Config.ANAKIM_MIN_PLAYER_LVL) || (member.getLevel() > Config.ANAKIM_MAX_PLAYER_LVL))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "31101-04.html"));
packet.setHtml(getHtm(player, "31101-04.html"));
packet.replace("%minlvl%", Integer.toString(Config.ANAKIM_MIN_PLAYER_LVL));
packet.replace("%maxlvl%", Integer.toString(Config.ANAKIM_MAX_PLAYER_LVL));
player.sendPacket(packet);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java vendored
View File

@@ -695,7 +695,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

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java vendored
View File

@@ -66,7 +66,7 @@ public final class Wormhole extends AbstractNpcAI
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "33901-2.html"));
packet.setHtml(getHtm(player, "33901-2.html"));
packet.replace("%min%", Integer.toString(Config.BELETH_MIN_PLAYERS));
player.sendPacket(packet);
return null;
@@ -83,7 +83,7 @@ public final class Wormhole extends AbstractNpcAI
else if ((members.size() < Config.BELETH_MIN_PLAYERS) || (members.size() > Config.BELETH_MAX_PLAYERS))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "33901-2.html"));
packet.setHtml(getHtm(player, "33901-2.html"));
packet.replace("%min%", Integer.toString(Config.BELETH_MIN_PLAYERS));
player.sendPacket(packet);
}
@@ -105,7 +105,7 @@ public final class Wormhole extends AbstractNpcAI
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "33901-1.html"));
packet.setHtml(getHtm(player, "33901-1.html"));
packet.replace("%min%", Integer.toString(Config.BELETH_MIN_PLAYERS));
packet.replace("%max%", Integer.toString(Config.BELETH_MAX_PLAYERS));
player.sendPacket(packet);

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java vendored
View File

@@ -315,7 +315,7 @@ public class Kelbim extends AbstractNpcAI
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "34052-2.html"));
packet.setHtml(getHtm(player, "34052-2.html"));
packet.replace("%min%", Integer.toString(Config.KELBIM_MIN_PLAYERS));
player.sendPacket(packet);
return null;
@@ -332,7 +332,7 @@ public class Kelbim extends AbstractNpcAI
else if ((members.size() < Config.KELBIM_MIN_PLAYERS) || (members.size() > Config.KELBIM_MAX_PLAYERS))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "34052-2.html"));
packet.setHtml(getHtm(player, "34052-2.html"));
packet.replace("%min%", Integer.toString(Config.KELBIM_MIN_PLAYERS));
player.sendPacket(packet);
}

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java vendored
View File

@@ -518,7 +518,7 @@ public class Lilith extends AbstractNpcAI
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "31118-02.html"));
packet.setHtml(getHtm(player, "31118-02.html"));
packet.replace("%min%", Integer.toString(Config.LILITH_MIN_PLAYERS));
player.sendPacket(packet);
return null;
@@ -535,7 +535,7 @@ public class Lilith extends AbstractNpcAI
if ((members.size() < Config.LILITH_MIN_PLAYERS) || (members.size() > Config.LILITH_MAX_PLAYERS))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "31118-02.html"));
packet.setHtml(getHtm(player, "31118-02.html"));
packet.replace("%min%", Integer.toString(Config.LILITH_MIN_PLAYERS));
player.sendPacket(packet);
return null;
@@ -546,7 +546,7 @@ public class Lilith extends AbstractNpcAI
if ((member.getLevel() < Config.LILITH_MIN_PLAYER_LVL) || (member.getLevel() > Config.LILITH_MAX_PLAYER_LVL))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "31118-04.html"));
packet.setHtml(getHtm(player, "31118-04.html"));
packet.replace("%minlvl%", Integer.toString(Config.LILITH_MIN_PLAYER_LVL));
packet.replace("%maxlvl%", Integer.toString(Config.LILITH_MAX_PLAYER_LVL));
player.sendPacket(packet);

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java vendored
View File

@@ -85,7 +85,7 @@ public class KatoSicanus extends AbstractNpcAI
if ((members.size() < Config.LINDVIOR_MIN_PLAYERS) || (members.size() > Config.LINDVIOR_MAX_PLAYERS))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "33881-4.html"));
packet.setHtml(getHtm(player, "33881-4.html"));
packet.replace("%min%", Integer.toString(Config.LINDVIOR_MIN_PLAYERS));
packet.replace("%max%", Integer.toString(Config.LINDVIOR_MAX_PLAYERS));
player.sendPacket(packet);
@@ -96,7 +96,7 @@ public class KatoSicanus extends AbstractNpcAI
if (member.getLevel() < Config.LINDVIOR_MIN_PLAYER_LVL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "33881-5.html"));
packet.setHtml(getHtm(player, "33881-5.html"));
packet.replace("%minlvl%", Integer.toString(Config.LINDVIOR_MIN_PLAYER_LVL));
player.sendPacket(packet);
return null;

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java vendored
View File

@@ -85,7 +85,7 @@ public class Daichir extends AbstractNpcAI
if ((members.size() < Config.TRASKEN_MIN_PLAYERS) || (members.size() > Config.TRASKEN_MAX_PLAYERS))
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "30537-4.html"));
packet.setHtml(getHtm(player, "30537-4.html"));
packet.replace("%min%", Integer.toString(Config.TRASKEN_MIN_PLAYERS));
packet.replace("%max%", Integer.toString(Config.TRASKEN_MAX_PLAYERS));
player.sendPacket(packet);
@@ -96,7 +96,7 @@ public class Daichir extends AbstractNpcAI
if (member.getLevel() < Config.TRASKEN_MIN_PLAYER_LVL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "30537-5.html"));
packet.setHtml(getHtm(player, "30537-5.html"));
packet.replace("%minlvl%", Integer.toString(Config.TRASKEN_MIN_PLAYER_LVL));
player.sendPacket(packet);
return null;

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java vendored
View File

@@ -138,7 +138,7 @@ public final class CastleAmbassador extends AbstractNpcAI
htmltext = "ambassador-03.html";
}
htmltext = getHtm(player.getHtmlPrefix(), htmltext);
htmltext = getHtm(player, htmltext);
htmltext = htmltext.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
return htmltext;
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -145,7 +145,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_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java vendored
View File

@@ -68,15 +68,15 @@ public final class CastleMercenaryManager extends AbstractNpcAI
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (castle.getName().equalsIgnoreCase("Aden"))
{
html.setHtml(getHtm(player.getHtmlPrefix(), "mercmanager-aden-limit.html"));
html.setHtml(getHtm(player, "mercmanager-aden-limit.html"));
}
else if (castle.getName().equalsIgnoreCase("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_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java vendored
View File

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

16
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java vendored
View File

@@ -77,7 +77,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
}
case "map":
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-map.html");
htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
break;
@@ -106,7 +106,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
// THE_CLAN_DOES_NOT_OWN_A_CLAN_HALL
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-cancelBid.html");
htmltext = getHtm(player, "ClanHallAuctioneer-cancelBid.html");
htmltext = htmltext.replaceAll("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan)));
htmltext = htmltext.replaceAll("%myBidRemain%", String.valueOf(clanHallAuction.getClanBid(clan) * 9));
break;
@@ -150,7 +150,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
{
final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-bid2.html");
htmltext = getHtm(player, "ClanHallAuctioneer-bid2.html");
htmltext = htmltext.replaceAll("%id%", String.valueOf(clanHallAuction.getClanHallId()));
htmltext = htmltext.replaceAll("%minBid%", String.valueOf(clanHallAuction.getHighestBid()));
htmltext = htmltext.replaceAll("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan)));
@@ -193,7 +193,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime);
final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-bidInfo.html");
htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html");
htmltext = htmltext.replaceAll("%id%", String.valueOf(clanHall.getResidenceId()));
htmltext = htmltext.replace("%owner%", owner != null ? owner.getName() : "");
htmltext = htmltext.replace("%clanLeader%", owner != null ? owner.getLeaderName() : "");
@@ -251,7 +251,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime);
final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-info.html"));
html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html"));
html.replace("%id%", clanHall.getResidenceId());
html.replace("%owner%", owner != null ? owner.getName() : "");
@@ -275,7 +275,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId(), getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-list.html"));
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId(), getHtm(player, "ClanHallAuctioneer-list.html"));
//@formatter:off
final PageResult result = PageBuilder.newBuilder(clanHalls, 8, "bypass -h Quest ClanHallAuctioneer auctionList")
.currentPage(page)
@@ -349,7 +349,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
if (bid == 0)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-bid1.html"));
html.setHtml(getHtm(player, "ClanHallAuctioneer-bid1.html"));
html.replace("%clanAdena%", clan.getWarehouse().getAdena());
html.replace("%minBid%", ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId).getHighestBid());
html.replace("%id%", clanHall.getResidenceId());
@@ -406,7 +406,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI
return;
}
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId(), getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-bidderList.html"));
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId(), getHtm(player, "ClanHallAuctioneer-bidderList.html"));
//@formatter:off
final PageResult result = PageBuilder.newBuilder(clanHallAuction.getBids().values().stream().sorted(Comparator.comparingLong(Bidder::getTime).reversed()).collect(Collectors.toList()), 10, "bypass -h Quest ClanHallAuctioneer auctionList")
.currentPage(page)

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java vendored
View File

@@ -99,7 +99,7 @@ public final class ClanHallDoorManager extends AbstractNpcAI
final ClanHall clanHall = npc.getClanHall();
if (isOwningClan(player, npc))
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallDoorManager-01.html");
htmltext = getHtm(player, "ClanHallDoorManager-01.html");
htmltext = htmltext.replace("%ownerClanName%", clanHall.getOwner().getName());
}
else if (clanHall.getOwnerId() <= 0)
@@ -108,7 +108,7 @@ public final class ClanHallDoorManager extends AbstractNpcAI
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallDoorManager-03.html");
htmltext = getHtm(player, "ClanHallDoorManager-03.html");
htmltext = htmltext.replace("%ownerName%", clanHall.getOwner().getLeaderName());
htmltext = htmltext.replace("%ownerClanName%", clanHall.getOwner().getName());
}

26
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java vendored
View File

@@ -172,7 +172,7 @@ public final class ClanHallManager extends AbstractNpcAI
final ResidenceFunction hpFunc = clanHall.getFunction(ResidenceFunctionType.HP_REGEN);
final ResidenceFunction mpFunc = clanHall.getFunction(ResidenceFunctionType.MP_REGEN);
final ResidenceFunction xpFunc = clanHall.getFunction(ResidenceFunctionType.EXP_RESTORE);
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-09.html");
htmltext = getHtm(player, "ClanHallManager-09.html");
htmltext = htmltext.replaceAll("%hpFunction%", hpFunc != null ? String.valueOf((int) hpFunc.getValue()) : "0");
htmltext = htmltext.replaceAll("%mpFunction%", mpFunc != null ? String.valueOf((int) mpFunc.getValue()) : "0");
htmltext = htmltext.replaceAll("%resFunction%", xpFunc != null ? String.valueOf((int) xpFunc.getValue()) : "0");
@@ -217,7 +217,7 @@ public final class ClanHallManager extends AbstractNpcAI
{
if (!st.hasMoreTokens())
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-funcBuffs_" + buffLevel + ".html");
htmltext = getHtm(player, "ClanHallManager-funcBuffs_" + buffLevel + ".html");
htmltext = htmltext.replaceAll("%manaLeft%", Integer.toString((int) npc.getCurrentMp()));
}
else
@@ -228,16 +228,16 @@ public final class ClanHallManager extends AbstractNpcAI
{
if (npc.getCurrentMp() < (npc.getStat().getMpConsume(skill.getSkill()) + npc.getStat().getMpInitialConsume(skill.getSkill())))
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-funcBuffsNoMp.html");
htmltext = getHtm(player, "ClanHallManager-funcBuffsNoMp.html");
}
else if (npc.isSkillDisabled(skill.getSkill()))
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-funcBuffsNoReuse.html");
htmltext = getHtm(player, "ClanHallManager-funcBuffsNoReuse.html");
}
else
{
castSkill(npc, player, skill);
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-funcBuffsDone.html");
htmltext = getHtm(player, "ClanHallManager-funcBuffsDone.html");
}
htmltext = htmltext.replaceAll("%manaLeft%", Integer.toString((int) npc.getCurrentMp()));
}
@@ -279,7 +279,7 @@ public final class ClanHallManager extends AbstractNpcAI
}
case "warehouse":
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-10.html");
htmltext = getHtm(player, "ClanHallManager-10.html");
htmltext = htmltext.replaceAll("%lease%", String.valueOf(clanHall.getLease()));
htmltext = htmltext.replaceAll("%payDate%", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(clanHall.getNextPayment())));
break;
@@ -298,7 +298,7 @@ public final class ClanHallManager extends AbstractNpcAI
{
case "recovery":
{
htmltext = getHtm(player.getHtmlPrefix(), clanHall.getGrade() == ClanHallGrade.GRADE_S ? "ClanHallManager-manageFuncRecoverySGrade.html" : "ClanHallManager-manageFuncRecoveryBGrade.html");
htmltext = getHtm(player, clanHall.getGrade() == ClanHallGrade.GRADE_S ? "ClanHallManager-manageFuncRecoverySGrade.html" : "ClanHallManager-manageFuncRecoveryBGrade.html");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.HP_REGEN), htmltext, "HP");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.MP_REGEN), htmltext, "MP");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.EXP_RESTORE), htmltext, "XP");
@@ -306,7 +306,7 @@ public final class ClanHallManager extends AbstractNpcAI
}
case "other":
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-manageFuncOther.html");
htmltext = getHtm(player, "ClanHallManager-manageFuncOther.html");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.TELEPORT), htmltext, "TP");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.BUFF), htmltext, "BUFF");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.ITEM), htmltext, "ITEM");
@@ -314,7 +314,7 @@ public final class ClanHallManager extends AbstractNpcAI
}
case "decor":
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-manageFuncDecor.html");
htmltext = getHtm(player, "ClanHallManager-manageFuncDecor.html");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.CURTAIN), htmltext, "CURTAIN");
htmltext = getFunctionInfo(clanHall.getFunction(ResidenceFunctionType.PLATFORM), htmltext, "PODIUM");
break;
@@ -330,7 +330,7 @@ public final class ClanHallManager extends AbstractNpcAI
if (oldFunc != null)
{
final int funcVal = (int) oldFunc.getTemplate().getValue();
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-manageFuncAlreadySet.html");
htmltext = getHtm(player, "ClanHallManager-manageFuncAlreadySet.html");
htmltext = htmltext.replaceAll("%funcEffect%", "<fstring p1=\"" + (funcVal > 0 ? funcVal : oldFunc.getLevel()) + "\">" + (funcVal > 0 ? NpcStringId.S1.getId() : NpcStringId.STAGE_S1.getId()) + "</fstring>");
}
else if ((funcId >= 1) && (funcId <= 8))
@@ -338,7 +338,7 @@ public final class ClanHallManager extends AbstractNpcAI
final ResidenceFunctionTemplate template = ResidenceFunctionsData.getInstance().getFunction(funcId, funcLv);
if (template != null)
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-funcConfirm" + funcId + ".html");
htmltext = getHtm(player, "ClanHallManager-funcConfirm" + funcId + ".html");
htmltext = htmltext.replaceAll("%funcId%", String.valueOf(funcId));
htmltext = htmltext.replaceAll("%funcLv%", String.valueOf(funcLv));
htmltext = htmltext.replaceAll("%funcCost%", "<fstring p1=\"" + template.getCost().getCount() + "\" p2=\"" + template.getDurationAsDays() + "\">" + NpcStringId.FONT_COLOR_FFAABB_S1_FONT_ADENA_S2_DAY_S.getId() + "</fstring>");
@@ -384,7 +384,7 @@ public final class ClanHallManager extends AbstractNpcAI
{
if (act.equals("confirm"))
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-removeFunctionConfirm.html");
htmltext = getHtm(player, "ClanHallManager-removeFunctionConfirm.html");
htmltext = htmltext.replaceAll("%FUNC_TYPE%", funcType.toString());
}
else if (act.equals("remove"))
@@ -445,7 +445,7 @@ public final class ClanHallManager extends AbstractNpcAI
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), "ClanHallManager-02.html");
htmltext = getHtm(player, "ClanHallManager-02.html");
htmltext = htmltext.replaceAll("%costFailDayLeft%", Integer.toString((8 - clanHall.getCostFailDay())));
}
}

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@@ -367,7 +367,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
if (classDataIndex == -1)
{
htmltext = getHtm(player.getHtmlPrefix(), "cc_options.html");
htmltext = getHtm(player, "cc_options.html");
htmltext = htmltext.replace("%name%", ClassListData.getInstance().getClass(classId).getClassName()); // getEscapedClientCode());
htmltext = htmltext.replace("%options%", getClassChangeOptions(player, classId));
return htmltext;
@@ -797,7 +797,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else if (checkIfClassChangeHasOptions(player))
{
String html = getHtm(player.getHtmlPrefix(), "cc_options.html");
String html = getHtm(player, "cc_options.html");
html = html.replace("%name%", ClassListData.getInstance().getClass(newClass.getId()).getClassName()); // getEscapedClientCode());
html = html.replace("%options%", getClassChangeOptions(player, newClass.getId()));
showResult(player, html);
@@ -904,19 +904,19 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
String html = null;
if ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP)) && (player.getLevel() >= 40)) // In retail you can skip first occupation
{
html = getHtm(player.getHtmlPrefix(), getSecondOccupationChangeHtml(player));
html = getHtm(player, getSecondOccupationChangeHtml(player));
}
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP) && (player.getLevel() >= 20))
{
html = getHtm(player.getHtmlPrefix(), getFirstOccupationChangeHtml(player));
html = getHtm(player, getFirstOccupationChangeHtml(player));
}
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && (player.getLevel() >= 76))
{
html = getHtm(player.getHtmlPrefix(), "qm_thirdclass.html");
html = getHtm(player, "qm_thirdclass.html");
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (player.getLevel() >= 85)) // 9
{
html = getHtm(player.getHtmlPrefix(), "qm_awaken.html");
html = getHtm(player, "qm_awaken.html");
}
if (html != null)

6
L2J_Mobius_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java vendored
View File

@@ -120,7 +120,7 @@ public final class HermuncusMinion extends AbstractNpcAI
{
sb.append(generateButton(teleportLoc));
}
htmltext = getHtm(player.getHtmlPrefix(), "HermuncusMinion-01.html").replace("%locations%", sb.toString());
htmltext = getHtm(player, "HermuncusMinion-01.html").replace("%locations%", sb.toString());
}
}
else if (event.equals("teleport") && st.hasMoreTokens())

2
L2J_Mobius_4.0_GrandCrusade/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

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -120,12 +120,12 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
case 2:
case 3: // First 3 weeks of month is 1v1 + 1v1 class matches
{
htmltext = getHtm(player.getHtmlPrefix(), "OlyManager-joinMatch.html");
htmltext = getHtm(player, "OlyManager-joinMatch.html");
break;
}
default:// Rest is only 1v1 class matches
{
htmltext = getHtm(player.getHtmlPrefix(), "OlyManager-joinMatchClass.html");
htmltext = getHtm(player, "OlyManager-joinMatchClass.html");
break;
}
}
@@ -279,7 +279,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
final int classId = Integer.parseInt(event.replace("rank_", ""));
final List<String> names = Olympiad.getInstance().getClassLeaderBoard(classId);
htmltext = getHtm(player.getHtmlPrefix(), "OlyManager-rankDetail.html");
htmltext = getHtm(player, "OlyManager-rankDetail.html");
int index = 1;
for (String name : names)

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java vendored
View File

@@ -69,7 +69,7 @@ public final class Proclaimer extends AbstractNpcAI
if (ownerClan != null)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), "proclaimer.html"));
packet.setHtml(getHtm(player, "proclaimer.html"));
packet.replace("%leaderName%", ownerClan.getLeaderName());
packet.replace("%clanName%", ownerClan.getName());
packet.replace("%castleName%", npc.getCastle().getName());

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java vendored
View File

@@ -141,7 +141,7 @@ public final class TrainingCamp extends AbstractNpcAI
{
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
String html = getHtm(player.getHtmlPrefix(), "4378-04.htm");
String html = getHtm(player, "4378-04.htm");
html = html.replace("%training_level%", String.valueOf(holder.getLevel()));
html = html.replace("%training_time%", String.valueOf(trainingTime));
html = html.replace("%training_exp%", String.valueOf(expGained));

22
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@@ -113,9 +113,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)
@@ -196,14 +196,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
@@ -220,7 +220,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)
{
@@ -228,13 +228,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":
@@ -275,7 +275,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)
{
@@ -283,7 +283,7 @@ public final class WyvernManager extends AbstractNpcAI
}
else
{
htmltext = replaceAll(npc, player.getHtmlPrefix());
htmltext = replaceAll(npc, player);
}
return htmltext;
}

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java vendored
View File

@@ -67,7 +67,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);
@@ -94,7 +94,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);
@@ -132,7 +132,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_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java vendored
View File

@@ -385,7 +385,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);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java vendored
View File

@@ -54,7 +54,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
else 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_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java vendored
View File

@@ -47,7 +47,7 @@ public class L2DoorInstanceActionShift implements IActionShiftHandler
final Castle castle = door.getCastle();
activeChar.sendPacket(new StaticObject(door, activeChar.isGM()));
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/doorinfo.htm");
html.setFile(activeChar, "data/html/admin/doorinfo.htm");
// Hp / MP
html.replace("%hpGauge%", HtmlUtil.getHpGauge(250, (long) door.getCurrentHp(), door.getMaxHp(), false));
html.replace("%mpGauge%", HtmlUtil.getMpGauge(250, (long) door.getCurrentMp(), door.getMaxMp(), false));

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@@ -53,7 +53,7 @@ public class L2NpcActionShift implements IActionShiftHandler
final L2Npc npc = (L2Npc) target;
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
final ClanHall clanHall = ClanHallData.getInstance().getClanHallByNpcId(npc.getId());
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_4.0_GrandCrusade/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 = PageBuilder.newBuilder(AnnouncementsTable.getInstance().getAllAnnouncements(), 8, "bypass admin_announces list").currentPage(page).bodyHandler((pages, announcement, sb) ->
{
sb.append("<tr>");

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -329,7 +329,7 @@ public class AdminBuffs implements IAdminCommandHandler
}).build();
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/getbuffs.htm");
html.setFile(activeChar, "data/html/admin/getbuffs.htm");
if (result.getPages() > 0)
{

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java vendored
View File

@@ -224,7 +224,7 @@ public final class AdminCastle implements IAdminCommandHandler
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/castlemanage.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/castlemanage.htm"));
activeChar.sendPacket(html);
}
}
@@ -239,7 +239,7 @@ public final class AdminCastle implements IAdminCommandHandler
{
final L2Clan ownerClan = castle.getOwner();
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/admin/castlemanage_selected.htm"));
html.setHtml(HtmCache.getInstance().getHtm(player, "data/html/admin/castlemanage_selected.htm"));
html.replace("%castleId%", castle.getResidenceId());
html.replace("%castleName%", castle.getName());
html.replace("%ownerName%", ownerClan != null ? ownerClan.getLeaderName() : "NPC");

4
L2J_Mobius_4.0_GrandCrusade/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())
{

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java vendored
View File

@@ -157,7 +157,7 @@ public final class AdminClanHall implements IAdminCommandHandler
private void sendClanHallList(L2PcInstance player, int page, BypassParser parser)
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(player.getHtmlPrefix(), "data/html/admin/clanhall_list.htm");
html.setFile(player, "data/html/admin/clanhall_list.htm");
final List<ClanHall> clanHallList = ClanHallData.getInstance().getClanHalls().stream().sorted(Comparator.comparingLong(ClanHall::getResidenceId)).collect(Collectors.toList());
//@formatter:off
@@ -209,7 +209,7 @@ public final class AdminClanHall implements IAdminCommandHandler
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
final StringBuilder sb = new StringBuilder();
html.setFile(player.getHtmlPrefix(), "data/html/admin/clanhall_detail.htm");
html.setFile(player, "data/html/admin/clanhall_detail.htm");
html.replace("%clanHallId%", clanHall.getResidenceId());
html.replace("%clanHallOwner%", (clanHall.getOwner() == null ? "<font color=\"00FF00\">Free</font>" : "<font color=\"FF9900\">" + clanHall.getOwner().getName() + "</font>"));
final String grade = clanHall.getGrade().toString().replace("GRADE_", "") + " Grade";

2
L2J_Mobius_4.0_GrandCrusade/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(0, 1);
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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -1076,7 +1076,7 @@ public class AdminEditChar implements IAdminCommandHandler
players.sort(Comparator.comparingLong(L2PcInstance::getUptime));
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charlist.htm");
html.setFile(activeChar, "data/html/admin/charlist.htm");
final PageResult result = PageBuilder.newBuilder(players, 20, "bypass -h admin_show_characters").currentPage(page).bodyHandler((pages, player, sb) ->
{
@@ -1151,7 +1151,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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));
@@ -1253,7 +1253,7 @@ public class AdminEditChar implements IAdminCommandHandler
int CharactersFound = 0;
String name;
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charfind.htm");
adminReply.setFile(activeChar, "data/html/admin/charfind.htm");
final StringBuilder replyMSG = new StringBuilder(1000);
@@ -1330,7 +1330,7 @@ public class AdminEditChar implements IAdminCommandHandler
String name, ip = "0.0.0.0";
final StringBuilder replyMSG = new StringBuilder(1000);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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));
@@ -1425,7 +1425,7 @@ public class AdminEditChar implements IAdminCommandHandler
chars.values().stream().forEachOrdered(replyMSG::add);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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());
@@ -1484,7 +1484,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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%", "");
@@ -1538,7 +1538,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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_");
@@ -1622,7 +1622,7 @@ public class AdminEditChar implements IAdminCommandHandler
private void gatherSummonInfo(L2Summon target, L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
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()));
@@ -1661,7 +1661,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
boolean color = true;
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@@ -547,7 +547,7 @@ public class AdminEffects implements IAdminCommandHandler
}).build();
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/ave_abnormal.htm");
html.setFile(activeChar, "data/html/admin/ave_abnormal.htm");
if (result.getPages() > 0)
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@@ -119,7 +119,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_4.0_GrandCrusade/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(0, 1);
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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java vendored
View File

@@ -98,7 +98,7 @@ public class AdminExpSp implements IAdminCommandHandler
return;
}
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java vendored
View File

@@ -146,7 +146,7 @@ public class AdminFortSiege implements IAdminCommandHandler
{
int i = 0;
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/forts.htm");
adminReply.setFile(activeChar, "data/html/admin/forts.htm");
final Collection<Fort> forts = FortManager.getInstance().getForts();
final StringBuilder cList = new StringBuilder(forts.size() * 100);
@@ -173,7 +173,7 @@ public class AdminFortSiege implements IAdminCommandHandler
private void showFortSiegePage(L2PcInstance activeChar, Fort fort)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java vendored
View File

@@ -61,7 +61,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/graciaseeds.htm");
html.setFile(activeChar, "data/html/admin/graciaseeds.htm");
html.replace("%sodstate%", String.valueOf(GraciaSeedsManager.getInstance().getSoDState()));
html.replace("%sodtiatkill%", String.valueOf(GraciaSeedsManager.getInstance().getSoDTiatKilled()));
if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0)

4
L2J_Mobius_4.0_GrandCrusade/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;
@@ -312,7 +312,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_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHwid.java vendored
View File

@@ -41,7 +41,7 @@ public class AdminHwid implements IAdminCommandHandler
}
final L2PcInstance target = activeChar.getTarget().getActingPlayer();
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/charhwinfo.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/charhwinfo.htm"));
html.replace("%name%", target.getName());
html.replace("%macAddress%", target.getClient().getHardwareInfo().getMacAddress());
html.replace("%windowsPlatformId%", target.getClient().getHardwareInfo().getWindowsPlatformId());

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java vendored
View File

@@ -80,7 +80,7 @@ public final class AdminInstance implements IAdminCommandHandler
case "admin_instances":
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/instances.htm");
html.setFile(activeChar, "data/html/admin/instances.htm");
html.replace("%instCount%", InstanceManager.getInstance().getInstances().size());
html.replace("%tempCount%", InstanceManager.getInstance().getInstanceTemplates().size());
activeChar.sendPacket(html);
@@ -204,7 +204,7 @@ public final class AdminInstance implements IAdminCommandHandler
final InstanceTemplate template = InstanceManager.getInstance().getInstanceTemplate(templateId);
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
final StringBuilder sb = new StringBuilder();
html.setFile(player.getHtmlPrefix(), "data/html/admin/instances_detail.htm");
html.setFile(player, "data/html/admin/instances_detail.htm");
html.replace("%templateId%", template.getId());
html.replace("%templateName%", template.getName());
html.replace("%activeWorlds%", template.getWorldCount() + " / " + (template.getMaxWorlds() == -1 ? "Unlimited" : template.getMaxWorlds()));
@@ -245,7 +245,7 @@ public final class AdminInstance implements IAdminCommandHandler
private void sendTemplateList(L2PcInstance player, int page, BypassParser parser)
{
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(player.getHtmlPrefix(), "data/html/admin/instances_list.htm");
html.setFile(player, "data/html/admin/instances_list.htm");
final InstanceManager instManager = InstanceManager.getInstance();
final List<InstanceTemplate> templateList = instManager.getInstanceTemplates().stream().sorted(Comparator.comparingLong(InstanceTemplate::getWorldCount).reversed()).filter(template -> !CommonUtil.contains(IGNORED_TEMPLATES, template.getId())).collect(Collectors.toList());

2
L2J_Mobius_4.0_GrandCrusade/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(0, 1);
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_4.0_GrandCrusade/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(0, 1);
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_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCafePoints.java vendored
View File

@@ -191,7 +191,7 @@ public final class AdminPcCafePoints implements IAdminCommandHandler
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
final L2PcInstance target = getTarget(activeChar);
final int points = target.getPcCafePoints();
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/pccafe.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/pccafe.htm"));
html.replace("%points%", Util.formatAdena(points));
html.replace("%targetName%", target.getName());
activeChar.sendPacket(html);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java vendored
View File

@@ -52,7 +52,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_4.0_GrandCrusade/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, 1);
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;
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPrimePoints.java vendored
View File

@@ -175,7 +175,7 @@ public final class AdminPrimePoints implements IAdminCommandHandler
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
final L2PcInstance target = getTarget(activeChar);
final int points = target.getPrimePoints();
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/primepoints.htm"));
html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/primepoints.htm"));
html.replace("%points%", Util.formatAdena(points));
html.replace("%targetName%", target.getName());
activeChar.sendPacket(html);

6
L2J_Mobius_4.0_GrandCrusade/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%", CommonUtil.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());

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java vendored
View File

@@ -182,7 +182,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%", "");
@@ -286,7 +286,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></td></tr></table>");
activeChar.sendPacket(msg);
@@ -365,7 +365,7 @@ public class AdminQuest implements IAdminCommandHandler
replace = replace.substring(0, 17200); // packetlimit
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/scriptdirectory.htm");
html.setFile(activeChar, "data/html/admin/scriptdirectory.htm");
html.replace("%path%", currentPath);
html.replace("%list%", replace);
activeChar.sendPacket(html);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminScan.java vendored
View File

@@ -171,7 +171,7 @@ public class AdminScan implements IAdminCommandHandler
{
final BypassBuilder bypassParser = createBypassBuilder(parser, "bypass -h admin_scan");
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/scan.htm");
html.setFile(activeChar, "data/html/admin/scan.htm");
//@formatter:off
final PageResult result = PageBuilder.newBuilder(L2World.getInstance().getVisibleObjects(activeChar, L2Npc.class, radius, condition), 15, bypassParser.toString())

2
L2J_Mobius_4.0_GrandCrusade/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_4.0_GrandCrusade/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()));

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -409,7 +409,7 @@ public class AdminSkill implements IAdminCommandHandler
}
final L2PcInstance player = target.getActingPlayer();
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
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_4.0_GrandCrusade/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(0, 1);
adminReply.setHtml(htmContent);
adminReply.replace("%PEACE%", activeChar.isInsideZone(ZoneId.PEACE) ? "<font color=\"LEVEL\">YES</font>" : "NO");

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java vendored
View File

@@ -265,7 +265,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);
}
@@ -561,7 +561,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler
private void buildHtmlWindow(L2PcInstance activeChar, 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(activeChar));
final AtomicInteger position = new AtomicInteger(page * 20);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java vendored
View File

@@ -45,7 +45,7 @@ public class Link implements IBypassHandler
return false;
}
final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/" + htmlPath);
final String content = HtmCache.getInstance().getHtm(activeChar, "data/html/" + htmlPath);
final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0);
html.setHtml(content.replace("%objectId%", String.valueOf(target != null ? target.getObjectId() : 0)));
activeChar.sendPacket(html);

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -199,7 +199,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));
@@ -274,7 +274,7 @@ public class NpcViewMod implements IBypassHandler
public static void sendNpcSkillView(L2PcInstance activeChar, L2Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/Skills.htm");
html.setFile(activeChar, "data/html/mods/NpcView/Skills.htm");
final StringBuilder sb = new StringBuilder();
@@ -306,7 +306,7 @@ public class NpcViewMod implements IBypassHandler
public static void sendAggroListView(L2PcInstance activeChar, L2Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/AggroList.htm");
html.setFile(activeChar, "data/html/mods/NpcView/AggroList.htm");
final StringBuilder sb = new StringBuilder();
@@ -568,7 +568,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.");

2
L2J_Mobius_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -211,7 +211,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_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java vendored
View File

@@ -45,14 +45,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_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -141,9 +141,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_4.0_GrandCrusade/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_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/HomeBoard.java vendored
View File

@@ -119,13 +119,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)));
@@ -139,7 +139,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"))
@@ -148,7 +148,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"))
@@ -157,13 +157,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, 0));
activeChar.sendPacket(new ExBuySellList(activeChar, false));
}
@@ -224,7 +224,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"))
{
@@ -254,7 +254,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"))
{
@@ -270,7 +270,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_4.0_GrandCrusade/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_4.0_GrandCrusade/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_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java vendored
View File

@@ -55,7 +55,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();
for (int i = 0; i < REGIONS.length; i++)
{
@@ -69,7 +69,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_4.0_GrandCrusade/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_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java vendored
View File

@@ -166,7 +166,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(), "data/html/jail_in.htm");
String content = HtmCache.getInstance().getHtm(player, "data/html/jail_in.htm");
if (content != null)
{
content = content.replaceAll("%reason%", task != null ? task.getReason() : "");
@@ -202,7 +202,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(), "data/html/jail_out.htm");
final String content = HtmCache.getInstance().getHtm(player, "data/html/jail_out.htm");
if (content != null)
{
msg.setHtml(content);

2
L2J_Mobius_4.0_GrandCrusade/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_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java vendored
View File

@@ -95,7 +95,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_4.0_GrandCrusade/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;
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java vendored
View File

@@ -658,7 +658,7 @@ public final class MemoryOfDisaster extends AbstractInstance
{
// myself->SetOneTimeQuestFlag(myself->c_ai0, 10491, 1);
finishInstance(player, 0);
player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "calltochange_end.htm")));
player.sendPacket(new TutorialShowHtml(getHtm(player, "calltochange_end.htm")));
break;
}
case "TIMER_ID_DIE":

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/LetterQuest.java vendored
View File

@@ -146,7 +146,7 @@ public abstract class LetterQuest extends Quest
final L2PcInstance player = event.getActiveChar();
if ((event.getMarkId() == getId()) && canStartQuest(player))
{
final String html = getHtm(player.getHtmlPrefix(), "popup.html").replace("%teleport%", getTeleportCommand());
final String html = getHtm(player, "popup.html").replace("%teleport%", getTeleportCommand());
final QuestState st = getQuestState(player, true);
st.startQuest();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java vendored
View File

@@ -374,7 +374,7 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest
if (event.getMarkId() == getId())
{
final L2PcInstance player = event.getActiveChar();
player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), "popup.html")));
player.sendPacket(new TutorialShowHtml(getHtm(player, "popup.html")));
}
}
}

26
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java vendored
View File

@@ -183,7 +183,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:
{
@@ -273,38 +273,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);
}
@@ -347,20 +347,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)

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java vendored
View File

@@ -213,12 +213,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());
}
}
@@ -454,13 +454,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_4.0_GrandCrusade/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;

18
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java vendored
View File

@@ -316,7 +316,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)
{
@@ -485,7 +485,7 @@ public final class Q00662_AGameOfCards extends Quest
giveItems(player, 729, 1);
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-13.html");
htmltext = getHtm(player, "30845-13.html");
}
else if (i6 == 30)
{
@@ -493,7 +493,7 @@ public final class Q00662_AGameOfCards extends Quest
giveItems(player, 951, 2);
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-14.html");
htmltext = getHtm(player, "30845-14.html");
}
else if ((i6 == 21) || (i6 == 12))
{
@@ -502,34 +502,34 @@ public final class Q00662_AGameOfCards extends Quest
giveItems(player, 955, 1);
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-15.html");
htmltext = getHtm(player, "30845-15.html");
}
else if (i6 == 20)
{
giveItems(player, 951, 2);
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-16.html");
htmltext = getHtm(player, "30845-16.html");
}
else if (i6 == 11)
{
giveItems(player, 951, 1);
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-17.html");
htmltext = getHtm(player, "30845-17.html");
}
else if (i6 == 10)
{
giveItems(player, 956, 2);
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-18.html");
htmltext = getHtm(player, "30845-18.html");
}
else if (i6 == 0)
{
st.set("ex", 0);
st.setCond(0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-19.html");
htmltext = getHtm(player, "30845-19.html");
}
}
@@ -626,7 +626,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)
{

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java vendored
View File

@@ -292,7 +292,7 @@ public class Q00663_SeductiveWhispers extends Quest
boolean isPlayerWin = false;
boolean isNpcWin = false;
String htmltext;
final String table = getHtm(player.getHtmlPrefix(), "table.html");
final String table = getHtm(player, "table.html");
if (isPlayerTurn)
{
@@ -316,25 +316,25 @@ public class Q00663_SeductiveWhispers extends Quest
}
isPlayerWin = true;
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-07.html" : "30846-18.html");
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
htmltext = htmltext.replace("%table%", table);
htmltext = htmltext.replaceAll("%win_count%", "" + winCount);
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-22.html" : "30846-16.html");
htmltext = getHtm(player, isPractice ? "30846-22.html" : "30846-16.html");
htmltext = htmltext.replace("%table%", table);
}
}
else if ((playerCard != null) && (npcCard != null) && isWinner(playerCard, npcCard, false))
{
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-24.html" : "30846-21.html");
htmltext = getHtm(player, isPractice ? "30846-24.html" : "30846-21.html");
htmltext = htmltext.replace("%table%", table);
isNpcWin = true;
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-23.html" : "30846-17.html");
htmltext = getHtm(player, isPractice ? "30846-23.html" : "30846-17.html");
htmltext = htmltext.replace("%table%", table);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java vendored
View File

@@ -283,7 +283,7 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
final L2PcInstance player = event.getActiveChar();
if ((event.getMarkId() == getId()) && canStartQuest(player))
{
final String html = getHtm(player.getHtmlPrefix(), "popup.html");
final String html = getHtm(player, "popup.html");
player.sendPacket(new TutorialShowHtml(html));
if (!hasQuestItems(player, LADA_LETTER))
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java vendored
View File

@@ -519,7 +519,7 @@ public final class Q10331_StartOfFate extends Quest
{
final L2PcInstance player = event.getActiveChar();
final String filename = "popup-" + player.getRace().toString().toLowerCase() + ".htm";
player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), filename)));
player.sendPacket(new TutorialShowHtml(getHtm(player, filename)));
}
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java vendored
View File

@@ -156,7 +156,7 @@ public final class Q10338_SeizeYourDestiny extends Quest
else if (player.getLevel() > 84)
{
// htmltext = "33477-01.htm";
player.sendPacket(new NpcHtmlMessage(npc.getObjectId(), getHtm(player.getHtmlPrefix(), "33477-01.htm")));
player.sendPacket(new NpcHtmlMessage(npc.getObjectId(), getHtm(player, "33477-01.htm")));
htmltext = null;
}
else

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java vendored
View File

@@ -83,7 +83,7 @@ public final class Q10351_OwnerOfHall extends Quest
addExpAndSp(player, 897850000, 215484);
giveItems(player, OCTAVIS_BRACELET, 1);
qs.exitQuest(false, true);
htmltext = getHtm(player.getHtmlPrefix(), "32892-08.html").replace("%name%", player.getName());
htmltext = getHtm(player, "32892-08.html").replace("%name%", player.getName());
}
break;
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java vendored
View File

@@ -82,7 +82,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest
addExpAndSp(player, 897850000, 215484);
giveItems(player, OCTAVIS_SOUL_BOTTLE, 1);
qs.exitQuest(false, true);
htmltext = getHtm(player.getHtmlPrefix(), "32892-07.html").replace("%name%", player.getName());
htmltext = getHtm(player, "32892-07.html").replace("%name%", player.getName());
}
break;
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java vendored
View File

@@ -518,7 +518,7 @@ public final class Q10360_CertificationOfFate extends Quest
break;
}
}
player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), fileName)));
player.sendPacket(new TutorialShowHtml(getHtm(player, fileName)));
}
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java vendored
View File

@@ -118,7 +118,7 @@ public final class Q10390_KekropusLetter extends Quest
{
if (st.isCond(1))
{
player.sendPacket(new TutorialShowHtml(getHtm(player.getHtmlPrefix(), event)));
player.sendPacket(new TutorialShowHtml(getHtm(player, event)));
player.sendPacket(new PlaySound(3, "Npcdialog1.kekrops_quest_1", 0, 0, 0, 0, 0));
st.setCond(2);
}

14
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java vendored
View File

@@ -107,10 +107,10 @@ public class Q10407_LetsGoFishing extends Quest
if (!hasQuestItems(player, PRACTICE_FISHING_ROD))
{
giveItems(player, PRACTICE_FISHING_ROD, 1);
htmltext = getHtm(player.getHtmlPrefix(), "GiveRod.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "GiveRod.html").replace("%name%", npc.getName());
break;
}
htmltext = getHtm(player.getHtmlPrefix(), "noNeed.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "noNeed.html").replace("%name%", npc.getName());
break;
}
case "give_bait":
@@ -118,10 +118,10 @@ public class Q10407_LetsGoFishing extends Quest
if (!hasQuestItems(player, PRACTICE_BAIT))
{
giveItems(player, PRACTICE_BAIT, 20);
htmltext = getHtm(player.getHtmlPrefix(), "GiveBait.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "GiveBait.html").replace("%name%", npc.getName());
break;
}
htmltext = getHtm(player.getHtmlPrefix(), "noNeed.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "noNeed.html").replace("%name%", npc.getName());
break;
}
case "31572-03.htm":
@@ -172,15 +172,15 @@ public class Q10407_LetsGoFishing extends Quest
{
if (qs.isCond(1))
{
htmltext = getHtm(player.getHtmlPrefix(), "31572-12.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "31572-12.html").replace("%name%", npc.getName());
}
else if (qs.isCond(2))
{
htmltext = getHtm(player.getHtmlPrefix(), "31572-07.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "31572-07.html").replace("%name%", npc.getName());
}
else if (qs.isCond(3))
{
htmltext = getHtm(player.getHtmlPrefix(), "31572-13.html").replace("%name%", npc.getName());
htmltext = getHtm(player, "31572-13.html").replace("%name%", npc.getName());
}
break;
}

Some files were not shown because too many files have changed in this diff Show More