Prevent the extensive use of the lvl abbreviation.
This commit is contained in:
@@ -69,7 +69,7 @@ public class Config
|
||||
public static int SCHEDULED_THREAD_POOL_COUNT;
|
||||
public static int INSTANT_THREAD_POOL_COUNT;
|
||||
// Npc
|
||||
public static boolean SHOW_NPC_LVL;
|
||||
public static boolean SHOW_NPC_LEVEL;
|
||||
public static boolean SHOW_NPC_AGGRESSION;
|
||||
|
||||
public static void load()
|
||||
@@ -120,7 +120,7 @@ public class Config
|
||||
|
||||
// Load NPC config file (if exists)
|
||||
final PropertiesParser npcSettings = new PropertiesParser(NPC_CONFIG_FILE);
|
||||
SHOW_NPC_LVL = npcSettings.getBoolean("ShowNpcLevel", false);
|
||||
SHOW_NPC_LEVEL = npcSettings.getBoolean("ShowNpcLevel", false);
|
||||
SHOW_NPC_AGGRESSION = npcSettings.getBoolean("ShowNpcAggression", false);
|
||||
}
|
||||
}
|
||||
|
@@ -1256,12 +1256,12 @@ public class AdminCommands extends Thread
|
||||
public void showSkill(ClientThread client, String value)
|
||||
{
|
||||
final PlayerInstance activeChar = client.getActiveChar();
|
||||
final int skillid = Integer.parseInt(value);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(skillid, 1);
|
||||
final int skillId = Integer.parseInt(value);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(skillId, 1);
|
||||
if ((skill != null) && (skill.getTargetType() == 0))
|
||||
{
|
||||
activeChar.setTarget(activeChar);
|
||||
final MagicSkillUser msk = new MagicSkillUser(activeChar, skillid, 1, skill.getHitTime(), skill.getReuseDelay());
|
||||
final MagicSkillUser msk = new MagicSkillUser(activeChar, skillId, 1, skill.getHitTime(), skill.getReuseDelay());
|
||||
activeChar.sendPacket(msk);
|
||||
activeChar.broadcastPacket(msk);
|
||||
}
|
||||
|
@@ -986,20 +986,20 @@ public class PlayerInstance extends Creature
|
||||
pkCountMulti = 1;
|
||||
}
|
||||
newKarma *= pkCountMulti;
|
||||
int lvlDiffMulti = 0;
|
||||
int levelDiffMulti = 0;
|
||||
if (pkLevel > level)
|
||||
{
|
||||
lvlDiffMulti = pkLevel / level;
|
||||
levelDiffMulti = pkLevel / level;
|
||||
}
|
||||
else
|
||||
{
|
||||
lvlDiffMulti = 1;
|
||||
levelDiffMulti = 1;
|
||||
}
|
||||
if (lvlDiffMulti < 1)
|
||||
if (levelDiffMulti < 1)
|
||||
{
|
||||
lvlDiffMulti = 1;
|
||||
levelDiffMulti = 1;
|
||||
}
|
||||
newKarma *= lvlDiffMulti;
|
||||
newKarma *= levelDiffMulti;
|
||||
if (newKarma < Config.KARMA_MIN_KARMA)
|
||||
{
|
||||
newKarma = Config.KARMA_MIN_KARMA;
|
||||
|
@@ -38,7 +38,7 @@ public class RequestGiveNickName extends ClientBasePacket
|
||||
PlayerInstance member;
|
||||
if (activeChar.getClan().getLevel() < 3)
|
||||
{
|
||||
activeChar.sendPacket(new SystemMessage(SystemMessage.CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE));
|
||||
activeChar.sendPacket(new SystemMessage(SystemMessage.CLAN_LEVEL_3_NEEDED_TO_ENDOVE_TITLE));
|
||||
activeChar.sendMessage("But you can do it freely for now ;)");
|
||||
}
|
||||
if ((member = World.getInstance().getPlayer(target)).getClanId() == activeChar.getClanId())
|
||||
|
@@ -106,10 +106,10 @@ public class NpcInfo extends ServerBasePacket
|
||||
|
||||
_title = _cha.getTitle();
|
||||
// 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();
|
||||
}
|
||||
|
@@ -83,7 +83,7 @@ public class SystemMessage extends ServerBasePacket
|
||||
public static final int S1_HAS_JOINED_CLAN = 222;
|
||||
public static final int CLAN_NAME_INCORRECT = 261;
|
||||
public static final int CLAN_NAME_TOO_LONG = 262;
|
||||
public static final int CLAN_LVL_3_NEEDED_TO_ENDOVE_TITLE = 271;
|
||||
public static final int CLAN_LEVEL_3_NEEDED_TO_ENDOVE_TITLE = 271;
|
||||
public static final int ITEM_MISSING_TO_LEARN_SKILL = 276;
|
||||
public static final int LEARNED_SKILL_S1 = 277;
|
||||
public static final int NOT_ENOUGH_SP_TO_LEARN_SKILL = 278;
|
||||
|
Reference in New Issue
Block a user