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

Reworked the custom localisation system.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-13 06:07:59 +00:00
parent 5fa60b02dc
commit 0be93db17c
3505 changed files with 26765 additions and 63542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/documentation.txt vendored
View File

@@ -1,212 +0,0 @@
Within data/lang, a folder should be created in order to hold the files
related with a given language.
Those folders should be named by using 2 letters, as described by the following
list:
Codes for the representation of the names of languages
ISO 639-1 codes arranged alphabetically
more info about this standard: http://en.wikipedia.org/wiki/ISO_639-1
aa Afar
ab Abkhazian
af Afrikaans
ak Akan
sq Albanian
am Amharic
ar Arabic
an Aragonese
hy Armenian
as Assamese
av Avaric
ae Avestan
ay Aymara
az Azerbaijani
ba Bashkir
bm Bambara
eu Basque
be Belarusian
bn Bengali
bh Bihari
bi Bislama
bs Bosnian
br Breton
bg Bulgarian
my Burmese
ca Catalan; Valencian
ch Chamorro
ce Chechen
zh Chinese
cu Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic
cv Chuvash
kw Cornish
co Corsican
cr Cree
cs Czech
da Danish
dv Divehi; Dhivehi; Maldivian
nl Dutch; Flemish
dz Dzongkha
en English
eo Esperanto
et Estonian
ee Ewe
fo Faroese
fj Fijian
fi Finnish
fr French
fy Western Frisian
ff Fulah
ka Georgian
de German
gd Gaelic; Scottish Gaelic
ga Irish
gl Galician
gv Manx
el Greek, Modern (1453-)
gn Guarani
gu Gujarati
ht Haitian; Haitian Creole
ha Hausa
he Hebrew
hz Herero
hi Hindi
ho Hiri Motu
hu Hungarian
ig Igbo
is Icelandic
io Ido
ii Sichuan Yi; Nuosu
iu Inuktitut
ie Interlingue; Occidental
ia Interlingua (International Auxiliary Language Association)
id Indonesian
ik Inupiaq
it Italian
jv Javanese
ja Japanese
kl Kalaallisut; Greenlandic
kn Kannada
ks Kashmiri
kr Kanuri
kk Kazakh
km Central Khmer
ki Kikuyu; Gikuyu
rw Kinyarwanda
ky Kirghiz; Kyrgyz
kv Komi
kg Kongo
ko Korean
kj Kuanyama; Kwanyama
ku Kurdish
lo Lao
la Latin
lv Latvian
li Limburgan; Limburger; Limburgish
ln Lingala
lt Lithuanian
lb Luxembourgish; Letzeburgesch
lu Luba-Katanga
lg Ganda
mk Macedonian
mh Marshallese
ml Malayalam
mi Maori
mr Marathi
ms Malay
mg Malagasy
mt Maltese
mo Moldavian
mn Mongolian
na Nauru
nv Navajo; Navaho
nr Ndebele, South; South Ndebele
nd Ndebele, North; North Ndebele
ng Ndonga
ne Nepali
nn Norwegian Nynorsk; Nynorsk, Norwegian
nb Bokmal, Norwegian; Norwegian Bokmal
no Norwegian
ny Chichewa; Chewa; Nyanja
oc Occitan (post 1500); Provencal
oj Ojibwa
or Oriya
om Oromo
os Ossetian; Ossetic
pa Panjabi; Punjabi
fa Persian
pi Pali
pl Polish
pt Portuguese
ps Pushto; Pashto
qu Quechua
rm Romansh
ro Romanian
rn Rundi
ru Russian
sg Sango
sa Sanskrit
sr Serbian
hr Croatian
si Sinhala; Sinhalese
sk Slovak
sl Slovenian
se Northern Sami
sm Samoan
sn Shona
sd Sindhi
so Somali
st Sotho, Southern
es Spanish; Castilian
sc Sardinian
ss Swati
su Sundanese
sw Swahili
sv Swedish
ty Tahitian
ta Tamil
tt Tatar
te Telugu
tg Tajik
tl Tagalog
th Thai
bo Tibetan
ti Tigrinya
to Tonga (Tonga Islands)
tn Tswana
ts Tsonga
tk Turkmen
tr Turkish
tw Twi
ug Uighur; Uyghur
uk Ukrainian
ur Urdu
uz Uzbek
ve Venda
vi Vietnamese
vo Volapuk
cy Welsh
wa Walloon
wo Wolof
xh Xhosa
yi Yiddish
yo Yoruba
za Zhuang; Chuang
zu Zulu
So if you wanted to add ukrainian support, you should:
1-Create a folder:
gameserver/data/lang/uk
2-Copy data/lang/systemmsg.txt to data/lang/uk/systemmsg.txt
3-Translate system messages as you see fit. (Be careful with
the placeholders such as $s1!!)
----THIS PART IS NOT IMPLEMENTED YET----
4-Copy and translate HTM files from html and scripts folders.
If a file or system message didn't exist/weren't defined for a
given language a player could be preferring, stock ones should
be dispatched.

11
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/el/NpcStringLocalisation.xml vendored Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/localisations.xsd">
<localisation id="99702" text="Τι κοιτάς;" />
<localisation id="1000288" text="$s1! Πώς τολμάς να διακόπτεις τον αγώνα μας! Βοήθεια παιδιά!" />
<localisation id="1000388" text="$s1! Έ! Έχουμε μια μονομαχία εδώ!" />
<localisation id="1000389" text="Η μονομαχία τελειώσε! Επίθεση!" />
<localisation id="1000390" text="Φάουλ! Σκοτώστε το δειλό!" />
<localisation id="1000391" text="Πώς τολμάς να διακόπτεις μια ιερή μονομαχία! Πρέπει να πάρεις ένα μάθημα!" />
<localisation id="1000392" text="Πέθανε, δειλέ!" />
<localisation id="1000394" text="Σκοτώστε το δειλό!" />
</list>

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/el/SystemMessageLocalisation.xml vendored Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/localisations.xsd">
<localisation id="34" text="Καλωσόρισες στον κόσμο του Lineage II." />
</list>

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/el/data/html/mods/Lang/Error.htm vendored Normal file
View File

@@ -0,0 +1,6 @@
<html><title>Επιλογή γλώσσας</title>
<body>
<br>
<center><font color="LEVEL">Σφάλμα, θα χρησιμοποιηθεί η προεπιλεγμένη γλώσσα.</font></center>
</body>
</html>

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/el/data/html/mods/Lang/LanguageSelect.htm vendored Normal file
View File

@@ -0,0 +1,8 @@
<html><title>Επιλογή γλώσσας</title>
<body>
<br>
<center><font color="LEVEL">Επιλέξτε μια γλώσσα:</font><br>
%list%
</center>
</body>
</html>

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/el/data/html/mods/Lang/Ok.htm vendored Normal file
View File

@@ -0,0 +1,6 @@
<html><title>Επιλογή γλώσσας</title>
<body>
<br>
<center><font color="LEVEL">Η γλώσσα επιλέχθηκε με επιτυχία.</font></center>
</body>
</html>

5
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/ger/sm/SystemMessageLocalisation.xml vendored
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../langs.xsd">
<sm id="0" text="Verbindung zum Server unterbrochen" /> <!-- YOU_HAVE_BEEN_DISCONNECTED -->
<sm name="THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECONDS" text="Der Server wird in $s1 Sekunden herrunter gefahren. Bitte suche einen sicheren Ort für den Logout." /> <!-- 1 -->
</list>

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/pl/data/html/mods/Lang/Error.htm vendored
View File

@@ -1,6 +0,0 @@
<html><title>Wybór języka</title>
<body>
<br>
<center><font color="LEVEL">Błąd podczas zmiany języka, użyto standardowego.</font></center>
</body>
</html>

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/pl/data/html/mods/Lang/LanguageSelect.htm vendored
View File

@@ -1,8 +0,0 @@
<html><title>Wybór języka</title>
<body>
<br>
<center><font color="LEVEL">Proszę wybierz preferowany język:</font><br>
%list%
</center>
</body>
</html>

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/pl/data/html/mods/Lang/Ok.htm vendored
View File

@@ -1,6 +0,0 @@
<html><title>Wybór języka</title>
<body>
<br>
<center><font color="LEVEL">Język poprawnie zmieniony.</font></center>
</body>
</html>

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/ru/data/html/mods/Lang/Error.htm vendored
View File

@@ -1,6 +0,0 @@
<html><title>Выбор языка</title>
<body>
<br>
<center><font color="LEVEL">Ошибка, используется язык по умолчанию.</font></center>
</body>
</html>

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/ru/data/html/mods/Lang/LanguageSelect.htm vendored
View File

@@ -1,8 +0,0 @@
<html><title>Выбор языка</title>
<body>
<br>
<center><font color="LEVEL">Пожалуйста выберите язык:</font><br>
%list%
</center>
</body>
</html>

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/ru/data/html/mods/Lang/Ok.htm vendored
View File

@@ -1,6 +0,0 @@
<html><title>Выбор языка</title>
<body>
<br>
<center><font color="LEVEL">Язык успешно выбран.</font></center>
</body>
</html>

3237
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/systemmsg.txt vendored
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java vendored
View File

@@ -80,7 +80,7 @@ public class HappyHours extends LongTimeEvent
{
_lastRewardTime = System.currentTimeMillis();
final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true);
final SystemMessage systemMsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_SIBI_S_COINS);
final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_SIBI_S_COINS);
systemMsg.addInt(20);
for (PlayerInstance plr : World.getInstance().getPlayers())
{

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -1196,7 +1196,7 @@ public class AdminEditChar implements IAdminCommandHandler
final int oldReputation = player.getReputation();
player.setReputation(newReputation);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_REPUTATION_HAS_BEEN_CHANGED_TO_S1);
sm.addInt(newReputation);
player.sendPacket(sm);
BuilderUtil.sendSysMessage(activeChar, "Successfully Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ").");

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java vendored
View File

@@ -85,7 +85,7 @@ public class AdminFortSiege implements IAdminCommandHandler
}
else if (fort.getSiege().addAttacker(player, false) == 4)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_BEEN_REGISTERED_TO_S1_S_FORTRESS_BATTLE);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_BEEN_REGISTERED_TO_S1_S_FORTRESS_BATTLE);
sm.addCastleId(fort.getResidenceId());
player.sendPacket(sm);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java vendored
View File

@@ -117,7 +117,7 @@ public class AdminGeodata implements IAdminCommandHandler
}
else
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_SEE_TARGET));
activeChar.sendPacket(new SystemMessage(SystemMessageId.CANNOT_SEE_TARGET));
}
}
else

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminMessages.java vendored
View File

@@ -43,7 +43,7 @@ public class AdminMessages implements IAdminCommandHandler
{
try
{
activeChar.sendPacket(SystemMessage.getSystemMessage(Integer.parseInt(command.substring(10).trim())));
activeChar.sendPacket(new SystemMessage(Integer.parseInt(command.substring(10).trim())));
return true;
}
catch (Exception e)
@@ -60,7 +60,7 @@ public class AdminMessages implements IAdminCommandHandler
return false;
}
final SystemMessage sm = SystemMessage.getSystemMessage(Integer.parseInt(tokens[1]));
final SystemMessage sm = new SystemMessage(Integer.parseInt(tokens[1]));
String val;
int lastPos = 0;
for (int i = 2; i < tokens.length; i++)

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java vendored
View File

@@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler
if (!targetPlayer.isClanLeader())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
sm.addString(targetPlayer.getName());
activeChar.sendPacket(sm);
showMainPage(activeChar);

9
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java vendored
View File

@@ -53,6 +53,8 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
import org.l2jmobius.gameserver.util.BuilderUtil;
import org.l2jmobius.gameserver.util.Util;
@@ -325,6 +327,13 @@ public class AdminReload implements IAdminCommandHandler
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Fake Player Chat data.");
break;
}
case "localisations":
{
SystemMessageId.loadLocalisations();
NpcStringId.loadLocalisations();
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Localisation data.");
break;
}
default:
{
activeChar.sendMessage(RELOAD_USAGE);

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -317,7 +317,7 @@ public class AdminSkill implements IAdminCommandHandler
if (!player.isClanLeader())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
sm.addString(player.getName());
activeChar.sendPacket(sm);
}
@@ -595,7 +595,7 @@ public class AdminSkill implements IAdminCommandHandler
final PlayerInstance player = target.getActingPlayer();
if (!player.isClanLeader())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
sm.addString(player.getName());
activeChar.sendPacket(sm);
showMainPage(activeChar);
@@ -616,7 +616,7 @@ public class AdminSkill implements IAdminCommandHandler
}
final String skillname = skill.getName();
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED);
sm.addSkillName(skill);
player.sendPacket(sm);
final Clan clan = player.getClan();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

@@ -219,7 +219,7 @@ public class AdminSpawn implements IAdminCommandHandler
}
else if (command.startsWith("admin_unspawnall"))
{
Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_NPC_SERVER_IS_NOT_OPERATING_AT_THIS_TIME));
Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.THE_NPC_SERVER_IS_NOT_OPERATING_AT_THIS_TIME));
// Unload all scripts.
QuestManager.getInstance().unloadAllScripts();
// Unload all zones.

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java vendored
View File

@@ -83,7 +83,7 @@ public final class ChatGeneral implements IChatHandler
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(new SystemMessage(SystemMessageId.GENERAL_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
return;
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatShout.java vendored
View File

@@ -54,7 +54,7 @@ public final class ChatShout implements IChatHandler
}
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SHOUT_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(new SystemMessage(SystemMessageId.SHOUT_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(Config.MINIMUM_CHAT_LEVEL));
return;
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java vendored
View File

@@ -54,7 +54,7 @@ public final class ChatTrade implements IChatHandler
}
if (activeChar.getLevel() < 20)
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(20));
activeChar.sendPacket(new SystemMessage(SystemMessageId.TRADE_CHAT_CANNOT_BE_USED_BY_NON_PREMIUM_USERS_LV_S1_OR_LOWER).addInt(20));
return;
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java vendored
View File

@@ -109,7 +109,7 @@ public final class ChatWhisper implements IChatHandler
}
if ((activeChar.getLevel() < Config.MINIMUM_CHAT_LEVEL) && !activeChar.getWhisperers().contains(receiver.getObjectId()) && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NON_PREMIUM_USERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
activeChar.sendPacket(new SystemMessage(SystemMessageId.NON_PREMIUM_USERS_LV_S1_OR_LOWER_CAN_RESPOND_TO_A_WHISPER_BUT_CANNOT_INITIATE_IT).addInt(Config.MINIMUM_CHAT_LEVEL));
return;
}
if (!BlockList.isBlocked(receiver, activeChar))

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java vendored
View File

@@ -61,7 +61,7 @@ public final class ChatWorld implements IChatHandler
if (activeChar.getLevel() < Config.WORLD_CHAT_MIN_LEVEL)
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_USE_WORLD_CHAT_FROM_LV_S1);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_USE_WORLD_CHAT_FROM_LV_S1);
msg.addInt(Config.WORLD_CHAT_MIN_LEVEL);
activeChar.sendPacket(msg);
}
@@ -87,7 +87,7 @@ public final class ChatWorld implements IChatHandler
if ((instant != null) && instant.isAfter(now))
{
final Duration timeDiff = Duration.between(now, instant);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_S1_SEC_UNTIL_YOU_ARE_ABLE_TO_USE_WORLD_CHAT);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_S1_SEC_UNTIL_YOU_ARE_ABLE_TO_USE_WORLD_CHAT);
msg.addInt((int) timeDiff.getSeconds());
activeChar.sendPacket(msg);
return;

18
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

@@ -67,21 +67,21 @@ public final class CallPc extends AbstractEffect
{
if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
sm.addItemName(_itemId);
target.sendPacket(sm);
return;
}
target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
sm.addItemName(_itemId);
target.sendPacket(sm);
}
target.addScript(new SummonRequestHolder(player, skill));
final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
confirm.addString(player.getName());
confirm.addZoneName(player.getX(), player.getY(), player.getZ());
confirm.getSystemMessage().addString(player.getName());
confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
confirm.addTime(30000);
confirm.addRequesterId(player.getObjectId());
target.sendPacket(confirm);
@@ -97,7 +97,7 @@ public final class CallPc extends AbstractEffect
if (target.isAlikeDead())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
sm.addPcName(target);
effector.sendPacket(sm);
return false;
@@ -105,7 +105,7 @@ public final class CallPc extends AbstractEffect
if (target.isInStoreMode())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
sm.addPcName(target);
effector.sendPacket(sm);
return false;
@@ -113,7 +113,7 @@ public final class CallPc extends AbstractEffect
if (target.isRooted() || target.isInCombat())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
sm.addPcName(target);
effector.sendPacket(sm);
return false;
@@ -133,7 +133,7 @@ public final class CallPc extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2);
sm.addString(target.getName());
effector.sendPacket(sm);
return false;
@@ -141,7 +141,7 @@ public final class CallPc extends AbstractEffect
if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
sm.addString(target.getName());
effector.sendPacket(sm);
return false;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java vendored
View File

@@ -72,7 +72,7 @@ public class ClassChange extends AbstractEffect
identifyCrisis.applyEffects(player, player);
}
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_SWITCHED_S1_TO_S2);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_SWITCHED_S1_TO_S2);
msg.addClassId(activeClass);
msg.addClassId(player.getClassId().getId());
player.sendPacket(msg);

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java vendored
View File

@@ -108,13 +108,13 @@ public final class ConvertItem extends AbstractEffect
final SystemMessage sm;
if (unequippedItem.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(unequippedItem);
}
player.sendPacket(sm);
@@ -147,13 +147,13 @@ public final class ConvertItem extends AbstractEffect
final SystemMessage msg;
if (newItem.getEnchantLevel() > 0)
{
msg = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2);
msg = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
msg.addInt(newItem.getEnchantLevel());
msg.addItemName(newItem);
}
else
{
msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
msg = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
msg.addItemName(newItem);
}
player.sendPacket(msg);

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java vendored
View File

@@ -87,14 +87,14 @@ public final class Cp extends AbstractEffect
{
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -76,14 +76,14 @@ public final class CpHeal extends AbstractEffect
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -73,14 +73,14 @@ public final class CpHealPercent extends AbstractEffect
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java vendored
View File

@@ -81,13 +81,13 @@ public final class Disarmor extends AbstractEffect
SystemMessage sm = null;
if (unequiped[0].getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(unequiped[0].getEnchantLevel());
sm.addItemName(unequiped[0]);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(unequiped[0]);
}
player.sendPacket(sm);
@@ -123,13 +123,13 @@ public final class Disarmor extends AbstractEffect
{
if (item.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2);
sm = new SystemMessage(SystemMessageId.EQUIPPED_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1);
sm.addItemName(item);
}
player.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@@ -86,7 +86,7 @@ public final class EnergyAttack extends AbstractEffect
if (!attacker.decreaseCharges(charge))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
attacker.sendPacket(sm);
return;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java vendored
View File

@@ -54,7 +54,7 @@ public final class FocusMaxMomentum extends AbstractEffect
player.setCharges(count);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1);
sm.addInt(count);
player.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java vendored
View File

@@ -79,7 +79,7 @@ public final class FocusMomentum extends AbstractEffect
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1);
sm.addInt(newCharge);
player.sendPacket(sm);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java vendored
View File

@@ -62,7 +62,7 @@ public class GetMomentum extends AbstractEffect
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FORCE_HAS_INCREASED_TO_LEVEL_S1);
sm.addInt(newCharge);
player.sendPacket(sm);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java vendored
View File

@@ -58,7 +58,7 @@ public final class GiveClanReputation extends AbstractEffect
{
if (member.isOnline())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_CLAN_HAS_ADDED_S1_POINT_S_TO_ITS_CLAN_REPUTATION);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ADDED_S1_POINT_S_TO_ITS_CLAN_REPUTATION);
sm.addInt(_reputation);
member.getPlayerInstance().sendPacket(sm);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java vendored
View File

@@ -59,7 +59,7 @@ public final class GiveExpAndSp extends AbstractEffect
effector.getActingPlayer().getStat().addSp(_sp);
SystemMessage sm = null;
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
sm.addLong(_xp);
sm.addLong(0);
sm.addLong(_sp);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java vendored
View File

@@ -66,7 +66,7 @@ public final class GiveRecommendation extends AbstractEffect
{
target.setRecomHave(target.getRecomHave() + recommendationsGiven);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATION_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATION_S);
sm.addInt(recommendationsGiven);
target.sendPacket(sm);
target.sendPacket(new UserInfo(target));

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java vendored
View File

@@ -73,12 +73,12 @@ public final class Harvesting extends AbstractEffect
SystemMessage sm = null;
if (item.getCount() == 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm.addItemName(harvestedItem.getId());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item.getId());
sm.addLong(harvestedItem.getCount());
}
@@ -90,13 +90,13 @@ public final class Harvesting extends AbstractEffect
{
if (item.getCount() == 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_2);
sm = new SystemMessage(SystemMessageId.C1_HAS_OBTAINED_S2_2);
sm.addString(player.getName());
sm.addItemName(harvestedItem.getId());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HARVESTED_S3_S2_S);
sm = new SystemMessage(SystemMessageId.C1_HARVESTED_S3_S2_S);
sm.addString(player.getName());
sm.addLong(harvestedItem.getCount());
sm.addItemName(harvestedItem.getId());

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

@@ -141,14 +141,14 @@ public final class Heal extends AbstractEffect
}
else if (effector.isPlayer() && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -83,12 +83,12 @@ public final class HealPercent extends AbstractEffect
SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm = new SystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
}
sm.addInt((int) amount);
effected.sendPacket(sm);

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java vendored
View File

@@ -88,12 +88,12 @@ public final class Hp extends AbstractEffect
SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm = new SystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
}
sm.addInt((int) amount);
effected.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java vendored
View File

@@ -52,7 +52,7 @@ public final class HpByLevel extends AbstractEffect
final int restored = (int) (absorb - effector.getCurrentHp());
effector.setCurrentHp(absorb);
// System message
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm.addInt(restored);
effector.sendPacket(sm);
}

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@@ -132,14 +132,14 @@ public final class HpCpHeal extends AbstractEffect
{
if (effector.isPlayer() && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) healAmount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm.addInt((int) healAmount);
effected.sendPacket(sm);
}
@@ -153,14 +153,14 @@ public final class HpCpHeal extends AbstractEffect
if (effector.isPlayer() && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount);
effected.sendPacket(sm);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java vendored
View File

@@ -84,11 +84,11 @@ public final class Lethal extends AbstractEffect
// Calculate instant kill resistance first.
if (Rnd.get(100) < effected.getStat().getValue(Stats.INSTANT_KILL_RESIST, 0))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK);
sm.addString(effected.getName());
sm.addString(effector.getName());
effected.sendPacket(sm);
final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY);
final SystemMessage sm2 = new SystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY);
sm2.addString(effector.getName());
effector.sendPacket(sm2);
}

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java vendored
View File

@@ -66,7 +66,7 @@ public final class MagicalAttackMp extends AbstractEffect
}
if (effected.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN);
sm.addString(effected.getName());
sm.addString(effector.getName());
effected.sendPacket(sm);
@@ -111,7 +111,7 @@ public final class MagicalAttackMp extends AbstractEffect
if (effected.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) mp);
effected.sendPacket(sm);
@@ -119,7 +119,7 @@ public final class MagicalAttackMp extends AbstractEffect
if (effector.isPlayer())
{
final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENT_S_MP_WAS_REDUCED_BY_S1);
final SystemMessage sm2 = new SystemMessage(SystemMessageId.YOUR_OPPONENT_S_MP_WAS_REDUCED_BY_S1);
sm2.addInt((int) mp);
effector.sendPacket(sm2);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java vendored
View File

@@ -69,7 +69,7 @@ public final class MagicalSoulAttack extends AbstractEffect
final int chargedSouls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
if (!effector.getActingPlayer().decreaseCharges(chargedSouls))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
effector.sendPacket(sm);
return;

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java vendored
View File

@@ -78,12 +78,12 @@ public final class ManaHeal extends AbstractEffect
SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm = new SystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
sm = new SystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
}
sm.addInt((int) amount);
effected.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java vendored
View File

@@ -125,7 +125,7 @@ public final class ManaHealByLevel extends AbstractEffect
effected.broadcastStatusUpdate(effector);
}
final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
final SystemMessage sm = new SystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
if (effector.getObjectId() != effected.getObjectId())
{
sm.addString(effector.getName());

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -80,12 +80,12 @@ public final class ManaHealPercent extends AbstractEffect
SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm = new SystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
sm = new SystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
}
sm.addInt((int) amount);
effected.sendPacket(sm);

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java vendored
View File

@@ -88,12 +88,12 @@ public final class Mp extends AbstractEffect
SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm = new SystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
sm = new SystemMessage(SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
}
sm.addInt((int) amount);
effected.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@@ -89,7 +89,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
final int souls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
if (!effector.getActingPlayer().decreaseCharges(souls))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
effector.sendPacket(sm);
return;

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -150,19 +150,19 @@ public final class RestorationRandom extends AbstractEffect
final SystemMessage sm;
if (count > 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item);
sm.addLong(count);
}
else if (item.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm.addItemName(item);
}
player.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java vendored
View File

@@ -36,7 +36,7 @@ public class SendSystemMessageToClan extends AbstractEffect
public SendSystemMessageToClan(StatsSet params)
{
final int id = params.getInt("id", 0);
_message = SystemMessage.getSystemMessage(id);
_message = new SystemMessage(id);
if (_message == null)
{

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java vendored
View File

@@ -75,11 +75,11 @@ public final class Sow extends AbstractEffect
{
player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket());
target.setSeeded(player.getActingPlayer());
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SEED_WAS_SUCCESSFULLY_SOWN);
sm = new SystemMessage(SystemMessageId.THE_SEED_WAS_SUCCESSFULLY_SOWN);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SEED_WAS_NOT_SOWN);
sm = new SystemMessage(SystemMessageId.THE_SEED_WAS_NOT_SOWN);
}
final Party party = player.getParty();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java vendored
View File

@@ -53,7 +53,7 @@ public final class TakeCastleStart extends AbstractEffect
final Castle castle = CastleManager.getInstance().getCastle(effected);
if ((castle != null) && castle.getSiege().isInProgress())
{
castle.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_OPPOSING_CLAN_HAS_STARTED_S1).addSkillName(skill.getId()), false);
castle.getSiege().announceToPlayer(new SystemMessage(SystemMessageId.THE_OPPOSING_CLAN_HAS_STARTED_S1).addSkillName(skill.getId()), false);
}
}
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java vendored
View File

@@ -52,7 +52,7 @@ public final class TakeFortStart extends AbstractEffect
final Clan clan = effector.getClan();
if ((fort != null) && (clan != null))
{
fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_TRYING_TO_DISPLAY_A_FLAG), clan.getName());
fort.getSiege().announceToPlayer(new SystemMessage(SystemMessageId.S1_CLAN_IS_TRYING_TO_DISPLAY_A_FLAG), clan.getName());
}
}
}

12
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java vendored
View File

@@ -58,7 +58,7 @@ public class TeleportToPlayer extends AbstractEffect
final PlayerInstance target = (PlayerInstance) effector.getTarget();
if (target.isAlikeDead())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
sm.addPcName(target);
effector.sendPacket(sm);
return;
@@ -66,7 +66,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.isInStoreMode())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRADING_OR_OPERATING_A_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
sm.addPcName(target);
effector.sendPacket(sm);
return;
@@ -74,7 +74,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.isRooted() || target.isInCombat())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED_OR_TELEPORTED);
sm.addPcName(target);
effector.sendPacket(sm);
return;
@@ -94,7 +94,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING_2);
sm.addString(target.getName());
effector.sendPacket(sm);
return;
@@ -102,7 +102,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
sm.addString(target.getName());
effector.sendPacket(sm);
return;
@@ -111,7 +111,7 @@ public class TeleportToPlayer extends AbstractEffect
final Instance instance = target.getInstanceWorld();
if ((instance != null) && !instance.isPlayerSummonAllowed())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
sm.addString(target.getName());
effector.sendPacket(sm);
return;

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java vendored
View File

@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAt
*/
public class ChangeAttributeCrystal implements IItemHandler
{
private static final Map<Integer, ItemGrade> ITEM_GRADES = new HashMap<>();
private static final Map<Integer, ItemGrade> ITEM_GRADES = new HashMap<>();
static
{
ITEM_GRADES.put(33502, ItemGrade.S);
@@ -57,13 +57,13 @@ public class ChangeAttributeCrystal implements IItemHandler
final PlayerInstance player = playable.getActingPlayer();
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_CHANGE_AN_ATTRIBUTE_WHILE_USING_A_PRIVATE_STORE_OR_WORKSHOP));
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_CHANGE_AN_ATTRIBUTE_WHILE_USING_A_PRIVATE_STORE_OR_WORKSHOP));
return false;
}
if (ITEM_GRADES.get(item.getId()) == null)
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHANGING_ATTRIBUTES_HAS_BEEN_FAILED));
player.sendPacket(new SystemMessage(SystemMessageId.CHANGING_ATTRIBUTES_HAS_BEEN_FAILED));
return false;
}
@@ -78,7 +78,7 @@ public class ChangeAttributeCrystal implements IItemHandler
if (itemList.isEmpty())
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_ITEM_FOR_CHANGING_AN_ATTRIBUTE_DOES_NOT_EXIST));
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_FOR_CHANGING_AN_ATTRIBUTE_DOES_NOT_EXIST));
return false;
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java vendored
View File

@@ -71,7 +71,7 @@ public class CharmOfCourage implements IItemHandler
if (itemLevel < level)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addItemName(item.getId());
player.sendPacket(sm);
return false;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EventItem.java vendored
View File

@@ -70,7 +70,7 @@ public class EventItem implements IItemHandler
final int blockCheckerArena = castor.getBlockCheckerArena();
if (blockCheckerArena == -1)
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
msg.addItemName(item);
castor.sendPacket(msg);
return false;

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -224,19 +224,19 @@ public class ExtractableItems implements IItemHandler
final SystemMessage sm;
if (count > 1)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item);
sm.addLong(count);
}
else if (item.getEnchantLevel() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1);
sm.addItemName(item);
}
player.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java vendored
View File

@@ -66,7 +66,7 @@ public class FatedSupportBox implements IItemHandler
// Characters that have gone through their 2nd class transfer/1st liberation will be able to open the Fated Support Box at level 40.
if ((player.getLevel() < 40) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP) || ((race != Race.ERTHEIA) && player.isInCategory(CategoryType.SECOND_CLASS_GROUP)))
{
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS).addItemName(item));
player.sendPacket(new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS).addItemName(item));
return false;
}

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -114,7 +114,7 @@ public class ItemSkillsTemplate implements IItemHandler
// Send message to the master.
if (playable.isPet())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_USES_S1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_USES_S1);
sm.addSkillName(itemSkill);
playable.sendPacket(sm);
}
@@ -207,7 +207,7 @@ public class ItemSkillsTemplate implements IItemHandler
SystemMessage sm = null;
if (hours > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
if ((skill == null) || skill.isStatic())
{
sm.addItemName(item);
@@ -221,7 +221,7 @@ public class ItemSkillsTemplate implements IItemHandler
}
else if (minutes > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
if ((skill == null) || skill.isStatic())
{
sm.addItemName(item);
@@ -234,7 +234,7 @@ public class ItemSkillsTemplate implements IItemHandler
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
if ((skill == null) || skill.isStatic())
{
sm.addItemName(item);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java vendored
View File

@@ -94,7 +94,7 @@ public final class MercTicket extends AbstractNpcAI implements IItemHandler
_items.put(player.getObjectId(), item);
final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
dlg.addTime(15000);
dlg.addNpcName(holder.getNpcId());
dlg.getSystemMessage().addNpcName(holder.getNpcId());
player.sendPacket(dlg);
player.addAction(PlayerAction.MERCENARY_CONFIRM);
return true;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/PetFood.java vendored
View File

@@ -90,7 +90,7 @@ public class PetFood implements IItemHandler
}
}
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addItemName(item);
player.sendPacket(sm);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Recipes.java vendored
View File

@@ -88,7 +88,7 @@ public class Recipes implements IItemHandler
if (recipeLimit)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_BE_REGISTERED);
final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_BE_REGISTERED);
sm.addInt(rp.isDwarvenRecipe() ? player.getDwarfRecipeLimit() : player.getCommonRecipeLimit());
player.sendPacket(sm);
return false;
@@ -104,7 +104,7 @@ public class Recipes implements IItemHandler
}
player.destroyItem("Consume", item.getObjectId(), 1, null, false);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED);
sm.addItemName(item);
player.sendPacket(sm);
return true;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java vendored
View File

@@ -70,7 +70,7 @@ public class RollingDice implements IItemHandler
Broadcast.toSelfAndKnownPlayers(player, new Dice(player.getObjectId(), itemId, number, destination.getX(), destination.getY(), destination.getZ()));
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ROLLED_A_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_ROLLED_A_S2);
sm.addString(player.getName());
sm.addInt(number);

46
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/SocialAction.java vendored
View File

@@ -124,7 +124,7 @@ public final class SocialAction implements IPlayerActionHandler
if (FakePlayerData.getInstance().isTalkable(target.getName()))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_COUPLE_ACTION_WITH_C1);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_COUPLE_ACTION_WITH_C1);
sm.addString(target.getName());
player.sendPacket(sm);
if (!player.isProcessingRequest())
@@ -151,7 +151,7 @@ public final class SocialAction implements IPlayerActionHandler
SystemMessage sm;
if (player.isInStoreMode() || player.isCrafting())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -159,7 +159,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isInCombat() || player.isInDuel() || AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -173,7 +173,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.getReputation() < 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -181,7 +181,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isInOlympiadMode())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -189,7 +189,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isInSiege())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -197,14 +197,14 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isInHideoutSiege())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_CLAN_HALL_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_CLAN_HALL_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
}
if (player.isMounted() || player.isFlyingMounted() || player.isInBoat() || player.isInAirShip())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -212,7 +212,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isTransformed())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -220,7 +220,7 @@ public final class SocialAction implements IPlayerActionHandler
if (player.isAlikeDead())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(player);
player.sendPacket(sm);
return;
@@ -230,7 +230,7 @@ public final class SocialAction implements IPlayerActionHandler
final PlayerInstance partner = target.getActingPlayer();
if (partner.isInStoreMode() || partner.isCrafting())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -238,7 +238,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isInCombat() || partner.isInDuel() || AttackStanceTaskManager.getInstance().hasAttackStanceTask(partner))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -246,7 +246,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.getMultiSociaAction() > 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_PARTICIPATING_IN_A_COUPLE_ACTION_AND_CANNOT_BE_REQUESTED_FOR_ANOTHER_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_ALREADY_PARTICIPATING_IN_A_COUPLE_ACTION_AND_CANNOT_BE_REQUESTED_FOR_ANOTHER_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -254,7 +254,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isFishing())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_FISHING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_FISHING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -262,7 +262,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.getReputation() < 0)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -270,7 +270,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isInOlympiadMode())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -278,7 +278,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isInHideoutSiege())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_CLAN_HALL_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_CLAN_HALL_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -286,7 +286,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isInSiege())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -294,7 +294,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isMounted() || partner.isFlyingMounted() || partner.isInBoat() || partner.isInAirShip())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -302,7 +302,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isTeleporting())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TELEPORTING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TELEPORTING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -310,7 +310,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isTransformed())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -318,7 +318,7 @@ public final class SocialAction implements IPlayerActionHandler
if (partner.isAlikeDead())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm = new SystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
sm.addPcName(partner);
player.sendPacket(sm);
return;
@@ -331,7 +331,7 @@ public final class SocialAction implements IPlayerActionHandler
}
player.setMultiSocialAction(id, partner.getObjectId());
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_COUPLE_ACTION_WITH_C1);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_COUPLE_ACTION_WITH_C1);
sm.addPcName(partner);
player.sendPacket(sm);

10
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java vendored
View File

@@ -62,35 +62,35 @@ public class BuildCampSkillCondition implements ISkillCondition
final SystemMessage sm;
if ((castle == null) && (fort == null))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress()))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null)))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (!player.isClanLeader())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;
}
else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount())))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canCreateBase = false;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java vendored
View File

@@ -69,7 +69,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition
}
else if ((player.getSummonPoints() + _summonPoints) > player.getMaxSummonPoints())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
sm.addSkillName(skill);
player.sendPacket(sm);
canSummon = false;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java vendored
View File

@@ -57,7 +57,7 @@ public class OpCheckFlagSkillCondition implements ISkillCondition
final SystemMessage sm;
if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canTakeFort = false;

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java vendored
View File

@@ -59,7 +59,7 @@ public class OpResurrectionSkillCondition implements ISkillCondition
canResurrect = false;
if (caster.isPlayer())
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
msg.addSkillName(skill);
caster.sendPacket(msg);
}
@@ -90,7 +90,7 @@ public class OpResurrectionSkillCondition implements ISkillCondition
canResurrect = false;
if (caster.isPlayer())
{
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
msg.addSkillName(skill);
caster.sendPacket(msg);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java vendored
View File

@@ -56,7 +56,7 @@ public class PossessHolythingSkillCondition implements ISkillCondition
SystemMessage sm;
if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null))
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
player.sendPacket(sm);
canTakeCastle = false;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java vendored
View File

@@ -47,7 +47,7 @@ public class ChannelDelete implements IUserCommandHandler
{
final CommandChannel channel = player.getParty().getCommandChannel();
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_COMMAND_CHANNEL_HAS_BEEN_DISBANDED);
channel.broadcastPacket(sm);
channel.disbandChannel();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java vendored
View File

@@ -55,7 +55,7 @@ public class ChannelLeave implements IUserCommandHandler
channel.removeParty(party);
party.getLeader().sendPacket(SystemMessageId.YOU_HAVE_QUIT_THE_COMMAND_CHANNEL);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_LEFT_THE_COMMAND_CHANNEL);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_S_PARTY_HAS_LEFT_THE_COMMAND_CHANNEL);
sm.addPcName(party.getLeader());
channel.broadcastPacket(sm);
return true;

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java vendored
View File

@@ -101,14 +101,14 @@ public class ClanWarsList implements IUserCommandHandler
if (ally_id > 0)
{
// Target With Ally
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_ALLIANCE);
sm = new SystemMessage(SystemMessageId.S1_S2_ALLIANCE);
sm.addString(clanName);
sm.addString(rs.getString("ally_name"));
}
else
{
// Target Without Ally
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_NO_ALLIANCE_EXISTS);
sm = new SystemMessage(SystemMessageId.S1_NO_ALLIANCE_EXISTS);
sm.addString(clanName);
}
player.sendPacket(sm);

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java vendored
View File

@@ -52,7 +52,7 @@ public class Loc implements IUserCommandHandler
SystemMessage sm;
if (region > 0)
{
sm = SystemMessage.getSystemMessage(region);
sm = new SystemMessage(region);
if (sm.getSystemMessageId().getParamCount() == 3)
{
sm.addInt(player.getX());
@@ -62,7 +62,7 @@ public class Loc implements IUserCommandHandler
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.CURRENT_LOCATION_S1);
sm = new SystemMessage(SystemMessageId.CURRENT_LOCATION_S1);
sm.addString(player.getX() + ", " + player.getY() + ", " + player.getZ());
}
player.sendPacket(sm);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/MyBirthday.java vendored
View File

@@ -44,7 +44,7 @@ public class MyBirthday implements IUserCommandHandler
final Calendar date = player.getCreateDate();
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_BIRTHDAY_IS_S3_S4_S2);
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_S_BIRTHDAY_IS_S3_S4_S2);
sm.addPcName(player);
sm.addString(Integer.toString(date.get(Calendar.YEAR)));
sm.addString(Integer.toString(date.get(Calendar.MONTH) + 1));

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java vendored
View File

@@ -50,14 +50,14 @@ public class OlympiadStat implements IUserCommandHandler
return false;
}
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FOR_THE_CURRENT_OLYMPIAD_YOU_HAVE_PARTICIPATED_IN_S1_MATCH_ES_AND_HAD_S2_WIN_S_AND_S3_DEFEAT_S_YOU_CURRENTLY_HAVE_S4_OLYMPIAD_POINT_S);
final SystemMessage sm = new SystemMessage(SystemMessageId.FOR_THE_CURRENT_OLYMPIAD_YOU_HAVE_PARTICIPATED_IN_S1_MATCH_ES_AND_HAD_S2_WIN_S_AND_S3_DEFEAT_S_YOU_CURRENTLY_HAVE_S4_OLYMPIAD_POINT_S);
sm.addInt(Olympiad.getInstance().getCompetitionDone(nobleObjId));
sm.addInt(Olympiad.getInstance().getCompetitionWon(nobleObjId));
sm.addInt(Olympiad.getInstance().getCompetitionLost(nobleObjId));
sm.addInt(Olympiad.getInstance().getNoblePoints((PlayerInstance) target));
player.sendPacket(sm);
final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.THE_MATCHES_THIS_WEEK_ARE_ALL_CLASS_BATTLES_THE_NUMBER_OF_MATCHES_THAT_ARE_ALLOWED_TO_PARTICIPATE_IS_S1);
final SystemMessage sm2 = new SystemMessage(SystemMessageId.THE_MATCHES_THIS_WEEK_ARE_ALL_CLASS_BATTLES_THE_NUMBER_OF_MATCHES_THAT_ARE_ALLOWED_TO_PARTICIPATE_IS_S1);
sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatches(nobleObjId));
player.sendPacket(sm2);
return true;

4
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Time.java vendored
View File

@@ -61,13 +61,13 @@ public class Time implements IUserCommandHandler
SystemMessage sm;
if (GameTimeController.getInstance().isNight())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_2);
sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_2);
sm.addString(h);
sm.addString(m);
}
else
{
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2);
sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2);
sm.addString(h);
sm.addString(m);
}

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java vendored
View File

@@ -52,7 +52,7 @@ public class StatsVCmd implements IVoicedCommandHandler
if (pc.getClient().isDetached())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CURRENTLY_OFFLINE);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CURRENTLY_OFFLINE);
sm.addPcName(pc);
activeChar.sendPacket(sm);
return false;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -162,7 +162,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
// Check if any player from the group has already finished the instance
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
return;
}
}

29
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/lang/langs.xsd → L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/localisations.xsd vendored
View File

@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema">
<element name="list">
<complexType>
<sequence minOccurs="1" maxOccurs="1">
<element name="sm" minOccurs="1" maxOccurs="unbounded">
<complexType>
<attribute name="id" type="nonNegativeInteger" use="optional" />
<attribute name="name" type="token" use="optional" />
<attribute name="text" type="normalizedString" use="required" />
</complexType>
</element>
</sequence>
</complexType>
</element>
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema">
<element name="list">
<complexType>
<sequence minOccurs="1" maxOccurs="1">
<element name="localisation" minOccurs="0" maxOccurs="unbounded">
<complexType>
<attribute name="id" type="nonNegativeInteger" use="required" />
<attribute name="text" type="normalizedString" use="required" />
</complexType>
</element>
</sequence>
</complexType>
</element>
</schema>