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

Prevent the extensive use of the lvl abbreviation.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-09-02 18:40:39 +00:00
parent aceb033e1b
commit ae7a5eecf1
5501 changed files with 416669 additions and 416806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
View File

@@ -181,7 +181,7 @@ public class Config
public static int MAX_MONSTER_ANIMATION;
public static boolean ENABLE_COMMUNITY_BOARD;
public static String BBS_DEFAULT;
public static boolean SHOW_NPC_LVL;
public static boolean SHOW_NPC_LEVEL;
public static boolean SHOW_NPC_AGGRESSION;
public static boolean SHOW_NPC_CLAN_CREST;
public static int ZONE_TOWN;
@@ -461,8 +461,8 @@ public class Config
public static boolean CHAMPION_ENABLE;
public static int CHAMPION_FREQUENCY;
public static int CHAMP_MIN_LVL;
public static int CHAMP_MAX_LVL;
public static int CHAMP_MIN_LEVEL;
public static int CHAMP_MAX_LEVEL;
public static int CHAMPION_HP;
public static int CHAMPION_REWARDS;
public static int CHAMPION_ADENAS_REWARDS;
@@ -663,8 +663,8 @@ public class Config
public static String ADD_CHAR_TITLE;
public static boolean NOBLE_CUSTOM_ITEMS;
public static boolean HERO_CUSTOM_ITEMS;
public static boolean ALLOW_CREATE_LVL;
public static int CHAR_CREATE_LVL;
public static boolean ALLOW_CREATE_LEVEL;
public static int CHAR_CREATE_LEVEL;
public static boolean SPAWN_CHAR;
public static int SPAWN_X;
public static int SPAWN_Y;
@@ -781,8 +781,8 @@ public class Config
public static int KILLS_TO_GET_WAR_LEGEND_AURA;
public static boolean ANTI_FARM_ENABLED;
public static boolean ANTI_FARM_CLAN_ALLY_ENABLED;
public static boolean ANTI_FARM_LVL_DIFF_ENABLED;
public static int ANTI_FARM_MAX_LVL_DIFF;
public static boolean ANTI_FARM_LEVEL_DIFF_ENABLED;
public static int ANTI_FARM_MAX_LEVEL_DIFF;
public static boolean ANTI_FARM_PDEF_DIFF_ENABLED;
public static int ANTI_FARM_MAX_PDEF_DIFF;
public static boolean ANTI_FARM_PATK_DIFF_ENABLED;
@@ -1556,7 +1556,7 @@ public class Config
MAX_NPC_ANIMATION = generalConfig.getInt("MaxNpcAnimation", 60);
MIN_MONSTER_ANIMATION = generalConfig.getInt("MinMonsterAnimation", 5);
MAX_MONSTER_ANIMATION = generalConfig.getInt("MaxMonsterAnimation", 60);
SHOW_NPC_LVL = generalConfig.getBoolean("ShowNpcLevel", false);
SHOW_NPC_LEVEL = generalConfig.getBoolean("ShowNpcLevel", false);
SHOW_NPC_AGGRESSION = generalConfig.getBoolean("ShowNpcAggression", false);
SHOW_NPC_CLAN_CREST = generalConfig.getBoolean("ShowNpcClanCrest", false);
FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false);
@@ -1662,8 +1662,8 @@ public class Config
final PropertiesParser championConfig = new PropertiesParser(CHAMPION_CONFIG_FILE);
CHAMPION_ENABLE = championConfig.getBoolean("ChampionEnable", false);
CHAMPION_FREQUENCY = championConfig.getInt("ChampionFrequency", 0);
CHAMP_MIN_LVL = championConfig.getInt("ChampionMinLevel", 20);
CHAMP_MAX_LVL = championConfig.getInt("ChampionMaxLevel", 60);
CHAMP_MIN_LEVEL = championConfig.getInt("ChampionMinLevel", 20);
CHAMP_MAX_LEVEL = championConfig.getInt("ChampionMaxLevel", 60);
CHAMPION_HP = championConfig.getInt("ChampionHp", 7);
CHAMPION_HP_REGEN = championConfig.getFloat("ChampionHpRegen", 1f);
CHAMPION_REWARDS = championConfig.getInt("ChampionRewards", 8);
@@ -1927,8 +1927,8 @@ public class Config
HERO_CUSTOM_ITEMS = customServerConfig.getBoolean("EnableHeroCustomItem", true);
HERO_CUSTOM_ITEM_ID = customServerConfig.getInt("HeroCustomItemId", 3481);
HERO_CUSTOM_DAY = customServerConfig.getLong("HeroCustomDay", 0);
ALLOW_CREATE_LVL = customServerConfig.getBoolean("CustomStartingLvl", false);
CHAR_CREATE_LVL = customServerConfig.getInt("CharLvl", 80);
ALLOW_CREATE_LEVEL = customServerConfig.getBoolean("CustomStartingLvl", false);
CHAR_CREATE_LEVEL = customServerConfig.getInt("CharLvl", 80);
SPAWN_CHAR = customServerConfig.getBoolean("CustomSpawn", false);
SPAWN_X = customServerConfig.getInt("SpawnX", 50821);
SPAWN_Y = customServerConfig.getInt("SpawnY", 186527);
@@ -2058,8 +2058,8 @@ public class Config
KILLS_TO_GET_WAR_LEGEND_AURA = pvpConfig.getInt("KillsToGetWarLegendAura", 30);
ANTI_FARM_ENABLED = pvpConfig.getBoolean("AntiFarmEnabled", false);
ANTI_FARM_CLAN_ALLY_ENABLED = pvpConfig.getBoolean("AntiFarmClanAlly", false);
ANTI_FARM_LVL_DIFF_ENABLED = pvpConfig.getBoolean("AntiFarmLvlDiff", false);
ANTI_FARM_MAX_LVL_DIFF = pvpConfig.getInt("AntiFarmMaxLvlDiff", 40);
ANTI_FARM_LEVEL_DIFF_ENABLED = pvpConfig.getBoolean("AntiFarmLvlDiff", false);
ANTI_FARM_MAX_LEVEL_DIFF = pvpConfig.getInt("AntiFarmMaxLvlDiff", 40);
ANTI_FARM_PDEF_DIFF_ENABLED = pvpConfig.getBoolean("AntiFarmPdefDiff", false);
ANTI_FARM_MAX_PDEF_DIFF = pvpConfig.getInt("AntiFarmMaxPdefDiff", 300);
ANTI_FARM_PATK_DIFF_ENABLED = pvpConfig.getBoolean("AntiFarmPatkDiff", false);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java
View File

@@ -48,11 +48,11 @@ public class HeroSkillTable
return HERO_SKILLS;
}
public static boolean isHeroSkill(int skillid)
public static boolean isHeroSkill(int skillId)
{
for (int id : HERO_SKILL_IDS)
{
if (id == skillid)
if (id == skillId)
{
return true;
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java
View File

@@ -646,12 +646,12 @@ public class NpcTable
return null;
}
public NpcTemplate[] getAllOfLevel(int lvl)
public NpcTemplate[] getAllOfLevel(int level)
{
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
{
if (t.getLevel() == lvl)
if (t.getLevel() == level)
{
list.add(t);
}
@@ -659,12 +659,12 @@ public class NpcTable
return list.toArray(new NpcTemplate[list.size()]);
}
public NpcTemplate[] getAllMonstersOfLevel(int lvl)
public NpcTemplate[] getAllMonstersOfLevel(int level)
{
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
{
if ((t.getLevel() == lvl) && "Monster".equals(t.getType()))
if ((t.getLevel() == level) && "Monster".equals(t.getType()))
{
list.add(t);
}

28
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java
View File

@@ -93,14 +93,14 @@ public class SkillTreeTable
final int id = skilltree.getInt("skill_id");
final int lvl = skilltree.getInt("level");
final String name = skilltree.getString("name");
final int minLvl = skilltree.getInt("min_level");
final int minLevel = skilltree.getInt("min_level");
final int cost = skilltree.getInt("sp");
if (prevSkillId != id)
{
prevSkillId = id;
}
map.put(SkillTable.getSkillHashCode(id, lvl), new SkillLearn(id, lvl, minLvl, name, cost, 0, 0));
map.put(SkillTable.getSkillHashCode(id, lvl), new SkillLearn(id, lvl, minLevel, name, cost, 0, 0));
}
_skillTrees.put(classId, map);
@@ -129,7 +129,7 @@ public class SkillTreeTable
final int id = skilltree.getInt("skill_id");
final int lvl = skilltree.getInt("level");
final String name = skilltree.getString("name");
final int minLvl = skilltree.getInt("min_level");
final int minLevel = skilltree.getInt("min_level");
final int cost = skilltree.getInt("sp");
final int costId = skilltree.getInt("costid");
final int costCount = skilltree.getInt("cost");
@@ -139,7 +139,7 @@ public class SkillTreeTable
prevSkillId = id;
}
final SkillLearn skill = new SkillLearn(id, lvl, minLvl, name, cost, costId, costCount);
final SkillLearn skill = new SkillLearn(id, lvl, minLevel, name, cost, costId, costCount);
if (isDwarven == 0)
{
_fishingSkillTrees.add(skill);
@@ -169,8 +169,8 @@ public class SkillTreeTable
final int id = skilltree.getInt("skill_id");
final int lvl = skilltree.getInt("level");
final String name = skilltree.getString("name");
final int baseLvl = skilltree.getInt("base_lvl");
final int minSkillLvl = skilltree.getInt("min_skill_lvl");
final int baseLevel = skilltree.getInt("base_lvl");
final int minskillLevel = skilltree.getInt("min_skill_lvl");
final int sp = skilltree.getInt("sp");
final int exp = skilltree.getInt("exp");
final byte rate76 = skilltree.getByte("success_rate76");
@@ -183,7 +183,7 @@ public class SkillTreeTable
prevSkillId = id;
}
_enchantSkillTrees.add(new EnchantSkillLearn(id, lvl, minSkillLvl, baseLvl, name, sp, exp, rate76, rate77, rate78, rate79, rate80));
_enchantSkillTrees.add(new EnchantSkillLearn(id, lvl, minskillLevel, baseLevel, name, sp, exp, rate76, rate77, rate78, rate79, rate80));
}
skilltree.close();
@@ -205,7 +205,7 @@ public class SkillTreeTable
final int id = skilltree.getInt("skill_id");
final int lvl = skilltree.getInt("level");
final String name = skilltree.getString("name");
final int baseLvl = skilltree.getInt("clan_lvl");
final int baseLevel = skilltree.getInt("clan_lvl");
final int sp = skilltree.getInt("repCost");
final int itemId = skilltree.getInt("itemId");
if (prevSkillId != id)
@@ -213,7 +213,7 @@ public class SkillTreeTable
prevSkillId = id;
}
_pledgeSkillTrees.add(new PledgeSkillLearn(id, lvl, baseLvl, name, sp, itemId));
_pledgeSkillTrees.add(new PledgeSkillLearn(id, lvl, baseLevel, name, sp, itemId));
}
skilltree.close();
@@ -257,13 +257,13 @@ public class SkillTreeTable
* Each class receives new skill on certain levels, this methods allow the retrieval of the minimum character level of given class required to learn a given skill
* @param skillId The iD of the skill
* @param classId The classId of the character
* @param skillLvl The SkillLvl
* @param skillLevel The skillLevel
* @return The min level
*/
public int getMinSkillLevel(int skillId, ClassId classId, int skillLvl)
public int getMinSkillLevel(int skillId, ClassId classId, int skillLevel)
{
final Map<Integer, SkillLearn> map = _skillTrees.get(classId);
final int skillHashCode = SkillTable.getSkillHashCode(skillId, skillLvl);
final int skillHashCode = SkillTable.getSkillHashCode(skillId, skillLevel);
if (map.containsKey(skillHashCode))
{
return map.get(skillHashCode).getMinLevel();
@@ -271,9 +271,9 @@ public class SkillTreeTable
return 0;
}
public int getMinSkillLevel(int skillId, int skillLvl)
public int getMinSkillLevel(int skillId, int skillLevel)
{
final int skillHashCode = SkillTable.getSkillHashCode(skillId, skillLvl);
final int skillHashCode = SkillTable.getSkillHashCode(skillId, skillLevel);
// Look on all classes for this skill (takes the first one found)
for (Map<Integer, SkillLearn> map : _skillTrees.values())

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java
View File

@@ -120,7 +120,7 @@ public class AugmentationData
int skillId = 0;
final int augmentationId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue());
String type = "blue";
int skillLvL = 0;
int skillLevel = 0;
for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling())
{
if ("skillId".equalsIgnoreCase(cd.getNodeName()))
@@ -131,7 +131,7 @@ public class AugmentationData
else if ("skillLevel".equalsIgnoreCase(cd.getNodeName()))
{
attrs = cd.getAttributes();
skillLvL = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
skillLevel = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
}
else if ("type".equalsIgnoreCase(cd.getNodeName()))
{
@@ -145,7 +145,7 @@ public class AugmentationData
badAugmantData++;
continue;
}
if (skillLvL == 0)
if (skillLevel == 0)
{
badAugmantData++;
continue;
@@ -159,15 +159,15 @@ public class AugmentationData
if (type.equalsIgnoreCase("blue"))
{
_blueSkills.get(k).add(new augmentationSkill(skillId, skillLvL, augmentationId));
_blueSkills.get(k).add(new augmentationSkill(skillId, skillLevel, augmentationId));
}
else if (type.equalsIgnoreCase("purple"))
{
_purpleSkills.get(k).add(new augmentationSkill(skillId, skillLvL, augmentationId));
_purpleSkills.get(k).add(new augmentationSkill(skillId, skillLevel, augmentationId));
}
else
{
_redSkills.get(k).add(new augmentationSkill(skillId, skillLvL, augmentationId));
_redSkills.get(k).add(new augmentationSkill(skillId, skillLevel, augmentationId));
}
}
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java
View File

@@ -78,17 +78,17 @@ public class FishData implements IXmlReader
/**
* Get a random {@link FishData} based on level, type and group.
* @param lvl : the fish level to check.
* @param level : the fish level to check.
* @param type : the fish type to check.
* @param group : the fish group to check.
* @return a Fish with good criteria.
*/
public Fish getFish(int lvl, int type, int group)
public Fish getFish(int level, int type, int group)
{
final List<Fish> result = new ArrayList<>();
for (Fish fish : _fish)
{
if ((fish.getLevel() == lvl) && (fish.getType() == type) && (fish.getGroup() == group))
if ((fish.getLevel() == level) && (fish.getType() == type) && (fish.getGroup() == group))
{
result.add(fish);
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java
View File

@@ -384,12 +384,12 @@ public class AdminBan implements IAdminCommandHandler
}
}
private boolean changeCharAccessLevel(PlayerInstance targetPlayer, String player, PlayerInstance activeChar, int lvl)
private boolean changeCharAccessLevel(PlayerInstance targetPlayer, String player, PlayerInstance activeChar, int level)
{
boolean output = false;
if (targetPlayer != null)
{
targetPlayer.setAccessLevel(lvl);
targetPlayer.setAccessLevel(level);
targetPlayer.sendMessage("Your character has been banned. Contact the administrator for more informations.");
try
@@ -419,7 +419,7 @@ public class AdminBan implements IAdminCommandHandler
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("UPDATE characters SET accesslevel=? WHERE char_name=?");
statement.setInt(1, lvl);
statement.setInt(1, level);
statement.setString(2, player);
statement.execute();
final int count = statement.getUpdateCount();
@@ -430,7 +430,7 @@ public class AdminBan implements IAdminCommandHandler
}
else
{
activeChar.sendMessage(player + " now has an access level of " + lvl);
activeChar.sendMessage(player + " now has an access level of " + level);
output = true;
}
}

28
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
View File

@@ -37,8 +37,8 @@ public class AdminCTFEngine implements IAdminCommandHandler
"admin_ctf_join_loc",
"admin_ctf_edit",
"admin_ctf_control",
"admin_ctf_minlvl",
"admin_ctf_maxlvl",
"admin_ctf_minLevel",
"admin_ctf_maxLevel",
"admin_ctf_tele_npc",
"admin_ctf_tele_team",
"admin_ctf_tele_flag",
@@ -141,7 +141,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
showControlPage(activeChar);
return true;
}
case "admin_ctf_minlvl":
case "admin_ctf_minLevel":
{
if (st.hasMoreTokens())
{
@@ -153,7 +153,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
}
catch (NumberFormatException e)
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minlvl <min_lvl_value>");
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minLevel <min_lvl_value>");
return false;
}
if (!CTF.checkMinLevel(lvl))
@@ -161,7 +161,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Min lvl must be lower then Max");
return false;
}
if (CTF.setMinLvl(lvl))
if (CTF.setMinLevel(lvl))
{
showMainPage(activeChar);
return true;
@@ -169,10 +169,10 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
return false;
}
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minlvl <min_lvl_value>");
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_minLevel <min_lvl_value>");
return false;
}
case "admin_ctf_maxlvl":
case "admin_ctf_maxLevel":
{
if (st.hasMoreTokens())
{
@@ -184,7 +184,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
}
catch (NumberFormatException e)
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxlvl <max_lvl_value>");
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxLevel <max_lvl_value>");
return false;
}
if (!CTF.checkMaxLevel(lvl))
@@ -192,7 +192,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Max lvl must be higher then Min");
return false;
}
if (CTF.setMaxLvl(lvl))
if (CTF.setMaxLevel(lvl))
{
showMainPage(activeChar);
return true;
@@ -200,7 +200,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
return false;
}
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxlvl <min_lvl_value>");
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_maxLevel <min_lvl_value>");
return false;
}
case "admin_ctf_tele_npc":
@@ -630,8 +630,8 @@ public class AdminCTFEngine implements IAdminCommandHandler
replyMSG.append("<td width=\"100\"><button value=\"Description\" action=\"bypass -h admin_ctf_desc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_ctf_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_ctf_maxlvl $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_ctf_minlvl $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_ctf_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_ctf_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("<td width=\"100\"><button value=\"Max players\" action=\"bypass -h admin_ctf_maxplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min players\" action=\"bypass -h admin_ctf_minplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
@@ -717,8 +717,8 @@ public class AdminCTFEngine implements IAdminCommandHandler
replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">(unknown)</font><br1>");
}
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + CTF.getRewardAmount() + "</font><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMinLvl() + "</font><br1>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMaxLvl() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMinLevel() + "</font><br1>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMaxLevel() + "</font><br><br>");
replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + CTF.getMinPlayers() + "</font><br1>");
replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + CTF.getMaxPlayers() + "</font><br>");
replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + CTF.getJoinTime() + "</font><br1>");

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
View File

@@ -31,8 +31,8 @@ public class AdminDMEngine implements IAdminCommandHandler
"admin_dmevent_name",
"admin_dmevent_desc",
"admin_dmevent_join_loc",
"admin_dmevent_minlvl",
"admin_dmevent_maxlvl",
"admin_dmevent_minLevel",
"admin_dmevent_maxLevel",
"admin_dmevent_npc",
"admin_dmevent_npc_pos",
"admin_dmevent_reward",
@@ -80,7 +80,7 @@ public class AdminDMEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
}
}
else if (command.startsWith("admin_dmevent_minlvl "))
else if (command.startsWith("admin_dmevent_minLevel "))
{
if (!DM.checkMinLevel(Integer.parseInt(command.substring(21))))
{
@@ -96,7 +96,7 @@ public class AdminDMEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
}
}
else if (command.startsWith("admin_dmevent_maxlvl "))
else if (command.startsWith("admin_dmevent_maxLevel "))
{
if (!DM.checkMaxLevel(Integer.parseInt(command.substring(21))))
{
@@ -262,8 +262,8 @@ public class AdminDMEngine implements IAdminCommandHandler
replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_dmevent_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_dmevent_maxlvl $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_dmevent_minlvl $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_dmevent_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_dmevent_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("<td width=\"100\"><button value=\"NPC\" action=\"bypass -h admin_dmevent_npc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"NPC Pos\" action=\"bypass -h admin_dmevent_npc_pos\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
@@ -299,8 +299,8 @@ public class AdminDMEngine implements IAdminCommandHandler
replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + DM.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + DM.getRewardId() + "</font><br1>");
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + DM.getRewardAmount() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + DM.getMinlvl() + "</font><br>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + DM.getMaxlvl() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + DM.getMinLevel() + "</font><br>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + DM.getMaxLevel() + "</font><br><br>");
replyMSG.append("Death Match Color:&nbsp;<font color=\"00FF00\">" + DM.getPlayerColors() + "</font><br>");
final Location playerLoc = DM.getPlayersSpawnLocation();

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLevel.java
View File

@@ -72,17 +72,17 @@ public class AdminLevel implements IAdminCommandHandler
}
final Playable targetPlayer = (Playable) targetChar;
final byte lvl = Byte.parseByte(val);
final byte level = Byte.parseByte(val);
int maxLevel = ExperienceData.getInstance().getMaxLevel();
if ((targetChar instanceof PlayerInstance) && ((PlayerInstance) targetPlayer).isSubClassActive())
{
maxLevel = Config.MAX_SUBCLASS_LEVEL;
}
if ((lvl >= 1) && (lvl <= maxLevel))
if ((level >= 1) && (level <= maxLevel))
{
final long pXp = targetPlayer.getStat().getExp();
final long tXp = ExperienceData.getInstance().getExpForLevel(lvl);
final long tXp = ExperienceData.getInstance().getExpForLevel(level);
if (pXp > tXp)
{
targetPlayer.getStat().removeExpAndSp(pXp - tXp, 0);

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
View File

@@ -35,8 +35,8 @@ public class AdminTvTEngine implements IAdminCommandHandler
"admin_tvt_name",
"admin_tvt_desc",
"admin_tvt_join_loc",
"admin_tvt_minlvl",
"admin_tvt_maxlvl",
"admin_tvt_minLevel",
"admin_tvt_maxLevel",
"admin_tvt_npc",
"admin_tvt_npc_pos",
"admin_tvt_reward",
@@ -93,7 +93,7 @@ public class AdminTvTEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
}
}
else if (command.startsWith("admin_tvt_minlvl "))
else if (command.startsWith("admin_tvt_minLevel "))
{
if (!TvT.checkMinLevel(Integer.parseInt(command.substring(17))))
{
@@ -109,7 +109,7 @@ public class AdminTvTEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, event in progress");
}
}
else if (command.startsWith("admin_tvt_maxlvl "))
else if (command.startsWith("admin_tvt_maxLevel "))
{
if (!TvT.checkMaxLevel(Integer.parseInt(command.substring(17))))
{
@@ -375,8 +375,8 @@ public class AdminTvTEngine implements IAdminCommandHandler
replyMSG.append("<td width=\"100\"><button value=\"Join Location\" action=\"bypass -h admin_tvt_join_loc $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_tvt_maxlvl $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_tvt_minlvl $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Max lvl\" action=\"bypass -h admin_tvt_maxLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("<td width=\"100\"><button value=\"Min lvl\" action=\"bypass -h admin_tvt_minLevel $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("</tr></table><br><table><tr>");
replyMSG.append("<td width=\"100\"><button value=\"Max players\" action=\"bypass -h admin_tvt_maxplayers $input1\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
@@ -424,8 +424,8 @@ public class AdminTvTEngine implements IAdminCommandHandler
replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + TvT.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + TvT.getRewardId() + "</font><br1>");
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + TvT.getRewardAmount() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMinlvl() + "</font><br>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMaxlvl() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMinLevel() + "</font><br>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + TvT.getMaxLevel() + "</font><br><br>");
replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + TvT.getMinPlayers() + "</font><br>");
replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + TvT.getMaxPlayers() + "</font><br><br>");
replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + TvT.getJoinTime() + "</font><br>");

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java
View File

@@ -83,12 +83,12 @@ public class CTFCmd implements IVoicedCommandHandler
activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
return false;
}
else if (activeChar.getLevel() < CTF.getMinLvl())
else if (activeChar.getLevel() < CTF.getMinLevel())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
return false;
}
else if (activeChar.getLevel() > CTF.getMaxLvl())
else if (activeChar.getLevel() > CTF.getMaxLevel())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
return false;
@@ -163,15 +163,15 @@ public class CTFCmd implements IVoicedCommandHandler
{
activeChar.sendMessage("There is " + CTF._playersShuffle.size() + " player participating in this event.");
activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + CTF.getMinLvl() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLvl() + ".");
activeChar.sendMessage("Player Min lvl: " + CTF.getMinLevel() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLevel() + ".");
}
else
{
activeChar.sendMessage("There are " + CTF._playersShuffle.size() + " players participating in this event.");
activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + CTF.getMinLvl() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLvl() + ".");
activeChar.sendMessage("Player Min lvl: " + CTF.getMinLevel() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLevel() + ".");
}
return true;
}

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java
View File

@@ -83,12 +83,12 @@ public class DMCmd implements IVoicedCommandHandler
activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
return false;
}
else if (activeChar.getLevel() < DM.getMinlvl())
else if (activeChar.getLevel() < DM.getMinLevel())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
return false;
}
else if (activeChar.getLevel() > DM.getMaxlvl())
else if (activeChar.getLevel() > DM.getMaxLevel())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
return false;
@@ -163,15 +163,15 @@ public class DMCmd implements IVoicedCommandHandler
{
activeChar.sendMessage("There is " + DM._players.size() + " player participating in this event.");
activeChar.sendMessage("Reward: " + DM.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(DM.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + DM.getMinlvl() + ".");
activeChar.sendMessage("Player Max lvl: " + DM.getMaxlvl() + ".");
activeChar.sendMessage("Player Min lvl: " + DM.getMinLevel() + ".");
activeChar.sendMessage("Player Max lvl: " + DM.getMaxLevel() + ".");
}
else
{
activeChar.sendMessage("There are " + DM._players.size() + " players participating in this event.");
activeChar.sendMessage("Reward: " + DM.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(DM.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + DM.getMinlvl() + ".");
activeChar.sendMessage("Player Max lvl: " + DM.getMaxlvl() + ".");
activeChar.sendMessage("Player Min lvl: " + DM.getMinLevel() + ".");
activeChar.sendMessage("Player Max lvl: " + DM.getMaxLevel() + ".");
}
return true;
}

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java
View File

@@ -83,12 +83,12 @@ public class TvTCmd implements IVoicedCommandHandler
activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
return false;
}
else if (activeChar.getLevel() < TvT.getMinlvl())
else if (activeChar.getLevel() < TvT.getMinLevel())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
return false;
}
else if (activeChar.getLevel() > TvT.getMaxlvl())
else if (activeChar.getLevel() > TvT.getMaxLevel())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
return false;
@@ -163,15 +163,15 @@ public class TvTCmd implements IVoicedCommandHandler
{
activeChar.sendMessage("There is " + TvT._playersShuffle.size() + " player participating in this event.");
activeChar.sendMessage("Reward: " + TvT.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(TvT.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + TvT.getMinlvl() + ".");
activeChar.sendMessage("Player Max lvl: " + TvT.getMaxlvl() + ".");
activeChar.sendMessage("Player Min lvl: " + TvT.getMinLevel() + ".");
activeChar.sendMessage("Player Max lvl: " + TvT.getMaxLevel() + ".");
}
else
{
activeChar.sendMessage("There are " + TvT._playersShuffle.size() + " players participating in this event.");
activeChar.sendMessage("Reward: " + TvT.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(TvT.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + TvT.getMinlvl() + ".");
activeChar.sendMessage("Player Max lvl: " + TvT.getMaxlvl() + ".");
activeChar.sendMessage("Player Min lvl: " + TvT.getMinLevel() + ".");
activeChar.sendMessage("Player Max lvl: " + TvT.getMaxLevel() + ".");
}
return true;
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/EnchantSkillLearn.java
View File

@@ -26,7 +26,7 @@ public class EnchantSkillLearn
// not needed, just for easier debug
private final String name;
private final int spCost;
private final int baseLvl;
private final int baseLevel;
private final int minSkillLevel;
private final int exp;
private final byte rate76;
@@ -35,11 +35,11 @@ public class EnchantSkillLearn
private final byte rate79;
private final byte rate80;
public EnchantSkillLearn(int id, int level, int minSkillLevel, int baseLvl, String name, int spCost, int exp, byte rate76, byte rate77, byte rate78, byte rate79, byte rate80)
public EnchantSkillLearn(int id, int level, int minSkillLevel, int baseLevel, String name, int spCost, int exp, byte rate76, byte rate77, byte rate78, byte rate79, byte rate80)
{
this.id = id;
this.level = level;
this.baseLvl = baseLvl;
this.baseLevel = baseLevel;
this.minSkillLevel = minSkillLevel;
this.name = name.intern();
this.spCost = spCost;
@@ -72,7 +72,7 @@ public class EnchantSkillLearn
*/
public int getBaseLevel()
{
return baseLvl;
return baseLevel;
}
/**

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/LvlupData.java
View File

@@ -162,11 +162,11 @@ public class LvlupData
}
/**
* @param lvl The _classLvl to set.
* @param level The _classLvl to set.
*/
public void setClassLvl(int lvl)
public void setClassLvl(int level)
{
_classLvl = lvl;
_classLvl = level;
}
/**

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PledgeSkillLearn.java
View File

@@ -29,14 +29,14 @@ public class PledgeSkillLearn
private final String _name;
private final int _repCost;
private final int _baseLvl;
private final int _baseLevel;
private final int _itemId;
public PledgeSkillLearn(int id, int lvl, int baseLvl, String name, int cost, int itemId)
public PledgeSkillLearn(int id, int level, int baseLevel, String name, int cost, int itemId)
{
_id = id;
_level = lvl;
_baseLvl = baseLvl;
_level = level;
_baseLevel = baseLevel;
_name = name.intern();
_repCost = cost;
_itemId = itemId;
@@ -63,7 +63,7 @@ public class PledgeSkillLearn
*/
public int getBaseLevel()
{
return _baseLvl;
return _baseLevel;
}
/**

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/SkillLearn.java
View File

@@ -33,11 +33,11 @@ public class SkillLearn
private final int _costid;
private final int _costcount;
public SkillLearn(int id, int lvl, int minLvl, String name, int cost, int costid, int costcount)
public SkillLearn(int id, int level, int minLevel, String name, int cost, int costid, int costcount)
{
_id = id;
_level = lvl;
_minLevel = minLvl;
_level = level;
_minLevel = minLevel;
_name = name.intern();
_spCost = cost;
_costid = costid;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -546,7 +546,7 @@ public class Attackable extends NpcInstance
if (Config.CHAMPION_ENABLE)
{
// Set champion on next spawn.
if (!(this instanceof GrandBossInstance) && !(this instanceof RaidBossInstance) && (this instanceof MonsterInstance) /* && !getTemplate().isQuestMonster */ && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Rnd.get(100) < Config.CHAMPION_FREQUENCY))
if (!(this instanceof GrandBossInstance) && !(this instanceof RaidBossInstance) && (this instanceof MonsterInstance) /* && !getTemplate().isQuestMonster */ && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LEVEL) && (getLevel() <= Config.CHAMP_MAX_LEVEL) && (Rnd.get(100) < Config.CHAMPION_FREQUENCY))
{
setChampion(true);
}
@@ -3049,7 +3049,7 @@ public class Attackable extends NpcInstance
final int diff = getLevel() - (ManorSeedData.getInstance().getSeedLevel(_seedType) - 5);
// hi-lvl mobs bonus
// hi-level mobs bonus
if (diff > 0)
{
count += diff;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -3156,8 +3156,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (_effects.get(i) != null)
{
final int skillid = _effects.get(i).getSkill().getId();
if (!_effects.get(i).getSkill().isToggle() && ((skillid <= 4360) || (skillid >= 4367)))
final int skillId = _effects.get(i).getSkill().getId();
if (!_effects.get(i).getSkill().isToggle() && ((skillId <= 4360) || (skillId >= 4367)))
{
pos++;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -778,7 +778,7 @@ public abstract class Summon extends Playable
{
if (petLevel > 77)
{
skillLevel = (petLevel - 77) + 3; // max buff lvl 11 with pet lvl 85
skillLevel = (petLevel - 77) + 3; // max buff level 11 with pet level 85
}
else if (petLevel >= 70)
{

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java
View File

@@ -190,16 +190,16 @@ public class ChestInstance extends MonsterInstance
private boolean handleCast(Creature creature, int skillId)
{
int skillLevel = 1;
final byte lvl = getTemplate().getLevel();
if ((lvl > 20) && (lvl <= 40))
final byte level = getTemplate().getLevel();
if ((level > 20) && (level <= 40))
{
skillLevel = 3;
}
else if ((lvl > 40) && (lvl <= 60))
else if ((level > 40) && (level <= 60))
{
skillLevel = 5;
}
else if (lvl > 60)
else if (level > 60)
{
skillLevel = 6;
}

30
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
View File

@@ -519,8 +519,8 @@ public class ClanHallManagerInstance extends FolkInstance
}
val = st.nextToken();
int fee;
final int lvl = Integer.parseInt(val);
switch (lvl)
final int level = Integer.parseInt(val);
switch (level)
{
case 0:
{
@@ -543,7 +543,7 @@ public class ClanHallManagerInstance extends FolkInstance
break;
}
}
if (!getClanHall().updateFunctions(ClanHall.FUNC_ITEM_CREATE, lvl, fee, Config.CH_ITEM_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)))
if (!getClanHall().updateFunctions(ClanHall.FUNC_ITEM_CREATE, level, fee, Config.CH_ITEM_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)))
{
player.sendMessage("You don't have enough adena in your clan's warehouse");
}
@@ -559,8 +559,8 @@ public class ClanHallManagerInstance extends FolkInstance
{
int fee;
val = st.nextToken();
final int lvl = Integer.parseInt(val);
switch (lvl)
final int level = Integer.parseInt(val);
switch (level)
{
case 0:
{
@@ -578,7 +578,7 @@ public class ClanHallManagerInstance extends FolkInstance
break;
}
}
if (!getClanHall().updateFunctions(ClanHall.FUNC_TELEPORT, lvl, fee, Config.CH_TELE_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)))
if (!getClanHall().updateFunctions(ClanHall.FUNC_TELEPORT, level, fee, Config.CH_TELE_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)))
{
player.sendMessage("You don't have enough adena in your clan's warehouse");
}
@@ -594,8 +594,8 @@ public class ClanHallManagerInstance extends FolkInstance
{
int fee;
val = st.nextToken();
final int lvl = Integer.parseInt(val);
switch (lvl)
final int level = Integer.parseInt(val);
switch (level)
{
case 0:
{
@@ -643,7 +643,7 @@ public class ClanHallManagerInstance extends FolkInstance
break;
}
}
if (!getClanHall().updateFunctions(ClanHall.FUNC_SUPPORT, lvl, fee, Config.CH_SUPPORT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)))
if (!getClanHall().updateFunctions(ClanHall.FUNC_SUPPORT, level, fee, Config.CH_SUPPORT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)))
{
player.sendMessage("You don't have enough adena in your clan's warehouse");
}
@@ -716,8 +716,8 @@ public class ClanHallManagerInstance extends FolkInstance
{
int fee;
val = st.nextToken();
final int lvl = Integer.parseInt(val);
switch (lvl)
final int level = Integer.parseInt(val);
switch (level)
{
case 0:
{
@@ -735,7 +735,7 @@ public class ClanHallManagerInstance extends FolkInstance
break;
}
}
if (!getClanHall().updateFunctions(ClanHall.FUNC_DECO_CURTAINS, lvl, fee, Config.CH_CURTAIN_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null)))
if (!getClanHall().updateFunctions(ClanHall.FUNC_DECO_CURTAINS, level, fee, Config.CH_CURTAIN_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null)))
{
player.sendMessage("You don't have enough adena in your clan's warehouse");
}
@@ -751,8 +751,8 @@ public class ClanHallManagerInstance extends FolkInstance
{
int fee;
val = st.nextToken();
final int lvl = Integer.parseInt(val);
switch (lvl)
final int level = Integer.parseInt(val);
switch (level)
{
case 0:
{
@@ -770,7 +770,7 @@ public class ClanHallManagerInstance extends FolkInstance
break;
}
}
if (!getClanHall().updateFunctions(ClanHall.FUNC_DECO_FRONTPLATEFORM, lvl, fee, Config.CH_FRONT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null)))
if (!getClanHall().updateFunctions(ClanHall.FUNC_DECO_FRONTPLATEFORM, level, fee, Config.CH_FRONT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null)))
{
player.sendMessage("You don't have enough adena in your clan's warehouse");
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -998,11 +998,11 @@ public class PetInstance extends Summon
private void deathPenalty()
{
// TODO Need Correct Penalty
final int lvl = getStat().getLevel();
final double percentLost = (-0.07 * lvl) + 6.5;
final int level = getStat().getLevel();
final double percentLost = (-0.07 * level) + 6.5;
// Calculate the Experience loss
final long lostExp = Math.round(((getStat().getExpForLevel(lvl + 1) - getStat().getExpForLevel(lvl)) * percentLost) / 100);
final long lostExp = Math.round(((getStat().getExpForLevel(level + 1) - getStat().getExpForLevel(level)) * percentLost) / 100);
// Get the Experience before applying penalty
_expBeforeDeath = getStat().getExp();
@@ -1118,8 +1118,8 @@ public class PetInstance extends Summon
{
return 0;
}
final int lvl = getStat().getLevel();
return lvl > 70 ? 7 + ((lvl - 70) / 5) : lvl / 10;
final int level = getStat().getLevel();
return level > 70 ? 7 + ((level - 70) / 5) : level / 10;
}
/**

88
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -6086,7 +6086,7 @@ public class PlayerInstance extends Playable
{
// this formula seems to work relatively well:
// baseKarma * thisLVL * (thisLVL/100)
// Calculate the new Karma of the attacker : newKarma = baseKarma*pkCountMulti*lvlDiffMulti
// Calculate the new Karma of the attacker : newKarma = baseKarma*pkCountMulti*levelDiffMulti
double karmaLost = Config.KARMA_LOST_BASE;
karmaLost *= getLevel(); // multiply by char lvl
karmaLost *= getLevel() / 100.0; // divide by 0.charLVL
@@ -6277,7 +6277,7 @@ public class PlayerInstance extends Playable
}
// Anti FARM level player < 40
if (Config.ANTI_FARM_LVL_DIFF_ENABLED && (targetPlayer.getLevel() < Config.ANTI_FARM_MAX_LVL_DIFF))
if (Config.ANTI_FARM_LEVEL_DIFF_ENABLED && (targetPlayer.getLevel() < Config.ANTI_FARM_MAX_LEVEL_DIFF))
{
sendMessage("Farm is punishable with Ban! Don't kill new players! GM informed.");
LOGGER.info("PVP POINT FARM ATTEMPT, " + getName() + " and " + targetPlayer.getName() + ". LVL DIFF.");
@@ -6669,7 +6669,7 @@ public class PlayerInstance extends Playable
final int karmaLimit = Config.KARMA_MAX_KARMA;
final int pkLVL = getLevel();
final int pkPKCount = getPkKills();
int lvlDiffMulti = 0;
int levelDiffMulti = 0;
int pkCountMulti = 0;
// Check if the attacker has a PK counter greater than 0
@@ -6690,21 +6690,21 @@ public class PlayerInstance extends Playable
// Calculate the level difference Multiplier between attacker and killed PlayerInstance
if (pkLVL > targLVL)
{
lvlDiffMulti = pkLVL / targLVL;
levelDiffMulti = pkLVL / targLVL;
}
else
{
lvlDiffMulti = 1;
levelDiffMulti = 1;
}
if (lvlDiffMulti < 1)
if (levelDiffMulti < 1)
{
lvlDiffMulti = 1;
levelDiffMulti = 1;
}
// Calculate the new Karma of the attacker : newKarma = baseKarma*pkCountMulti*lvlDiffMulti
// Calculate the new Karma of the attacker : newKarma = baseKarma*pkCountMulti*levelDiffMulti
newKarma *= pkCountMulti;
newKarma *= lvlDiffMulti;
newKarma *= levelDiffMulti;
// Make sure newKarma is less than karmaLimit and higher than baseKarma
if (newKarma < baseKarma)
@@ -6927,14 +6927,14 @@ public class PlayerInstance extends Playable
long lostExp = 0;
if (!atEvent && (!_inEventTvT || !TvT.isStarted()) && (!_inEventDM || !DM.hasStarted()) && (!_inEventCTF || !CTF.isStarted()) && (!_inEventVIP || !VIP._started))
{
final byte maxLvl = ExperienceData.getInstance().getMaxLevel();
if (lvl < maxLvl)
final byte maxLevel = ExperienceData.getInstance().getMaxLevel();
if (lvl < maxLevel)
{
lostExp = Math.round(((getStat().getExpForLevel(lvl + 1) - getStat().getExpForLevel(lvl)) * percentLost) / 100);
}
else
{
lostExp = Math.round(((getStat().getExpForLevel(maxLvl) - getStat().getExpForLevel(maxLvl - 1)) * percentLost) / 100);
lostExp = Math.round(((getStat().getExpForLevel(maxLevel) - getStat().getExpForLevel(maxLevel - 1)) * percentLost) / 100);
}
}
// Get the Experience before applying penalty
@@ -8791,7 +8791,7 @@ public class PlayerInstance extends Playable
if (currentTime < t.getStamp())
{
final int skillId = t.getSkillId();
final int skillLvl = t.getSkillLevel();
final int skillLevel = t.getSkillLevel();
if (storedSkills.contains(skillId))
{
continue;
@@ -8800,7 +8800,7 @@ public class PlayerInstance extends Playable
statement.setInt(1, getObjectId());
statement.setInt(2, skillId);
statement.setInt(3, skillLvl);
statement.setInt(3, skillLevel);
statement.setInt(4, -1);
statement.setInt(5, -1);
statement.setLong(6, t.getReuse());
@@ -8994,78 +8994,78 @@ public class PlayerInstance extends Playable
// loop through all skills of player
for (Skill skill : getAllSkills())
{
final int skillid = skill.getId();
final int skillId = skill.getId();
// int skilllevel = skill.getLevel();
foundskill = false;
// loop through all skills in players skilltree
for (SkillLearn temp : skillTree)
{
// if the skill was found and the level is possible to obtain for his class everything is ok
if (temp.getId() == skillid)
if (temp.getId() == skillId)
{
foundskill = true;
}
}
// exclude noble skills
if (isNoble() && (skillid >= 325) && (skillid <= 397))
if (isNoble() && (skillId >= 325) && (skillId <= 397))
{
foundskill = true;
}
if (isNoble() && (skillid >= 1323) && (skillid <= 1327))
if (isNoble() && (skillId >= 1323) && (skillId <= 1327))
{
foundskill = true;
}
// exclude hero skills
if (isHero() && (skillid >= 395) && (skillid <= 396))
if (isHero() && (skillId >= 395) && (skillId <= 396))
{
foundskill = true;
}
if (isHero() && (skillid >= 1374) && (skillid <= 1376))
if (isHero() && (skillId >= 1374) && (skillId <= 1376))
{
foundskill = true;
}
// exclude cursed weapon skills
if (isCursedWeaponEquiped() && (skillid == CursedWeaponsManager.getInstance().getCursedWeapon(_cursedWeaponEquipedId).getSkillId()))
if (isCursedWeaponEquiped() && (skillId == CursedWeaponsManager.getInstance().getCursedWeapon(_cursedWeaponEquipedId).getSkillId()))
{
foundskill = true;
}
// exclude clan skills
if ((getClan() != null) && (skillid >= 370) && (skillid <= 391))
if ((getClan() != null) && (skillId >= 370) && (skillId <= 391))
{
foundskill = true;
}
// exclude seal of ruler / build siege hq
if ((getClan() != null) && ((skillid == 246) || (skillid == 247)) && (getClan().getLeaderId() == getObjectId()))
if ((getClan() != null) && ((skillId == 246) || (skillId == 247)) && (getClan().getLeaderId() == getObjectId()))
{
foundskill = true;
}
// exclude fishing skills and common skills + dwarfen craft
if ((skillid >= 1312) && (skillid <= 1322))
if ((skillId >= 1312) && (skillId <= 1322))
{
foundskill = true;
}
if ((skillid >= 1368) && (skillid <= 1373))
if ((skillId >= 1368) && (skillId <= 1373))
{
foundskill = true;
}
// exclude sa / enchant bonus / penality etc. skills
if ((skillid >= 3000) && (skillid < 7000))
if ((skillId >= 3000) && (skillId < 7000))
{
foundskill = true;
}
// exclude Skills from AllowedSkills in options.ini
if (Config.ALLOWED_SKILLS_LIST.contains(skillid))
if (Config.ALLOWED_SKILLS_LIST.contains(skillId))
{
foundskill = true;
}
@@ -9188,7 +9188,7 @@ public class PlayerInstance extends Playable
while (rset.next())
{
final int skillId = rset.getInt("skill_id");
final int skillLvl = rset.getInt("skill_level");
final int skillLevel = rset.getInt("skill_level");
final int effectCount = rset.getInt("effect_count");
final int effectCurTime = rset.getInt("effect_cur_time");
final long reuseDelay = rset.getLong("reuse_delay");
@@ -9202,7 +9202,7 @@ public class PlayerInstance extends Playable
if (activateEffects)
{
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
skill.getEffects(this, this, false, false, false);
for (Effect effect : getAllEffects())
{
@@ -9217,7 +9217,7 @@ public class PlayerInstance extends Playable
final long remainingTime = systime - currentTime;
if (remainingTime > 10)
{
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
continue;
@@ -9240,13 +9240,13 @@ public class PlayerInstance extends Playable
while (rset.next())
{
final int skillId = rset.getInt("skill_id");
final int skillLvl = rset.getInt("skill_level");
final int skillLevel = rset.getInt("skill_level");
final long reuseDelay = rset.getLong("reuse_delay");
final long systime = rset.getLong("systime");
final long remainingTime = systime - currentTime;
if (remainingTime > 0)
{
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
continue;
@@ -14412,15 +14412,15 @@ public class PlayerInstance extends Playable
private int getRandomFishLvl()
{
final Effect[] effects = getAllEffects();
int skilllvl = getSkillLevel(1315);
int skillLevel = getSkillLevel(1315);
for (Effect e : effects)
{
if (e.getSkill().getId() == 2274)
{
skilllvl = (int) e.getSkill().getPower(this);
skillLevel = (int) e.getSkill().getPower(this);
}
}
if (skilllvl <= 0)
if (skillLevel <= 0)
{
return 1;
}
@@ -14428,11 +14428,11 @@ public class PlayerInstance extends Playable
final int check = Rnd.get(100);
if (check <= 50)
{
randomlvl = skilllvl;
randomlvl = skillLevel;
}
else if (check <= 85)
{
randomlvl = skilllvl - 1;
randomlvl = skillLevel - 1;
if (randomlvl <= 0)
{
randomlvl = 1;
@@ -14440,7 +14440,7 @@ public class PlayerInstance extends Playable
}
else
{
randomlvl = skilllvl + 1;
randomlvl = skillLevel + 1;
if (randomlvl > 27)
{
randomlvl = 27;
@@ -15611,10 +15611,10 @@ public class PlayerInstance extends Playable
public void rewardAioSkills()
{
Skill skill;
for (Integer skillid : Config.AIO_SKILLS.keySet())
for (Integer skillId : Config.AIO_SKILLS.keySet())
{
final int skilllvl = Config.AIO_SKILLS.get(skillid);
skill = SkillTable.getInstance().getSkill(skillid, skilllvl);
final int skillLevel = Config.AIO_SKILLS.get(skillId);
skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (skill != null)
{
addSkill(skill, true);
@@ -15629,10 +15629,10 @@ public class PlayerInstance extends Playable
public void lostAioSkills()
{
Skill skill;
for (Integer skillid : Config.AIO_SKILLS.keySet())
for (Integer skillId : Config.AIO_SKILLS.keySet())
{
final int skilllvl = Config.AIO_SKILLS.get(skillid);
skill = SkillTable.getInstance().getSkill(skillid, skilllvl);
final int skillLevel = Config.AIO_SKILLS.get(skillId);
skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
removeSkill(skill);
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
View File

@@ -258,11 +258,11 @@ public class TeleporterInstance extends FolkInstance
else if ((list.getTeleId() == 9982) && (list.getTeleId() == 9983) && (list.getTeleId() == 9984) && (getNpcId() == 30483) && (player.getLevel() >= Config.CRUMA_TOWER_LEVEL_RESTRICT))
{
// Chars level XX can't enter in Cruma Tower. Retail: level 56 and above
final int maxlvl = Config.CRUMA_TOWER_LEVEL_RESTRICT;
final int maxLevel = Config.CRUMA_TOWER_LEVEL_RESTRICT;
final String filename = "data/html/teleporter/30483-biglvl.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(filename);
html.replace("%allowedmaxlvl%", "" + maxlvl + "");
html.replace("%allowedmaxLevel%", "" + maxLevel + "");
player.sendPacket(html);
return;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -717,7 +717,7 @@ public class VillageMasterInstance extends FolkInstance
* @param clanName the clan name
* @param leaderName the leader name
* @param pledgeType the pledge type
* @param minClanLvl the min clan lvl
* @param minClanLvl the min clan level
*/
public void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
View File

@@ -216,7 +216,7 @@ public class PlayerStat extends PlayableStat
if (getActiveChar().isInFunEvent())
{
if (getActiveChar()._inEventTvT && (TvT.getMaxlvl() == getLevel()) && !TvT.isStarted())
if (getActiveChar()._inEventTvT && (TvT.getMaxLevel() == getLevel()) && !TvT.isStarted())
{
TvT.removePlayer(getActiveChar());
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java
View File

@@ -199,9 +199,9 @@ public class Rebirth
player.setClassId(player.getBaseClass());
player.broadcastUserInfo();
final byte lvl = Byte.parseByte(returnToLevel + "");
final byte level = Byte.parseByte(returnToLevel + "");
final long pXp = player.getStat().getExp();
final long tXp = ExperienceData.getInstance().getExpForLevel(lvl);
final long tXp = ExperienceData.getInstance().getExpForLevel(level);
if (pXp > tXp)
{
player.getStat().removeExpAndSp(pXp - tXp, 0);

80
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java
View File

@@ -80,8 +80,8 @@ public class CTF implements EventTask
protected static int _npcHeading = 0;
protected static int _rewardId = 0;
protected static int _rewardAmount = 0;
protected static int _minlvl = 0;
protected static int _maxlvl = 0;
protected static int _minLevel = 0;
protected static int _maxLevel = 0;
protected static int _joinTime = 0;
protected static int _eventTime = 0;
protected static int _minPlayers = 0;
@@ -286,48 +286,48 @@ public class CTF implements EventTask
}
/**
* Gets the _minlvl.
* @return the _minlvl
* Gets the _minLevel.
* @return the _minLevel
*/
public static int getMinLvl()
public static int getMinLevel()
{
return _minlvl;
return _minLevel;
}
/**
* Set_minlvl.
* @param minlvl the _minlvl to set
* Set_minLevel.
* @param minLevel the _minLevel to set
* @return true, if successful
*/
public static boolean setMinLvl(int minlvl)
public static boolean setMinLevel(int minLevel)
{
if (!_inProgress)
{
CTF._minlvl = minlvl;
CTF._minLevel = minLevel;
return true;
}
return false;
}
/**
* Gets the _maxlvl.
* @return the _maxlvl
* Gets the _maxLevel.
* @return the _maxLevel
*/
public static int getMaxLvl()
public static int getMaxLevel()
{
return _maxlvl;
return _maxLevel;
}
/**
* Set_maxlvl.
* @param maxlvl the _maxlvl to set
* Set_maxLevel.
* @param maxLevel the _maxLevel to set
* @return true, if successful
*/
public static boolean setMaxLvl(int maxlvl)
public static boolean setMaxLevel(int maxLevel)
{
if (!_inProgress)
{
CTF._maxlvl = maxlvl;
CTF._maxLevel = maxLevel;
return true;
}
return false;
@@ -533,22 +533,22 @@ public class CTF implements EventTask
/**
* Check max level.
* @param maxlvl the maxlvl
* @param maxLevel the maxLevel
* @return true, if successful
*/
public static boolean checkMaxLevel(int maxlvl)
public static boolean checkMaxLevel(int maxLevel)
{
return _minlvl < maxlvl;
return _minLevel < maxLevel;
}
/**
* Check min level.
* @param minlvl the minlvl
* @param minLevel the minLevel
* @return true, if successful
*/
public static boolean checkMinLevel(int minlvl)
public static boolean checkMinLevel(int minLevel)
{
return _maxlvl > minlvl;
return _maxLevel > minLevel;
}
/**
@@ -746,7 +746,7 @@ public class CTF implements EventTask
{
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
}
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minlvl + " to " + _maxlvl);
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + ".");
if (Config.CTF_COMMAND)
{
@@ -1621,8 +1621,8 @@ public class CTF implements EventTask
LOGGER.info("Name: " + _eventName);
LOGGER.info("Desc: " + _eventDesc);
LOGGER.info("Join location: " + _joiningLocationName);
LOGGER.info("Min lvl: " + _minlvl);
LOGGER.info("Max lvl: " + _maxlvl);
LOGGER.info("Min lvl: " + _minLevel);
LOGGER.info("Max lvl: " + _maxLevel);
LOGGER.info("");
LOGGER.info("##########################");
LOGGER.info("# _teams(List<String>) #");
@@ -1744,8 +1744,8 @@ public class CTF implements EventTask
_rewardId = 0;
_rewardAmount = 0;
_topScore = 0;
_minlvl = 0;
_maxlvl = 0;
_minLevel = 0;
_maxLevel = 0;
_joinTime = 0;
_eventTime = 0;
_minPlayers = 0;
@@ -1765,8 +1765,8 @@ public class CTF implements EventTask
_eventName = rs.getString("eventName");
_eventDesc = rs.getString("eventDesc");
_joiningLocationName = rs.getString("joiningLocation");
_minlvl = rs.getInt("minlvl");
_maxlvl = rs.getInt("maxlvl");
_minLevel = rs.getInt("minLevel");
_maxLevel = rs.getInt("maxLevel");
_npcId = rs.getInt("npcId");
_npcX = rs.getInt("npcX");
_npcY = rs.getInt("npcY");
@@ -1838,12 +1838,12 @@ public class CTF implements EventTask
statement.execute();
statement.close();
statement = con.prepareStatement("INSERT INTO ctf (eventName, eventDesc, joiningLocation, minlvl, maxlvl, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
statement = con.prepareStatement("INSERT INTO ctf (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
statement.setString(1, _eventName);
statement.setString(2, _eventDesc);
statement.setString(3, _joiningLocationName);
statement.setInt(4, _minlvl);
statement.setInt(5, _maxlvl);
statement.setInt(4, _minLevel);
statement.setInt(5, _maxLevel);
statement.setInt(6, _npcId);
statement.setInt(7, _npcX);
statement.setInt(8, _npcY);
@@ -1923,7 +1923,7 @@ public class CTF implements EventTask
{
replyMSG.append("<font color=\"FFFF00\">You can't participate to this event with a cursed Weapon.</font><br>");
}
else if (!_started && _joining && (eventPlayer.getLevel() >= _minlvl) && (eventPlayer.getLevel() <= _maxlvl))
else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
{
synchronized (_players)
{
@@ -1945,8 +1945,8 @@ public class CTF implements EventTask
else
{
replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minlvl + "</font></center></td><br>");
replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxlvl + "</font></center></td><br><br>");
replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
replyMSG.append("<center><font color=\"3366CC\">Teams:</font></center><br>");
if (Config.CTF_EVEN_TEAMS.equals("NO") || Config.CTF_EVEN_TEAMS.equals("BALANCE"))
{
@@ -1981,11 +1981,11 @@ public class CTF implements EventTask
{
replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
}
else if ((eventPlayer.getLevel() < _minlvl) || (eventPlayer.getLevel() > _maxlvl))
else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
{
replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minlvl + "</font><br>");
replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxlvl + "</font><br><br>");
replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
}

80
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java
View File

@@ -72,8 +72,8 @@ public class DM implements EventTask
protected static int _npcHeading = 0;
protected static int _rewardId = 0;
protected static int _rewardAmount = 0;
protected static int _minlvl = 0;
protected static int _maxlvl = 0;
protected static int _minLevel = 0;
protected static int _maxLevel = 0;
protected static int _joinTime = 0;
protected static int _eventTime = 0;
protected static int _minPlayers = 0;
@@ -260,48 +260,48 @@ public class DM implements EventTask
}
/**
* Gets the _minlvl.
* @return the _minlvl
* Gets the _minLevel.
* @return the _minLevel
*/
public static int getMinlvl()
public static int getMinLevel()
{
return _minlvl;
return _minLevel;
}
/**
* Set_minlvl.
* @param minlvl the _minlvl to set
* Set_minLevel.
* @param minLevel the _minLevel to set
* @return true, if successful
*/
public static boolean setMinlvl(int minlvl)
public static boolean setMinlvl(int minLevel)
{
if (!_inProgress)
{
DM._minlvl = minlvl;
DM._minLevel = minLevel;
return true;
}
return false;
}
/**
* Gets the _maxlvl.
* @return the _maxlvl
* Gets the _maxLevel.
* @return the _maxLevel
*/
public static int getMaxlvl()
public static int getMaxLevel()
{
return _maxlvl;
return _maxLevel;
}
/**
* Set_maxlvl.
* @param maxlvl the _maxlvl to set
* Set_maxLevel.
* @param maxLevel the _maxLevel to set
* @return true, if successful
*/
public static boolean setMaxlvl(int maxlvl)
public static boolean setMaxlvl(int maxLevel)
{
if (!_inProgress)
{
DM._maxlvl = maxlvl;
DM._maxLevel = maxLevel;
return true;
}
return false;
@@ -507,22 +507,22 @@ public class DM implements EventTask
/**
* Check max level.
* @param maxlvl the maxlvl
* @param maxLevel the maxLevel
* @return true, if successful
*/
public static boolean checkMaxLevel(int maxlvl)
public static boolean checkMaxLevel(int maxLevel)
{
return _minlvl < maxlvl;
return _minLevel < maxLevel;
}
/**
* Check min level.
* @param minlvl the minlvl
* @param minLevel the minLevel
* @return true, if successful
*/
public static boolean checkMinLevel(int minlvl)
public static boolean checkMinLevel(int minLevel)
{
return _maxlvl > minlvl;
return _maxLevel > minLevel;
}
/**
@@ -706,7 +706,7 @@ public class DM implements EventTask
{
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
}
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minlvl + " to " + _maxlvl);
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName);
if (Config.DM_COMMAND)
{
@@ -1469,8 +1469,8 @@ public class DM implements EventTask
LOGGER.info("Name: " + _eventName);
LOGGER.info("Desc: " + _eventDesc);
LOGGER.info("Join location: " + _joiningLocationName);
LOGGER.info("Min lvl: " + _minlvl);
LOGGER.info("Max lvl: " + _maxlvl);
LOGGER.info("Min lvl: " + _minLevel);
LOGGER.info("Max lvl: " + _maxLevel);
LOGGER.info("");
LOGGER.info("##################################");
@@ -1543,8 +1543,8 @@ public class DM implements EventTask
_rewardId = 0;
_rewardAmount = 0;
_topKills = 0;
_minlvl = 0;
_maxlvl = 0;
_minLevel = 0;
_maxLevel = 0;
_joinTime = 0;
_eventTime = 0;
_minPlayers = 0;
@@ -1567,8 +1567,8 @@ public class DM implements EventTask
_eventName = rs.getString("eventName");
_eventDesc = rs.getString("eventDesc");
_joiningLocationName = rs.getString("joiningLocation");
_minlvl = rs.getInt("minlvl");
_maxlvl = rs.getInt("maxlvl");
_minLevel = rs.getInt("minLevel");
_maxLevel = rs.getInt("maxLevel");
_npcId = rs.getInt("npcId");
_npcX = rs.getInt("npcX");
_npcY = rs.getInt("npcY");
@@ -1606,12 +1606,12 @@ public class DM implements EventTask
statement.execute();
statement.close();
statement = con.prepareStatement("INSERT INTO dm (eventName, eventDesc, joiningLocation, minlvl, maxlvl, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, joinTime, eventTime, minPlayers, maxPlayers, color, playerX, playerY, playerZ, delayForNextEvent ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
statement = con.prepareStatement("INSERT INTO dm (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, joinTime, eventTime, minPlayers, maxPlayers, color, playerX, playerY, playerZ, delayForNextEvent ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
statement.setString(1, _eventName);
statement.setString(2, _eventDesc);
statement.setString(3, _joiningLocationName);
statement.setInt(4, _minlvl);
statement.setInt(5, _maxlvl);
statement.setInt(4, _minLevel);
statement.setInt(5, _maxLevel);
statement.setInt(6, _npcId);
statement.setInt(7, _npcX);
statement.setInt(8, _npcY);
@@ -1673,7 +1673,7 @@ public class DM implements EventTask
{
replyMSG.append("<font color=\"FFFF00\">You can't participate to this event with a cursed Weapon.</font><br>");
}
else if (!_started && _joining && (eventPlayer.getLevel() >= _minlvl) && (eventPlayer.getLevel() <= _maxlvl))
else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
{
if (_players.contains(eventPlayer))
{
@@ -1689,8 +1689,8 @@ public class DM implements EventTask
{
replyMSG.append("<center>Joined Players: <font color=\"00FF00\">" + _players.size() + "</font></center><br>");
replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minlvl + "</font></center></td><br>");
replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxlvl + "</font></center></td><br><br>");
replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
replyMSG.append("<center><button value=\"Join\" action=\"bypass -h npc_" + objectId + "_dmevent_player_join\" width=50 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center><br>");
}
}
@@ -1698,11 +1698,11 @@ public class DM implements EventTask
{
replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
}
else if ((eventPlayer.getLevel() < _minlvl) || (eventPlayer.getLevel() > _maxlvl))
else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
{
replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minlvl + "</font><br>");
replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxlvl + "</font><br><br>");
replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
}
}

80
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java
View File

@@ -72,8 +72,8 @@ public class TvT implements EventTask
protected static int _npcHeading = 0;
protected static int _rewardId = 0;
protected static int _rewardAmount = 0;
protected static int _minlvl = 0;
protected static int _maxlvl = 0;
protected static int _minLevel = 0;
protected static int _maxLevel = 0;
protected static int _joinTime = 0;
protected static int _eventTime = 0;
protected static int _minPlayers = 0;
@@ -265,48 +265,48 @@ public class TvT implements EventTask
}
/**
* Gets the _minlvl.
* @return the _minlvl
* Gets the _minLevel.
* @return the _minLevel
*/
public static int getMinlvl()
public static int getMinLevel()
{
return _minlvl;
return _minLevel;
}
/**
* Set_minlvl.
* @param minlvl the _minlvl to set
* Set_minLevel.
* @param minLevel the _minLevel to set
* @return true, if successful
*/
public static boolean setMinlvl(int minlvl)
public static boolean setMinlvl(int minLevel)
{
if (!_inProgress)
{
TvT._minlvl = minlvl;
TvT._minLevel = minLevel;
return true;
}
return false;
}
/**
* Gets the _maxlvl.
* @return the _maxlvl
* Gets the _maxLevel.
* @return the _maxLevel
*/
public static int getMaxlvl()
public static int getMaxLevel()
{
return _maxlvl;
return _maxLevel;
}
/**
* Set_maxlvl.
* @param maxlvl the _maxlvl to set
* Set_maxLevel.
* @param maxLevel the _maxLevel to set
* @return true, if successful
*/
public static boolean setMaxlvl(int maxlvl)
public static boolean setMaxlvl(int maxLevel)
{
if (!_inProgress)
{
TvT._maxlvl = maxlvl;
TvT._maxLevel = maxLevel;
return true;
}
return false;
@@ -512,22 +512,22 @@ public class TvT implements EventTask
/**
* Check max level.
* @param maxlvl the maxlvl
* @param maxLevel the maxLevel
* @return true, if successful
*/
public static boolean checkMaxLevel(int maxlvl)
public static boolean checkMaxLevel(int maxLevel)
{
return _minlvl < maxlvl;
return _minLevel < maxLevel;
}
/**
* Check min level.
* @param minlvl the minlvl
* @param minLevel the minLevel
* @return true, if successful
*/
public static boolean checkMinLevel(int minlvl)
public static boolean checkMinLevel(int minLevel)
{
return _maxlvl > minlvl;
return _maxLevel > minLevel;
}
/**
@@ -711,7 +711,7 @@ public class TvT implements EventTask
{
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Reward: " + _rewardAmount + " " + ItemTable.getInstance().getTemplate(_rewardId).getName());
}
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minlvl + " to " + _maxlvl);
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Recruiting levels: " + _minLevel + " to " + _maxLevel);
Announcements.getInstance().criticalAnnounceToAll(_eventName + ": Joinable in " + _joiningLocationName + ".");
if (Config.TVT_COMMAND)
{
@@ -1550,8 +1550,8 @@ public class TvT implements EventTask
LOGGER.info("Name: " + _eventName);
LOGGER.info("Desc: " + _eventDesc);
LOGGER.info("Join location: " + _joiningLocationName);
LOGGER.info("Min lvl: " + _minlvl);
LOGGER.info("Max lvl: " + _maxlvl);
LOGGER.info("Min lvl: " + _minLevel);
LOGGER.info("Max lvl: " + _maxLevel);
LOGGER.info("");
LOGGER.info("##########################");
LOGGER.info("# _teams(List<String>) #");
@@ -1651,8 +1651,8 @@ public class TvT implements EventTask
_rewardId = 0;
_rewardAmount = 0;
_topKills = 0;
_minlvl = 0;
_maxlvl = 0;
_minLevel = 0;
_maxLevel = 0;
_joinTime = 0;
_eventTime = 0;
_minPlayers = 0;
@@ -1672,8 +1672,8 @@ public class TvT implements EventTask
_eventName = rs.getString("eventName");
_eventDesc = rs.getString("eventDesc");
_joiningLocationName = rs.getString("joiningLocation");
_minlvl = rs.getInt("minlvl");
_maxlvl = rs.getInt("maxlvl");
_minLevel = rs.getInt("minLevel");
_maxLevel = rs.getInt("maxLevel");
_npcId = rs.getInt("npcId");
_npcX = rs.getInt("npcX");
_npcY = rs.getInt("npcY");
@@ -1736,12 +1736,12 @@ public class TvT implements EventTask
statement.execute();
statement.close();
statement = con.prepareStatement("INSERT INTO tvt (eventName, eventDesc, joiningLocation, minlvl, maxlvl, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)");
statement = con.prepareStatement("INSERT INTO tvt (eventName, eventDesc, joiningLocation, minLevel, maxLevel, npcId, npcX, npcY, npcZ, npcHeading, rewardId, rewardAmount, teamsCount, joinTime, eventTime, minPlayers, maxPlayers,delayForNextEvent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)");
statement.setString(1, _eventName);
statement.setString(2, _eventDesc);
statement.setString(3, _joiningLocationName);
statement.setInt(4, _minlvl);
statement.setInt(5, _maxlvl);
statement.setInt(4, _minLevel);
statement.setInt(5, _maxLevel);
statement.setInt(6, _npcId);
statement.setInt(7, _npcX);
statement.setInt(8, _npcY);
@@ -1819,7 +1819,7 @@ public class TvT implements EventTask
{
replyMSG.append("<font color=\"FFFF00\">You can't participate to this event with a cursed Weapon.</font><br>");
}
else if (!_started && _joining && (eventPlayer.getLevel() >= _minlvl) && (eventPlayer.getLevel() <= _maxlvl))
else if (!_started && _joining && (eventPlayer.getLevel() >= _minLevel) && (eventPlayer.getLevel() <= _maxLevel))
{
synchronized (_players)
{
@@ -1841,8 +1841,8 @@ public class TvT implements EventTask
else
{
replyMSG.append("<center><font color=\"3366CC\">You want to participate in the event?</font></center><br>");
replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minlvl + "</font></center></td><br>");
replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxlvl + "</font></center></td><br><br>");
replyMSG.append("<center><td width=\"200\">Min lvl: <font color=\"00FF00\">" + _minLevel + "</font></center></td><br>");
replyMSG.append("<center><td width=\"200\">Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font></center></td><br><br>");
replyMSG.append("<center><font color=\"3366CC\">Teams:</font></center><br>");
if (Config.TVT_EVEN_TEAMS.equals("NO") || Config.TVT_EVEN_TEAMS.equals("BALANCE"))
{
@@ -1877,11 +1877,11 @@ public class TvT implements EventTask
{
replyMSG.append("<center>" + _eventName + " match is in progress.</center>");
}
else if ((eventPlayer.getLevel() < _minlvl) || (eventPlayer.getLevel() > _maxlvl))
else if ((eventPlayer.getLevel() < _minLevel) || (eventPlayer.getLevel() > _maxLevel))
{
replyMSG.append("Your lvl: <font color=\"00FF00\">" + eventPlayer.getLevel() + "</font><br>");
replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minlvl + "</font><br>");
replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxlvl + "</font><br><br>");
replyMSG.append("Min lvl: <font color=\"00FF00\">" + _minLevel + "</font><br>");
replyMSG.append("Max lvl: <font color=\"00FF00\">" + _maxLevel + "</font><br><br>");
replyMSG.append("<font color=\"FFFF00\">You can't participate to this event.</font><br>");
}

26
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java
View File

@@ -34,19 +34,19 @@ public class PartyMatchRoom
private String _title;
private int _loot;
private int _location;
private int _minlvl;
private int _maxlvl;
private int _minLevel;
private int _maxLevel;
private int _maxmem;
private final List<PlayerInstance> _members = new ArrayList<>();
public PartyMatchRoom(int id, String title, int loot, int minlvl, int maxlvl, int maxmem, PlayerInstance owner)
public PartyMatchRoom(int id, String title, int loot, int minLevel, int maxLevel, int maxmem, PlayerInstance owner)
{
_id = id;
_title = title;
_loot = loot;
_location = MapRegionData.getInstance().getClosestLocation(owner.getX(), owner.getY());
_minlvl = minlvl;
_maxlvl = maxlvl;
_minLevel = minLevel;
_maxLevel = maxLevel;
_maxmem = maxmem;
_members.add(owner);
}
@@ -150,24 +150,24 @@ public class PartyMatchRoom
_loot = loot;
}
public int getMinLvl()
public int getMinLevel()
{
return _minlvl;
return _minLevel;
}
public void setMinLvl(int minlvl)
public void setMinLevel(int minLevel)
{
_minlvl = minlvl;
_minLevel = minLevel;
}
public int getMaxLvl()
public int getMaxLevel()
{
return _maxlvl;
return _maxLevel;
}
public void setMaxLvl(int maxlvl)
public void setMaxLevel(int maxLevel)
{
_maxlvl = maxlvl;
_maxLevel = maxLevel;
}
public int getLocation()

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java
View File

@@ -2824,8 +2824,8 @@ public class Formulas
public static boolean calcMagicSuccess(Creature attacker, Creature target, Skill skill)
{
final double lvlDifference = target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel());
final int rate = Math.round((float) (Math.pow(1.3, lvlDifference) * 100));
final double levelDifference = target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel());
final int rate = Math.round((float) (Math.pow(1.3, levelDifference) * 100));
return Rnd.get(10000) > rate;
}

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java
View File

@@ -25,18 +25,18 @@ import org.l2jmobius.gameserver.model.Skill;
public class SkillHolder
{
private final int _skillId;
private final int _skillLvl;
private final int _skillLevel;
public SkillHolder(int skillId, int skillLvl)
public SkillHolder(int skillId, int skillLevel)
{
_skillId = skillId;
_skillLvl = skillLvl;
_skillLevel = skillLevel;
}
public SkillHolder(Skill skill)
{
_skillId = skill.getId();
_skillLvl = skill.getLevel();
_skillLevel = skill.getLevel();
}
public int getSkillId()
@@ -44,13 +44,13 @@ public class SkillHolder
return _skillId;
}
public int getSkillLvl()
public int getSkillLevel()
{
return _skillLvl;
return _skillLevel;
}
public Skill getSkill()
{
return SkillTable.getInstance().getSkill(_skillId, _skillLvl);
return SkillTable.getInstance().getSkill(_skillId, _skillLevel);
}
}

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
View File

@@ -38,8 +38,8 @@ public abstract class ZoneType
/** Parameters to affect specific characters */
private boolean _checkAffected;
private int _minLvl;
private int _maxLvl;
private int _minLevel;
private int _maxLevel;
private int[] _race;
private int[] _class;
private char _classType;
@@ -48,8 +48,8 @@ public abstract class ZoneType
{
_id = id;
_checkAffected = false;
_minLvl = 0;
_maxLvl = 0xFF;
_minLevel = 0;
_maxLevel = 0xFF;
_classType = 0;
_race = null;
_class = null;
@@ -74,13 +74,13 @@ public abstract class ZoneType
{
case "affectedLvlMin":
{
_minLvl = Integer.parseInt(value);
_minLevel = Integer.parseInt(value);
break;
}
// Maximum level
case "affectedLvlMax":
{
_maxLvl = Integer.parseInt(value);
_maxLevel = Integer.parseInt(value);
break;
}
// Affected Races
@@ -150,8 +150,8 @@ public abstract class ZoneType
*/
private boolean isAffected(Creature creature)
{
// Check lvl
if ((creature.getLevel() < _minLvl) || (creature.getLevel() > _maxLvl))
// Check level
if ((creature.getLevel() < _minLevel) || (creature.getLevel() > _maxLevel))
{
return false;
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java
View File

@@ -166,9 +166,9 @@ public class EffectZone extends ZoneType
}
}
protected Skill getSkill(int skillId, int skillLvl)
protected Skill getSkill(int skillId, int skillLevel)
{
return SkillTable.getInstance().getSkill(skillId, skillLvl);
return SkillTable.getInstance().getSkill(skillId, skillLevel);
}
public int getChance()
@@ -181,9 +181,9 @@ public class EffectZone extends ZoneType
return _enabled;
}
public void addSkill(int skillId, int skillLvL)
public void addSkill(int skillId, int skillLevel)
{
if (skillLvL < 1) // remove skill
if (skillLevel < 1) // remove skill
{
removeSkill(skillId);
return;
@@ -199,7 +199,7 @@ public class EffectZone extends ZoneType
}
}
}
_skills.put(skillId, skillLvL);
_skills.put(skillId, skillLevel);
}
public void removeSkill(int skillId)

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java
View File

@@ -35,7 +35,7 @@ public class PoisonZone extends ZoneType
protected int _skillId;
int _chance;
private int _initialDelay;
protected int _skillLvl;
protected int _skillLevel;
private int _reuse;
boolean _enabled;
String _target;
@@ -45,7 +45,7 @@ public class PoisonZone extends ZoneType
{
super(id);
_skillId = 4070;
_skillLvl = 1;
_skillLevel = 1;
_chance = 100;
_initialDelay = 0;
_reuse = 30000;
@@ -63,9 +63,9 @@ public class PoisonZone extends ZoneType
_skillId = Integer.parseInt(value);
break;
}
case "skillLvl":
case "skillLevel":
{
_skillLvl = Integer.parseInt(value);
_skillLevel = Integer.parseInt(value);
break;
}
case "chance":
@@ -122,7 +122,7 @@ public class PoisonZone extends ZoneType
public Skill getSkill()
{
return SkillTable.getInstance().getSkill(_skillId, _skillLvl);
return SkillTable.getInstance().getSkill(_skillId, _skillLevel);
}
public String getTargetType()
@@ -160,7 +160,7 @@ public class PoisonZone extends ZoneType
if (skill == null)
{
LOGGER.warning("ATTENTION: error on zone with id " + getId());
LOGGER.warning("Skill " + _skillId + "," + _skillLvl + " not present between skills");
LOGGER.warning("Skill " + _skillId + "," + _skillLevel + " not present between skills");
}
else
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
View File

@@ -71,7 +71,7 @@ public class AnswerJoinPartyRoom extends GameClientPacket
return;
}
if ((player.getLevel() >= room.getMinLvl()) && (player.getLevel() <= room.getMaxLvl()))
if ((player.getLevel() >= room.getMinLevel()) && (player.getLevel() <= room.getMaxLevel()))
{
// Remove from waiting list
PartyMatchWaitingList.getInstance().removePlayer(player);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -224,9 +224,9 @@ public class CharacterCreate extends GameClientPacket
newChar.setXYZInvisible(template.getSpawnX(), template.getSpawnY(), template.getSpawnZ());
}
if (Config.ALLOW_CREATE_LVL)
if (Config.ALLOW_CREATE_LEVEL)
{
newChar.getStat().addExp(ExperienceData.getInstance().getExpForLevel(Config.CHAR_CREATE_LVL));
newChar.getStat().addExp(ExperienceData.getInstance().getExpForLevel(Config.CHAR_CREATE_LEVEL));
}
if (Config.CHAR_TITLE)

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -521,22 +521,22 @@ public class RequestActionUse extends GameClientPacket
}
case 1003: // Wind Hatchling/Strider - Wild Stun
{
useSkill(4710); // TODO use correct skill lvl based on pet lvl
useSkill(4710); // TODO use correct skill level based on pet level
break;
}
case 1004: // Wind Hatchling/Strider - Wild Defense
{
useSkill(4711, player); // TODO use correct skill lvl based on pet lvl
useSkill(4711, player); // TODO use correct skill level based on pet level
break;
}
case 1005: // Star Hatchling/Strider - Bright Burst
{
useSkill(4712); // TODO use correct skill lvl based on pet lvl
useSkill(4712); // TODO use correct skill level based on pet level
break;
}
case 1006: // Star Hatchling/Strider - Bright Heal
{
useSkill(4713, player); // TODO use correct skill lvl based on pet lvl
useSkill(4713, player); // TODO use correct skill level based on pet level
break;
}
case 1007: // Cat Queen - Blessing of Queen

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
View File

@@ -120,7 +120,7 @@ public class RequestExAskJoinMPCC extends GameClientPacket
private void askJoinMPCC(PlayerInstance requestor, PlayerInstance target)
{
boolean hasRight = false;
if ((requestor.getClan() != null) && (requestor.getClan().getLeaderId() == requestor.getObjectId()) && (requestor.getClan().getLevel() >= 5)) // Clanleader of lvl5 Clan or higher
if ((requestor.getClan() != null) && (requestor.getClan().getLeaderId() == requestor.getObjectId()) && (requestor.getClan().getLevel() >= 5)) // Clanleader of level5 Clan or higher
{
hasRight = true;
}

22
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@@ -37,19 +37,19 @@ import org.l2jmobius.gameserver.util.IllegalPlayerAction;
import org.l2jmobius.gameserver.util.Util;
/**
* Format chdd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill lvl
* Format chdd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill level
* @author -Wooden-
*/
public class RequestExEnchantSkill extends GameClientPacket
{
private int _skillId;
private int _skillLvl;
private int _skillLevel;
@Override
protected void readImpl()
{
_skillId = readD();
_skillLvl = readD();
_skillLevel = readD();
}
@Override
@@ -73,7 +73,7 @@ public class RequestExEnchantSkill extends GameClientPacket
return;
}
if (player.getSkillLevel(_skillId) >= _skillLvl)
if (player.getSkillLevel(_skillId) >= _skillLevel)
{
return;
}
@@ -88,12 +88,12 @@ public class RequestExEnchantSkill extends GameClientPacket
return;
}
final Skill skill = SkillTable.getInstance().getSkill(_skillId, _skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(_skillId, _skillLevel);
int counts = 0;
int requiredSp = 10000000;
int requiredExp = 100000;
byte rate = 0;
int baseLvl = 1;
int baseLevel = 1;
final EnchantSkillLearn[] skills = SkillTreeTable.getInstance().getAvailableEnchantSkills(player);
for (EnchantSkillLearn s : skills)
@@ -108,7 +108,7 @@ public class RequestExEnchantSkill extends GameClientPacket
requiredSp = s.getSpCost();
requiredExp = s.getExp();
rate = s.getRate(player);
baseLvl = s.getBaseLevel();
baseLevel = s.getBaseLevel();
}
if ((counts == 0) && !Config.ALT_GAME_SKILL_LEARN)
@@ -124,7 +124,7 @@ public class RequestExEnchantSkill extends GameClientPacket
final long expAfter = player.getExp() - requiredExp;
if ((player.getExp() >= requiredExp) && (expAfter >= ExperienceData.getInstance().getExpForLevel(player.getLevel())))
{
if (Config.ES_SP_BOOK_NEEDED && ((_skillLvl == 101) || (_skillLvl == 141))) // only first lvl requires book
if (Config.ES_SP_BOOK_NEEDED && ((_skillLevel == 101) || (_skillLevel == 141))) // only first level requires book
{
final int spbId = 6622;
final ItemInstance spb = player.getInventory().getItemByItemId(spbId);
@@ -173,8 +173,8 @@ public class RequestExEnchantSkill extends GameClientPacket
{
if (skill.getLevel() > 100)
{
_skillLvl = baseLvl;
player.addSkill(SkillTable.getInstance().getSkill(_skillId, _skillLvl), true);
_skillLevel = baseLevel;
player.addSkill(SkillTable.getInstance().getSkill(_skillId, _skillLevel), true);
player.sendSkillList();
}
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_THE_SKILL_WILL_BE_INITIALIZED);
@@ -191,7 +191,7 @@ public class RequestExEnchantSkill extends GameClientPacket
{
if ((sc.getId() == _skillId) && (sc.getType() == ShortCut.TYPE_SKILL))
{
final ShortCut newsc = new ShortCut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), _skillLvl);
final ShortCut newsc = new ShortCut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), _skillLevel);
player.sendPacket(new ShortCutRegister(newsc));
player.registerShortCut(newsc);
}

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@@ -27,25 +27,25 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfo;
/**
* Format chdd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill lvl
* Format chdd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill level
* @author -Wooden-
*/
public class RequestExEnchantSkillInfo extends GameClientPacket
{
private int _skillId;
private int _skillLvl;
private int _skillLevel;
@Override
protected void readImpl()
{
_skillId = readD();
_skillLvl = readD();
_skillLevel = readD();
}
@Override
protected void runImpl()
{
if ((_skillId <= 0) || (_skillLvl <= 0))
if ((_skillId <= 0) || (_skillLevel <= 0))
{
return;
}
@@ -74,7 +74,7 @@ public class RequestExEnchantSkillInfo extends GameClientPacket
boolean canteach = false;
final Skill skill = SkillTable.getInstance().getSkill(_skillId, _skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(_skillId, _skillLevel);
if ((skill == null) || (skill.getId() != _skillId))
{
return;
@@ -88,7 +88,7 @@ public class RequestExEnchantSkillInfo extends GameClientPacket
final EnchantSkillLearn[] skills = SkillTreeTable.getInstance().getAvailableEnchantSkills(player);
for (EnchantSkillLearn s : skills)
{
if ((s.getId() == _skillId) && (s.getLevel() == _skillLvl))
if ((s.getId() == _skillId) && (s.getLevel() == _skillLevel))
{
canteach = true;
break;
@@ -104,7 +104,7 @@ public class RequestExEnchantSkillInfo extends GameClientPacket
final int requiredExp = SkillTreeTable.getInstance().getSkillExpCost(player, skill);
final byte rate = SkillTreeTable.getInstance().getSkillRate(player, skill);
final ExEnchantSkillInfo asi = new ExEnchantSkillInfo(skill.getId(), skill.getLevel(), requiredSp, requiredExp, rate);
if (Config.ES_SP_BOOK_NEEDED && ((skill.getLevel() == 101) || (skill.getLevel() == 141))) // only first lvl requires book
if (Config.ES_SP_BOOK_NEEDED && ((skill.getLevel() == 101) || (skill.getLevel() == 141))) // only first level requires book
{
final int spbId = 6622;
asi.addRequirement(4, spbId, 1, 0);

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
View File

@@ -25,16 +25,16 @@ import org.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaiting
public class RequestListPartyMatchingWaitingRoom extends GameClientPacket
{
private static int _page;
private static int _minlvl;
private static int _maxlvl;
private static int _minLevel;
private static int _maxLevel;
private static int _mode; // 1 - waitlist 0 - room waitlist
@Override
protected void readImpl()
{
_page = readD();
_minlvl = readD();
_maxlvl = readD();
_minLevel = readD();
_maxLevel = readD();
_mode = readD();
}
@@ -47,6 +47,6 @@ public class RequestListPartyMatchingWaitingRoom extends GameClientPacket
return;
}
player.sendPacket(new ExListPartyMatchingWaitingRoom(player, _page, _minlvl, _maxlvl, _mode));
player.sendPacket(new ExListPartyMatchingWaitingRoom(player, _page, _minLevel, _maxLevel, _mode));
}
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
View File

@@ -30,14 +30,14 @@ public class RequestPartyMatchConfig extends GameClientPacket
{
private int _auto;
private int _loc;
private int _lvl;
private int _level;
@Override
protected void readImpl()
{
_auto = readD();
_loc = readD();
_lvl = readD();
_level = readD();
}
@Override
@@ -82,7 +82,7 @@ public class RequestPartyMatchConfig extends GameClientPacket
PartyMatchWaitingList.getInstance().addPlayer(player);
// Send Room list
player.sendPacket(new PartyMatchList(player, _auto, _loc, _lvl));
player.sendPacket(new PartyMatchList(player, _auto, _loc, _level));
}
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
View File

@@ -68,7 +68,7 @@ public class RequestPartyMatchDetail extends GameClientPacket
return;
}
if ((player.getLevel() >= room.getMinLvl()) && (player.getLevel() <= room.getMaxLvl()))
if ((player.getLevel() >= room.getMinLevel()) && (player.getLevel() <= room.getMaxLevel()))
{
// Remove from waiting list
PartyMatchWaitingList.getInstance().removePlayer(player);

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
View File

@@ -35,8 +35,8 @@ public class RequestPartyMatchList extends GameClientPacket
private int _roomid;
private int _membersmax;
private int _lvlmin;
private int _lvlmax;
private int _minLevel;
private int _maxLevel;
private int _loot;
private String _roomtitle;
@@ -45,8 +45,8 @@ public class RequestPartyMatchList extends GameClientPacket
{
_roomid = readD();
_membersmax = readD();
_lvlmin = readD();
_lvlmax = readD();
_minLevel = readD();
_maxLevel = readD();
_loot = readD();
_roomtitle = readS();
}
@@ -67,8 +67,8 @@ public class RequestPartyMatchList extends GameClientPacket
{
LOGGER.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName());
room.setMaxMembers(_membersmax);
room.setMinLvl(_lvlmin);
room.setMaxLvl(_lvlmax);
room.setMinLevel(_minLevel);
room.setMaxLevel(_maxLevel);
room.setLootType(_loot);
room.setTitle(_roomtitle);
@@ -87,7 +87,7 @@ public class RequestPartyMatchList extends GameClientPacket
else
{
final int maxId = PartyMatchRoomList.getInstance().getMaxId();
final PartyMatchRoom room = new PartyMatchRoom(maxId, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, player);
final PartyMatchRoom room = new PartyMatchRoom(maxId, _roomtitle, _loot, _minLevel, _maxLevel, _membersmax, player);
LOGGER.info("PartyMatchRoom #" + maxId + " created by " + player.getName());

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@@ -62,7 +62,7 @@ public class RequestRefine extends GameClientPacket
final ItemInstance gemstoneItem = (ItemInstance) World.getInstance().findObject(_gemstoneItemObjId);
if ((targetItem == null) || (refinerItem == null) || (gemstoneItem == null) || (targetItem.getOwnerId() != player.getObjectId()) || (refinerItem.getOwnerId() != player.getObjectId()) || (gemstoneItem.getOwnerId() != player.getObjectId()) || (player.getLevel() < 46)) // must
// be
// lvl
// level
// 46
{
player.sendPacket(new ExVariationResult(0, 0, 0));

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java
View File

@@ -311,7 +311,7 @@ public class CharSelectInfo extends GameServerPacket
final int baseClassId = chardata.getInt("base_class");
final int activeClassId = chardata.getInt("classid");
// if is in subclass, load subclass exp, sp, lvl info
// if is in subclass, load subclass exp, sp, level info
if (baseClassId != activeClassId)
{
loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId);

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
public class ConfirmDlg extends GameServerPacket
{
private final int _messageId;
private int _skillLvL = 1;
private int _skillLevel = 1;
private static final int TYPE_ZONE_NAME = 7;
private static final int TYPE_SKILL_NAME = 4;
private static final int TYPE_ITEM_NAME = 3;
@@ -88,11 +88,11 @@ public class ConfirmDlg extends GameServerPacket
return addSkillName(id, 1);
}
public ConfirmDlg addSkillName(int id, int lvl)
public ConfirmDlg addSkillName(int id, int level)
{
_types.add(TYPE_SKILL_NAME);
_values.add(id);
_skillLvL = lvl;
_skillLevel = level;
return this;
}
@@ -139,7 +139,7 @@ public class ConfirmDlg extends GameServerPacket
{
final int t1 = ((Integer) _values.get(i)).intValue();
writeD(t1); // Skill Id
writeD(_skillLvL); // Skill lvl
writeD(_skillLevel); // Skill level
break;
}
case TYPE_ZONE_NAME:

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
View File

@@ -46,18 +46,18 @@ public class EtcStatusUpdate extends GameServerPacket
writeC(0xF3); // several icons to a separate line (0 = disabled)
if (_effect != null)
{
writeD(_effect.getLevel()); // 1-7 increase force, lvl
writeD(_effect.getLevel()); // 1-7 increase force, level
}
else
{
writeD(0x00); // 1-7 increase force, lvl
writeD(0x00); // 1-7 increase force, level
}
writeD(_player.getWeightPenalty()); // 1-4 weight penalty, lvl (1=50%, 2=66.6%, 3=80%, 4=100%)
writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%)
writeD(_player.isInRefusalMode() || _player.isChatBanned() ? 1 : 0); // 1 = block all chat
// writeD(0x00); // 1 = danger area
writeD(_player.isInsideZone(ZoneId.DANGER_AREA)/* || _player.isInDangerArea() */ ? 1 : 0); // 1 = danger area
writeD(Math.min(_player.getExpertisePenalty() + _player.getMasteryPenalty() + _player.getMasteryWeapPenalty(), 1)); // 1 = grade penalty
writeD(_player.getCharmOfCourage() ? 1 : 0); // 1 = charm of courage (no xp loss in siege..)
writeD(_player.getDeathPenaltyBuffLevel()); // 1-15 death penalty, lvl (combat ability decreased due to death)
writeD(_player.getDeathPenaltyBuffLevel()); // 1-15 death penalty, level (combat ability decreased due to death)
}
}

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
View File

@@ -32,17 +32,17 @@ public class ExListPartyMatchingWaitingRoom extends GameServerPacket
private final PlayerInstance _player;
@SuppressWarnings("unused")
private final int _page;
private final int _minlvl;
private final int _maxlvl;
private final int _minLevel;
private final int _maxLevel;
private final int _mode;
private final List<PlayerInstance> _members;
public ExListPartyMatchingWaitingRoom(PlayerInstance player, int page, int minlvl, int maxlvl, int mode)
public ExListPartyMatchingWaitingRoom(PlayerInstance player, int page, int minLevel, int maxLevel, int mode)
{
_player = player;
_page = page;
_minlvl = minlvl;
_maxlvl = maxlvl;
_minLevel = minLevel;
_maxLevel = maxLevel;
_mode = mode;
_members = new ArrayList<>();
}
@@ -80,7 +80,7 @@ public class ExListPartyMatchingWaitingRoom extends GameServerPacket
continue;
}
if ((cha.getLevel() < _minlvl) || (cha.getLevel() > _maxlvl))
if ((cha.getLevel() < _minLevel) || (cha.getLevel() > _maxLevel))
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
View File

@@ -67,7 +67,7 @@ public class MultiSellList extends GameServerPacket
writeD(ItemTable.getInstance().getTemplate(i.getItemId()).getBodyPart());
writeH(ItemTable.getInstance().getTemplate(i.getItemId()).getType2());
writeD(i.getItemCount());
writeH(i.getEnchantmentLevel()); // enchtant lvl
writeH(i.getEnchantmentLevel()); // enchtant level
writeD(0x00); // C6
writeD(0x00); // C6
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
View File

@@ -121,10 +121,10 @@ public class NpcInfo extends GameServerPacket
}
// Custom level titles
if (cha.isMonster() && (Config.SHOW_NPC_LVL || Config.SHOW_NPC_AGGRESSION))
if (cha.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION))
{
String t1 = "";
if (Config.SHOW_NPC_LVL)
if (Config.SHOW_NPC_LEVEL)
{
t1 += "Lv " + cha.getLevel();
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
View File

@@ -39,8 +39,8 @@ public class PartyMatchDetail extends GameServerPacket
writeC(0x97);
writeD(_room.getId()); // Room ID
writeD(_room.getMaxMembers()); // Max Members
writeD(_room.getMinLvl()); // Level Min
writeD(_room.getMaxLvl()); // Level Max
writeD(_room.getMinLevel()); // Level Min
writeD(_room.getMaxLevel()); // Level Max
writeD(_room.getLootType()); // Loot Type
writeD(_room.getLocation()); // Room Location
writeS(_room.getTitle()); // Room title

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java
View File

@@ -59,7 +59,7 @@ public class PartyMatchList extends GameServerPacket
continue;
}
if ((_lim == 0) && ((_player.getLevel() < room.getMinLvl()) || (_player.getLevel() > room.getMaxLvl())))
if ((_lim == 0) && ((_player.getLevel() < room.getMinLevel()) || (_player.getLevel() > room.getMaxLevel())))
{
continue;
}
@@ -85,8 +85,8 @@ public class PartyMatchList extends GameServerPacket
writeD(_rooms.get(count).getId());
writeS(_rooms.get(count).getTitle());
writeD(_rooms.get(count).getLocation());
writeD(_rooms.get(count).getMinLvl());
writeD(_rooms.get(count).getMaxLvl());
writeD(_rooms.get(count).getMinLevel());
writeD(_rooms.get(count).getMaxLevel());
writeD(_rooms.get(count).getMembers());
writeD(_rooms.get(count).getMaxMembers());
writeS(_rooms.get(count).getOwner().getName());

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
View File

@@ -129,7 +129,7 @@ public class PetInfo extends GameServerPacket
writeD((int) _summon.getCurrentMp()); // current mp
writeD(_maxMp); // max mp
writeD(_summon.getStat().getSp()); // sp
writeD(_summon.getLevel()); // lvl
writeD(_summon.getLevel()); // level
writeQ(_summon.getStat().getExp());
writeQ(_summon.getExpForThisLevel()); // 0% absolute value
writeQ(_summon.getExpForNextLevel()); // 100% absoulte value

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
View File

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
public class PledgeShowMemberListAdd extends GameServerPacket
{
private String _name;
private int _lvl;
private int _level;
private int _classId;
private int _objectId;
private int _pledgeType;
@@ -33,7 +33,7 @@ public class PledgeShowMemberListAdd extends GameServerPacket
public PledgeShowMemberListAdd(PlayerInstance player)
{
_name = player.getName();
_lvl = player.getLevel();
_level = player.getLevel();
_classId = player.getClassId().getId();
_objectId = player.isOnline() ? player.getObjectId() : 0;
_pledgeType = player.getPledgeType();
@@ -44,7 +44,7 @@ public class PledgeShowMemberListAdd extends GameServerPacket
try
{
_name = cm.getName();
_lvl = cm.getLevel();
_level = cm.getLevel();
_classId = cm.getClassId();
_objectId = cm.isOnline() ? cm.getObjectId() : 0;
_pledgeType = cm.getPledgeType();
@@ -59,7 +59,7 @@ public class PledgeShowMemberListAdd extends GameServerPacket
{
writeC(0x55);
writeS(_name);
writeD(_lvl);
writeD(_level);
writeD(_classId);
writeD(0);
writeD(1);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@@ -86,7 +86,7 @@ public class PledgeShowMemberListAll extends GameServerPacket
writeD(_clan.getCastleId());
writeD(_clan.getHideoutId());
writeD(TOP);
writeD(_clan.getReputationScore()); // was activechar lvl
writeD(_clan.getReputationScore()); // was activechar level
writeD(0); // 0
writeD(0); // 0

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
View File

@@ -23,12 +23,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class PledgeSkillListAdd extends GameServerPacket
{
private final int _id;
private final int _lvl;
private final int _level;
public PledgeSkillListAdd(int id, int lvl)
public PledgeSkillListAdd(int id, int level)
{
_id = id;
_lvl = lvl;
_level = level;
}
@Override
@@ -38,6 +38,6 @@ public class PledgeSkillListAdd extends GameServerPacket
writeH(0x3a);
writeD(_id);
writeD(_lvl);
writeD(_level);
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
View File

@@ -60,7 +60,7 @@ public class PrivateStoreManageListBuy extends GameServerPacket
for (ItemInstance item : _itemList)
{
writeD(item.getItemId());
writeH(item.getEnchantLevel()); // show enchant lvl, but you can't buy enchanted weapons because of L2 Interlude Client bug
writeH(item.getEnchantLevel()); // show enchant level, but you can't buy enchanted weapons because of L2 Interlude Client bug
writeD(item.getCount());
writeD(item.getReferencePrice());
writeH(0x00);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
View File

@@ -75,7 +75,7 @@ public class PrivateStoreManageListSell extends GameServerPacket
writeD(item.getItem().getItemId());
writeD(item.getCount());
writeH(0);
writeH(item.getEnchant()); // enchant lvl
writeH(item.getEnchant()); // enchant level
writeH(0);
writeD(item.getItem().getBodyPart());
writeD(item.getPrice()); // store price
@@ -90,7 +90,7 @@ public class PrivateStoreManageListSell extends GameServerPacket
writeD(item.getItem().getItemId());
writeD(item.getCount());
writeH(0);
writeH(item.getEnchant()); // enchant lvl
writeH(item.getEnchant()); // enchant level
writeH(0x00);
writeD(item.getItem().getBodyPart());
writeD(item.getPrice()); // your price

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
View File

@@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class ShortBuffStatusUpdate extends GameServerPacket
{
private final int _skillId;
private final int _skillLvl;
private final int _skillLevel;
private final int _duration;
public ShortBuffStatusUpdate(int skillId, int skillLvl, int duration)
public ShortBuffStatusUpdate(int skillId, int skillLevel, int duration)
{
_skillId = skillId;
_skillLvl = skillLvl;
_skillLevel = skillLevel;
_duration = duration;
}
@@ -34,7 +34,7 @@ public class ShortBuffStatusUpdate extends GameServerPacket
{
writeC(0xF4);
writeD(_skillId);
writeD(_skillLvl);
writeD(_skillLevel);
writeD(_duration);
}
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

@@ -34,7 +34,7 @@ public class SystemMessage extends GameServerPacket
private final int _messageId;
private final List<Integer> _types = new ArrayList<>();
private final List<Object> _values = new ArrayList<>();
private int _skillLvL = 1;
private int _skillLevel = 1;
public SystemMessage(SystemMessageId messageId)
{
@@ -104,7 +104,7 @@ public class SystemMessage extends GameServerPacket
{
_types.add(TYPE_SKILL_NAME);
_values.add(id);
_skillLvL = lvl;
_skillLevel = lvl;
return this;
}
@@ -112,7 +112,7 @@ public class SystemMessage extends GameServerPacket
{
_types.add(TYPE_SKILL_NAME);
_values.add(skill.getId());
_skillLvL = skill.getLevel();
_skillLevel = skill.getLevel();
return this;
}
@@ -148,7 +148,7 @@ public class SystemMessage extends GameServerPacket
{
final int t1 = ((Integer) _values.get(i)).intValue();
writeD(t1); // Skill Id
writeD(_skillLvL); // Skill lvl
writeD(_skillLevel); // Skill lvl
break;
}
case TYPE_ZONE_NAME: