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

Retail like builder HTML debugging.

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

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
View File

@ -475,6 +475,7 @@ public final class Config
public static boolean GM_CRITANNOUNCER_NAME;
public static boolean GM_GIVE_SPECIAL_SKILLS;
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
@ -1985,6 +1986,7 @@ public final class Config
GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);

17
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -27,6 +27,8 @@ import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.file.filter.HTMLFilter;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.util.BuilderUtil;
import com.l2jmobius.gameserver.util.Util;
/**
@ -142,9 +144,9 @@ public class HtmCache
return content;
}
public String getHtmForce(String prefix, String path)
public String getHtmForce(L2PcInstance player, String path)
{
String content = getHtm(prefix, path);
String content = getHtm(player, path);
if (content == null)
{
content = "<html><body>My text is missing:<br>" + path + "</body></html>";
@ -153,8 +155,9 @@ public class HtmCache
return content;
}
public String getHtm(String prefix, String path)
public String getHtm(L2PcInstance player, String path)
{
final String prefix = player != null ? player.getHtmlPrefix() : "en";
String newPath = null;
String content;
if ((prefix != null) && !prefix.isEmpty())
@ -163,6 +166,10 @@ public class HtmCache
content = getHtm(newPath);
if (content != null)
{
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{
BuilderUtil.sendHtmlMessage(player, newPath.substring(5));
}
return content;
}
}
@ -173,6 +180,10 @@ public class HtmCache
_cache.put(newPath, content);
}
if ((player != null) && player.isGM() && (path != null) && Config.GM_DEBUG_HTML_PATHS)
{
BuilderUtil.sendHtmlMessage(player, path.substring(5));
}
return content;
}

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java
View File

@ -277,7 +277,7 @@ public final class DimensionalRiftManager
if (player.getParty().getMemberCount() < Config.RIFT_MIN_PARTY_SIZE)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/seven_signs/rift/SmallParty.htm");
html.setFile(player, "data/html/seven_signs/rift/SmallParty.htm");
html.replace("%npc_name%", npc.getName());
html.replace("%count%", Integer.toString(Config.RIFT_MIN_PARTY_SIZE));
player.sendPacket(html);
@ -336,7 +336,7 @@ public final class DimensionalRiftManager
if (!canPass)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/seven_signs/rift/NoFragments.htm");
html.setFile(player, "data/html/seven_signs/rift/NoFragments.htm");
html.replace("%npc_name%", npc.getName());
html.replace("%count%", Integer.toString(count));
player.sendPacket(html);
@ -349,7 +349,7 @@ public final class DimensionalRiftManager
if (!p.destroyItem("RiftEntrance", i, count, null, false))
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/seven_signs/rift/NoFragments.htm");
html.setFile(player, "data/html/seven_signs/rift/NoFragments.htm");
html.replace("%npc_name%", npc.getName());
html.replace("%count%", Integer.toString(count));
player.sendPacket(html);
@ -434,7 +434,7 @@ public final class DimensionalRiftManager
public void showHtmlFile(L2PcInstance player, String file, L2Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), file);
html.setFile(player, file);
html.replace("%npc_name%", npc.getName());
player.sendPacket(html);
}

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java
View File

@ -288,7 +288,7 @@ public class FishingChampionshipManager
pl.addItem("fishing_reward", Config.ALT_FISH_CHAMPIONSHIP_REWARD_ITEM, rewardCnt, null, true);
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event_reward001.htm");
html.setFile(pl, "data/html/fisherman/championship/fish_event_reward001.htm");
pl.sendPacket(html);
}
}
@ -301,7 +301,7 @@ public class FishingChampionshipManager
if (_needRefresh)
{
html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event003.htm");
html.setFile(pl, "data/html/fisherman/championship/fish_event003.htm");
pl.sendPacket(html);
refreshResult();
@ -309,7 +309,7 @@ public class FishingChampionshipManager
return;
}
html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event002.htm");
html.setFile(pl, "data/html/fisherman/championship/fish_event002.htm");
String str = null;
for (int x = 1; x <= 5; x++)
@ -331,7 +331,7 @@ public class FishingChampionshipManager
public void showChampScreen(L2PcInstance pl, L2NpcInstance npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(pl.getHtmlPrefix(), "data/html/fisherman/championship/fish_event001.htm");
html.setFile(pl, "data/html/fisherman/championship/fish_event001.htm");
String str = null;
for (int x = 1; x <= 5; x++)

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
View File

@ -1579,7 +1579,7 @@ public final class FourSepulchersManager
public void showHtmlFile(L2PcInstance player, String file, L2Npc npc, L2PcInstance member)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/SepulcherNpc/" + file);
html.setFile(player, "data/html/SepulcherNpc/" + file);
if (member != null)
{
html.replace("%member%", member.getName());

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java
View File

@ -427,7 +427,7 @@ public final class PetitionManager
final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/petition.htm");
html.setFile(activeChar, "data/html/admin/petition.htm");
html.replace("%petition%", String.valueOf(currPetition.getId()));
html.replace("%time%", dateFormat.format(new Date(currPetition.getSubmitTime())));
html.replace("%type%", currPetition.getTypeAsString());

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
View File

@ -86,20 +86,20 @@ public final class SellBuffsManager implements IGameXmlReader
public void sendSellMenu(L2PcInstance player)
{
final String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + (player.isSellingBuffs() ? "BuffMenu_already.html" : "BuffMenu.html"));
final String html = HtmCache.getInstance().getHtm(player, htmlFolder + (player.isSellingBuffs() ? "BuffMenu_already.html" : "BuffMenu.html"));
CommunityBoardHandler.separateAndSend(html, player);
}
public void sendBuffChoiceMenu(L2PcInstance player, int index)
{
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + "BuffChoice.html");
String html = HtmCache.getInstance().getHtm(player, htmlFolder + "BuffChoice.html");
html = html.replace("%list%", buildSkillMenu(player, index));
CommunityBoardHandler.separateAndSend(html, player);
}
public void sendBuffEditMenu(L2PcInstance player)
{
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + "BuffChoice.html");
String html = HtmCache.getInstance().getHtm(player, htmlFolder + "BuffChoice.html");
html = html.replace("%list%", buildEditMenu(player));
CommunityBoardHandler.separateAndSend(html, player);
}
@ -111,7 +111,7 @@ public final class SellBuffsManager implements IGameXmlReader
return;
}
String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmlFolder + "BuffBuyMenu.html");
String html = HtmCache.getInstance().getHtm(player, htmlFolder + "BuffBuyMenu.html");
html = html.replace("%list%", buildBuffMenu(player, seller, index));
CommunityBoardHandler.separateAndSend(html, player);
}

14
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -702,7 +702,7 @@ public class L2Npc extends L2Character
player.sendPacket(ActionFailed.STATIC_PACKET);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/npcbusy.htm");
html.setFile(player, "data/html/npcbusy.htm");
html.replace("%busymessage%", getBusyMessage());
html.replace("%npcname%", getName());
html.replace("%playername%", player.getName());
@ -861,7 +861,7 @@ public class L2Npc extends L2Character
*/
private boolean showPkDenyChatWindow(L2PcInstance player, String type)
{
final String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/" + type + "/" + getId() + "-pk.htm");
final String html = HtmCache.getInstance().getHtm(player, "data/html/" + type + "/" + getId() + "-pk.htm");
if (html != null)
{
insertObjectIdAndShowChatWindow(player, html);
@ -1129,7 +1129,7 @@ public class L2Npc extends L2Character
// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
if (this instanceof L2MerchantInstance)
{
@ -1157,7 +1157,7 @@ public class L2Npc extends L2Character
{
// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -1515,15 +1515,15 @@ public class L2Npc extends L2Character
if (this instanceof L2WarehouseInstance)
{
html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/warehouse/" + npcId + "-noteach.htm");
html = HtmCache.getInstance().getHtm(player, "data/html/warehouse/" + npcId + "-noteach.htm");
}
else if (this instanceof L2TrainerInstance)
{
html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/trainer/" + npcId + "-noteach.htm");
html = HtmCache.getInstance().getHtm(player, "data/html/trainer/" + npcId + "-noteach.htm");
// Trainer Healer?
if (html == null)
{
html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/scripts/ai/npc/Trainers/HealerTrainer/" + npcId + "-noteach.html");
html = HtmCache.getInstance().getHtm(player, "data/scripts/ai/npc/Trainers/HealerTrainer/" + npcId + "-noteach.html");
}
}

38
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java
View File

@ -65,7 +65,7 @@ public final class L2AuctioneerInstance extends L2Npc
{
final String filename = "data/html/auction/auction-busy.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
return;
@ -110,7 +110,7 @@ public final class L2AuctioneerInstance extends L2Npc
final String filename = "data/html/auction/AgitSale3.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%x%", val);
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
@ -161,7 +161,7 @@ public final class L2AuctioneerInstance extends L2Npc
final Auction a = ClanHallAuctionManager.getInstance().getAuction(auctionId);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
if (a != null)
{
html.replace("%AGIT_NAME%", a.getItemName());
@ -253,7 +253,7 @@ public final class L2AuctioneerInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_bidding " + val);
html.replace("%PLEDGE_ADENA%", String.valueOf(player.getClan().getWarehouse().getAdena()));
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(minimumBid));
@ -347,7 +347,7 @@ public final class L2AuctioneerInstance extends L2Npc
final String filename = "data/html/auction/AgitAuctionList.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
html.replace("%itemsField%", items.toString());
player.sendPacket(html);
@ -378,7 +378,7 @@ public final class L2AuctioneerInstance extends L2Npc
final String filename = "data/html/auction/AgitBidderList.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_LIST%", biders);
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
html.replace("%x%", val);
@ -393,7 +393,7 @@ public final class L2AuctioneerInstance extends L2Npc
final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
final String filename = "data/html/auction/AgitBidInfo.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
final Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt());
if (a != null)
{
@ -424,7 +424,7 @@ public final class L2AuctioneerInstance extends L2Npc
final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
final String filename = "data/html/auction/AgitSaleInfo.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
final Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getHideoutId());
if (a != null)
{
@ -456,7 +456,7 @@ public final class L2AuctioneerInstance extends L2Npc
final int ItemId = player.getClan().getHideoutId();
final String filename = "data/html/auction/AgitInfo.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
if (ClanHallManager.getInstance().getAuctionableHallById(ItemId) != null)
{
html.replace("%AGIT_NAME%", ClanHallManager.getInstance().getAuctionableHallById(ItemId).getName());
@ -492,7 +492,7 @@ public final class L2AuctioneerInstance extends L2Npc
final long bid = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt()).getBidders().get(player.getClanId()).getBid();
final String filename = "data/html/auction/AgitBidCancel.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_BID%", String.valueOf(bid));
html.replace("%AGIT_BID_REMAIN%", String.valueOf((long) (bid * 0.9)));
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
@ -515,14 +515,14 @@ public final class L2AuctioneerInstance extends L2Npc
{
final String filename = "data/html/auction/not_authorized.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
return;
}
final String filename = "data/html/auction/AgitSaleCancel.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
html.replace("%objectId%", String.valueOf(getObjectId()));
@ -542,7 +542,7 @@ public final class L2AuctioneerInstance extends L2Npc
{
final String filename = "data/html/auction/AgitSale2.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_LAST_PRICE%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_sale");
html.replace("%objectId%", String.valueOf(getObjectId()));
@ -555,14 +555,14 @@ public final class L2AuctioneerInstance extends L2Npc
{
final String filename = "data/html/auction/not_authorized.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
return;
}
final String filename = "data/html/auction/AgitSale1.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
html.replace("%AGIT_PLEDGE_ADENA%", String.valueOf(player.getClan().getWarehouse().getAdena()));
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
@ -577,7 +577,7 @@ public final class L2AuctioneerInstance extends L2Npc
{
final String filename = "data/html/auction/not_authorized.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
return;
@ -586,7 +586,7 @@ public final class L2AuctioneerInstance extends L2Npc
{
final String filename = "data/html/auction/AgitBid2.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
final Auction a = ClanHallAuctionManager.getInstance().getAuction(player.getClan().getAuctionBiddedAt());
if (a != null)
{
@ -612,7 +612,7 @@ public final class L2AuctioneerInstance extends L2Npc
else if (actualCommand.equalsIgnoreCase("location"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/auction/location.htm");
html.setFile(player, "data/html/auction/location.htm");
html.replace("%location%", MapRegionManager.getInstance().getClosestTownName(player));
html.replace("%LOCATION%", getPictureName(player));
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
@ -645,7 +645,7 @@ public final class L2AuctioneerInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcId%", String.valueOf(getId()));
html.replace("%npcname%", getName());

16
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java
View File

@ -109,11 +109,11 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (ok)
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/evolve-ok.htm");
html.setFile(player, "data/html/clanHallDoormen/evolve-ok.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/evolve-no.htm");
html.setFile(player, "data/html/clanHallDoormen/evolve-no.htm");
}
player.sendPacket(html);
return;
@ -136,12 +136,12 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
{
if (_hasEvolve)
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen2.htm");
html.setFile(player, "data/html/clanHallDoormen/doormen2.htm");
html.replace("%clanname%", owner.getName());
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen1.htm");
html.setFile(player, "data/html/clanHallDoormen/doormen1.htm");
html.replace("%clanname%", owner.getName());
}
}
@ -149,13 +149,13 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
{
if ((owner != null) && (owner.getLeader() != null))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-no.htm");
html.setFile(player, "data/html/clanHallDoormen/doormen-no.htm");
html.replace("%leadername%", owner.getLeaderName());
html.replace("%clanname%", owner.getName());
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/emptyowner.htm");
html.setFile(player, "data/html/clanHallDoormen/emptyowner.htm");
html.replace("%hallname%", getClanHall().getName());
}
}
@ -174,7 +174,7 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
{
getClanHall().openCloseDoors(true);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-opened.htm");
html.setFile(player, "data/html/clanHallDoormen/doormen-opened.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -184,7 +184,7 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance
{
getClanHall().openCloseDoors(false);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-closed.htm");
html.setFile(player, "data/html/clanHallDoormen/doormen-closed.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}

148
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
View File

@ -96,17 +96,17 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
if (val.equalsIgnoreCase("list"))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/banish-list.htm");
html.setFile(player, "data/html/clanHallManager/banish-list.htm");
}
else if (val.equalsIgnoreCase("banish"))
{
getClanHall().banishForeigners();
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/banish.htm");
html.setFile(player, "data/html/clanHallManager/banish.htm");
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
html.setFile(player, "data/html/clanHallManager/not_authorized.htm");
}
sendHtmlMessage(player, html);
return;
@ -118,11 +118,11 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
if (getClanHall().getLease() <= 0)
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/vault-chs.htm");
html.setFile(player, "data/html/clanHallManager/vault-chs.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/vault.htm");
html.setFile(player, "data/html/clanHallManager/vault.htm");
html.replace("%rent%", String.valueOf(getClanHall().getLease()));
html.replace("%date%", format.format(getClanHall().getPaidUntil()));
}
@ -130,7 +130,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
html.setFile(player, "data/html/clanHallManager/not_authorized.htm");
sendHtmlMessage(player, html);
}
return;
@ -143,22 +143,22 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("open"))
{
getClanHall().openCloseDoors(true);
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/door-open.htm");
html.setFile(player, "data/html/clanHallManager/door-open.htm");
}
else if (val.equalsIgnoreCase("close"))
{
getClanHall().openCloseDoors(false);
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/door-close.htm");
html.setFile(player, "data/html/clanHallManager/door-close.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/door.htm");
html.setFile(player, "data/html/clanHallManager/door.htm");
}
sendHtmlMessage(player, html);
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
html.setFile(player, "data/html/clanHallManager/not_authorized.htm");
sendHtmlMessage(player, html);
}
return;
@ -170,11 +170,11 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/chamberlain-nac.htm");
html.setFile(player, "data/html/clanHallManager/chamberlain-nac.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm");
html.setFile(player, "data/html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm");
}
sendHtmlMessage(player, html);
}
@ -183,7 +183,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/chamberlain-nac.htm");
html.setFile(player, "data/html/clanHallManager/chamberlain-nac.htm");
sendHtmlMessage(player, html);
return;
}
@ -200,11 +200,11 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/chamberlain-nac.htm");
html.setFile(player, "data/html/clanHallManager/chamberlain-nac.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile(player, "data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
}
sendHtmlMessage(player, html);
@ -216,7 +216,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions.htm");
html.setFile(player, "data/html/clanHallManager/functions.htm");
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
{
html.replace("%xp_regen%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()));
@ -262,7 +262,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("hp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "recovery hp 0");
sendHtmlMessage(player, html);
return;
@ -270,7 +270,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("mp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "recovery mp 0");
sendHtmlMessage(player, html);
return;
@ -278,7 +278,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("exp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "recovery exp 0");
sendHtmlMessage(player, html);
return;
@ -287,7 +287,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Fireplace (HP Recovery Device)");
final int percent = Integer.parseInt(val);
int cost;
@ -370,7 +370,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Carpet (MP Recovery)");
final int percent = Integer.parseInt(val);
int cost;
@ -412,7 +412,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Chandelier (EXP Recovery Device)");
final int percent = Integer.parseInt(val);
int cost;
@ -467,12 +467,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -484,7 +484,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 20:
@ -555,7 +555,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_HP, percent, fee, Config.CH_HPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -573,12 +573,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -590,7 +590,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 5:
@ -621,7 +621,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_MP, percent, fee, Config.CH_MPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -639,12 +639,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -656,7 +656,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 5:
@ -697,7 +697,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_EXP, percent, fee, Config.CH_EXPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -710,7 +710,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/edit_recovery.htm");
html.setFile(player, "data/html/clanHallManager/edit_recovery.htm");
final String hp_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 20\">20%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 220\">220%</a>]";
final String hp_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 100\">100%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 160\">160%</a>]";
final String hp_grade2 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 80\">80%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 140\">140%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 200\">200%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 260\">260%</a>]";
@ -912,7 +912,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("item_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "other item 0");
sendHtmlMessage(player, html);
return;
@ -920,7 +920,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("tele_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "other tele 0");
sendHtmlMessage(player, html);
return;
@ -928,7 +928,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("support_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "other support 0");
sendHtmlMessage(player, html);
return;
@ -937,7 +937,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Magic Equipment (Item Production Facilities)");
final int stage = Integer.parseInt(val);
int cost;
@ -969,7 +969,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Insignia (Supplementary Magic)");
final int stage = Integer.parseInt(val);
int cost;
@ -1026,7 +1026,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Mirror (Teleportation Device)");
final int stage = Integer.parseInt(val);
int cost;
@ -1060,12 +1060,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -1078,7 +1078,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -1099,7 +1099,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_ITEM_CREATE, lvl, fee, Config.CH_ITEM_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -1117,12 +1117,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -1134,7 +1134,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -1150,7 +1150,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_TELEPORT, lvl, fee, Config.CH_TELE_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -1168,12 +1168,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -1185,7 +1185,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -1231,7 +1231,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_SUPPORT, lvl, fee, Config.CH_SUPPORT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -1244,7 +1244,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/edit_other.htm");
html.setFile(player, "data/html/clanHallManager/edit_other.htm");
final String tele = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
final String support_grade0 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
final String support_grade1 = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 4\">Level 4</a>]";
@ -1348,7 +1348,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("curtains_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "deco curtains 0");
sendHtmlMessage(player, html);
return;
@ -1356,7 +1356,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("fixtures_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel.htm");
html.replace("%apply%", "deco fixtures 0");
sendHtmlMessage(player, html);
return;
@ -1365,7 +1365,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Curtains (Decoration)");
final int stage = Integer.parseInt(val);
int cost;
@ -1392,7 +1392,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply.htm");
html.replace("%name%", "Front Platform (Decoration)");
final int stage = Integer.parseInt(val);
int cost;
@ -1422,12 +1422,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -1439,7 +1439,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -1455,7 +1455,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_CURTAINS, lvl, fee, Config.CH_CURTAIN_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -1473,12 +1473,12 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-apply_confirmed.htm");
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
{
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.setFile(player, "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -1490,7 +1490,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/clanHallManager/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -1506,7 +1506,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_FRONTPLATEFORM, lvl, fee, Config.CH_FRONT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/low_adena.htm");
html.setFile(player, "data/html/clanHallManager/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -1519,7 +1519,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/deco.htm");
html.setFile(player, "data/html/clanHallManager/deco.htm");
final String curtains = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_curtains 2\">Level 2</a>]";
final String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
@ -1555,14 +1555,14 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), getClanHall().isSiegableHall() ? "data/html/clanHallManager/manage_siegable.htm" : "data/html/clanHallManager/manage.htm");
html.setFile(player, getClanHall().isSiegableHall() ? "data/html/clanHallManager/manage_siegable.htm" : "data/html/clanHallManager/manage.htm");
sendHtmlMessage(player, html);
}
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(1);
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/not_authorized.htm");
html.setFile(player, "data/html/clanHallManager/not_authorized.htm");
sendHtmlMessage(player, html);
}
return;
@ -1608,7 +1608,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support-no_mana.htm");
html.setFile(player, "data/html/clanHallManager/support-no_mana.htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
sendHtmlMessage(player, html);
return;
@ -1623,7 +1623,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
return;
}
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support-done.htm");
html.setFile(player, "data/html/clanHallManager/support-done.htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
sendHtmlMessage(player, html);
}
@ -1646,7 +1646,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
file = "data/html/clanHallManager/chamberlain.htm";
}
html.setFile(player.getHtmlPrefix(), file);
html.setFile(player, file);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
sendHtmlMessage(player, html);
@ -1659,7 +1659,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
{
return;
}
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile(player, "data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
html.replace("%mp%", String.valueOf((int) getStatus().getCurrentMp()));
sendHtmlMessage(player, html);
return;
@ -1701,7 +1701,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
filename = "data/html/clanHallManager/chamberlain-of.htm";
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcId%", String.valueOf(getId()));
player.sendPacket(html);

22
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java
View File

@ -87,7 +87,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
if (checkAndChangeClass(player, val))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/ok.htm");
html.setFile(player, "data/html/classmaster/ok.htm");
html.replace("%name%", ClassListData.getInstance().getClass(val).getClientCode());
player.sendPacket(html);
}
@ -100,7 +100,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/nobleok.htm");
html.setFile(player, "data/html/classmaster/nobleok.htm");
player.sendPacket(html);
}
}
@ -113,13 +113,13 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
if (!player.isClanLeader())
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/noclanleader.htm");
html.setFile(player, "data/html/classmaster/noclanleader.htm");
player.sendPacket(html);
}
else if (player.getClan().getLevel() >= 5)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/noclanlevel.htm");
html.setFile(player, "data/html/classmaster/noclanlevel.htm");
player.sendPacket(html);
}
else
@ -193,7 +193,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
if (!Config.ALLOW_CLASS_MASTERS)
{
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/disabled.htm");
html.setFile(player, "data/html/classmaster/disabled.htm");
}
else if (!Config.CLASS_MASTER_SETTINGS.isAllowed(level))
{
@ -264,7 +264,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
final ClassId currentClassId = player.getClassId();
if (currentClassId.level() >= level)
{
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/nomore.htm");
html.setFile(player, "data/html/classmaster/nomore.htm");
}
else
{
@ -286,13 +286,13 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
if (menu.length() > 0)
{
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/template.htm");
html.setFile(player, "data/html/classmaster/template.htm");
html.replace("%name%", ClassListData.getInstance().getClass(currentClassId).getClientCode());
html.replace("%menu%", menu.toString());
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/comebacklater.htm");
html.setFile(player, "data/html/classmaster/comebacklater.htm");
html.replace("%level%", String.valueOf(getMinLevel(level - 1)));
}
}
@ -300,12 +300,12 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
{
if (minLevel < Integer.MAX_VALUE)
{
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/comebacklater.htm");
html.setFile(player, "data/html/classmaster/comebacklater.htm");
html.replace("%level%", String.valueOf(minLevel));
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/classmaster/nomore.htm");
html.setFile(player, "data/html/classmaster/nomore.htm");
}
}
}
@ -324,7 +324,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
return;
}
String msg = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/classmaster/tutorialtemplate.htm");
String msg = HtmCache.getInstance().getHtm(player, "data/html/classmaster/tutorialtemplate.htm");
msg = msg.replaceAll("%name%", ClassListData.getInstance().getClass(currentClassId).getEscapedClientCode());
final StringBuilder menu = new StringBuilder(100);

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DawnPriestInstance.java
View File

@ -146,7 +146,7 @@ public class L2DawnPriestInstance extends L2SignsPriestInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoormenInstance.java
View File

@ -96,11 +96,11 @@ public class L2DoormenInstance extends L2NpcInstance
if (!isOwnerClan(player))
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-no.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-no.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + ".htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + ".htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
@ -134,7 +134,7 @@ public class L2DoormenInstance extends L2NpcInstance
player.sendPacket(ActionFailed.STATIC_PACKET);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
player.sendPacket(html);
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java
View File

@ -91,7 +91,7 @@ public class L2DungeonGatekeeperInstance extends L2Npc
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename += "necro_no.htm";
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
player.sendPacket(html);
}
else
@ -136,7 +136,7 @@ public class L2DungeonGatekeeperInstance extends L2Npc
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename += "cata_no.htm";
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
player.sendPacket(html);
}
else

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DuskPriestInstance.java
View File

@ -146,7 +146,7 @@ public class L2DuskPriestInstance extends L2SignsPriestInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java
View File

@ -200,7 +200,7 @@ public final class L2FestivalGuideInstance extends L2Npc
// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%festivalType%", SevenSignsFestival.getFestivalName(_festivalType));
html.replace("%cycleMins%", String.valueOf(SevenSignsFestival.getInstance().getMinsToNextCycle()));

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java
View File

@ -146,7 +146,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
private static void sendHtml(L2PcInstance player, L2Npc npc, String htmlName)
{
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fisherman/championship/" + htmlName);
html.setFile(player, "data/html/fisherman/championship/" + htmlName);
player.sendPacket(html);
}
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortDoormenInstance.java
View File

@ -44,15 +44,15 @@ public class L2FortDoormenInstance extends L2DoormenInstance
if (!isOwnerClan(player))
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-no.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-no.htm");
}
else if (isUnderSiege())
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + "-busy.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/doormen/" + getTemplate().getId() + ".htm");
html.setFile(player, "data/html/doormen/" + getTemplate().getId() + ".htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));

26
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortLogisticsInstance.java
View File

@ -80,12 +80,12 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
if (isMyLord(player))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-rewards.htm");
html.setFile(player, "data/html/fortress/logistics-rewards.htm");
html.replace("%bloodoath%", String.valueOf(player.getClan().getBloodOathCount()));
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -99,16 +99,16 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
player.addItem("Quest", 9910, blood, this, true);
player.getClan().resetBloodOathCount();
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-blood.htm");
html.setFile(player, "data/html/fortress/logistics-blood.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noblood.htm");
html.setFile(player, "data/html/fortress/logistics-noblood.htm");
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -119,17 +119,17 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
if (player.isClanLeader())
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supplylvl.htm");
html.setFile(player, "data/html/fortress/logistics-supplylvl.htm");
html.replace("%supplylvl%", String.valueOf(getFort().getSupplyLvL()));
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-1.htm"); // TODO: Missing HTML?
html.setFile(player, "data/html/fortress/logistics-1.htm"); // TODO: Missing HTML?
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -140,7 +140,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
{
if (getFort().getSiege().isInProgress())
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-siege.htm");
html.setFile(player, "data/html/fortress/logistics-siege.htm");
}
else
{
@ -158,17 +158,17 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
getFort().setSupplyLvL(0);
getFort().saveFortVariables();
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supply.htm");
html.setFile(player, "data/html/fortress/logistics-supply.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-nosupply.htm");
html.setFile(player, "data/html/fortress/logistics-nosupply.htm");
}
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
html.setFile(player, "data/html/fortress/logistics-noprivs.htm");
}
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
@ -201,7 +201,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcId%", String.valueOf(getId()));
if (getFort().getOwnerClan() != null)

114
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java
View File

@ -102,14 +102,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (player.hasClanPrivilege(ClanPrivilege.CS_DISMISS))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-expel.htm");
html.setFile(player, "data/html/fortress/foreman-expel.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -121,14 +121,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
getFort().banishForeigners(); // Move non-clan members off fortress area
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-expeled.htm");
html.setFile(player, "data/html/fortress/foreman-expeled.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -139,7 +139,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFortState() < 2)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-report.htm");
html.setFile(player, "data/html/fortress/foreman-report.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
if (Config.FS_MAX_OWN_TIME > 0)
{
@ -160,7 +160,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-castlereport.htm");
html.setFile(player, "data/html/fortress/foreman-castlereport.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
int hour, minutes;
if (Config.FS_MAX_OWN_TIME > 0)
@ -201,14 +201,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (open)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-opened.htm");
html.setFile(player, "data/html/fortress/foreman-opened.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-closed.htm");
html.setFile(player, "data/html/fortress/foreman-closed.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -216,7 +216,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getTemplate().getId() + "-d.htm");
html.setFile(player, "data/html/fortress/" + getTemplate().getId() + "-d.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -225,7 +225,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}
@ -245,7 +245,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (Config.ENABLE_WAREHOUSESORTING_CLAN)
{
final String htmFile = "data/html/mods/WhSortedC.htm";
final String htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), htmFile);
final String htmContent = HtmCache.getInstance().getHtm(player, htmFile);
if (htmContent != null)
{
final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(getObjectId());
@ -265,13 +265,13 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-vault.htm");
html.setFile(player, "data/html/fortress/foreman-vault.htm");
sendHtmlMessage(player, html);
}
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
sendHtmlMessage(player, html);
}
return;
@ -300,11 +300,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (getFort().getFunction(Fort.FUNC_TELEPORT) == null)
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-nac.htm");
html.setFile(player, "data/html/fortress/foreman-nac.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/" + getId() + "-t" + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
html.setFile(player, "data/html/fortress/" + getId() + "-t" + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + ".htm");
}
sendHtmlMessage(player, html);
}
@ -313,11 +313,11 @@ public class L2FortManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (getFort().getFunction(Fort.FUNC_SUPPORT) == null)
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-nac.htm");
html.setFile(player, "data/html/fortress/foreman-nac.htm");
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile(player, "data/html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
}
sendHtmlMessage(player, html);
@ -329,7 +329,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-functions.htm");
html.setFile(player, "data/html/fortress/foreman-functions.htm");
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
{
html.replace("%xp_regen%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()));
@ -375,7 +375,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("hp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "recovery hp 0");
sendHtmlMessage(player, html);
return;
@ -383,7 +383,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("mp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "recovery mp 0");
sendHtmlMessage(player, html);
return;
@ -391,7 +391,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("exp_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "recovery exp 0");
sendHtmlMessage(player, html);
return;
@ -400,7 +400,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "(HP Recovery Device)");
final int percent = Integer.parseInt(val);
int cost;
@ -428,7 +428,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "(MP Recovery)");
final int percent = Integer.parseInt(val);
int cost;
@ -455,7 +455,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "(EXP Recovery Device)");
final int percent = Integer.parseInt(val);
int cost;
@ -485,12 +485,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
{
if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -502,7 +502,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 300:
@ -518,7 +518,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_HP, percent, fee, Config.FS_HPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_HP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -532,12 +532,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
{
if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -549,7 +549,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 40:
@ -565,7 +565,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_MP, percent, fee, Config.FS_MPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_MP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -579,12 +579,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
{
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
@ -596,7 +596,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 45:
@ -612,7 +612,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_EXP, percent, fee, Config.FS_EXPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_EXP) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -621,7 +621,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/edit_recovery.htm");
html.setFile(player, "data/html/fortress/edit_recovery.htm");
final String hp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 300\">300%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_hp 400\">400%</a>]";
final String exp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 45\">45%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_exp 50\">50%</a>]";
final String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
@ -676,7 +676,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (val.equalsIgnoreCase("tele_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "other tele 0");
sendHtmlMessage(player, html);
return;
@ -684,7 +684,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else if (val.equalsIgnoreCase("support_cancel"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel.htm");
html.setFile(player, "data/html/fortress/functions-cancel.htm");
html.replace("%apply%", "other support 0");
sendHtmlMessage(player, html);
return;
@ -693,7 +693,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "Insignia (Supplementary Magic)");
final int stage = Integer.parseInt(val);
int cost;
@ -720,7 +720,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply.htm");
html.setFile(player, "data/html/fortress/functions-apply.htm");
html.replace("%name%", "Mirror (Teleportation Device)");
final int stage = Integer.parseInt(val);
int cost;
@ -750,12 +750,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
{
if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -767,7 +767,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -783,7 +783,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_TELEPORT, lvl, fee, Config.FS_TELE_FEE_RATIO, (getFort().getFunction(Fort.FUNC_TELEPORT) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
sendHtmlMessage(player, html);
@ -797,12 +797,12 @@ public class L2FortManagerInstance extends L2MerchantInstance
int fee;
val = st.nextToken();
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-apply_confirmed.htm");
if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
{
if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.setFile(player, "data/html/fortress/functions-used.htm");
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
@ -814,7 +814,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
case 0:
{
fee = 0;
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-cancel_confirmed.htm");
html.setFile(player, "data/html/fortress/functions-cancel_confirmed.htm");
break;
}
case 1:
@ -830,7 +830,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (!getFort().updateFunctions(player, Fort.FUNC_SUPPORT, lvl, fee, Config.FS_SUPPORT_FEE_RATIO, (getFort().getFunction(Fort.FUNC_SUPPORT) == null)))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/low_adena.htm");
html.setFile(player, "data/html/fortress/low_adena.htm");
sendHtmlMessage(player, html);
}
else
@ -842,7 +842,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/edit_other.htm");
html.setFile(player, "data/html/fortress/edit_other.htm");
final String tele = "[<a action=\"bypass -h npc_%objectId%_manage other edit_tele 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_tele 2\">Level 2</a>]";
final String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
@ -878,14 +878,14 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/manage.htm");
html.setFile(player, "data/html/fortress/manage.htm");
sendHtmlMessage(player, html);
}
}
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
sendHtmlMessage(player, html);
}
return;
@ -931,13 +931,13 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support-no_mana.htm");
html.setFile(player, "data/html/fortress/support-no_mana.htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
sendHtmlMessage(player, html);
return;
}
}
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support-done.htm");
html.setFile(player, "data/html/fortress/support-done.htm");
html.replace("%mp%", String.valueOf((int) getCurrentMp()));
sendHtmlMessage(player, html);
}
@ -959,7 +959,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
return;
}
html.setFile(player.getHtmlPrefix(), "data/html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile(player, "data/html/fortress/support" + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + ".htm");
html.replace("%mp%", String.valueOf((int) getStatus().getCurrentMp()));
sendHtmlMessage(player, html);
return;
@ -994,7 +994,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -1061,7 +1061,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
html.setFile(player, "data/html/fortress/foreman-noprivs.htm");
sendHtmlMessage(player, html);
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ObservationInstance.java
View File

@ -66,7 +66,7 @@ public final class L2ObservationInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java
View File

@ -61,7 +61,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
if (Config.ALLOW_RENTPET && Config.LIST_PET_RENT_NPC.contains(getId()))
{
html.replace("_Quest", "_RentPet\">Rent Pet</a><br><a action=\"bypass -h npc_%objectId%_Quest");
@ -136,7 +136,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
if (!ok)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/evolve_no.htm");
html.setFile(player, "data/html/petmanager/evolve_no.htm");
player.sendPacket(html);
}
return;
@ -178,7 +178,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
if (!ok)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/restore_no.htm");
html.setFile(player, "data/html/petmanager/restore_no.htm");
player.sendPacket(html);
}
return;
@ -195,12 +195,12 @@ public class L2PetManagerInstance extends L2MerchantInstance
if (player.destroyItemByItemId("Consume", itemIdtake, 1, this, true))
{
player.addItem("", itemIdgive, 1, this, true);
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/" + getId() + ".htm");
html.setFile(player, "data/html/petmanager/" + getId() + ".htm");
player.sendPacket(html);
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/petmanager/exchange_no.htm");
html.setFile(player, "data/html/petmanager/exchange_no.htm");
player.sendPacket(html);
}
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java
View File

@ -312,7 +312,7 @@ public class L2RaceManagerInstance extends L2Npc
String filename, search;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 5);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
for (int i = 0; i < 8; i++)
{
final int n = i + 1;
@ -331,7 +331,7 @@ public class L2RaceManagerInstance extends L2Npc
String filename, search;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 6);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
for (int i = 0; i < 8; i++)
{
final int n = i + 1;
@ -356,7 +356,7 @@ public class L2RaceManagerInstance extends L2Npc
if (val < 10)
{
filename = getHtmlPath(npcId, 2);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
for (int i = 0; i < 8; i++)
{
final int n = i + 1;
@ -381,7 +381,7 @@ public class L2RaceManagerInstance extends L2Npc
return;
}
filename = getHtmlPath(npcId, 3);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("0place", "" + player.getRace(0));
search = "Mob1";
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
@ -404,7 +404,7 @@ public class L2RaceManagerInstance extends L2Npc
return;
}
filename = getHtmlPath(npcId, 4);
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("0place", "" + player.getRace(0));
search = "Mob1";
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java
View File

@ -50,7 +50,7 @@ public class L2SchemeBufferInstance extends L2Npc
if (currentCommand.startsWith("menu"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), getHtmlPath(getId(), 0));
html.setFile(player, getHtmlPath(getId(), 0));
html.replace("%objectId%", getObjectId());
player.sendPacket(html);
}
@ -65,7 +65,7 @@ public class L2SchemeBufferInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), getHtmlPath(getId(), 0));
html.setFile(player, getHtmlPath(getId(), 0));
html.replace("%objectId%", getObjectId());
player.sendPacket(html);
}
@ -81,7 +81,7 @@ public class L2SchemeBufferInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), getHtmlPath(getId(), 0));
html.setFile(player, getHtmlPath(getId(), 0));
html.replace("%objectId%", getObjectId());
player.sendPacket(html);
}
@ -250,7 +250,7 @@ public class L2SchemeBufferInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), getHtmlPath(getId(), 1));
html.setFile(player, getHtmlPath(getId(), 1));
html.replace("%schemes%", sb.toString());
html.replace("%max_schemes%", Config.BUFFER_MAX_SCHEMES);
html.replace("%objectId%", getObjectId());
@ -269,7 +269,7 @@ public class L2SchemeBufferInstance extends L2Npc
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
final List<Integer> schemeSkills = SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName);
html.setFile(player.getHtmlPrefix(), getHtmlPath(getId(), 2));
html.setFile(player, getHtmlPath(getId(), 2));
html.replace("%schemename%", schemeName);
html.replace("%count%", schemeSkills.size() + " / " + player.getStat().getMaxBuffCount());
html.replace("%typesframe%", getTypesFrame(groupType, schemeName));

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
View File

@ -273,7 +273,7 @@ public class L2SepulcherNpcInstance extends L2Npc
{
final String filename = getHtmlPath(getId(), val);
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
player.sendPacket(html);
player.sendPacket(ActionFailed.STATIC_PACKET);
@ -285,7 +285,7 @@ public class L2SepulcherNpcInstance extends L2Npc
if (isBusy())
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/npcbusy.htm");
html.setFile(player, "data/html/npcbusy.htm");
html.replace("%busymessage%", getBusyMessage());
html.replace("%npcname%", getName());
html.replace("%playername%", player.getName());
@ -446,7 +446,7 @@ public class L2SepulcherNpcInstance extends L2Npc
public void showHtmlFile(L2PcInstance player, String file)
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), "data/html/SepulcherNpc/" + file);
html.setFile(player, "data/html/SepulcherNpc/" + file);
html.replace("%npcname%", getName());
player.sendPacket(html);
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java
View File

@ -592,7 +592,7 @@ public class L2SignsPriestInstance extends L2Npc
path = SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_6_dusk_contribute.htm";
}
String contentContr = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), path);
String contentContr = HtmCache.getInstance().getHtm(player, path);
if (contentContr != null)
{
@ -827,7 +827,7 @@ public class L2SignsPriestInstance extends L2Npc
path = SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_17_dusk.htm";
}
String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), path);
String content = HtmCache.getInstance().getHtm(player, path);
if (content != null)
{

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
View File

@ -70,7 +70,7 @@ public final class L2TeleporterInstance extends L2Npc
final String filename = "data/html/teleporter/epictransformed.htm";
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -188,7 +188,7 @@ public final class L2TeleporterInstance extends L2Npc
filename = "data/html/teleporter/" + getTemplate().getId() + "-1.htm";
}
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -209,7 +209,7 @@ public final class L2TeleporterInstance extends L2Npc
filename = "data/html/teleporter/" + getId() + "-1.htm";
}
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -239,7 +239,7 @@ public final class L2TeleporterInstance extends L2Npc
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);
@ -275,7 +275,7 @@ public final class L2TeleporterInstance extends L2Npc
{
final String filename = "data/html/teleporter/nobleteleporter-no.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.setFile(player, filename);
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%npcname%", getName());
player.sendPacket(html);

52
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java
View File

@ -245,11 +245,11 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (clan.getNewLeaderId() == 0)
{
clan.setNewLeaderId(member.getObjectId(), true);
msg.setFile(player.getHtmlPrefix(), "data/scripts/village_master/Clan/9000-07-success.htm");
msg.setFile(player, "data/scripts/village_master/Clan/9000-07-success.htm");
}
else
{
msg.setFile(player.getHtmlPrefix(), "data/scripts/village_master/Clan/9000-07-in-progress.htm");
msg.setFile(player, "data/scripts/village_master/Clan/9000-07-in-progress.htm");
}
player.sendPacket(msg);
}
@ -267,7 +267,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (clan.getNewLeaderId() != 0)
{
clan.setNewLeaderId(0, true);
msg.setFile(player.getHtmlPrefix(), "data/scripts/village_master/Clan/9000-07-canceled.htm");
msg.setFile(player, "data/scripts/village_master/Clan/9000-07-canceled.htm");
}
else
{
@ -304,14 +304,14 @@ public class L2VillageMasterInstance extends L2NpcInstance
// Subclasses may not be changed while a transformated state.
if (player.getTransformation() != null)
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_NoTransformed.htm");
html.setFile(player, "data/html/villagemaster/SubClass_NoTransformed.htm");
player.sendPacket(html);
return;
}
// Subclasses may not be changed while a summon is active.
if (player.hasSummon())
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_NoSummon.htm");
html.setFile(player, "data/html/villagemaster/SubClass_NoSummon.htm");
player.sendPacket(html);
return;
}
@ -360,7 +360,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
{
case 0: // Subclass change menu
{
html.setFile(player.getHtmlPrefix(), getSubClassMenu(player.getRace()));
html.setFile(player, getSubClassMenu(player.getRace()));
break;
}
case 1: // Add Subclass - Initial
@ -368,14 +368,14 @@ public class L2VillageMasterInstance extends L2NpcInstance
// Avoid giving player an option to add a new sub class, if they have max sub-classes already.
if (player.getTotalSubClasses() >= Config.MAX_SUBCLASS)
{
html.setFile(player.getHtmlPrefix(), getSubClassFail());
html.setFile(player, getSubClassFail());
break;
}
subsAvailable = getAvailableSubClasses(player);
if ((subsAvailable != null) && !subsAvailable.isEmpty())
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Add.htm");
html.setFile(player, "data/html/villagemaster/SubClass_Add.htm");
final StringBuilder content1 = new StringBuilder(200);
for (PlayerClass subClass : subsAvailable)
{
@ -387,12 +387,12 @@ public class L2VillageMasterInstance extends L2NpcInstance
{
if ((player.getRace() == Race.ELF) || (player.getRace() == Race.DARK_ELF))
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Fail_Elves.htm");
html.setFile(player, "data/html/villagemaster/SubClass_Fail_Elves.htm");
player.sendPacket(html);
}
else if (player.getRace() == Race.KAMAEL)
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Fail_Kamael.htm");
html.setFile(player, "data/html/villagemaster/SubClass_Fail_Kamael.htm");
player.sendPacket(html);
}
else
@ -408,7 +408,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
{
if (player.getSubClasses().isEmpty())
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ChangeNo.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ChangeNo.htm");
}
else
{
@ -429,12 +429,12 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (content2.length() > 0)
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Change.htm");
html.setFile(player, "data/html/villagemaster/SubClass_Change.htm");
html.replace("%list%", content2.toString());
}
else
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ChangeNotFound.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ChangeNotFound.htm");
}
}
break;
@ -443,14 +443,14 @@ public class L2VillageMasterInstance extends L2NpcInstance
{
if ((player.getSubClasses() == null) || player.getSubClasses().isEmpty())
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyEmpty.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyEmpty.htm");
break;
}
// custom value
if (player.getTotalSubClasses() > 3)
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyCustom.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyCustom.htm");
final StringBuilder content3 = new StringBuilder(200);
int classIndex = 1;
@ -465,7 +465,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
else
{
// retail html contain only 3 subclasses
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Modify.htm");
html.setFile(player, "data/html/villagemaster/SubClass_Modify.htm");
if (player.getSubClasses().containsKey(1))
{
html.replace("%sub1%", ClassListData.getInstance().getClass(player.getSubClasses().get(1).getClassId()).getClientCode());
@ -553,13 +553,13 @@ public class L2VillageMasterInstance extends L2NpcInstance
player.setActiveClass(player.getTotalSubClasses());
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_AddOk.htm");
html.setFile(player, "data/html/villagemaster/SubClass_AddOk.htm");
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED); // Subclass added.
}
else
{
html.setFile(player.getHtmlPrefix(), getSubClassFail());
html.setFile(player, getSubClassFail());
}
break;
}
@ -576,7 +576,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (player.getClassIndex() == paramOne)
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Current.htm");
html.setFile(player, "data/html/villagemaster/SubClass_Current.htm");
break;
}
@ -633,22 +633,22 @@ public class L2VillageMasterInstance extends L2NpcInstance
{
case 1:
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice1.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyChoice1.htm");
break;
}
case 2:
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice2.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyChoice2.htm");
break;
}
case 3:
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice3.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyChoice3.htm");
break;
}
default:
{
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyChoice.htm");
}
}
html.replace("%list%", content6.toString());
@ -678,7 +678,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
player.stopCubics();
player.setActiveClass(paramOne);
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyOk.htm");
html.setFile(player, "data/html/villagemaster/SubClass_ModifyOk.htm");
html.replace("%name%", ClassListData.getInstance().getClass(paramTwo).getClientCode());
player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED); // Subclass added.
@ -1194,7 +1194,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
if (!player.isClanLeader())
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NotClanLeader.htm");
html.setFile(player, "data/html/villagemaster/NotClanLeader.htm");
player.sendPacket(html);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
@ -1228,7 +1228,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
else
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NoMoreSkills.htm");
html.setFile(player, "data/html/villagemaster/NoMoreSkills.htm");
player.sendPacket(html);
}
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Hero.java
View File

@ -442,7 +442,7 @@ public class Hero
if (mainList != null)
{
final NpcHtmlMessage diaryReply = new NpcHtmlMessage();
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/olympiad/herodiary.htm");
final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/olympiad/herodiary.htm");
final String heroMessage = HERO_MESSAGE.get(charid);
if ((htmContent != null) && (heroMessage != null))
{
@ -528,7 +528,7 @@ public class Hero
if (heroFights != null)
{
final NpcHtmlMessage FightReply = new NpcHtmlMessage();
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/olympiad/herohistory.htm");
final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/olympiad/herohistory.htm");
if (htmContent != null)
{
FightReply.setHtml(htmContent);

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java
View File

@ -122,11 +122,11 @@ public class L2Event
if (_registeredPlayers.contains(player))
{
htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participating.htm");
htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participating.htm");
}
else
{
htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participation.htm");
htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participation.htm");
}
if (htmContent != null)

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
View File

@ -407,7 +407,7 @@ public class TvTEvent
final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage();
statusUpdate.addAttribute(StatusUpdate.CUR_LOAD, playerInstance.getCurrentLoad());
npcHtmlMessage.setHtml(HtmCache.getInstance().getHtm(playerInstance.getHtmlPrefix(), htmlPath + "Reward.html"));
npcHtmlMessage.setHtml(HtmCache.getInstance().getHtm(playerInstance, htmlPath + "Reward.html"));
playerInstance.sendPacket(statusUpdate);
playerInstance.sendPacket(npcHtmlMessage);
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
View File

@ -520,7 +520,7 @@ public class OlympiadManager
if (points <= 0)
{
final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
message.setFile(player.getHtmlPrefix(), "data/html/olympiad/noble_nopoints1.htm");
message.setFile(player, "data/html/olympiad/noble_nopoints1.htm");
message.replace("%objectId%", String.valueOf(noble.getLastHtmlActionOriginId()));
player.sendPacket(message);
return false;
@ -529,7 +529,7 @@ public class OlympiadManager
if ((Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, noble, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
{
final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
message.setFile(player.getHtmlPrefix(), "data/html/mods/OlympiadIPRestriction.htm");
message.setFile(player, "data/html/mods/OlympiadIPRestriction.htm");
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
player.sendPacket(message);
return false;

18
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -65,8 +65,8 @@ import com.l2jmobius.gameserver.model.olympiad.Participant;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import com.l2jmobius.gameserver.network.serverpackets.NpcQuestHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcQuestHtmlMessage;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
/**
@ -1664,7 +1664,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public static String getNoQuestMsg(L2PcInstance player)
{
final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/noquest.htm");
final String result = HtmCache.getInstance().getHtm(player, "data/html/noquest.htm");
return (result != null) && (result.length() > 0) ? result : DEFAULT_NO_QUEST_MSG;
}
@ -1674,7 +1674,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public static String getAlreadyCompletedMsg(L2PcInstance player)
{
final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/alreadycompleted.htm");
final String result = HtmCache.getInstance().getHtm(player, "data/html/alreadycompleted.htm");
return (result != null) && (result.length() > 0) ? result : DEFAULT_ALREADY_COMPLETED_MSG;
}
@ -2448,7 +2448,7 @@ public class Quest extends AbstractScript implements IIdentifiable
final int questId = getId();
// Create handler to file linked to the quest
String content = getHtm(player.getHtmlPrefix(), filename);
String content = getHtm(player, filename);
// Send message to client if message not empty
if (content != null)
@ -2478,20 +2478,20 @@ public class Quest extends AbstractScript implements IIdentifiable
}
/**
* @param prefix player's language prefix.
* @param player for language prefix.
* @param fileName the html file to be get.
* @return the HTML file contents
*/
public String getHtm(String prefix, String fileName)
public String getHtm(L2PcInstance player, String fileName)
{
final HtmCache hc = HtmCache.getInstance();
String content = hc.getHtm(prefix, fileName.startsWith("data/") ? fileName : "data/scripts/" + getPath().toLowerCase() + "/" + fileName);
String content = hc.getHtm(player, fileName.startsWith("data/") ? fileName : "data/scripts/" + getPath() + "/" + fileName);
if (content == null)
{
content = hc.getHtm(prefix, "data/scripts/" + getPath() + "/" + fileName);
content = hc.getHtm(player, "data/scripts/" + getPath() + "/" + fileName);
if (content == null)
{
content = hc.getHtmForce(prefix, "data/scripts/quests/" + getName() + "/" + fileName);
content = hc.getHtmForce(player, "data/scripts/quests/" + getName() + "/" + fileName);
}
}
return content;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@ -758,7 +758,7 @@ public final class QuestState
*/
public void showTutorialHTML(String html)
{
String text = HtmCache.getInstance().getHtm(_player.getHtmlPrefix(), "data/scripts/quests/Q00255_Tutorial/" + html);
String text = HtmCache.getInstance().getHtm(_player, "data/scripts/quests/Q00255_Tutorial/" + html);
if (text == null)
{
LOGGER.warning("missing html page data/scripts/quests/Q00255_Tutorial/" + html);

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/Debug.java
View File

@ -47,7 +47,7 @@ public class Debug
}
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(attacker.getActingPlayer().getHtmlPrefix(), "data/html/admin/skilldebug.htm");
msg.setFile(attacker.getActingPlayer(), "data/html/admin/skilldebug.htm");
msg.replace("%patk%", target.getPAtk(target));
msg.replace("%matk%", target.getMAtk(target, skill));
msg.replace("%pdef%", target.getPDef(target));
@ -86,7 +86,7 @@ public class Debug
}
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(player.getHtmlPrefix(), "data/html/admin/itemdebug.htm");
msg.setFile(player, "data/html/admin/itemdebug.htm");
msg.replace("%itemName%", item.getName());
msg.replace("%itemSlot%", getBodyPart(item.getItem().getBodyPart()));
msg.replace("%itemType%", item.isArmor() ? "Armor" : item.isWeapon() ? "Weapon" : "Etc");

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
View File

@ -121,7 +121,7 @@ public class CharacterSelect implements IClientIncomingPacket
if ((Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddClient(AntiFeedManager.GAME_ID, client, Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/IPRestriction.htm");
msg.setFile(null, "data/html/mods/IPRestriction.htm");
msg.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(client, Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP)));
client.sendPacket(msg);
return;
@ -132,7 +132,7 @@ public class CharacterSelect implements IClientIncomingPacket
if (info.isGood() && (L2World.getInstance().getAllGoodPlayers().size() >= (L2World.getInstance().getAllEvilPlayers().size() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.setFile(null, "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.replace("%more%", Config.FACTION_GOOD_TEAM_NAME);
msg.replace("%less%", Config.FACTION_EVIL_TEAM_NAME);
client.sendPacket(msg);
@ -141,7 +141,7 @@ public class CharacterSelect implements IClientIncomingPacket
if (info.isEvil() && (L2World.getInstance().getAllEvilPlayers().size() >= (L2World.getInstance().getAllGoodPlayers().size() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.setFile(null, "data/html/mods/Faction/ExceededOnlineLimit.htm");
msg.replace("%more%", Config.FACTION_EVIL_TEAM_NAME);
msg.replace("%less%", Config.FACTION_GOOD_TEAM_NAME);
client.sendPacket(msg);

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -511,7 +511,7 @@ public class EnterWorld implements IClientIncomingPacket
if (showClanNotice)
{
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar.getHtmlPrefix(), "data/html/clanNotice.htm");
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
notice.replace("%notice_text%", activeChar.getClan().getNotice());
notice.disableValidation();
@ -519,7 +519,7 @@ public class EnterWorld implements IClientIncomingPacket
}
else if (Config.SERVER_NEWS)
{
final String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/servnews.htm");
final String serverNews = HtmCache.getInstance().getHtm(activeChar, "data/html/servnews.htm");
if (serverNews != null)
{
client.sendPacket(new NpcHtmlMessage(serverNews));

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@ -75,7 +75,7 @@ public final class RequestLinkHtml implements IClientIncomingPacket
final String filename = "data/html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
msg.setFile(actor.getHtmlPrefix(), filename);
msg.setFile(actor, filename);
client.sendPacket(msg);
}
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
View File

@ -87,9 +87,9 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
_html = html;
}
public final boolean setFile(String prefix, String path)
public final boolean setFile(L2PcInstance player, String path)
{
final String content = HtmCache.getInstance().getHtm(prefix, path);
final String content = HtmCache.getInstance().getHtm(player, path);
if (content == null)
{
setHtml("<html><body>My Text is missing:<br>" + path + "</body></html>");

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
View File

@ -40,6 +40,16 @@ public final class BuilderUtil
player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
}
/**
* Sends builder html message to the player.
* @param player
* @param message
*/
public static void sendHtmlMessage(L2PcInstance player, String message)
{
player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message));
}
/**
* Changes player's hiding state.
* @param player