Minor code improvements.
This commit is contained in:
parent
9be051a70f
commit
224f9331f7
@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%race%", npc.getTemplate().getRace().toString());
|
html.replace("%race%", npc.getTemplate().getRace().toString());
|
||||||
html.replace("%id%", String.valueOf(npc.getTemplate().getId()));
|
html.replace("%id%", String.valueOf(npc.getTemplate().getId()));
|
||||||
html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel()));
|
html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel()));
|
||||||
html.replace("%name%", String.valueOf(npc.getTemplate().getName()));
|
html.replace("%name%", npc.getTemplate().getName());
|
||||||
html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId()));
|
html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId()));
|
||||||
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
||||||
html.replace("%hp%", String.valueOf((int) npc.getCurrentHp()));
|
html.replace("%hp%", String.valueOf((int) npc.getCurrentHp()));
|
||||||
@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%int%", String.valueOf(npc.getINT()));
|
html.replace("%int%", String.valueOf(npc.getINT()));
|
||||||
html.replace("%wit%", String.valueOf(npc.getWIT()));
|
html.replace("%wit%", String.valueOf(npc.getWIT()));
|
||||||
html.replace("%men%", String.valueOf(npc.getMEN()));
|
html.replace("%men%", String.valueOf(npc.getMEN()));
|
||||||
html.replace("%loc%", String.valueOf(target.getX() + " " + target.getY() + " " + target.getZ()));
|
html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ());
|
||||||
html.replace("%heading%", String.valueOf(npc.getHeading()));
|
html.replace("%heading%", String.valueOf(npc.getHeading()));
|
||||||
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
|
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
|
||||||
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
|
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
|
||||||
@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
{
|
{
|
||||||
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
|
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
|
||||||
html.replace("%spawnfile%", fileName);
|
html.replace("%spawnfile%", fileName);
|
||||||
html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName()));
|
html.replace("%spawnname%", template.getSpawnTemplate().getName());
|
||||||
html.replace("%spawngroup%", String.valueOf(template.getGroup().getName()));
|
html.replace("%spawngroup%", template.getGroup().getName());
|
||||||
if (template.getSpawnTemplate().getAI() != null)
|
if (template.getSpawnTemplate().getAI() != null)
|
||||||
{
|
{
|
||||||
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
|
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
|
||||||
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
}
|
}
|
||||||
else if (npc.getSpawn().hasRespawnRandom())
|
else if (npc.getSpawn().hasRespawnRandom())
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"));
|
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
|
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : "";
|
final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : "";
|
||||||
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : "";
|
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : "";
|
||||||
|
|
||||||
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + String.valueOf(npc.getAI().getIntention().name()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + npc.getAI().getIntention().name() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + npc.getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + npc.getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + String.valueOf(npc.getAiType()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + npc.getAiType() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + npc.getTemplate().getClanHelpRange() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "</td></tr></table></td></tr>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler
|
|||||||
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
||||||
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
|
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
|
||||||
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
||||||
adminReply.replace("%time%", String.valueOf(format.format(cal.getTime())));
|
adminReply.replace("%time%", format.format(cal.getTime()));
|
||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler
|
|||||||
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + String.valueOf(format.format(endDate)) + "</font></td></tr>");
|
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + format.format(endDate) + "</font></td></tr>");
|
||||||
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + String.valueOf(format.format(System.currentTimeMillis())) + "<br><br></font></td></tr>");
|
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(System.currentTimeMillis()) + "<br><br></font></td></tr>");
|
||||||
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
||||||
|
@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%race%", npc.getTemplate().getRace().toString());
|
html.replace("%race%", npc.getTemplate().getRace().toString());
|
||||||
html.replace("%id%", String.valueOf(npc.getTemplate().getId()));
|
html.replace("%id%", String.valueOf(npc.getTemplate().getId()));
|
||||||
html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel()));
|
html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel()));
|
||||||
html.replace("%name%", String.valueOf(npc.getTemplate().getName()));
|
html.replace("%name%", npc.getTemplate().getName());
|
||||||
html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId()));
|
html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId()));
|
||||||
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
||||||
html.replace("%hp%", String.valueOf((int) npc.getCurrentHp()));
|
html.replace("%hp%", String.valueOf((int) npc.getCurrentHp()));
|
||||||
@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%int%", String.valueOf(npc.getINT()));
|
html.replace("%int%", String.valueOf(npc.getINT()));
|
||||||
html.replace("%wit%", String.valueOf(npc.getWIT()));
|
html.replace("%wit%", String.valueOf(npc.getWIT()));
|
||||||
html.replace("%men%", String.valueOf(npc.getMEN()));
|
html.replace("%men%", String.valueOf(npc.getMEN()));
|
||||||
html.replace("%loc%", String.valueOf(target.getX() + " " + target.getY() + " " + target.getZ()));
|
html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ());
|
||||||
html.replace("%heading%", String.valueOf(npc.getHeading()));
|
html.replace("%heading%", String.valueOf(npc.getHeading()));
|
||||||
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
|
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
|
||||||
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
|
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
|
||||||
@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
{
|
{
|
||||||
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
|
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
|
||||||
html.replace("%spawnfile%", fileName);
|
html.replace("%spawnfile%", fileName);
|
||||||
html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName()));
|
html.replace("%spawnname%", template.getSpawnTemplate().getName());
|
||||||
html.replace("%spawngroup%", String.valueOf(template.getGroup().getName()));
|
html.replace("%spawngroup%", template.getGroup().getName());
|
||||||
if (template.getSpawnTemplate().getAI() != null)
|
if (template.getSpawnTemplate().getAI() != null)
|
||||||
{
|
{
|
||||||
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
|
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
|
||||||
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
}
|
}
|
||||||
else if (npc.getSpawn().hasRespawnRandom())
|
else if (npc.getSpawn().hasRespawnRandom())
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"));
|
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
|
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : "";
|
final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : "";
|
||||||
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : "";
|
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : "";
|
||||||
|
|
||||||
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + String.valueOf(npc.getAI().getIntention().name()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + npc.getAI().getIntention().name() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + npc.getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + npc.getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + String.valueOf(npc.getAiType()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + npc.getAiType() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + npc.getTemplate().getClanHelpRange() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "</td></tr></table></td></tr>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler
|
|||||||
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
||||||
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
|
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
|
||||||
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
||||||
adminReply.replace("%time%", String.valueOf(format.format(cal.getTime())));
|
adminReply.replace("%time%", format.format(cal.getTime()));
|
||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler
|
|||||||
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + String.valueOf(format.format(endDate)) + "</font></td></tr>");
|
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + format.format(endDate) + "</font></td></tr>");
|
||||||
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + String.valueOf(format.format(System.currentTimeMillis())) + "<br><br></font></td></tr>");
|
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(System.currentTimeMillis()) + "<br><br></font></td></tr>");
|
||||||
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
||||||
|
@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%race%", npc.getTemplate().getRace().toString());
|
html.replace("%race%", npc.getTemplate().getRace().toString());
|
||||||
html.replace("%id%", String.valueOf(npc.getTemplate().getId()));
|
html.replace("%id%", String.valueOf(npc.getTemplate().getId()));
|
||||||
html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel()));
|
html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel()));
|
||||||
html.replace("%name%", String.valueOf(npc.getTemplate().getName()));
|
html.replace("%name%", npc.getTemplate().getName());
|
||||||
html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId()));
|
html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId()));
|
||||||
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
||||||
html.replace("%hp%", String.valueOf((int) npc.getCurrentHp()));
|
html.replace("%hp%", String.valueOf((int) npc.getCurrentHp()));
|
||||||
@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%int%", String.valueOf(npc.getINT()));
|
html.replace("%int%", String.valueOf(npc.getINT()));
|
||||||
html.replace("%wit%", String.valueOf(npc.getWIT()));
|
html.replace("%wit%", String.valueOf(npc.getWIT()));
|
||||||
html.replace("%men%", String.valueOf(npc.getMEN()));
|
html.replace("%men%", String.valueOf(npc.getMEN()));
|
||||||
html.replace("%loc%", String.valueOf(target.getX() + " " + target.getY() + " " + target.getZ()));
|
html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ());
|
||||||
html.replace("%heading%", String.valueOf(npc.getHeading()));
|
html.replace("%heading%", String.valueOf(npc.getHeading()));
|
||||||
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
|
html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius()));
|
||||||
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
|
html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight()));
|
||||||
@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
{
|
{
|
||||||
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
|
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
|
||||||
html.replace("%spawnfile%", fileName);
|
html.replace("%spawnfile%", fileName);
|
||||||
html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName()));
|
html.replace("%spawnname%", template.getSpawnTemplate().getName());
|
||||||
html.replace("%spawngroup%", String.valueOf(template.getGroup().getName()));
|
html.replace("%spawngroup%", template.getGroup().getName());
|
||||||
if (template.getSpawnTemplate().getAI() != null)
|
if (template.getSpawnTemplate().getAI() != null)
|
||||||
{
|
{
|
||||||
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
|
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
|
||||||
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
}
|
}
|
||||||
else if (npc.getSpawn().hasRespawnRandom())
|
else if (npc.getSpawn().hasRespawnRandom())
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"));
|
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
|
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : "";
|
final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : "";
|
||||||
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : "";
|
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : "";
|
||||||
|
|
||||||
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + String.valueOf(npc.getAI().getIntention().name()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + npc.getAI().getIntention().name() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + npc.getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + npc.getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + String.valueOf(npc.getAiType()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + npc.getAiType() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + npc.getTemplate().getClanHelpRange() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "</td></tr></table></td></tr>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler
|
|||||||
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
||||||
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
|
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size()));
|
||||||
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
||||||
adminReply.replace("%time%", String.valueOf(format.format(cal.getTime())));
|
adminReply.replace("%time%", format.format(cal.getTime()));
|
||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler
|
|||||||
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + String.valueOf(format.format(endDate)) + "</font></td></tr>");
|
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + format.format(endDate) + "</font></td></tr>");
|
||||||
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + String.valueOf(format.format(System.currentTimeMillis())) + "<br><br></font></td></tr>");
|
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(System.currentTimeMillis()) + "<br><br></font></td></tr>");
|
||||||
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
||||||
|
@ -471,7 +471,7 @@ public final class FeedableBeasts extends AbstractNpcAI
|
|||||||
|
|
||||||
if (MAD_COW_POLYMORPH.containsKey(nextNpcId))
|
if (MAD_COW_POLYMORPH.containsKey(nextNpcId))
|
||||||
{
|
{
|
||||||
this.startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player);
|
startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
// register the player in the feedinfo for the mob that just spawned
|
// register the player in the feedinfo for the mob that just spawned
|
||||||
|
@ -32,17 +32,17 @@ import ai.AbstractNpcAI;
|
|||||||
public final class LairOfAntharas extends AbstractNpcAI
|
public final class LairOfAntharas extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
// NPC
|
// NPC
|
||||||
final private static int KNORIKS = 22857;
|
private static final int KNORIKS = 22857;
|
||||||
final private static int DRAGON_KNIGHT = 22844;
|
private static final int DRAGON_KNIGHT = 22844;
|
||||||
final private static int DRAGON_KNIGHT2 = 22845;
|
private static final int DRAGON_KNIGHT2 = 22845;
|
||||||
final private static int ELITE_DRAGON_KNIGHT = 22846;
|
private static final int ELITE_DRAGON_KNIGHT = 22846;
|
||||||
|
|
||||||
final private static int DRAGON_GUARD = 22852;
|
private static final int DRAGON_GUARD = 22852;
|
||||||
final private static int DRAGON_MAGE = 22853;
|
private static final int DRAGON_MAGE = 22853;
|
||||||
// Misc
|
// Misc
|
||||||
final private static int KNIGHT_CHANCE = 30;
|
private static final int KNIGHT_CHANCE = 30;
|
||||||
final private static int KNORIKS_CHANCE = 60;
|
private static final int KNORIKS_CHANCE = 60;
|
||||||
final private static int KNORIKS_CHANCE2 = 50;
|
private static final int KNORIKS_CHANCE2 = 50;
|
||||||
|
|
||||||
private LairOfAntharas()
|
private LairOfAntharas()
|
||||||
{
|
{
|
||||||
|
@ -246,7 +246,7 @@ public final class Orfen extends AbstractNpcAI
|
|||||||
if ((skill.getEffectPoint() > 0) && (getRandom(5) == 0) && npc.isInsideRadius(originalCaster, 1000, false, false))
|
if ((skill.getEffectPoint() > 0) && (getRandom(5) == 0) && npc.isInsideRadius(originalCaster, 1000, false, false))
|
||||||
{
|
{
|
||||||
final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), TEXT[getRandom(4)]);
|
final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), TEXT[getRandom(4)]);
|
||||||
packet.addStringParameter(caster.getName().toString());
|
packet.addStringParameter(caster.getName());
|
||||||
npc.broadcastPacket(packet);
|
npc.broadcastPacket(packet);
|
||||||
originalCaster.teleToLocation(npc.getLocation());
|
originalCaster.teleToLocation(npc.getLocation());
|
||||||
npc.setTarget(originalCaster);
|
npc.setTarget(originalCaster);
|
||||||
@ -301,7 +301,7 @@ public final class Orfen extends AbstractNpcAI
|
|||||||
else if (npc.isInsideRadius(attacker, 1000, false, false) && !npc.isInsideRadius(attacker, 300, false, false) && (getRandom(10) == 0))
|
else if (npc.isInsideRadius(attacker, 1000, false, false) && !npc.isInsideRadius(attacker, 300, false, false) && (getRandom(10) == 0))
|
||||||
{
|
{
|
||||||
final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npcId, TEXT[getRandom(3)]);
|
final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npcId, TEXT[getRandom(3)]);
|
||||||
packet.addStringParameter(attacker.getName().toString());
|
packet.addStringParameter(attacker.getName());
|
||||||
npc.broadcastPacket(packet);
|
npc.broadcastPacket(packet);
|
||||||
attacker.teleToLocation(npc.getLocation());
|
attacker.teleToLocation(npc.getLocation());
|
||||||
npc.setTarget(attacker);
|
npc.setTarget(attacker);
|
||||||
|
@ -114,7 +114,7 @@ public final class CastleAmbassador extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
|
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
|
||||||
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
|
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
|
||||||
packet.replace("%castleName%", String.valueOf(fortresss.getCastleByAmbassador(npc.getId()).getName()));
|
packet.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
|
||||||
player.sendPacket(packet);
|
player.sendPacket(packet);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -149,7 +149,7 @@ public final class CastleAmbassador extends AbstractNpcAI
|
|||||||
|
|
||||||
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
|
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
|
||||||
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
|
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
|
||||||
packet.replace("%castleName%", String.valueOf(fortresss.getCastleByAmbassador(npc.getId()).getName()));
|
packet.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
|
||||||
player.sendPacket(packet);
|
player.sendPacket(packet);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -1208,8 +1208,8 @@ public final class CastleChamberlain extends AbstractNpcAI
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
final NpcHtmlMessage html = getHtmlPacket(player, npc, "chamberlain-25.html");
|
final NpcHtmlMessage html = getHtmlPacket(player, npc, "chamberlain-25.html");
|
||||||
html.replace("%owner_name%", String.valueOf(player.getName()));
|
html.replace("%owner_name%", player.getName());
|
||||||
html.replace("%feud_name%", String.valueOf(String.valueOf(1001000 + castle.getResidenceId())));
|
html.replace("%feud_name%", String.valueOf(1001000 + castle.getResidenceId()));
|
||||||
player.sendPacket(html);
|
player.sendPacket(html);
|
||||||
giveItems(player, CROWN, 1);
|
giveItems(player, CROWN, 1);
|
||||||
}
|
}
|
||||||
|
@ -193,7 +193,7 @@ public final class SubclassCertification extends AbstractNpcAI
|
|||||||
String htmltext = getHtm(player.getHtmlPrefix(), htmlFile);
|
String htmltext = getHtm(player.getHtmlPrefix(), htmlFile);
|
||||||
if (replaceClass)
|
if (replaceClass)
|
||||||
{
|
{
|
||||||
htmltext = htmltext.replace("%class%", String.valueOf(ClassListData.getInstance().getClass(player.getActiveClass()).getClientCode()));
|
htmltext = htmltext.replace("%class%", ClassListData.getInstance().getClass(player.getActiveClass()).getClientCode());
|
||||||
}
|
}
|
||||||
if (levelToReplace != null)
|
if (levelToReplace != null)
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@ public final class HuntingGroundsTeleport extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
// NPCs
|
// NPCs
|
||||||
// @formatter:off
|
// @formatter:off
|
||||||
private final static int[] PRIESTS =
|
private static final int[] PRIESTS =
|
||||||
{
|
{
|
||||||
31078, 31079, 31080, 31081, 31082, 31083, 31084, 31085, 31086, 31087,
|
31078, 31079, 31080, 31081, 31082, 31083, 31084, 31085, 31086, 31087,
|
||||||
31088, 31089, 31090, 31091, 31168, 31169, 31692, 31693, 31694, 31695,
|
31088, 31089, 31090, 31091, 31168, 31169, 31692, 31693, 31694, 31695,
|
||||||
|
@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
|
|||||||
public final class MithrilMinesTeleporter extends AbstractNpcAI
|
public final class MithrilMinesTeleporter extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
// NPC
|
// NPC
|
||||||
private final static int TELEPORT_CRYSTAL = 32652;
|
private static final int TELEPORT_CRYSTAL = 32652;
|
||||||
// Location
|
// Location
|
||||||
private static final Location[] LOCS =
|
private static final Location[] LOCS =
|
||||||
{
|
{
|
||||||
|
@ -35,27 +35,27 @@ import ai.AbstractNpcAI;
|
|||||||
public final class OracleTeleport extends AbstractNpcAI
|
public final class OracleTeleport extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
// @formatter:off
|
// @formatter:off
|
||||||
private final static int[] TOWN_DAWN =
|
private static final int[] TOWN_DAWN =
|
||||||
{
|
{
|
||||||
31078, 31079, 31080, 31081, 31083, 31084, 31082, 31692, 31694, 31997, 31168
|
31078, 31079, 31080, 31081, 31083, 31084, 31082, 31692, 31694, 31997, 31168
|
||||||
};
|
};
|
||||||
|
|
||||||
private final static int[] TOWN_DUSK =
|
private static final int[] TOWN_DUSK =
|
||||||
{
|
{
|
||||||
31085, 31086, 31087, 31088, 31090, 31091, 31089, 31693, 31695, 31998, 31169
|
31085, 31086, 31087, 31088, 31090, 31091, 31089, 31693, 31695, 31998, 31169
|
||||||
};
|
};
|
||||||
|
|
||||||
private final static int[] TEMPLE_PRIEST =
|
private static final int[] TEMPLE_PRIEST =
|
||||||
{
|
{
|
||||||
31127, 31128, 31129, 31130, 31131, 31137, 31138, 31139, 31140, 31141
|
31127, 31128, 31129, 31130, 31131, 31137, 31138, 31139, 31140, 31141
|
||||||
};
|
};
|
||||||
|
|
||||||
private final static int[] RIFT_POSTERS =
|
private static final int[] RIFT_POSTERS =
|
||||||
{
|
{
|
||||||
31488, 31489, 31490, 31491, 31492, 31493
|
31488, 31489, 31490, 31491, 31492, 31493
|
||||||
};
|
};
|
||||||
|
|
||||||
private final static int[] TELEPORTERS =
|
private static final int[] TELEPORTERS =
|
||||||
{
|
{
|
||||||
31078, 31079, 31080, 31081, 31082, 31083, 31084, 31692, 31694, 31997,
|
31078, 31079, 31080, 31081, 31082, 31083, 31084, 31692, 31694, 31997,
|
||||||
31168, 31085, 31086, 31087, 31088, 31089, 31090, 31091, 31693, 31695,
|
31168, 31085, 31086, 31087, 31088, 31089, 31090, 31091, 31693, 31695,
|
||||||
@ -66,7 +66,7 @@ public final class OracleTeleport extends AbstractNpcAI
|
|||||||
31122, 31123, 31124, 31125
|
31122, 31123, 31124, 31125
|
||||||
};
|
};
|
||||||
// @formatter:on
|
// @formatter:on
|
||||||
private final static Location[] RETURN_LOCS =
|
private static final Location[] RETURN_LOCS =
|
||||||
{
|
{
|
||||||
new Location(-80555, 150337, -3040),
|
new Location(-80555, 150337, -3040),
|
||||||
new Location(-13953, 121404, -2984),
|
new Location(-13953, 121404, -2984),
|
||||||
|
@ -31,7 +31,7 @@ import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
|
|||||||
public final class StakatoNestTeleporter extends AbstractNpcAI
|
public final class StakatoNestTeleporter extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
// Locations
|
// Locations
|
||||||
private final static Location[] LOCS =
|
private static final Location[] LOCS =
|
||||||
{
|
{
|
||||||
new Location(80456, -52322, -5640),
|
new Location(80456, -52322, -5640),
|
||||||
new Location(88718, -46214, -4640),
|
new Location(88718, -46214, -4640),
|
||||||
@ -40,7 +40,7 @@ public final class StakatoNestTeleporter extends AbstractNpcAI
|
|||||||
new Location(87682, -43291, -4128)
|
new Location(87682, -43291, -4128)
|
||||||
};
|
};
|
||||||
// NPC
|
// NPC
|
||||||
private final static int KINTAIJIN = 32640;
|
private static final int KINTAIJIN = 32640;
|
||||||
|
|
||||||
private StakatoNestTeleporter()
|
private StakatoNestTeleporter()
|
||||||
{
|
{
|
||||||
|
@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
|
|||||||
public final class StrongholdsTeleports extends AbstractNpcAI
|
public final class StrongholdsTeleports extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
// NPCs
|
// NPCs
|
||||||
private final static int[] NPCs =
|
private static final int[] NPCs =
|
||||||
{
|
{
|
||||||
32163,
|
32163,
|
||||||
32181,
|
32181,
|
||||||
@ -48,9 +48,9 @@ public final class StrongholdsTeleports extends AbstractNpcAI
|
|||||||
{
|
{
|
||||||
if (player.getLevel() < 20)
|
if (player.getLevel() < 20)
|
||||||
{
|
{
|
||||||
return String.valueOf(npc.getId()) + ".htm";
|
return npc.getId() + ".htm";
|
||||||
}
|
}
|
||||||
return String.valueOf(npc.getId()) + "-no.htm";
|
return npc.getId() + "-no.htm";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args)
|
public static void main(String[] args)
|
||||||
|
@ -30,14 +30,14 @@ import ai.AbstractNpcAI;
|
|||||||
public final class TeleportWithCharm extends AbstractNpcAI
|
public final class TeleportWithCharm extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
// NPCs
|
// NPCs
|
||||||
private final static int WHIRPY = 30540;
|
private static final int WHIRPY = 30540;
|
||||||
private final static int TAMIL = 30576;
|
private static final int TAMIL = 30576;
|
||||||
// Items
|
// Items
|
||||||
private final static int ORC_GATEKEEPER_CHARM = 1658;
|
private static final int ORC_GATEKEEPER_CHARM = 1658;
|
||||||
private final static int DWARF_GATEKEEPER_TOKEN = 1659;
|
private static final int DWARF_GATEKEEPER_TOKEN = 1659;
|
||||||
// Locations
|
// Locations
|
||||||
private final static Location ORC_TELEPORT = new Location(-80826, 149775, -3043);
|
private static final Location ORC_TELEPORT = new Location(-80826, 149775, -3043);
|
||||||
private final static Location DWARF_TELEPORT = new Location(-80826, 149775, -3043);
|
private static final Location DWARF_TELEPORT = new Location(-80826, 149775, -3043);
|
||||||
|
|
||||||
private TeleportWithCharm()
|
private TeleportWithCharm()
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.Util;
|
|||||||
*/
|
*/
|
||||||
public final class EchoCrystals extends Quest
|
public final class EchoCrystals extends Quest
|
||||||
{
|
{
|
||||||
private final static int[] NPCs =
|
private static final int[] NPCs =
|
||||||
{
|
{
|
||||||
31042,
|
31042,
|
||||||
31043
|
31043
|
||||||
|
@ -59,7 +59,7 @@ public class NpcBuffer extends Quest
|
|||||||
|
|
||||||
private static void print(Exception e)
|
private static void print(Exception e)
|
||||||
{
|
{
|
||||||
_log.warning(">>>" + e.toString() + "<<<");
|
_log.warning(">>>" + e + "<<<");
|
||||||
if (DEBUG)
|
if (DEBUG)
|
||||||
{
|
{
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@ -2023,7 +2023,7 @@ public class NpcBuffer extends Quest
|
|||||||
return formatted;
|
return formatted;
|
||||||
}
|
}
|
||||||
|
|
||||||
static public void main(String[] args)
|
public static void main(String[] args)
|
||||||
{
|
{
|
||||||
new NpcBuffer();
|
new NpcBuffer();
|
||||||
}
|
}
|
||||||
|
@ -302,7 +302,7 @@ public final class NpcLocationInfo extends Quest
|
|||||||
|
|
||||||
if (Util.contains(NPC, npcId))
|
if (Util.contains(NPC, npcId))
|
||||||
{
|
{
|
||||||
htmltext = String.valueOf(npcId) + ".htm";
|
htmltext = npcId + ".htm";
|
||||||
}
|
}
|
||||||
|
|
||||||
return htmltext;
|
return htmltext;
|
||||||
|
@ -149,7 +149,7 @@ public final class SubClassSkills extends Quest
|
|||||||
{
|
{
|
||||||
for (int j = Config.MAX_SUBCLASS; j > 0; j--)
|
for (int j = Config.MAX_SUBCLASS; j > 0; j--)
|
||||||
{
|
{
|
||||||
qName = VARS[i] + String.valueOf(j);
|
qName = VARS[i] + j;
|
||||||
qValue = player.getVariables().getString(qName);
|
qValue = player.getVariables().getString(qName);
|
||||||
if ((qValue == null) || qValue.isEmpty())
|
if ((qValue == null) || qValue.isEmpty())
|
||||||
{
|
{
|
||||||
|
@ -220,7 +220,7 @@ public final class Elpies extends Event
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void dropItem(L2Npc mob, L2PcInstance player, int[][] droplist)
|
private static void dropItem(L2Npc mob, L2PcInstance player, int[][] droplist)
|
||||||
{
|
{
|
||||||
final int chance = getRandom(100);
|
final int chance = getRandom(100);
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ public final class CharacterBirthday extends Quest
|
|||||||
private static final int ALEGRIA = 32600;
|
private static final int ALEGRIA = 32600;
|
||||||
private static int SPAWNS = 0;
|
private static int SPAWNS = 0;
|
||||||
|
|
||||||
private final static int[] GK =
|
private static final int[] GK =
|
||||||
{
|
{
|
||||||
30006,
|
30006,
|
||||||
30059,
|
30059,
|
||||||
|
@ -27,20 +27,20 @@ import com.l2jmobius.gameserver.model.event.LongTimeEvent;
|
|||||||
*/
|
*/
|
||||||
public final class HeavyMedal extends LongTimeEvent
|
public final class HeavyMedal extends LongTimeEvent
|
||||||
{
|
{
|
||||||
private final static int CAT_ROY = 31228;
|
private static final int CAT_ROY = 31228;
|
||||||
private final static int CAT_WINNIE = 31229;
|
private static final int CAT_WINNIE = 31229;
|
||||||
private final static int GLITTERING_MEDAL = 6393;
|
private static final int GLITTERING_MEDAL = 6393;
|
||||||
|
|
||||||
private final static int WIN_CHANCE = 50;
|
private static final int WIN_CHANCE = 50;
|
||||||
|
|
||||||
private final static int[] MEDALS =
|
private static final int[] MEDALS =
|
||||||
{
|
{
|
||||||
5,
|
5,
|
||||||
10,
|
10,
|
||||||
20,
|
20,
|
||||||
40
|
40
|
||||||
};
|
};
|
||||||
private final static int[] BADGES =
|
private static final int[] BADGES =
|
||||||
{
|
{
|
||||||
6399,
|
6399,
|
||||||
6400,
|
6400,
|
||||||
@ -93,12 +93,12 @@ public final class HeavyMedal extends LongTimeEvent
|
|||||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||||
level++;
|
level++;
|
||||||
}
|
}
|
||||||
htmltext = "31229-" + event.toLowerCase() + "-" + String.valueOf(level) + ".htm";
|
htmltext = "31229-" + event.toLowerCase() + "-" + level + ".htm";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (event.equalsIgnoreCase("talk"))
|
else if (event.equalsIgnoreCase("talk"))
|
||||||
{
|
{
|
||||||
htmltext = String.valueOf(npc.getId()) + "-lvl-" + String.valueOf(level) + ".htm";
|
htmltext = npc.getId() + "-lvl-" + level + ".htm";
|
||||||
}
|
}
|
||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
@ -608,7 +608,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void finishInstance(InstanceWorld world)
|
private static void finishInstance(InstanceWorld world)
|
||||||
{
|
{
|
||||||
if (world instanceof HEAWorld)
|
if (world instanceof HEAWorld)
|
||||||
{
|
{
|
||||||
|
@ -981,7 +981,7 @@ public class SeedOfDestruction extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void removeBuffs(L2Character ch)
|
private static void removeBuffs(L2Character ch)
|
||||||
{
|
{
|
||||||
ch.stopAllEffectsExceptThoseThatLastThroughDeath();
|
ch.stopAllEffectsExceptThoseThatLastThroughDeath();
|
||||||
if (ch.hasSummon())
|
if (ch.hasSummon())
|
||||||
|
@ -70,7 +70,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%race%", ((L2Npc) target).getTemplate().getRace().toString());
|
html.replace("%race%", ((L2Npc) target).getTemplate().getRace().toString());
|
||||||
html.replace("%id%", String.valueOf(((L2Npc) target).getTemplate().getId()));
|
html.replace("%id%", String.valueOf(((L2Npc) target).getTemplate().getId()));
|
||||||
html.replace("%lvl%", String.valueOf(((L2Npc) target).getTemplate().getLevel()));
|
html.replace("%lvl%", String.valueOf(((L2Npc) target).getTemplate().getLevel()));
|
||||||
html.replace("%name%", String.valueOf(((L2Npc) target).getTemplate().getName()));
|
html.replace("%name%", ((L2Npc) target).getTemplate().getName());
|
||||||
html.replace("%tmplid%", String.valueOf(((L2Npc) target).getTemplate().getId()));
|
html.replace("%tmplid%", String.valueOf(((L2Npc) target).getTemplate().getId()));
|
||||||
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
|
||||||
html.replace("%hp%", String.valueOf((int) ((L2Character) target).getCurrentHp()));
|
html.replace("%hp%", String.valueOf((int) ((L2Character) target).getCurrentHp()));
|
||||||
@ -96,7 +96,7 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
html.replace("%int%", String.valueOf(((L2Character) target).getINT()));
|
html.replace("%int%", String.valueOf(((L2Character) target).getINT()));
|
||||||
html.replace("%wit%", String.valueOf(((L2Character) target).getWIT()));
|
html.replace("%wit%", String.valueOf(((L2Character) target).getWIT()));
|
||||||
html.replace("%men%", String.valueOf(((L2Character) target).getMEN()));
|
html.replace("%men%", String.valueOf(((L2Character) target).getMEN()));
|
||||||
html.replace("%loc%", String.valueOf(target.getX() + " " + target.getY() + " " + target.getZ()));
|
html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ());
|
||||||
html.replace("%heading%", String.valueOf(((L2Character) target).getHeading()));
|
html.replace("%heading%", String.valueOf(((L2Character) target).getHeading()));
|
||||||
html.replace("%collision_radius%", String.valueOf(((L2Character) target).getTemplate().getfCollisionRadius()));
|
html.replace("%collision_radius%", String.valueOf(((L2Character) target).getTemplate().getfCollisionRadius()));
|
||||||
html.replace("%collision_height%", String.valueOf(((L2Character) target).getTemplate().getfCollisionHeight()));
|
html.replace("%collision_height%", String.valueOf(((L2Character) target).getTemplate().getfCollisionHeight()));
|
||||||
@ -134,11 +134,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
}
|
}
|
||||||
else if (((L2Npc) target).getSpawn().hasRespawnRandom())
|
else if (((L2Npc) target).getSpawn().hasRespawnRandom())
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((((L2Npc) target).getSpawn().getRespawnMaxDelay() / 1000) + " sec"));
|
html.replace("%resp%", ((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000 + "-" + (((L2Npc) target).getSpawn().getRespawnMaxDelay() / 1000) + " sec");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace("%resp%", String.valueOf(((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000) + " sec");
|
html.replace("%resp%", ((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000 + " sec");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -158,11 +158,11 @@ public class L2NpcActionShift implements IActionShiftHandler
|
|||||||
final String clansString = clans != null ? Util.implode(clans.toArray(), ", ") : "";
|
final String clansString = clans != null ? Util.implode(clans.toArray(), ", ") : "";
|
||||||
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? Util.implode(ignoreClanNpcIds.toArray(), ", ") : "";
|
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? Util.implode(ignoreClanNpcIds.toArray(), ", ") : "";
|
||||||
|
|
||||||
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + String.valueOf(((L2Npc) target).getAI().getIntention().name()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + ((L2Npc) target).getAI().getIntention().name() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + ((L2Npc) target).getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + ((L2Npc) target).getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + String.valueOf(((L2Npc) target).getAiType()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + ((L2Npc) target).getAiType() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + String.valueOf(((L2Npc) target).getTemplate().getClanHelpRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + ((L2Npc) target).getTemplate().getClanHelpRange() + "</td></tr></table></td></tr>");
|
||||||
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + String.valueOf(((L2Npc) target).getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
|
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + ((L2Npc) target).getTemplate().getAggroRange() + "</td></tr></table></td></tr>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.GMAudit;
|
|||||||
|
|
||||||
public class AdminBuffs implements IAdminCommandHandler
|
public class AdminBuffs implements IAdminCommandHandler
|
||||||
{
|
{
|
||||||
private final static int PAGE_LIMIT = 20;
|
private static final int PAGE_LIMIT = 20;
|
||||||
|
|
||||||
private static final String[] ADMIN_COMMANDS =
|
private static final String[] ADMIN_COMMANDS =
|
||||||
{
|
{
|
||||||
@ -338,7 +338,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
String slots = "";
|
String slots = "";
|
||||||
for (AbnormalType slot : target.getEffectList().getAllBlockedBuffSlots())
|
for (AbnormalType slot : target.getEffectList().getAllBlockedBuffSlots())
|
||||||
{
|
{
|
||||||
slots += slot.toString() + ", ";
|
slots += slot + ", ";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!slots.isEmpty() && (slots.length() > 3))
|
if (!slots.isEmpty() && (slots.length() > 3))
|
||||||
@ -352,7 +352,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
|
|
||||||
if (Config.GMAUDIT)
|
if (Config.GMAUDIT)
|
||||||
{
|
{
|
||||||
GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "getbuffs", target.getName() + " (" + Integer.toString(target.getObjectId()) + ")", "");
|
GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "getbuffs", target.getName() + " (" + target.getObjectId() + ")", "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +69,8 @@ public final class AdminCHSiege implements IAdminCommandHandler
|
|||||||
activeChar.sendMessage("You have to specify the hall id at least");
|
activeChar.sendMessage("You have to specify the hall id at least");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if ((hall = getHall(split[1], activeChar)) == null)
|
hall = getHall(split[1], activeChar);
|
||||||
|
if (hall == null)
|
||||||
{
|
{
|
||||||
activeChar.sendMessage("Couldnt find he desired siegable hall (" + split[1] + ")");
|
activeChar.sendMessage("Couldnt find he desired siegable hall (" + split[1] + ")");
|
||||||
return false;
|
return false;
|
||||||
@ -161,7 +162,7 @@ public final class AdminCHSiege implements IAdminCommandHandler
|
|||||||
|
|
||||||
if (c.getTimeInMillis() > System.currentTimeMillis())
|
if (c.getTimeInMillis() > System.currentTimeMillis())
|
||||||
{
|
{
|
||||||
activeChar.sendMessage(hall.getName() + " siege: " + c.getTime().toString());
|
activeChar.sendMessage(hall.getName() + " siege: " + c.getTime());
|
||||||
hall.setNextSiegeDate(c.getTimeInMillis());
|
hall.setNextSiegeDate(c.getTimeInMillis());
|
||||||
hall.getSiege().updateSiege();
|
hall.getSiege().updateSiege();
|
||||||
hall.updateDb();
|
hall.updateDb();
|
||||||
|
@ -1040,8 +1040,8 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
adminReply.replace("%account%", player.getAccountName());
|
adminReply.replace("%account%", player.getAccountName());
|
||||||
adminReply.replace("%ip%", ip);
|
adminReply.replace("%ip%", ip);
|
||||||
adminReply.replace("%hwid%", hwid);
|
adminReply.replace("%hwid%", hwid);
|
||||||
adminReply.replace("%ai%", String.valueOf(player.getAI().getIntention().name()));
|
adminReply.replace("%ai%", player.getAI().getIntention().name());
|
||||||
adminReply.replace("%inst%", player.getInstanceId() > 0 ? "<tr><td>InstanceId:</td><td><a action=\"bypass -h admin_instance_spawns " + String.valueOf(player.getInstanceId()) + "\">" + String.valueOf(player.getInstanceId()) + "</a></td></tr>" : "");
|
adminReply.replace("%inst%", player.getInstanceId() > 0 ? "<tr><td>InstanceId:</td><td><a action=\"bypass -h admin_instance_spawns " + player.getInstanceId() + "\">" + player.getInstanceId() + "</a></td></tr>" : "");
|
||||||
adminReply.replace("%noblesse%", player.isNoble() ? "Yes" : "No");
|
adminReply.replace("%noblesse%", player.isNoble() ? "Yes" : "No");
|
||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
@ -1251,7 +1251,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else if (CharactersFound > 20)
|
else if (CharactersFound > 20)
|
||||||
{
|
{
|
||||||
adminReply.replace("%number%", " more than " + String.valueOf(CharactersFound));
|
adminReply.replace("%number%", " more than " + CharactersFound);
|
||||||
replyMSG2 = "s.<br>In order to avoid you a client crash I won't <br1>display results beyond the 20th character.";
|
replyMSG2 = "s.<br>In order to avoid you a client crash I won't <br1>display results beyond the 20th character.";
|
||||||
}
|
}
|
||||||
else if (CharactersFound == 1)
|
else if (CharactersFound == 1)
|
||||||
@ -1487,7 +1487,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
final String owner = target.getActingPlayer().getName();
|
final String owner = target.getActingPlayer().getName();
|
||||||
html.replace("%owner%", " <a action=\"bypass -h admin_character_info " + owner + "\">" + owner + "</a>");
|
html.replace("%owner%", " <a action=\"bypass -h admin_character_info " + owner + "\">" + owner + "</a>");
|
||||||
html.replace("%class%", target.getClass().getSimpleName());
|
html.replace("%class%", target.getClass().getSimpleName());
|
||||||
html.replace("%ai%", target.hasAI() ? String.valueOf(target.getAI().getIntention().name()) : "NULL");
|
html.replace("%ai%", target.hasAI() ? target.getAI().getIntention().name() : "NULL");
|
||||||
html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp());
|
html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp());
|
||||||
html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp());
|
html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp());
|
||||||
html.replace("%karma%", Integer.toString(target.getKarma()));
|
html.replace("%karma%", Integer.toString(target.getKarma()));
|
||||||
@ -1531,7 +1531,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
text.append("<tr><td><table width=270 border=0 cellpadding=2><tr><td width=30 align=right>");
|
text.append("<tr><td><table width=270 border=0 cellpadding=2><tr><td width=30 align=right>");
|
||||||
}
|
}
|
||||||
text.append(member.getLevel() + "</td><td width=130><a action=\"bypass -h admin_character_info " + member.getName() + "\">" + member.getName() + "</a>");
|
text.append(member.getLevel() + "</td><td width=130><a action=\"bypass -h admin_character_info " + member.getName() + "\">" + member.getName() + "</a>");
|
||||||
text.append("</td><td width=110 align=right>" + member.getClassId().toString() + "</td></tr></table></td></tr>");
|
text.append("</td><td width=110 align=right>" + member.getClassId() + "</td></tr></table></td></tr>");
|
||||||
color = !color;
|
color = !color;
|
||||||
}
|
}
|
||||||
html.replace("%player%", target.getName());
|
html.replace("%player%", target.getName());
|
||||||
|
@ -477,7 +477,7 @@ public class AdminEventEngine implements IAdminCommandHandler
|
|||||||
|
|
||||||
result.append("</table>");
|
result.append("</table>");
|
||||||
|
|
||||||
return note + result.toString();
|
return note + result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void showMainPage(L2PcInstance activeChar)
|
public void showMainPage(L2PcInstance activeChar)
|
||||||
|
@ -458,7 +458,7 @@ public final class AdminPForge implements IAdminCommandHandler
|
|||||||
target = activeChar.getTarget();
|
target = activeChar.getTarget();
|
||||||
if ((target != null) && (target instanceof L2Character))
|
if ((target != null) && (target instanceof L2Character))
|
||||||
{
|
{
|
||||||
value = String.valueOf(((L2Character) target).getTitle());
|
value = ((L2Character) target).getTitle();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -469,7 +469,7 @@ public final class AdminPForge implements IAdminCommandHandler
|
|||||||
target = activeChar.getTarget();
|
target = activeChar.getTarget();
|
||||||
if (target != null)
|
if (target != null)
|
||||||
{
|
{
|
||||||
value = String.valueOf(target.getName());
|
value = target.getName();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -385,7 +385,7 @@ public class AdminPunishment implements IAdminCommandHandler
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String findCharId(String key)
|
private static String findCharId(String key)
|
||||||
{
|
{
|
||||||
final int charId = CharNameTable.getInstance().getIdByName(key);
|
final int charId = CharNameTable.getInstance().getIdByName(key);
|
||||||
if (charId > 0) // Yeah its a char name!
|
if (charId > 0) // Yeah its a char name!
|
||||||
|
@ -89,7 +89,7 @@ public class AdminShowQuests implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
val[0] = "full";
|
val[0] = "full";
|
||||||
}
|
}
|
||||||
if (cmdParams[2].indexOf("_") != -1)
|
if (cmdParams[2].contains("_"))
|
||||||
{
|
{
|
||||||
val[0] = "name";
|
val[0] = "name";
|
||||||
val[1] = cmdParams[2];
|
val[1] = cmdParams[2];
|
||||||
|
@ -112,7 +112,7 @@ public class AdminShutdown implements IAdminCommandHandler
|
|||||||
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
|
||||||
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getAllPlayersCount()));
|
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getAllPlayersCount()));
|
||||||
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
|
||||||
adminReply.replace("%time%", String.valueOf(format.format(cal.getTime())));
|
adminReply.replace("%time%", format.format(cal.getTime()));
|
||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -365,7 +365,7 @@ public class AdminSiege implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
if (hall != null)
|
if (hall != null)
|
||||||
{
|
{
|
||||||
cList.append("<td fixwidth=90><a action=\"bypass -h admin_chsiege_siegablehall " + String.valueOf(hall.getId()) + "\">" + hall.getName() + "</a></td>");
|
cList.append("<td fixwidth=90><a action=\"bypass -h admin_chsiege_siegablehall " + hall.getId() + "\">" + hall.getName() + "</a></td>");
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (i > 1)
|
if (i > 1)
|
||||||
@ -381,7 +381,7 @@ public class AdminSiege implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
if (clanhall != null)
|
if (clanhall != null)
|
||||||
{
|
{
|
||||||
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + String.valueOf(clanhall.getId()) + "\">" + clanhall.getName() + "</a></td>");
|
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + clanhall.getId() + "\">" + clanhall.getName() + "</a></td>");
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (i > 1)
|
if (i > 1)
|
||||||
@ -397,7 +397,7 @@ public class AdminSiege implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
if (clanhall != null)
|
if (clanhall != null)
|
||||||
{
|
{
|
||||||
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + String.valueOf(clanhall.getId()) + "\">" + clanhall.getName() + "</a></td>");
|
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + clanhall.getId() + "\">" + clanhall.getName() + "</a></td>");
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (i > 1)
|
if (i > 1)
|
||||||
@ -453,18 +453,18 @@ public class AdminSiege implements IAdminCommandHandler
|
|||||||
if (isSunday)
|
if (isSunday)
|
||||||
{
|
{
|
||||||
adminReply.replace("%sundaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
adminReply.replace("%sundaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
||||||
adminReply.replace("%sunday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
|
adminReply.replace("%sunday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
|
||||||
newDay.add(Calendar.DAY_OF_MONTH, 13);
|
newDay.add(Calendar.DAY_OF_MONTH, 13);
|
||||||
adminReply.replace("%saturdaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
adminReply.replace("%saturdaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
||||||
adminReply.replace("%saturday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
|
adminReply.replace("%saturday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
adminReply.replace("%saturdaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
adminReply.replace("%saturdaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
||||||
adminReply.replace("%saturday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
|
adminReply.replace("%saturday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
|
||||||
newDay.add(Calendar.DAY_OF_MONTH, 1);
|
newDay.add(Calendar.DAY_OF_MONTH, 1);
|
||||||
adminReply.replace("%sundaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
adminReply.replace("%sundaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
|
||||||
adminReply.replace("%sunday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
|
adminReply.replace("%sunday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
|
||||||
}
|
}
|
||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
@ -128,7 +128,7 @@ public class ClanWarehouse implements IBypassHandler
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
|
private static void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
|
||||||
{
|
{
|
||||||
player.sendPacket(ActionFailed.STATIC_PACKET);
|
player.sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
|
|
||||||
|
@ -227,7 +227,7 @@ public class Festival implements IBypassHandler
|
|||||||
|
|
||||||
if (dawnScore > 0)
|
if (dawnScore > 0)
|
||||||
{
|
{
|
||||||
strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + String.valueOf(dawnScore) + "<br>" + dawnData.getString("members") + "<br>");
|
strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + dawnScore + "<br>" + dawnData.getString("members") + "<br>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -236,7 +236,7 @@ public class Festival implements IBypassHandler
|
|||||||
|
|
||||||
if (duskScore > 0)
|
if (duskScore > 0)
|
||||||
{
|
{
|
||||||
strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + String.valueOf(duskScore) + "<br>" + duskData.getString("members") + "<br>");
|
strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + duskScore + "<br>" + duskData.getString("members") + "<br>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -255,14 +255,14 @@ public class Festival implements IBypassHandler
|
|||||||
cabalStr = "Children of Dusk";
|
cabalStr = "Children of Dusk";
|
||||||
}
|
}
|
||||||
|
|
||||||
strBuffer.append("Consecutive top scores: " + calculateDate(overallData.getString("date")) + ". Score " + String.valueOf(overallScore) + "<br>Affilated side: " + cabalStr + "<br>" + overallData.getString("members") + "<br>");
|
strBuffer.append("Consecutive top scores: " + calculateDate(overallData.getString("date")) + ". Score " + overallScore + "<br>Affilated side: " + cabalStr + "<br>" + overallData.getString("members") + "<br>");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
|
strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
|
||||||
}
|
}
|
||||||
|
|
||||||
strBuffer.append("<a action=\"bypass -h npc_" + String.valueOf(npc.getObjectId()) + "_Chat 0\">Go back.</a></body></html>");
|
strBuffer.append("<a action=\"bypass -h npc_" + npc.getObjectId() + "_Chat 0\">Go back.</a></body></html>");
|
||||||
|
|
||||||
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
|
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
|
||||||
html.setHtml(strBuffer.toString());
|
html.setHtml(strBuffer.toString());
|
||||||
|
@ -90,7 +90,7 @@ public class Loto implements IBypassHandler
|
|||||||
// 23 - current lottery jackpot
|
// 23 - current lottery jackpot
|
||||||
// 24 - Previous winning numbers/Prize claim
|
// 24 - Previous winning numbers/Prize claim
|
||||||
// >24 - check lottery ticket by item object id
|
// >24 - check lottery ticket by item object id
|
||||||
public static final void showLotoWindow(L2PcInstance player, L2Npc npc, int val)
|
public static void showLotoWindow(L2PcInstance player, L2Npc npc, int val)
|
||||||
{
|
{
|
||||||
final int npcId = npc.getTemplate().getId();
|
final int npcId = npc.getTemplate().getId();
|
||||||
String filename;
|
String filename;
|
||||||
|
@ -155,7 +155,7 @@ public class Observation implements IBypassHandler
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void doObserve(L2PcInstance player, L2Npc npc, Location pos, long cost)
|
private static void doObserve(L2PcInstance player, L2Npc npc, Location pos, long cost)
|
||||||
{
|
{
|
||||||
if (player.reduceAdena("Broadcast", cost, npc, true))
|
if (player.reduceAdena("Broadcast", cost, npc, true))
|
||||||
{
|
{
|
||||||
|
@ -57,8 +57,8 @@ public class OlympiadManagerLink implements IBypassHandler
|
|||||||
"olympiad"
|
"olympiad"
|
||||||
};
|
};
|
||||||
|
|
||||||
private static final String FEWER_THAN = "Fewer than " + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
|
private static final String FEWER_THAN = "Fewer than " + Config.ALT_OLY_REG_DISPLAY;
|
||||||
private static final String MORE_THAN = "More than " + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
|
private static final String MORE_THAN = "More than " + Config.ALT_OLY_REG_DISPLAY;
|
||||||
private static final int GATE_PASS = Config.ALT_OLY_COMP_RITEM;
|
private static final int GATE_PASS = Config.ALT_OLY_COMP_RITEM;
|
||||||
|
|
||||||
private static final int[] BUFFS =
|
private static final int[] BUFFS =
|
||||||
|
@ -42,7 +42,7 @@ public class PlayerHelp implements IBypassHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final String path = command.substring(12);
|
final String path = command.substring(12);
|
||||||
if (path.indexOf("..") != -1)
|
if (path.contains(".."))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ public class PrivateWarehouse implements IBypassHandler
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
|
private static void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
|
||||||
{
|
{
|
||||||
player.sendPacket(ActionFailed.STATIC_PACKET);
|
player.sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
player.setActiveWarehouse(player.getWarehouse());
|
player.setActiveWarehouse(player.getWarehouse());
|
||||||
|
@ -122,7 +122,7 @@ public class QuestLink implements IBypassHandler
|
|||||||
state = quest.isCustomQuest() ? " (Done)" : "03";
|
state = quest.isCustomQuest() ? " (Done)" : "03";
|
||||||
// color = "787878";
|
// color = "787878";
|
||||||
}
|
}
|
||||||
sb.append("<a action=\"bypass -h npc_" + String.valueOf(npc.getObjectId()) + "_Quest " + quest.getName() + "\">");
|
sb.append("<a action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
|
||||||
// StringUtil.append(sb, "<font color=\"" + color + "\">[");
|
// StringUtil.append(sb, "<font color=\"" + color + "\">[");
|
||||||
sb.append("[");
|
sb.append("[");
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ public class QuestLink implements IBypassHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sb.append("<fstring>" + String.valueOf(quest.getNpcStringId()) + state + "</fstring>");
|
sb.append("<fstring>" + quest.getNpcStringId() + state + "</fstring>");
|
||||||
}
|
}
|
||||||
// sb.append("]</font></a><br>");
|
// sb.append("]</font></a><br>");
|
||||||
sb.append("]</a><br>");
|
sb.append("]</a><br>");
|
||||||
|
@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void tryRentPet(L2PcInstance player, int val)
|
public static void tryRentPet(L2PcInstance player, int val)
|
||||||
{
|
{
|
||||||
if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
|
if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
|
||||||
{
|
{
|
||||||
|
@ -68,7 +68,7 @@ public class Wear implements IBypassHandler
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void showWearWindow(L2PcInstance player, int val)
|
private static void showWearWindow(L2PcInstance player, int val)
|
||||||
{
|
{
|
||||||
final L2BuyList buyList = BuyListData.getInstance().getBuyList(val);
|
final L2BuyList buyList = BuyListData.getInstance().getBuyList(val);
|
||||||
if (buyList == null)
|
if (buyList == null)
|
||||||
|
@ -69,7 +69,7 @@ public class FavoriteBoard implements IParseBoardHandler
|
|||||||
{
|
{
|
||||||
while (rs.next())
|
while (rs.next())
|
||||||
{
|
{
|
||||||
String link = list.replaceAll("%fav_bypass%", String.valueOf(rs.getString("favBypass")));
|
String link = list.replaceAll("%fav_bypass%", rs.getString("favBypass"));
|
||||||
link = link.replaceAll("%fav_title%", rs.getString("favTitle"));
|
link = link.replaceAll("%fav_title%", rs.getString("favTitle"));
|
||||||
final SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
final SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
link = link.replaceAll("%fav_add_date%", date.format(rs.getTimestamp("favAddDate")));
|
link = link.replaceAll("%fav_add_date%", date.format(rs.getTimestamp("favAddDate")));
|
||||||
|
@ -67,7 +67,7 @@ public class RegionBoard implements IWriteBoardHandler
|
|||||||
link = link.replace("%region_name%", String.valueOf(REGIONS[i]));
|
link = link.replace("%region_name%", String.valueOf(REGIONS[i]));
|
||||||
link = link.replace("%region_owning_clan%", (clan != null ? clan.getName() : "NPC"));
|
link = link.replace("%region_owning_clan%", (clan != null ? clan.getName() : "NPC"));
|
||||||
link = link.replace("%region_owning_clan_alliance%", ((clan != null) && (clan.getAllyName() != null) ? clan.getAllyName() : ""));
|
link = link.replace("%region_owning_clan_alliance%", ((clan != null) && (clan.getAllyName() != null) ? clan.getAllyName() : ""));
|
||||||
link = link.replace("%region_tax_rate%", String.valueOf(castle.getTaxRate() * 100) + "%");
|
link = link.replace("%region_tax_rate%", castle.getTaxRate() * 100 + "%");
|
||||||
sb.append(link);
|
sb.append(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ public class DebugHandler implements ITelnetHandler
|
|||||||
final StackTraceElement[] stes = entry.getValue();
|
final StackTraceElement[] stes = entry.getValue();
|
||||||
final Thread t = entry.getKey();
|
final Thread t = entry.getKey();
|
||||||
sb.append("--------------\n");
|
sb.append("--------------\n");
|
||||||
sb.append(t.toString() + " (" + t.getId() + ")\n");
|
sb.append(t + " (" + t.getId() + ")\n");
|
||||||
sb.append("State: " + t.getState() + '\n');
|
sb.append("State: " + t.getState() + '\n');
|
||||||
sb.append("isAlive: " + t.isAlive() + " | isDaemon: " + t.isDaemon() + " | isInterrupted: " + t.isInterrupted() + '\n');
|
sb.append("isAlive: " + t.isAlive() + " | isDaemon: " + t.isDaemon() + " | isInterrupted: " + t.isInterrupted() + '\n');
|
||||||
sb.append('\n');
|
sb.append('\n');
|
||||||
|
@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler
|
|||||||
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
|
||||||
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + String.valueOf(format.format(endDate)) + "</font></td></tr>");
|
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + format.format(endDate) + "</font></td></tr>");
|
||||||
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + String.valueOf(format.format(System.currentTimeMillis())) + "<br><br></font></td></tr>");
|
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(System.currentTimeMillis()) + "<br><br></font></td></tr>");
|
||||||
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
|
||||||
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");
|
||||||
|
@ -104,7 +104,7 @@ public final class Bernarde extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final boolean isTransformed(L2PcInstance player)
|
private static boolean isTransformed(L2PcInstance player)
|
||||||
{
|
{
|
||||||
return player.isTransformed() && (player.getTransformation().getId() == NATIVE_TRANSFORM);
|
return player.isTransformed() && (player.getTransformation().getId() == NATIVE_TRANSFORM);
|
||||||
}
|
}
|
||||||
|
@ -375,7 +375,7 @@ public abstract class Chamber extends AbstractInstance
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Save location for teleport back into main hall
|
// Save location for teleport back into main hall
|
||||||
partyMember.getVariables().set(RETURN, Integer.toString(partyMember.getX()) + ";" + Integer.toString(partyMember.getY()) + ";" + Integer.toString(partyMember.getZ()));
|
partyMember.getVariables().set(RETURN, partyMember.getX() + ";" + partyMember.getY() + ";" + partyMember.getZ());
|
||||||
|
|
||||||
partyMember.setInstanceId(world.getInstanceId());
|
partyMember.setInstanceId(world.getInstanceId());
|
||||||
world.addAllowed(partyMember.getObjectId());
|
world.addAllowed(partyMember.getObjectId());
|
||||||
|
@ -135,7 +135,7 @@ public final class CrystalCaverns extends AbstractInstance
|
|||||||
private static final int CONT_CRYSTAL = 9690; // Contaminated Crystal
|
private static final int CONT_CRYSTAL = 9690; // Contaminated Crystal
|
||||||
private static final int RED_CORAL = 9692; // Red Coral
|
private static final int RED_CORAL = 9692; // Red Coral
|
||||||
private static final int CRYSTALFOOD = 9693; // Food item for Crystal Golems
|
private static final int CRYSTALFOOD = 9693; // Food item for Crystal Golems
|
||||||
final private static int RACE_KEY = 9694; // Race Key for Emerald doors
|
private static final int RACE_KEY = 9694; // Race Key for Emerald doors
|
||||||
private static final int BOSS_CRYSTAL_1 = 9695; // Clear Crystal
|
private static final int BOSS_CRYSTAL_1 = 9695; // Clear Crystal
|
||||||
private static final int BOSS_CRYSTAL_2 = 9696; // Clear Crystal
|
private static final int BOSS_CRYSTAL_2 = 9696; // Clear Crystal
|
||||||
private static final int BOSS_CRYSTAL_3 = 9697; // Clear Crystal
|
private static final int BOSS_CRYSTAL_3 = 9697; // Clear Crystal
|
||||||
@ -167,7 +167,7 @@ public final class CrystalCaverns extends AbstractInstance
|
|||||||
private static final int KECHIGUARD = 25533;
|
private static final int KECHIGUARD = 25533;
|
||||||
private static final int BAYLOR = 29099;
|
private static final int BAYLOR = 29099;
|
||||||
private static final int DARNEL = 25531;
|
private static final int DARNEL = 25531;
|
||||||
private final static int ALARMID = 18474;
|
private static final int ALARMID = 18474;
|
||||||
// private static final int[] BOSSCR = {9695,9696,9697};
|
// private static final int[] BOSSCR = {9695,9696,9697};
|
||||||
private static final int[] CGMOBS =
|
private static final int[] CGMOBS =
|
||||||
{
|
{
|
||||||
@ -232,7 +232,7 @@ public final class CrystalCaverns extends AbstractInstance
|
|||||||
20107
|
20107
|
||||||
};
|
};
|
||||||
// @formatter:off
|
// @formatter:off
|
||||||
private final static int[][] ALARMSPAWN =
|
private static final int[][] ALARMSPAWN =
|
||||||
{
|
{
|
||||||
{153572, 141277, -12738},
|
{153572, 141277, -12738},
|
||||||
{153572, 142852, -12738},
|
{153572, 142852, -12738},
|
||||||
@ -1740,7 +1740,7 @@ public final class CrystalCaverns extends AbstractInstance
|
|||||||
npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
|
npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
|
||||||
final Instance baylorInstance = InstanceManager.getInstance().getInstance(npc.getInstanceId());
|
final Instance baylorInstance = InstanceManager.getInstance().getInstance(npc.getInstanceId());
|
||||||
baylorInstance.setDuration(300000);
|
baylorInstance.setDuration(300000);
|
||||||
this.startQuestTimer("spawn_oracle", 1000, npc, null);
|
startQuestTimer("spawn_oracle", 1000, npc, null);
|
||||||
giveRewards(player, npc.getInstanceId(), -1, true);
|
giveRewards(player, npc.getInstanceId(), -1, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1225,7 +1225,7 @@ public final class Kamaloka extends AbstractInstance
|
|||||||
* @param index (0-18) index of the kamaloka in arrays
|
* @param index (0-18) index of the kamaloka in arrays
|
||||||
* @return true if party allowed to enter
|
* @return true if party allowed to enter
|
||||||
*/
|
*/
|
||||||
private static final boolean checkPartyConditions(L2PcInstance player, int index)
|
private static boolean checkPartyConditions(L2PcInstance player, int index)
|
||||||
{
|
{
|
||||||
final L2Party party = player.getParty();
|
final L2Party party = player.getParty();
|
||||||
// player must be in party
|
// player must be in party
|
||||||
@ -1302,7 +1302,7 @@ public final class Kamaloka extends AbstractInstance
|
|||||||
* Removing all buffs from player and pet except BUFFS_WHITELIST
|
* Removing all buffs from player and pet except BUFFS_WHITELIST
|
||||||
* @param ch player
|
* @param ch player
|
||||||
*/
|
*/
|
||||||
private static final void removeBuffs(L2Character ch)
|
private static void removeBuffs(L2Character ch)
|
||||||
{
|
{
|
||||||
final Function<BuffInfo, Boolean> removeBuffs = info ->
|
final Function<BuffInfo, Boolean> removeBuffs = info ->
|
||||||
{
|
{
|
||||||
|
@ -166,7 +166,7 @@ public final class NornilsGarden extends AbstractInstance
|
|||||||
};
|
};
|
||||||
// @formatter:on
|
// @formatter:on
|
||||||
|
|
||||||
private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
|
private static void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
|
||||||
{
|
{
|
||||||
final int chance = getRandom(100);
|
final int chance = getRandom(100);
|
||||||
for (int[] element : drop)
|
for (int[] element : drop)
|
||||||
@ -178,7 +178,7 @@ public final class NornilsGarden extends AbstractInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void giveBuffs(L2Character ch)
|
private static void giveBuffs(L2Character ch)
|
||||||
{
|
{
|
||||||
if (skill1 != null)
|
if (skill1 != null)
|
||||||
{
|
{
|
||||||
@ -395,7 +395,7 @@ public final class NornilsGarden extends AbstractInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String checkConditions(L2Npc npc, L2PcInstance player)
|
private static String checkConditions(L2Npc npc, L2PcInstance player)
|
||||||
{
|
{
|
||||||
final L2Party party = player.getParty();
|
final L2Party party = player.getParty();
|
||||||
// player must be in party
|
// player must be in party
|
||||||
@ -537,7 +537,7 @@ public final class NornilsGarden extends AbstractInstance
|
|||||||
int correct = st.getInt("correct");
|
int correct = st.getInt("correct");
|
||||||
correct++;
|
correct++;
|
||||||
st.set("correct", String.valueOf(correct));
|
st.set("correct", String.valueOf(correct));
|
||||||
htmltext = npc.getId() + "-0" + String.valueOf(correct + 2) + ".html";
|
htmltext = npc.getId() + "-0" + correct + 2 + ".html";
|
||||||
}
|
}
|
||||||
else if (event.equalsIgnoreCase("check"))
|
else if (event.equalsIgnoreCase("check"))
|
||||||
{
|
{
|
||||||
|
@ -46,7 +46,7 @@ public final class SanctumOftheLordsOfDawn extends AbstractInstance
|
|||||||
protected static final class HSWorld extends InstanceWorld
|
protected static final class HSWorld extends InstanceWorld
|
||||||
{
|
{
|
||||||
protected int doorst = 0;
|
protected int doorst = 0;
|
||||||
protected final static Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
|
protected static final Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
|
||||||
|
|
||||||
public static Map<Integer, List<L2Npc>> getMonsters()
|
public static Map<Integer, List<L2Npc>> getMonsters()
|
||||||
{
|
{
|
||||||
|
@ -33,24 +33,24 @@ import com.l2jmobius.gameserver.util.Util;
|
|||||||
public final class Q00171_ActsOfEvil extends Quest
|
public final class Q00171_ActsOfEvil extends Quest
|
||||||
{
|
{
|
||||||
// NPCs
|
// NPCs
|
||||||
private final static int TRADER_ARODIN = 30207;
|
private static final int TRADER_ARODIN = 30207;
|
||||||
private static final int GUARD_ALVAH = 30381;
|
private static final int GUARD_ALVAH = 30381;
|
||||||
private final static int TYRA = 30420;
|
private static final int TYRA = 30420;
|
||||||
private final static int NETI = 30425;
|
private static final int NETI = 30425;
|
||||||
private final static int TRADER_ROLENTO = 30437;
|
private static final int TRADER_ROLENTO = 30437;
|
||||||
private final static int TUREK_CHIEF_BURAI = 30617;
|
private static final int TUREK_CHIEF_BURAI = 30617;
|
||||||
// Items
|
// Items
|
||||||
private final static int BLADE_MOLD = 4239;
|
private static final int BLADE_MOLD = 4239;
|
||||||
private final static int TYRAS_BILL = 4240;
|
private static final int TYRAS_BILL = 4240;
|
||||||
private final static int RANGERS_REPORT1 = 4241;
|
private static final int RANGERS_REPORT1 = 4241;
|
||||||
private final static int RANGERS_REPORT2 = 4242;
|
private static final int RANGERS_REPORT2 = 4242;
|
||||||
private final static int RANGERS_REPORT3 = 4243;
|
private static final int RANGERS_REPORT3 = 4243;
|
||||||
private final static int RANGERS_REPORT4 = 4244;
|
private static final int RANGERS_REPORT4 = 4244;
|
||||||
private final static int WEAPONS_TRADE_CONTRACT = 4245;
|
private static final int WEAPONS_TRADE_CONTRACT = 4245;
|
||||||
private final static int ATTACK_DIRECTIVES = 4246;
|
private static final int ATTACK_DIRECTIVES = 4246;
|
||||||
private final static int CERTIFICATE_OF_THE_SILVER_GUILD = 4247;
|
private static final int CERTIFICATE_OF_THE_SILVER_GUILD = 4247;
|
||||||
private final static int ROLENTOS_CARGOBOX = 4248;
|
private static final int ROLENTOS_CARGOBOX = 4248;
|
||||||
private final static int OL_MAHUM_CAPTAINS_HEAD = 4249;
|
private static final int OL_MAHUM_CAPTAINS_HEAD = 4249;
|
||||||
// Monster
|
// Monster
|
||||||
private static final int TUMRAN_BUGBEAR = 20062;
|
private static final int TUMRAN_BUGBEAR = 20062;
|
||||||
private static final int TUMRAN_BUGBEAR_WARRIOR = 20064;
|
private static final int TUMRAN_BUGBEAR_WARRIOR = 20064;
|
||||||
|
@ -294,7 +294,7 @@ public final class Q00175_TheWayOfTheWarrior extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void giveNewbieReward(L2PcInstance player)
|
public static void giveNewbieReward(L2PcInstance player)
|
||||||
{
|
{
|
||||||
final PlayerVariables vars = player.getVariables();
|
final PlayerVariables vars = player.getVariables();
|
||||||
if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))
|
if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))
|
||||||
|
@ -37,7 +37,7 @@ import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
|
|||||||
*/
|
*/
|
||||||
public final class Q00257_TheGuardIsBusy extends Quest
|
public final class Q00257_TheGuardIsBusy extends Quest
|
||||||
{
|
{
|
||||||
public final static class MobDrop extends ItemHolder
|
public static final class MobDrop extends ItemHolder
|
||||||
{
|
{
|
||||||
private final int _chance;
|
private final int _chance;
|
||||||
private final int _random;
|
private final int _random;
|
||||||
|
@ -138,7 +138,7 @@ public final class Q00279_TargetOfOpportunity extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final boolean haveAllExceptThis(L2PcInstance player, int idx)
|
private static boolean haveAllExceptThis(L2PcInstance player, int idx)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < SEAL_COMPONENTS.length; i++)
|
for (int i = 0; i < SEAL_COMPONENTS.length; i++)
|
||||||
{
|
{
|
||||||
|
@ -195,7 +195,7 @@ public final class Q00281_HeadForTheHills extends Quest
|
|||||||
* Give basic newbie reward.
|
* Give basic newbie reward.
|
||||||
* @param player the player to reward
|
* @param player the player to reward
|
||||||
*/
|
*/
|
||||||
public static final void giveNewbieReward(L2PcInstance player)
|
public static void giveNewbieReward(L2PcInstance player)
|
||||||
{
|
{
|
||||||
final PlayerVariables vars = player.getVariables();
|
final PlayerVariables vars = player.getVariables();
|
||||||
if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))
|
if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))
|
||||||
|
@ -157,7 +157,7 @@ public final class Q00306_CrystalOfFireAndIce extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void giveKillReward(L2PcInstance player, L2Npc npc)
|
private static void giveKillReward(L2PcInstance player, L2Npc npc)
|
||||||
{
|
{
|
||||||
if (Util.checkIfInRange(1500, npc, player, false))
|
if (Util.checkIfInRange(1500, npc, player, false))
|
||||||
{
|
{
|
||||||
|
@ -349,7 +349,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void tradeItems(L2PcInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
|
private static void tradeItems(L2PcInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
|
||||||
{
|
{
|
||||||
if (itemCount1 < required)
|
if (itemCount1 < required)
|
||||||
{
|
{
|
||||||
|
@ -248,7 +248,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final boolean giveReward(L2PcInstance player, int itemId, int minCount, int rewardItemId, long rewardCount)
|
private static boolean giveReward(L2PcInstance player, int itemId, int minCount, int rewardItemId, long rewardCount)
|
||||||
{
|
{
|
||||||
long count = getQuestItemsCount(player, itemId);
|
long count = getQuestItemsCount(player, itemId);
|
||||||
if (count < minCount)
|
if (count < minCount)
|
||||||
|
@ -272,7 +272,7 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void finishInstance(L2PcInstance player)
|
private static void finishInstance(L2PcInstance player)
|
||||||
{
|
{
|
||||||
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
|
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
|
||||||
|
|
||||||
|
@ -248,7 +248,7 @@ public final class Q00695_DefendTheHallOfSuffering extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void finishInstance(L2PcInstance player)
|
private static void finishInstance(L2PcInstance player)
|
||||||
{
|
{
|
||||||
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
|
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
|
|||||||
|
|
||||||
if (Util.isDigit(event))
|
if (Util.isDigit(event))
|
||||||
{
|
{
|
||||||
htmltext = Integer.toString(npc.getId()) + "-1" + event + ".html";
|
htmltext = npc.getId() + "-1" + event + ".html";
|
||||||
giveItems(player, 10520 + Integer.valueOf(event), 2);
|
giveItems(player, 10520 + Integer.valueOf(event), 2);
|
||||||
addExpAndSp(player, 202160, 20375);
|
addExpAndSp(player, 202160, 20375);
|
||||||
qs.exitQuest(false, true);
|
qs.exitQuest(false, true);
|
||||||
|
@ -425,7 +425,7 @@ public class SevenSigns
|
|||||||
return reward;
|
return reward;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String getCabalShortName(int cabal)
|
public static String getCabalShortName(int cabal)
|
||||||
{
|
{
|
||||||
switch (cabal)
|
switch (cabal)
|
||||||
{
|
{
|
||||||
@ -438,7 +438,7 @@ public class SevenSigns
|
|||||||
return "No Cabal";
|
return "No Cabal";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String getCabalName(int cabal)
|
public static String getCabalName(int cabal)
|
||||||
{
|
{
|
||||||
switch (cabal)
|
switch (cabal)
|
||||||
{
|
{
|
||||||
@ -451,7 +451,7 @@ public class SevenSigns
|
|||||||
return "No Cabal";
|
return "No Cabal";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String getSealName(int seal, boolean shortName)
|
public static String getSealName(int seal, boolean shortName)
|
||||||
{
|
{
|
||||||
String sealName = (!shortName) ? "Seal of " : "";
|
String sealName = (!shortName) ? "Seal of " : "";
|
||||||
|
|
||||||
|
@ -809,7 +809,7 @@ public class SevenSignsFestival implements SpawnListener
|
|||||||
* @param festivalID
|
* @param festivalID
|
||||||
* @return String festivalName
|
* @return String festivalName
|
||||||
*/
|
*/
|
||||||
public static final String getFestivalName(int festivalID)
|
public static String getFestivalName(int festivalID)
|
||||||
{
|
{
|
||||||
String festivalName;
|
String festivalName;
|
||||||
|
|
||||||
@ -840,7 +840,7 @@ public class SevenSignsFestival implements SpawnListener
|
|||||||
* @param festivalId
|
* @param festivalId
|
||||||
* @return int maxLevel
|
* @return int maxLevel
|
||||||
*/
|
*/
|
||||||
public static final int getMaxLevelForFestival(int festivalId)
|
public static int getMaxLevelForFestival(int festivalId)
|
||||||
{
|
{
|
||||||
int maxLevel = (ExperienceData.getInstance().getMaxLevel() - 1);
|
int maxLevel = (ExperienceData.getInstance().getMaxLevel() - 1);
|
||||||
|
|
||||||
@ -868,7 +868,7 @@ public class SevenSignsFestival implements SpawnListener
|
|||||||
* @param npcId
|
* @param npcId
|
||||||
* @return boolean isArcher
|
* @return boolean isArcher
|
||||||
*/
|
*/
|
||||||
protected static final boolean isFestivalArcher(int npcId)
|
protected static boolean isFestivalArcher(int npcId)
|
||||||
{
|
{
|
||||||
if ((npcId < 18009) || (npcId > 18108))
|
if ((npcId < 18009) || (npcId > 18108))
|
||||||
{
|
{
|
||||||
@ -884,7 +884,7 @@ public class SevenSignsFestival implements SpawnListener
|
|||||||
* @param npcId
|
* @param npcId
|
||||||
* @return boolean isChest
|
* @return boolean isChest
|
||||||
*/
|
*/
|
||||||
protected static final boolean isFestivalChest(int npcId)
|
protected static boolean isFestivalChest(int npcId)
|
||||||
{
|
{
|
||||||
return ((npcId < 18109) || (npcId > 18118));
|
return ((npcId < 18109) || (npcId > 18118));
|
||||||
}
|
}
|
||||||
@ -980,7 +980,7 @@ public class SevenSignsFestival implements SpawnListener
|
|||||||
|
|
||||||
for (int i = 0; i < FESTIVAL_COUNT; i++)
|
for (int i = 0; i < FESTIVAL_COUNT; i++)
|
||||||
{
|
{
|
||||||
_accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + String.valueOf(i)));
|
_accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -153,7 +153,7 @@ public class EnchantItemData implements IXmlReader
|
|||||||
* Gets the single instance of EnchantItemData.
|
* Gets the single instance of EnchantItemData.
|
||||||
* @return single instance of EnchantItemData
|
* @return single instance of EnchantItemData
|
||||||
*/
|
*/
|
||||||
public static final EnchantItemData getInstance()
|
public static EnchantItemData getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -142,7 +142,7 @@ public class EnchantItemHPBonusData implements IXmlReader
|
|||||||
* Gets the single instance of EnchantHPBonusData.
|
* Gets the single instance of EnchantHPBonusData.
|
||||||
* @return single instance of EnchantHPBonusData
|
* @return single instance of EnchantHPBonusData
|
||||||
*/
|
*/
|
||||||
public static final EnchantItemHPBonusData getInstance()
|
public static EnchantItemHPBonusData getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -278,7 +278,7 @@ public final class MultisellData implements IXmlReader
|
|||||||
separateAndSend(listId, player, npc, inventoryOnly, 1, 1);
|
separateAndSend(listId, player, npc, inventoryOnly, 1, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final boolean hasSpecialIngredient(int id, long amount, L2PcInstance player)
|
public static boolean hasSpecialIngredient(int id, long amount, L2PcInstance player)
|
||||||
{
|
{
|
||||||
switch (id)
|
switch (id)
|
||||||
{
|
{
|
||||||
@ -310,7 +310,7 @@ public final class MultisellData implements IXmlReader
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final boolean takeSpecialIngredient(int id, long amount, L2PcInstance player)
|
public static boolean takeSpecialIngredient(int id, long amount, L2PcInstance player)
|
||||||
{
|
{
|
||||||
switch (id)
|
switch (id)
|
||||||
{
|
{
|
||||||
@ -329,7 +329,7 @@ public final class MultisellData implements IXmlReader
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void giveSpecialProduct(int id, long amount, L2PcInstance player)
|
public static void giveSpecialProduct(int id, long amount, L2PcInstance player)
|
||||||
{
|
{
|
||||||
switch (id)
|
switch (id)
|
||||||
{
|
{
|
||||||
|
@ -111,7 +111,7 @@ public class SiegeScheduleData implements IXmlReader
|
|||||||
return _scheduleData;
|
return _scheduleData;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final SiegeScheduleData getInstance()
|
public static SiegeScheduleData getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -998,7 +998,7 @@ public class AugmentationData
|
|||||||
return new L2Augmentation(((stat34 << 16) + stat12));
|
return new L2Augmentation(((stat34 << 16) + stat12));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final AugmentationData getInstance()
|
public static AugmentationData getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,7 @@ public class MerchantPriceConfigTable implements InstanceListManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final MerchantPriceConfig defaultMpc = this.getMerchantPriceConfig(defaultPriceConfigId);
|
final MerchantPriceConfig defaultMpc = getMerchantPriceConfig(defaultPriceConfigId);
|
||||||
if (defaultMpc == null)
|
if (defaultMpc == null)
|
||||||
{
|
{
|
||||||
throw new IllegalStateException("'defaultPriceConfig' points to an non-loaded priceConfig");
|
throw new IllegalStateException("'defaultPriceConfig' points to an non-loaded priceConfig");
|
||||||
|
@ -1264,7 +1264,7 @@ public abstract class DocumentBase
|
|||||||
final char ch = value.isEmpty() ? ' ' : value.charAt(0);
|
final char ch = value.isEmpty() ? ' ' : value.charAt(0);
|
||||||
if ((ch == '#') || (ch == '-') || Character.isDigit(ch))
|
if ((ch == '#') || (ch == '-') || Character.isDigit(ch))
|
||||||
{
|
{
|
||||||
set.set(name, String.valueOf(getValue(value, level)));
|
set.set(name, getValue(value, level));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -107,7 +107,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
|
|||||||
// Send debug message
|
// Send debug message
|
||||||
if (Config.DEBUG)
|
if (Config.DEBUG)
|
||||||
{
|
{
|
||||||
LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode.toString());
|
LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -432,7 +432,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
|
|||||||
scheduleModeChange();
|
scheduleModeChange();
|
||||||
if (Config.DEBUG)
|
if (Config.DEBUG)
|
||||||
{
|
{
|
||||||
LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode.toString() + "!");
|
LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode + "!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@ public final class ClanHallAuctionManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final ClanHallAuctionManager getInstance()
|
public static ClanHallAuctionManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -219,7 +219,7 @@ public final class DuelManager
|
|||||||
return ARENAS.get(Rnd.get(ARENAS.size()));
|
return ARENAS.get(Rnd.get(ARENAS.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final DuelManager getInstance()
|
public static DuelManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -167,7 +167,7 @@ public class RaidBossPointsManager
|
|||||||
return tmpRanking;
|
return tmpRanking;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final RaidBossPointsManager getInstance()
|
public static RaidBossPointsManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ public class ServerRestartManager
|
|||||||
{
|
{
|
||||||
nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime());
|
nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime());
|
||||||
ThreadPoolManager.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000));
|
ThreadPoolManager.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000));
|
||||||
_log.info("Scheduled server restart at " + lastRestart.getTime().toString() + ".");
|
_log.info("Scheduled server restart at " + lastRestart.getTime() + ".");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
@ -204,7 +204,7 @@ public final class SoDManager
|
|||||||
* Gets the single instance of {@code GraciaSeedsManager}.
|
* Gets the single instance of {@code GraciaSeedsManager}.
|
||||||
* @return single instance of {@code GraciaSeedsManager}
|
* @return single instance of {@code GraciaSeedsManager}
|
||||||
*/
|
*/
|
||||||
public static final SoDManager getInstance()
|
public static SoDManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -251,7 +251,7 @@ public class SoIManager
|
|||||||
* Gets the single instance of {@code GraciaSeedsManager}.
|
* Gets the single instance of {@code GraciaSeedsManager}.
|
||||||
* @return single instance of {@code GraciaSeedsManager}
|
* @return single instance of {@code GraciaSeedsManager}
|
||||||
*/
|
*/
|
||||||
public static final SoIManager getInstance()
|
public static SoIManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -1789,7 +1789,7 @@ public final class TerritoryWarManager implements Siegable
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final TerritoryWarManager getInstance()
|
public static TerritoryWarManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder._instance;
|
return SingletonHolder._instance;
|
||||||
}
|
}
|
||||||
|
@ -2171,7 +2171,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
* @param itemObjId the item object ID
|
* @param itemObjId the item object ID
|
||||||
* @return if the item has a reuse time stamp, the remaining time, otherwise -1
|
* @return if the item has a reuse time stamp, the remaining time, otherwise -1
|
||||||
*/
|
*/
|
||||||
public synchronized final long getItemRemainingReuseTime(int itemObjId)
|
public final synchronized long getItemRemainingReuseTime(int itemObjId)
|
||||||
{
|
{
|
||||||
final TimeStamp reuseStamp = (_reuseTimeStampsItems != null) ? _reuseTimeStampsItems.get(itemObjId) : null;
|
final TimeStamp reuseStamp = (_reuseTimeStampsItems != null) ? _reuseTimeStampsItems.get(itemObjId) : null;
|
||||||
return reuseStamp != null ? reuseStamp.getRemaining() : -1;
|
return reuseStamp != null ? reuseStamp.getRemaining() : -1;
|
||||||
@ -2242,7 +2242,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
* Removes a skill reuse time stamp.
|
* Removes a skill reuse time stamp.
|
||||||
* @param skill the skill to remove
|
* @param skill the skill to remove
|
||||||
*/
|
*/
|
||||||
public synchronized final void removeTimeStamp(Skill skill)
|
public final synchronized void removeTimeStamp(Skill skill)
|
||||||
{
|
{
|
||||||
if (_reuseTimeStampsSkills != null)
|
if (_reuseTimeStampsSkills != null)
|
||||||
{
|
{
|
||||||
@ -2253,7 +2253,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
/**
|
/**
|
||||||
* Removes all skill reuse time stamps.
|
* Removes all skill reuse time stamps.
|
||||||
*/
|
*/
|
||||||
public synchronized final void resetTimeStamps()
|
public final synchronized void resetTimeStamps()
|
||||||
{
|
{
|
||||||
if (_reuseTimeStampsSkills != null)
|
if (_reuseTimeStampsSkills != null)
|
||||||
{
|
{
|
||||||
@ -2266,7 +2266,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
* @param hashCode the skill hash code
|
* @param hashCode the skill hash code
|
||||||
* @return if the skill has a reuse time stamp, the remaining time, otherwise -1
|
* @return if the skill has a reuse time stamp, the remaining time, otherwise -1
|
||||||
*/
|
*/
|
||||||
public synchronized final long getSkillRemainingReuseTime(int hashCode)
|
public final synchronized long getSkillRemainingReuseTime(int hashCode)
|
||||||
{
|
{
|
||||||
final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
|
final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
|
||||||
return reuseStamp != null ? reuseStamp.getRemaining() : -1;
|
return reuseStamp != null ? reuseStamp.getRemaining() : -1;
|
||||||
@ -2277,7 +2277,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
* @param hashCode the skill hash code
|
* @param hashCode the skill hash code
|
||||||
* @return {@code true} if the skill is under reuse time, {@code false} otherwise
|
* @return {@code true} if the skill is under reuse time, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
public synchronized final boolean hasSkillReuse(int hashCode)
|
public final synchronized boolean hasSkillReuse(int hashCode)
|
||||||
{
|
{
|
||||||
final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
|
final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
|
||||||
return (reuseStamp != null) && reuseStamp.hasNotPassed();
|
return (reuseStamp != null) && reuseStamp.hasNotPassed();
|
||||||
@ -2288,7 +2288,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
* @param hashCode the skill hash code
|
* @param hashCode the skill hash code
|
||||||
* @return if the skill has a reuse time stamp, the skill reuse time stamp, otherwise {@code null}
|
* @return if the skill has a reuse time stamp, the skill reuse time stamp, otherwise {@code null}
|
||||||
*/
|
*/
|
||||||
public synchronized final TimeStamp getSkillReuseTimeStamp(int hashCode)
|
public final synchronized TimeStamp getSkillReuseTimeStamp(int hashCode)
|
||||||
{
|
{
|
||||||
return _reuseTimeStampsSkills != null ? _reuseTimeStampsSkills.get(hashCode) : null;
|
return _reuseTimeStampsSkills != null ? _reuseTimeStampsSkills.get(hashCode) : null;
|
||||||
}
|
}
|
||||||
@ -2345,7 +2345,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
/**
|
/**
|
||||||
* Removes all the disabled skills.
|
* Removes all the disabled skills.
|
||||||
*/
|
*/
|
||||||
public synchronized final void resetDisabledSkills()
|
public final synchronized void resetDisabledSkills()
|
||||||
{
|
{
|
||||||
if (_disabledSkills != null)
|
if (_disabledSkills != null)
|
||||||
{
|
{
|
||||||
|
@ -113,7 +113,7 @@ public final class L2AuctioneerInstance extends L2Npc
|
|||||||
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
||||||
html.setFile(player.getHtmlPrefix(), filename);
|
html.setFile(player.getHtmlPrefix(), filename);
|
||||||
html.replace("%x%", val);
|
html.replace("%x%", val);
|
||||||
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
|
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
|
||||||
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
||||||
html.replace("%AGIT_AUCTION_MIN%", String.valueOf(a.getStartingBid()));
|
html.replace("%AGIT_AUCTION_MIN%", String.valueOf(a.getStartingBid()));
|
||||||
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getDesc());
|
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getDesc());
|
||||||
@ -181,8 +181,8 @@ public final class L2AuctioneerInstance extends L2Npc
|
|||||||
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
|
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
|
||||||
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
|
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
|
||||||
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
|
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
|
||||||
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
|
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
|
||||||
html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes");
|
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
|
||||||
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
||||||
html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size()));
|
html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size()));
|
||||||
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
|
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
|
||||||
@ -424,8 +424,8 @@ public final class L2AuctioneerInstance extends L2Npc
|
|||||||
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
|
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
|
||||||
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
|
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
|
||||||
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
|
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
|
||||||
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
|
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
|
||||||
html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes");
|
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
|
||||||
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
||||||
html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
|
html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
|
||||||
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
|
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
|
||||||
@ -455,8 +455,8 @@ public final class L2AuctioneerInstance extends L2Npc
|
|||||||
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
|
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
|
||||||
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
|
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
|
||||||
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
|
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
|
||||||
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
|
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
|
||||||
html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes");
|
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
|
||||||
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
||||||
html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size()));
|
html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size()));
|
||||||
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
|
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
|
||||||
@ -613,7 +613,7 @@ public final class L2AuctioneerInstance extends L2Npc
|
|||||||
{
|
{
|
||||||
html.replace("%AGIT_AUCTION_BID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
|
html.replace("%AGIT_AUCTION_BID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
|
||||||
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
|
||||||
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
|
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
|
||||||
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
|
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
|
||||||
html.replace("npc_%objectId%_bid1", "npc_" + getObjectId() + "_bid1 " + a.getId());
|
html.replace("npc_%objectId%_bid1", "npc_" + getObjectId() + "_bid1 " + a.getId());
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ public class L2BlockInstance extends L2MonsterInstance
|
|||||||
// Change color
|
// Change color
|
||||||
_colorEffect = 0x00;
|
_colorEffect = 0x00;
|
||||||
// BroadCast to all known players
|
// BroadCast to all known players
|
||||||
this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
|
broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
|
||||||
increaseTeamPointsAndSend(attacker, team, event);
|
increaseTeamPointsAndSend(attacker, team, event);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -69,7 +69,7 @@ public class L2BlockInstance extends L2MonsterInstance
|
|||||||
// Change color
|
// Change color
|
||||||
_colorEffect = 0x53;
|
_colorEffect = 0x53;
|
||||||
// BroadCast to all known players
|
// BroadCast to all known players
|
||||||
this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
|
broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
|
||||||
increaseTeamPointsAndSend(attacker, team, event);
|
increaseTeamPointsAndSend(attacker, team, event);
|
||||||
}
|
}
|
||||||
// 30% chance to drop the event items
|
// 30% chance to drop the event items
|
||||||
|
@ -334,9 +334,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
|
html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
|
||||||
html.replace("%apply%", "recovery hp " + String.valueOf(percent));
|
html.replace("%apply%", "recovery hp " + percent);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -366,9 +366,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_MPREG5_FEE;
|
cost = Config.CH_MPREG5_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
|
html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
|
||||||
html.replace("%apply%", "recovery mp " + String.valueOf(percent));
|
html.replace("%apply%", "recovery mp " + percent);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -404,9 +404,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_EXPREG7_FEE;
|
cost = Config.CH_EXPREG7_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
|
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
|
||||||
html.replace("%apply%", "recovery exp " + String.valueOf(percent));
|
html.replace("%apply%", "recovery exp " + percent);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -427,7 +427,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", String.valueOf(val) + "%");
|
html.replace("%val%", val + "%");
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -509,7 +509,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", String.valueOf(val) + "%");
|
html.replace("%val%", val + "%");
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -567,7 +567,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", String.valueOf(val) + "%");
|
html.replace("%val%", val + "%");
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -631,7 +631,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
final String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
|
final String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
|
||||||
{
|
{
|
||||||
html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime()));
|
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime()));
|
||||||
final int grade = getClanHall().getGrade();
|
final int grade = getClanHall().getGrade();
|
||||||
switch (grade)
|
switch (grade)
|
||||||
@ -673,7 +673,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
|
||||||
{
|
{
|
||||||
html.replace("%exp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime()));
|
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime()));
|
||||||
final int grade = getClanHall().getGrade();
|
final int grade = getClanHall().getGrade();
|
||||||
switch (grade)
|
switch (grade)
|
||||||
@ -715,7 +715,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
|
||||||
{
|
{
|
||||||
html.replace("%mp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime()));
|
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime()));
|
||||||
final int grade = getClanHall().getGrade();
|
final int grade = getClanHall().getGrade();
|
||||||
switch (grade)
|
switch (grade)
|
||||||
@ -811,9 +811,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_ITEM3_FEE;
|
cost = Config.CH_ITEM3_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Allow the purchase of special items at fixed intervals.");
|
html.replace("%use%", "Allow the purchase of special items at fixed intervals.");
|
||||||
html.replace("%apply%", "other item " + String.valueOf(stage));
|
html.replace("%apply%", "other item " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -852,9 +852,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_SUPPORT8_FEE;
|
cost = Config.CH_SUPPORT8_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Enables the use of supplementary magic.");
|
html.replace("%use%", "Enables the use of supplementary magic.");
|
||||||
html.replace("%apply%", "other support " + String.valueOf(stage));
|
html.replace("%apply%", "other support " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -875,9 +875,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_TELE2_FEE;
|
cost = Config.CH_TELE2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Teleports clan members in a clan hall to the target <font color=\"00FFFF\">Stage " + String.valueOf(stage) + "</font> staging area");
|
html.replace("%use%", "Teleports clan members in a clan hall to the target <font color=\"00FFFF\">Stage " + stage + "</font> staging area");
|
||||||
html.replace("%apply%", "other tele " + String.valueOf(stage));
|
html.replace("%apply%", "other tele " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -902,7 +902,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -955,7 +955,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1004,7 +1004,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1065,7 +1065,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
final String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
|
final String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
|
||||||
{
|
{
|
||||||
html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "</font>Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime()));
|
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime()));
|
||||||
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
|
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
|
||||||
}
|
}
|
||||||
@ -1077,7 +1077,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
|
||||||
{
|
{
|
||||||
html.replace("%support%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "</font>Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime()));
|
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime()));
|
||||||
final int grade = getClanHall().getGrade();
|
final int grade = getClanHall().getGrade();
|
||||||
switch (grade)
|
switch (grade)
|
||||||
@ -1119,7 +1119,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
|
||||||
{
|
{
|
||||||
html.replace("%item%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "</font>Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime()));
|
html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime()));
|
||||||
html.replace("%change_item%", "[<a action=\"bypass -h npc_%objectId%_manage other item_cancel\">Deactivate</a>]" + item);
|
html.replace("%change_item%", "[<a action=\"bypass -h npc_%objectId%_manage other item_cancel\">Deactivate</a>]" + item);
|
||||||
}
|
}
|
||||||
@ -1174,9 +1174,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_CURTAIN2_FEE;
|
cost = Config.CH_CURTAIN2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "These curtains can be used to decorate the clan hall.");
|
html.replace("%use%", "These curtains can be used to decorate the clan hall.");
|
||||||
html.replace("%apply%", "deco curtains " + String.valueOf(stage));
|
html.replace("%apply%", "deco curtains " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1197,9 +1197,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.CH_FRONT2_FEE;
|
cost = Config.CH_FRONT2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Used to decorate the clan hall.");
|
html.replace("%use%", "Used to decorate the clan hall.");
|
||||||
html.replace("%apply%", "deco fixtures " + String.valueOf(stage));
|
html.replace("%apply%", "deco fixtures " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1220,7 +1220,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1269,7 +1269,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val))
|
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1308,7 +1308,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
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>]";
|
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)
|
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
|
||||||
{
|
{
|
||||||
html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "</font>Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime()));
|
html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime()));
|
||||||
html.replace("%change_curtain%", "[<a action=\"bypass -h npc_%objectId%_manage deco curtains_cancel\">Deactivate</a>]" + curtains);
|
html.replace("%change_curtain%", "[<a action=\"bypass -h npc_%objectId%_manage deco curtains_cancel\">Deactivate</a>]" + curtains);
|
||||||
}
|
}
|
||||||
@ -1320,7 +1320,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
|
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
|
||||||
{
|
{
|
||||||
html.replace("%fixture%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "</font>Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime()));
|
html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime()));
|
||||||
html.replace("%change_fixture%", "[<a action=\"bypass -h npc_%objectId%_manage deco fixtures_cancel\">Deactivate</a>]" + fixtures);
|
html.replace("%change_fixture%", "[<a action=\"bypass -h npc_%objectId%_manage deco fixtures_cancel\">Deactivate</a>]" + fixtures);
|
||||||
}
|
}
|
||||||
|
@ -133,7 +133,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void onTutorialLink(L2PcInstance player, String request)
|
public static void onTutorialLink(L2PcInstance player, String request)
|
||||||
{
|
{
|
||||||
if (!Config.ALTERNATE_CLASS_MASTER || (request == null) || !request.startsWith("CO"))
|
if (!Config.ALTERNATE_CLASS_MASTER || (request == null) || !request.startsWith("CO"))
|
||||||
{
|
{
|
||||||
@ -156,7 +156,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
|
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void onTutorialQuestionMark(L2PcInstance player, int number)
|
public static void onTutorialQuestionMark(L2PcInstance player, int number)
|
||||||
{
|
{
|
||||||
if (!Config.ALTERNATE_CLASS_MASTER || (number != 1001))
|
if (!Config.ALTERNATE_CLASS_MASTER || (number != 1001))
|
||||||
{
|
{
|
||||||
@ -166,7 +166,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
showTutorialHtml(player);
|
showTutorialHtml(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void showQuestionMark(L2PcInstance player)
|
public static void showQuestionMark(L2PcInstance player)
|
||||||
{
|
{
|
||||||
if (!Config.ALTERNATE_CLASS_MASTER)
|
if (!Config.ALTERNATE_CLASS_MASTER)
|
||||||
{
|
{
|
||||||
@ -187,7 +187,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
player.sendPacket(new TutorialShowQuestionMark(1001));
|
player.sendPacket(new TutorialShowQuestionMark(1001));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void showHtmlMenu(L2PcInstance player, int objectId, int level)
|
private static void showHtmlMenu(L2PcInstance player, int objectId, int level)
|
||||||
{
|
{
|
||||||
final NpcHtmlMessage html = new NpcHtmlMessage(objectId);
|
final NpcHtmlMessage html = new NpcHtmlMessage(objectId);
|
||||||
|
|
||||||
@ -308,7 +308,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
player.sendPacket(html);
|
player.sendPacket(html);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void showTutorialHtml(L2PcInstance player)
|
private static void showTutorialHtml(L2PcInstance player)
|
||||||
{
|
{
|
||||||
final ClassId currentClassId = player.getClassId();
|
final ClassId currentClassId = player.getClassId();
|
||||||
if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE)
|
if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE)
|
||||||
@ -337,7 +337,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
player.sendPacket(new TutorialShowHtml(msg));
|
player.sendPacket(new TutorialShowHtml(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final boolean checkAndChangeClass(L2PcInstance player, int val)
|
private static boolean checkAndChangeClass(L2PcInstance player, int val)
|
||||||
{
|
{
|
||||||
final ClassId currentClassId = player.getClassId();
|
final ClassId currentClassId = player.getClassId();
|
||||||
if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE)
|
if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE)
|
||||||
@ -409,7 +409,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
* @param level - current skillId level (0 - start, 1 - first, etc)
|
* @param level - current skillId level (0 - start, 1 - first, etc)
|
||||||
* @return minimum player level required for next class transfer
|
* @return minimum player level required for next class transfer
|
||||||
*/
|
*/
|
||||||
private static final int getMinLevel(int level)
|
private static int getMinLevel(int level)
|
||||||
{
|
{
|
||||||
switch (level)
|
switch (level)
|
||||||
{
|
{
|
||||||
@ -430,7 +430,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
* @param val new class index
|
* @param val new class index
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static final boolean validateClassId(ClassId oldCID, int val)
|
private static boolean validateClassId(ClassId oldCID, int val)
|
||||||
{
|
{
|
||||||
return validateClassId(oldCID, ClassId.getClassId(val));
|
return validateClassId(oldCID, ClassId.getClassId(val));
|
||||||
}
|
}
|
||||||
@ -441,7 +441,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
* @param newCID new ClassId
|
* @param newCID new ClassId
|
||||||
* @return true if class change is possible
|
* @return true if class change is possible
|
||||||
*/
|
*/
|
||||||
private static final boolean validateClassId(ClassId oldCID, ClassId newCID)
|
private static boolean validateClassId(ClassId oldCID, ClassId newCID)
|
||||||
{
|
{
|
||||||
if ((newCID == null) || (newCID.getRace() == null))
|
if ((newCID == null) || (newCID.getRace() == null))
|
||||||
{
|
{
|
||||||
|
@ -204,7 +204,7 @@ public final class L2FestivalGuideInstance extends L2Npc
|
|||||||
player.sendPacket(ActionFailed.STATIC_PACKET);
|
player.sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String getStatsTable()
|
private static String getStatsTable()
|
||||||
{
|
{
|
||||||
final StringBuilder tableHtml = new StringBuilder(1000);
|
final StringBuilder tableHtml = new StringBuilder(1000);
|
||||||
|
|
||||||
@ -225,13 +225,13 @@ public final class L2FestivalGuideInstance extends L2Npc
|
|||||||
winningCabal = "None";
|
winningCabal = "None";
|
||||||
}
|
}
|
||||||
|
|
||||||
tableHtml.append("<tr><td width=\"100\" align=\"center\">" + festivalName + "</td><td align=\"center\" width=\"35\">" + String.valueOf(duskScore) + "</td><td align=\"center\" width=\"35\">" + String.valueOf(dawnScore) + "</td><td align=\"center\" width=\"130\">" + winningCabal + "</td></tr>");
|
tableHtml.append("<tr><td width=\"100\" align=\"center\">" + festivalName + "</td><td align=\"center\" width=\"35\">" + duskScore + "</td><td align=\"center\" width=\"35\">" + dawnScore + "</td><td align=\"center\" width=\"130\">" + winningCabal + "</td></tr>");
|
||||||
}
|
}
|
||||||
|
|
||||||
return tableHtml.toString();
|
return tableHtml.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String getBonusTable()
|
private static String getBonusTable()
|
||||||
{
|
{
|
||||||
final StringBuilder tableHtml = new StringBuilder(500);
|
final StringBuilder tableHtml = new StringBuilder(500);
|
||||||
|
|
||||||
@ -241,7 +241,7 @@ public final class L2FestivalGuideInstance extends L2Npc
|
|||||||
final int accumScore = SevenSignsFestival.getInstance().getAccumulatedBonus(i);
|
final int accumScore = SevenSignsFestival.getInstance().getAccumulatedBonus(i);
|
||||||
final String festivalName = SevenSignsFestival.getFestivalName(i);
|
final String festivalName = SevenSignsFestival.getFestivalName(i);
|
||||||
|
|
||||||
tableHtml.append("<tr><td align=\"center\" width=\"150\">" + festivalName + "</td><td align=\"center\" width=\"150\">" + String.valueOf(accumScore) + "</td></tr>");
|
tableHtml.append("<tr><td align=\"center\" width=\"150\">" + festivalName + "</td><td align=\"center\" width=\"150\">" + accumScore + "</td></tr>");
|
||||||
}
|
}
|
||||||
|
|
||||||
return tableHtml.toString();
|
return tableHtml.toString();
|
||||||
|
@ -414,9 +414,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Provides additional HP recovery for clan members in the fortress.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
|
html.replace("%use%", "Provides additional HP recovery for clan members in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
|
||||||
html.replace("%apply%", "recovery hp " + String.valueOf(percent));
|
html.replace("%apply%", "recovery hp " + percent);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -437,9 +437,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.FS_MPREG2_FEE;
|
cost = Config.FS_MPREG2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Provides additional MP recovery for clan members in the fortress.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
|
html.replace("%use%", "Provides additional MP recovery for clan members in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
|
||||||
html.replace("%apply%", "recovery mp " + String.valueOf(percent));
|
html.replace("%apply%", "recovery mp " + percent);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -460,9 +460,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.FS_EXPREG2_FEE;
|
cost = Config.FS_EXPREG2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
|
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
|
||||||
html.replace("%apply%", "recovery exp " + String.valueOf(percent));
|
html.replace("%apply%", "recovery exp " + percent);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -483,7 +483,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
|
if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
||||||
html.replace("%val%", String.valueOf(val) + "%");
|
html.replace("%val%", val + "%");
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -528,7 +528,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
|
if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
||||||
html.replace("%val%", String.valueOf(val) + "%");
|
html.replace("%val%", val + "%");
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -573,7 +573,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
|
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
||||||
html.replace("%val%", String.valueOf(val) + "%");
|
html.replace("%val%", val + "%");
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -609,7 +609,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
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>]";
|
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>]";
|
||||||
if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
|
if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
|
||||||
{
|
{
|
||||||
html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime()));
|
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime()));
|
||||||
html.replace("%change_hp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery hp_cancel\">Deactivate</a>]" + hp);
|
html.replace("%change_hp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery hp_cancel\">Deactivate</a>]" + hp);
|
||||||
}
|
}
|
||||||
@ -621,7 +621,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
|
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
|
||||||
{
|
{
|
||||||
html.replace("%exp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime()));
|
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime()));
|
||||||
html.replace("%change_exp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery exp_cancel\">Deactivate</a>]" + exp);
|
html.replace("%change_exp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery exp_cancel\">Deactivate</a>]" + exp);
|
||||||
}
|
}
|
||||||
@ -633,7 +633,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
|
if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
|
||||||
{
|
{
|
||||||
html.replace("%mp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime()));
|
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime()));
|
||||||
html.replace("%change_mp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery mp_cancel\">Deactivate</a>]" + mp);
|
html.replace("%change_mp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery mp_cancel\">Deactivate</a>]" + mp);
|
||||||
}
|
}
|
||||||
@ -688,9 +688,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.FS_SUPPORT2_FEE;
|
cost = Config.FS_SUPPORT2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Enables the use of supplementary magic.");
|
html.replace("%use%", "Enables the use of supplementary magic.");
|
||||||
html.replace("%apply%", "other support " + String.valueOf(stage));
|
html.replace("%apply%", "other support " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -711,9 +711,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
cost = Config.FS_TELE2_FEE;
|
cost = Config.FS_TELE2_FEE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
|
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
|
||||||
html.replace("%use%", "Teleports clan members in a fort to the target <font color=\"00FFFF\">Stage " + String.valueOf(stage) + "</font> staging area");
|
html.replace("%use%", "Teleports clan members in a fort to the target <font color=\"00FFFF\">Stage " + stage + "</font> staging area");
|
||||||
html.replace("%apply%", "other tele " + String.valueOf(stage));
|
html.replace("%apply%", "other tele " + stage);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -734,7 +734,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
|
if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -779,7 +779,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
|
if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
|
||||||
{
|
{
|
||||||
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
|
||||||
html.replace("%val%", "Stage " + String.valueOf(val));
|
html.replace("%val%", "Stage " + val);
|
||||||
sendHtmlMessage(player, html);
|
sendHtmlMessage(player, html);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -817,7 +817,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
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>]";
|
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)
|
if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
|
||||||
{
|
{
|
||||||
html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "</font>Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime()));
|
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime()));
|
||||||
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
|
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
|
||||||
}
|
}
|
||||||
@ -829,7 +829,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
}
|
}
|
||||||
if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
|
if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
|
||||||
{
|
{
|
||||||
html.replace("%support%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
|
html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "</font>Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
|
||||||
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime()));
|
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime()));
|
||||||
html.replace("%change_support%", "[<a action=\"bypass -h npc_%objectId%_manage other support_cancel\">Deactivate</a>]" + support);
|
html.replace("%change_support%", "[<a action=\"bypass -h npc_%objectId%_manage other support_cancel\">Deactivate</a>]" + support);
|
||||||
}
|
}
|
||||||
@ -897,7 +897,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
|
|||||||
{
|
{
|
||||||
if (!((skill.getMpConsume() + skill.getMpInitialConsume()) > getCurrentMp()))
|
if (!((skill.getMpConsume() + skill.getMpInitialConsume()) > getCurrentMp()))
|
||||||
{
|
{
|
||||||
this.doCast(skill);
|
doCast(skill);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -176,7 +176,7 @@ public final class L2StaticObjectInstance extends L2Character
|
|||||||
public void setMeshIndex(int meshIndex)
|
public void setMeshIndex(int meshIndex)
|
||||||
{
|
{
|
||||||
_meshIndex = meshIndex;
|
_meshIndex = meshIndex;
|
||||||
this.broadcastPacket(new StaticObject(this));
|
broadcastPacket(new StaticObject(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -376,7 +376,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
final StringBuilder content1 = new StringBuilder(200);
|
final StringBuilder content1 = new StringBuilder(200);
|
||||||
for (PlayerClass subClass : subsAvailable)
|
for (PlayerClass subClass : subsAvailable)
|
||||||
{
|
{
|
||||||
content1.append("<a action=\"bypass -h npc_%objectId%_Subclass 4 " + String.valueOf(subClass.ordinal()) + "\" msg=\"1268;" + ClassListData.getInstance().getClass(subClass.ordinal()).getClassName() + "\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
|
content1.append("<a action=\"bypass -h npc_%objectId%_Subclass 4 " + subClass.ordinal() + "\" msg=\"1268;" + ClassListData.getInstance().getClass(subClass.ordinal()).getClassName() + "\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
|
||||||
}
|
}
|
||||||
html.replace("%list%", content1.toString());
|
html.replace("%list%", content1.toString());
|
||||||
}
|
}
|
||||||
@ -418,7 +418,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
final SubClass subClass = subList.next();
|
final SubClass subClass = subList.next();
|
||||||
if (checkVillageMaster(subClass.getClassDefinition()))
|
if (checkVillageMaster(subClass.getClassDefinition()))
|
||||||
{
|
{
|
||||||
content2.append("<a action=\"bypass -h npc_%objectId%_Subclass 5 " + String.valueOf(subClass.getClassIndex()) + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
|
content2.append("<a action=\"bypass -h npc_%objectId%_Subclass 5 " + subClass.getClassIndex() + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -451,7 +451,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
{
|
{
|
||||||
final SubClass subClass = subList.next();
|
final SubClass subClass = subList.next();
|
||||||
|
|
||||||
content3.append("Sub-class " + String.valueOf(classIndex++) + "<br><a action=\"bypass -h npc_%objectId%_Subclass 6 " + String.valueOf(subClass.getClassIndex()) + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
|
content3.append("Sub-class " + classIndex++ + "<br><a action=\"bypass -h npc_%objectId%_Subclass 6 " + subClass.getClassIndex() + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
|
||||||
}
|
}
|
||||||
html.replace("%list%", content3.toString());
|
html.replace("%list%", content3.toString());
|
||||||
}
|
}
|
||||||
@ -613,7 +613,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
final StringBuilder content6 = new StringBuilder(200);
|
final StringBuilder content6 = new StringBuilder(200);
|
||||||
for (PlayerClass subClass : subsAvailable)
|
for (PlayerClass subClass : subsAvailable)
|
||||||
{
|
{
|
||||||
content6.append("<a action=\"bypass -h npc_%objectId%_Subclass 7 " + String.valueOf(paramOne) + " " + String.valueOf(subClass.ordinal()) + "\" msg=\"1445;\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
|
content6.append("<a action=\"bypass -h npc_%objectId%_Subclass 7 " + paramOne + " " + subClass.ordinal() + "\" msg=\"1445;\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (paramOne)
|
switch (paramOne)
|
||||||
@ -879,12 +879,12 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass);
|
return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Iterator<SubClass> iterSubClasses(L2PcInstance player)
|
private static Iterator<SubClass> iterSubClasses(L2PcInstance player)
|
||||||
{
|
{
|
||||||
return player.getSubClasses().values().iterator();
|
return player.getSubClasses().values().iterator();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void dissolveClan(L2PcInstance player, int clanId)
|
private static void dissolveClan(L2PcInstance player, int clanId)
|
||||||
{
|
{
|
||||||
if (!player.isClanLeader())
|
if (!player.isClanLeader())
|
||||||
{
|
{
|
||||||
@ -945,7 +945,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
ClanTable.getInstance().scheduleRemoveClan(clan.getId());
|
ClanTable.getInstance().scheduleRemoveClan(clan.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void recoverClan(L2PcInstance player, int clanId)
|
private static void recoverClan(L2PcInstance player, int clanId)
|
||||||
{
|
{
|
||||||
if (!player.isClanLeader())
|
if (!player.isClanLeader())
|
||||||
{
|
{
|
||||||
@ -958,7 +958,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
clan.updateClanInDB();
|
clan.updateClanInDB();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
|
private static void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
|
||||||
{
|
{
|
||||||
if (!player.isClanLeader())
|
if (!player.isClanLeader())
|
||||||
{
|
{
|
||||||
@ -1069,7 +1069,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName)
|
private static void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName)
|
||||||
{
|
{
|
||||||
if (!player.isClanLeader())
|
if (!player.isClanLeader())
|
||||||
{
|
{
|
||||||
@ -1102,7 +1102,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
player.sendMessage("Pledge name changed.");
|
player.sendMessage("Pledge name changed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName)
|
private static void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName)
|
||||||
{
|
{
|
||||||
if (!player.isClanLeader())
|
if (!player.isClanLeader())
|
||||||
{
|
{
|
||||||
@ -1165,7 +1165,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
* this displays PledgeSkillList to the player.
|
* this displays PledgeSkillList to the player.
|
||||||
* @param player
|
* @param player
|
||||||
*/
|
*/
|
||||||
public static final void showPledgeSkillList(L2PcInstance player)
|
public static void showPledgeSkillList(L2PcInstance player)
|
||||||
{
|
{
|
||||||
if (!player.isClanLeader())
|
if (!player.isClanLeader())
|
||||||
{
|
{
|
||||||
|
@ -299,7 +299,7 @@ public enum PlayerClass
|
|||||||
return subclasses;
|
return subclasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final EnumSet<PlayerClass> getSet(Race race, ClassLevel level)
|
public static EnumSet<PlayerClass> getSet(Race race, ClassLevel level)
|
||||||
{
|
{
|
||||||
final EnumSet<PlayerClass> allOf = EnumSet.noneOf(PlayerClass.class);
|
final EnumSet<PlayerClass> allOf = EnumSet.noneOf(PlayerClass.class);
|
||||||
|
|
||||||
|
@ -32,5 +32,5 @@ public interface IDropItem
|
|||||||
* @param killer the killer
|
* @param killer the killer
|
||||||
* @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise
|
* @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise
|
||||||
*/
|
*/
|
||||||
public Collection<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
|
Collection<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
|
||||||
}
|
}
|
||||||
|
@ -170,7 +170,7 @@ public class FortSiege implements Siegable
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + String.valueOf(_time));
|
_log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user