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

Separated the Classic Datapack to it's own folder.

Browse Source
This commit is contained in:
MobiusDev
2015-05-02 03:45:56 +00:00
parent 08e28fe058
commit 484bff80bb
11501 changed files with 2200482 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/gameserver/network/Debug.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/NpcStringId.java
View File

@ -33203,7 +33203,7 @@ public final class NpcStringId
String text;
for (final String lang : languages)
{
file = new File(Config.DATAPACK_ROOT, "/data/lang/" + lang + "/ns/NpcStringLocalisation.xml");
file = new File(Config.DATAPACK_ROOT, "/lang/" + lang + "/ns/NpcStringLocalisation.xml");
if (!file.isFile())
{
continue;

2
trunk/java/com/l2jserver/gameserver/network/SystemMessageId.java
View File

@ -13979,7 +13979,7 @@ public final class SystemMessageId
String text;
for (final String lang : languages)
{
file = new File(Config.DATAPACK_ROOT, "/data/lang/" + lang + "/sm/SystemMessageLocalisation.xml");
file = new File(Config.DATAPACK_ROOT, "/lang/" + lang + "/sm/SystemMessageLocalisation.xml");
if (!file.isFile())
{
continue;

38
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
View File

@ -299,44 +299,6 @@ public final class CharacterCreate extends L2GameClientPacket
{
newChar.setXYZInvisible(Config.FACTION_STARTING_LOCATION.getX(), Config.FACTION_STARTING_LOCATION.getY(), Config.FACTION_STARTING_LOCATION.getZ());
}
else if (Config.SERVER_CLASSIC_SUPPORT)
{
switch (template.getRace())
{
case HUMAN:
{
if (template.getClassId().isMage())
{
newChar.setXYZInvisible(-90875, 248162, -3570);
}
else
{
newChar.setXYZInvisible(-71338, 258271, -3104);
}
break;
}
case ELF:
{
newChar.setXYZInvisible(46045, 41251, -3440);
break;
}
case DARK_ELF:
{
newChar.setXYZInvisible(28295, 11063, -4224);
break;
}
case ORC:
{
newChar.setXYZInvisible(-56733, -113459, -690);
break;
}
case DWARF:
{
newChar.setXYZInvisible(108644, -173947, -400);
break;
}
}
}
else
{
Location createLoc = template.getCreationPoint();

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
View File

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

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
View File

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

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
View File

@ -42,7 +42,7 @@ public class ExPCCafeRequestOpenWindowWithoutNPC extends L2GameClientPacket
public void getHtmlPage(L2PcInstance player)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player.getHtmlPrefix(), "data/html/pccafe.htm");
html.setFile(player.getHtmlPrefix(), "html/pccafe.htm");
player.sendPacket(html);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@ -73,7 +73,7 @@ public final class RequestLinkHtml extends L2GameClientPacket
return;
}
String filename = "data/html/" + _link;
String filename = "html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
msg.setFile(actor.getHtmlPrefix(), filename);
sendPacket(msg);

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
View File

@ -318,7 +318,7 @@ public class CharSelectionInfo extends L2GameServerPacket
{
lang = Config.L2JMOD_MULTILANG_DEFAULT;
}
charInfopackage.setHtmlPrefix("data/lang/" + lang + "/");
charInfopackage.setHtmlPrefix("lang/" + lang + "/");
}
// if is in subclass, load subclass exp, sp, lvl info