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

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java vendored
View File

@@ -185,7 +185,7 @@ public class DenOfEvil extends AbstractNpcAI
{
for (int i = SKILL_ID; i <= (SKILL_ID + 4); i += 2)
{
// test 3 skills if some is lvl 4
// test 3 skills if some is level 4
if (_zone.getSkillLevel(i) > 3)
{
destroyZone();

8
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java vendored
View File

@@ -89,7 +89,7 @@ public class Kekropus extends AbstractNpcAI
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "34222-01.html"));
packet.replace("%min%", Integer.toString(Config.HELIOS_MIN_PLAYER));
packet.replace("%minlvl%", Integer.toString(Config.HELIOS_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.HELIOS_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}
@@ -106,18 +106,18 @@ public class Kekropus extends AbstractNpcAI
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "34222-01.html"));
packet.replace("%min%", Integer.toString(Config.HELIOS_MIN_PLAYER));
packet.replace("%minlvl%", Integer.toString(Config.HELIOS_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.HELIOS_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.HELIOS_MIN_PLAYER_LVL)
if (member.getLevel() < Config.HELIOS_MIN_PLAYER_LEVEL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "34222-01.html"));
packet.replace("%min%", Integer.toString(Config.HELIOS_MIN_PLAYER));
packet.replace("%minlvl%", Integer.toString(Config.HELIOS_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.HELIOS_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java vendored
View File

@@ -90,11 +90,11 @@ public class Erda extends AbstractNpcAI
}
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.ETINA_MIN_PLAYER_LVL)
if (member.getLevel() < Config.ETINA_MIN_PLAYER_LEVEL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "34319-5.html"));
packet.replace("%minlvl%", Integer.toString(Config.ETINA_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.ETINA_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@@ -280,7 +280,7 @@ public class Raina extends AbstractNpcAI
{
htmltext = "notImplemented.html";
}
// TODO: Maybe html is different when you have 85lvl but you haven't completed quest
// TODO: Maybe html is different when you have 85level but you haven't completed quest
if ((player.getRace() != Race.ERTHEIA) || (player.getLevel() < 105) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) || player.hasDualClass() || !haveDoneQuest(player, true))
{
htmltext = "addDualClassErtheiaFailed.html";

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java vendored
View File

@@ -229,11 +229,11 @@ public class Anakim extends AbstractNpcAI
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.ANAKIM_MIN_PLAYER_LVL)
if (member.getLevel() < Config.ANAKIM_MIN_PLAYER_LEVEL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "31101-04.html"));
packet.replace("%minlvl%", Integer.toString(Config.ANAKIM_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.ANAKIM_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java vendored
View File

@@ -241,7 +241,7 @@ public class Fafurion extends AbstractNpcAI
}
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.FAFURION_MIN_PLAYER_LVL)
if (member.getLevel() < Config.FAFURION_MIN_PLAYER_LEVEL)
{
return "34488-01.html";
}

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java vendored
View File

@@ -227,11 +227,11 @@ public class Lilith extends AbstractNpcAI
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.LILITH_MIN_PLAYER_LVL)
if (member.getLevel() < Config.LILITH_MIN_PLAYER_LEVEL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "31118-04.html"));
packet.replace("%minlvl%", Integer.toString(Config.LILITH_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.LILITH_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/LimitBarrier.java vendored
View File

@@ -32,7 +32,7 @@ import ai.AbstractNpcAI;
/**
* Limit Barrier AI
* @author RobikBobik<br>
* OK - Raid Bosses lvl 100 and higher from now on use "Limit Barrier" skill when their HP reaches 90%, 60% and 30%.<br>
* OK - Raid Bosses level 100 and higher from now on use "Limit Barrier" skill when their HP reaches 90%, 60% and 30%.<br>
* OK - 600 hits in 15 seconds are required to destroy the barrier. Amount of damage does not matter.<br>
* OK - If barrier destruction is failed, Boss restores full HP.<br>
* OK - Epic Bosses Orfen, Queen Ant and Core also use Limit Barrier.<br>

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java vendored
View File

@@ -93,11 +93,11 @@ public class KatoSicanus extends AbstractNpcAI
}
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.LINDVIOR_MIN_PLAYER_LVL)
if (member.getLevel() < Config.LINDVIOR_MIN_PLAYER_LEVEL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "33881-5.html"));
packet.replace("%minlvl%", Integer.toString(Config.LINDVIOR_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.LINDVIOR_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java vendored
View File

@@ -93,11 +93,11 @@ public class Daichir extends AbstractNpcAI
}
for (PlayerInstance member : members)
{
if (member.getLevel() < Config.TRASKEN_MIN_PLAYER_LVL)
if (member.getLevel() < Config.TRASKEN_MIN_PLAYER_LEVEL)
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player, "30537-5.html"));
packet.replace("%minlvl%", Integer.toString(Config.TRASKEN_MIN_PLAYER_LVL));
packet.replace("%minLevel%", Integer.toString(Config.TRASKEN_MIN_PLAYER_LEVEL));
player.sendPacket(packet);
return null;
}

18
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java vendored
View File

@@ -239,28 +239,28 @@ public class Valakas extends AbstractNpcAI
// Verify if "Valakas Regeneration" skill is active.
final BuffInfo info = npc.getEffectList().getBuffInfoBySkillId(VALAKAS_REGENERATION);
final int lvl = info != null ? info.getSkill().getLevel() : 0;
final int level = info != null ? info.getSkill().getLevel() : 0;
// Current HPs are inferior to 25% ; apply lvl 4 of regen skill.
if ((npc.getCurrentHp() < (npc.getMaxHp() / 4)) && (lvl != 4))
// Current HPs are inferior to 25% ; apply level 4 of regen skill.
if ((npc.getCurrentHp() < (npc.getMaxHp() / 4)) && (level != 4))
{
npc.setTarget(npc);
npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 4));
}
// Current HPs are inferior to 50% ; apply lvl 3 of regen skill.
else if ((npc.getCurrentHp() < ((npc.getMaxHp() * 2) / 4.0)) && (lvl != 3))
// Current HPs are inferior to 50% ; apply level 3 of regen skill.
else if ((npc.getCurrentHp() < ((npc.getMaxHp() * 2) / 4.0)) && (level != 3))
{
npc.setTarget(npc);
npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 3));
}
// Current HPs are inferior to 75% ; apply lvl 2 of regen skill.
else if ((npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0)) && (lvl != 2))
// Current HPs are inferior to 75% ; apply level 2 of regen skill.
else if ((npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0)) && (level != 2))
{
npc.setTarget(npc);
npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 2));
}
// Apply lvl 1.
else if (lvl != 1)
// Apply level 1.
else if (level != 1)
{
npc.setTarget(npc);
npc.doCast(SkillData.getInstance().getSkill(VALAKAS_REGENERATION, 1));

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java vendored
View File

@@ -45,7 +45,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
// Items
private static final int VORPAL_RING = 15763; // Sealed Vorpal Ring
private static final int VORPAL_EARRING = 15764; // Sealed Vorpal Earring
// Reward - Zaken lvl 83 @formatter:off
// Reward - Zaken level 83 @formatter:off
private static final int[][] VORPAL_JEWELS =
{
// Time, jewel id, chance

14
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java vendored
View File

@@ -36,11 +36,11 @@ public class FameManager extends AbstractNpcAI
36480, // Scipio
};
// Misc
private static final int MIN_LVL = 40;
private static final int MIN_LEVEL = 40;
private static final int DECREASE_COST = 5000;
private static final int REPUTATION_COST = 1000;
private static final int MIN_CLAN_LVL = 5;
private static final int CLASS_LVL = 2;
private static final int MIN_CLAN_LEVEL = 5;
private static final int CLASS_LEVEL = 2;
private FameManager()
{
@@ -69,7 +69,7 @@ public class FameManager extends AbstractNpcAI
{
if (player.getPkKills() > 0)
{
if ((player.getFame() >= DECREASE_COST) && (player.getLevel() >= MIN_LVL) && (player.getClassId().level() >= CLASS_LVL))
if ((player.getFame() >= DECREASE_COST) && (player.getLevel() >= MIN_LEVEL) && (player.getClassId().level() >= CLASS_LEVEL))
{
player.setFame(player.getFame() - DECREASE_COST);
player.setPkKills(player.getPkKills() - 1);
@@ -89,9 +89,9 @@ public class FameManager extends AbstractNpcAI
}
case "clanRep":
{
if ((player.getClan() != null) && (player.getClan().getLevel() >= MIN_CLAN_LVL))
if ((player.getClan() != null) && (player.getClan().getLevel() >= MIN_CLAN_LEVEL))
{
if ((player.getFame() >= REPUTATION_COST) && (player.getLevel() >= MIN_LVL) && (player.getClassId().level() >= CLASS_LVL))
if ((player.getFame() >= REPUTATION_COST) && (player.getLevel() >= MIN_LEVEL) && (player.getClassId().level() >= CLASS_LEVEL))
{
player.setFame(player.getFame() - REPUTATION_COST);
player.getClan().addReputationScore(50, true);
@@ -117,7 +117,7 @@ public class FameManager extends AbstractNpcAI
@Override
public String onFirstTalk(Npc npc, PlayerInstance player)
{
return ((player.getFame() > 0) && (player.getLevel() >= MIN_LVL) && (player.getClassId().level() >= CLASS_LVL)) ? npc.getId() + ".html" : npc.getId() + "-01.html";
return ((player.getFame() > 0) && (player.getLevel() >= MIN_LEVEL) && (player.getClassId().level() >= CLASS_LEVEL)) ? npc.getId() + ".html" : npc.getId() + "-01.html";
}
public static void main(String[] args)

6
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@@ -44,7 +44,7 @@ public class WyvernManager extends AbstractNpcAI
private static final int CRYSTAL_B_GRADE = 1460;
private static final int WYVERN = 12621;
private static final int WYVERN_FEE = 25;
private static final int STRIDER_LVL = 55;
private static final int STRIDER_LEVEL = 55;
private static final int[] STRIDERS =
{
12526,
@@ -104,7 +104,7 @@ public class WyvernManager extends AbstractNpcAI
private String mountWyvern(Npc npc, PlayerInstance player)
{
if (player.isMounted() && (player.getMountLevel() >= STRIDER_LVL) && CommonUtil.contains(STRIDERS, player.getMountNpcId()))
if (player.isMounted() && (player.getMountLevel() >= STRIDER_LEVEL) && CommonUtil.contains(STRIDERS, player.getMountNpcId()))
{
if (isOwnerClan(npc, player) && (getQuestItemsCount(player, CRYSTAL_B_GRADE) >= WYVERN_FEE))
{
@@ -203,7 +203,7 @@ public class WyvernManager extends AbstractNpcAI
private String replacePart(PlayerInstance player, String htmlFile)
{
return getHtm(player, htmlFile).replace("%wyvern_fee%", String.valueOf(WYVERN_FEE)).replace("%strider_level%", String.valueOf(STRIDER_LVL));
return getHtm(player, htmlFile).replace("%wyvern_fee%", String.valueOf(WYVERN_FEE)).replace("%strider_level%", String.valueOf(STRIDER_LEVEL));
}
@Override

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionhandlers/PlayerInstanceAction.java vendored
View File

@@ -82,8 +82,8 @@ public class PlayerInstanceAction implements IActionHandler
// Check if this PlayerInstance is autoAttackable
if (target.isAutoAttackable(player))
{
// Player with lvl < 21 can't attack a cursed weapon holder
// And a cursed weapon holder can't attack players with lvl < 21
// Player with level < 21 can't attack a cursed weapon holder
// And a cursed weapon holder can't attack players with level < 21
if ((targetPlayer.isCursedWeaponEquipped() && (player.getLevel() < CURSED_WEAPON_VICTIM_MIN_LEVEL)) //
|| (player.isCursedWeaponEquipped() && (targetPlayer.getLevel() < CURSED_WEAPON_VICTIM_MIN_LEVEL)))
{

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -89,7 +89,7 @@ public class AdminBuffs implements IAdminCommandHandler
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
BuilderUtil.sendSysMessage(activeChar, "Skill with id: " + skillId + ", lvl: " + skillLevel + " not found.");
BuilderUtil.sendSysMessage(activeChar, "Skill with id: " + skillId + ", level: " + skillLevel + " not found.");
return false;
}

8
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java vendored
View File

@@ -78,14 +78,14 @@ public class AdminLevel implements IAdminCommandHandler
try
{
final byte lvl = Byte.parseByte(val);
if ((lvl >= 1) && (lvl <= maxLevel))
final byte level = Byte.parseByte(val);
if ((level >= 1) && (level <= maxLevel))
{
final long pXp = targetPlayer.getExp();
final long tXp = ExperienceData.getInstance().getExpForLevel(lvl);
final long tXp = ExperienceData.getInstance().getExpForLevel(level);
if (pXp > tXp)
{
targetPlayer.getStat().setLevel(lvl);
targetPlayer.getStat().setLevel(level);
targetPlayer.removeExpAndSp(pXp - tXp, 0);
BuilderUtil.sendSysMessage(activeChar, "Removed " + (pXp - tXp) + " exp.");
}

10
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -205,18 +205,18 @@ public class AdminSkill implements IAdminCommandHandler
{
final String[] split = command.split(" ");
final int id = Integer.parseInt(split[1]);
final int lvl = Integer.parseInt(split[2]);
final Skill skill = SkillData.getInstance().getSkill(id, lvl);
final int level = Integer.parseInt(split[2]);
final Skill skill = SkillData.getInstance().getSkill(id, level);
if (skill != null)
{
activeChar.addSkill(skill);
activeChar.sendSkillList();
BuilderUtil.sendSysMessage(activeChar, "You added yourself skill " + skill.getName() + "(" + id + ") level " + lvl);
BuilderUtil.sendSysMessage(activeChar, "You added yourself skill " + skill.getName() + "(" + id + ") level " + level);
activeChar.sendPacket(new AcquireSkillList(activeChar));
}
else
{
BuilderUtil.sendSysMessage(activeChar, "No such skill found. Id: " + id + " Level: " + lvl);
BuilderUtil.sendSysMessage(activeChar, "No such skill found. Id: " + id + " Level: " + level);
}
}
else if (command.startsWith("admin_cast"))
@@ -237,7 +237,7 @@ public class AdminSkill implements IAdminCommandHandler
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
BuilderUtil.sendSysMessage(activeChar, "Skill with id: " + skillId + ", lvl: " + skillLevel + " not found.");
BuilderUtil.sendSysMessage(activeChar, "Skill with id: " + skillId + ", level: " + skillLevel + " not found.");
return false;
}

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java vendored
View File

@@ -37,7 +37,7 @@ public class CallSkill extends AbstractEffect
public CallSkill(StatSet params)
{
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0));
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel ", 0));
_skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0);
}
@@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect
final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
if (knownLevel > 0)
{
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ());
}
else
{

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@@ -37,7 +37,7 @@ public class CallSkillOnActionTime extends AbstractEffect
public CallSkillOnActionTime(StatSet params)
{
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0));
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel ", 0));
setTicks(params.getInt("ticks"));
}

22
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java vendored
View File

@@ -72,45 +72,45 @@ public class ManaHealByLevel extends AbstractEffect
amount = effected.getStat().getValue(Stat.MANA_CHARGE, amount);
if (effected.getLevel() > skill.getMagicLevel())
{
final int lvlDiff = effected.getLevel() - skill.getMagicLevel();
final int levelDiff = effected.getLevel() - skill.getMagicLevel();
// if target is too high compared to skill level, the amount of recharged mp gradually decreases.
if (lvlDiff == 6)
if (levelDiff == 6)
{
amount *= 0.9; // only 90% effective
}
else if (lvlDiff == 7)
else if (levelDiff == 7)
{
amount *= 0.8; // 80%
}
else if (lvlDiff == 8)
else if (levelDiff == 8)
{
amount *= 0.7; // 70%
}
else if (lvlDiff == 9)
else if (levelDiff == 9)
{
amount *= 0.6; // 60%
}
else if (lvlDiff == 10)
else if (levelDiff == 10)
{
amount *= 0.5; // 50%
}
else if (lvlDiff == 11)
else if (levelDiff == 11)
{
amount *= 0.4; // 40%
}
else if (lvlDiff == 12)
else if (levelDiff == 12)
{
amount *= 0.3; // 30%
}
else if (lvlDiff == 13)
else if (levelDiff == 13)
{
amount *= 0.2; // 20%
}
else if (lvlDiff == 14)
else if (levelDiff == 14)
{
amount *= 0.1; // 10%
}
else if (lvlDiff >= 15)
else if (levelDiff >= 15)
{
amount = 0; // 0mp recharged
}

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java vendored
View File

@@ -39,12 +39,12 @@ public class ResistSkill extends AbstractEffect
for (int i = 1;; i++)
{
final int skillId = params.getInt("skillId" + i, 0);
final int skillLvl = params.getInt("skillLvl" + i, 0);
final int skillLevel = params.getInt("skillLevel" + i, 0);
if (skillId == 0)
{
break;
}
_skills.add(new SkillHolder(skillId, skillLvl));
_skills.add(new SkillHolder(skillId, skillLevel));
}
if (_skills.isEmpty())

6
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java vendored
View File

@@ -30,12 +30,12 @@ import org.l2jmobius.gameserver.model.skills.Skill;
public class SetSkill extends AbstractEffect
{
private final int _skillId;
private final int _skillLvl;
private final int _skillLevel;
public SetSkill(StatSet params)
{
_skillId = params.getInt("skillId", 0);
_skillLvl = params.getInt("skillLvl", 1);
_skillLevel = params.getInt("skillLevel", 1);
}
@Override
@@ -52,7 +52,7 @@ public class SetSkill extends AbstractEffect
return;
}
final Skill setSkill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
final Skill setSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel);
if (setSkill == null)
{
return;

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java vendored
View File

@@ -123,7 +123,7 @@ public class BeastSoulShot implements IItemHandler
{
activeOwner.sendMessage("Your pet uses soulshot."); // activeOwner.sendPacket(SystemMessageId.YOUR_PET_USES_SPIRITSHOT);
pet.chargeShot(ShotType.SOULSHOTS);
// Visual effect change if player has equipped Ruby lvl 3 or higher
// Visual effect change if player has equipped Ruby level 3 or higher
if (activeOwner.getActiveRubyJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, activeOwner.getActiveRubyJewel().getEffectId(), 1, 0, 0), 600);
@@ -140,7 +140,7 @@ public class BeastSoulShot implements IItemHandler
{
activeOwner.sendMessage("Your servitor uses soulshot."); // activeOwner.sendPacket(SystemMessageId.YOUR_PET_USES_SPIRITSHOT);
s.chargeShot(ShotType.SOULSHOTS);
// Visual effect change if player has equipped Ruby lvl 3 or higher
// Visual effect change if player has equipped Ruby level 3 or higher
if (activeOwner.getActiveRubyJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, activeOwner.getActiveRubyJewel().getEffectId(), 1, 0, 0), 600);

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java vendored
View File

@@ -124,7 +124,7 @@ public class BeastSpiritShot implements IItemHandler
{
activeOwner.sendMessage(isBlessed ? "Your pet uses blessed spiritshot." : "Your pet uses spiritshot."); // activeOwner.sendPacket(SystemMessageId.YOUR_PET_USES_SPIRITSHOT);
pet.chargeShot(shotType);
// Visual effect change if player has equipped Sapphire lvl 3 or higher
// Visual effect change if player has equipped Sapphire level 3 or higher
if (activeOwner.getActiveShappireJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, activeOwner.getActiveShappireJewel().getEffectId(), 2, 0, 0), 600);
@@ -141,7 +141,7 @@ public class BeastSpiritShot implements IItemHandler
{
activeOwner.sendMessage(isBlessed ? "Your servitor uses blessed spiritshot." : "Your servitor uses spiritshot."); // activeOwner.sendPacket(SystemMessageId.YOUR_PET_USES_SPIRITSHOT);
s.chargeShot(shotType);
// Visual effect change if player has equipped Sapphire lvl 3 or higher
// Visual effect change if player has equipped Sapphire level 3 or higher
if (activeOwner.getActiveShappireJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, activeOwner.getActiveShappireJewel().getEffectId(), 2, 0, 0), 600);

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java vendored
View File

@@ -98,7 +98,7 @@ public class BlessedSoulShots implements IItemHandler
player.sendPacket(SystemMessageId.YOUR_SOULSHOTS_ARE_ENABLED);
}
// Visual effect change if player has equipped Ruby lvl 3 or higher
// Visual effect change if player has equipped Ruby level 3 or higher
if (player.getActiveRubyJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, player.getActiveRubyJewel().getEffectId(), 1, 0, 0), 600);

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java vendored
View File

@@ -88,7 +88,7 @@ public class BlessedSpiritShot implements IItemHandler
player.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_HAS_BEEN_ENABLED);
}
// Visual effect change if player has equipped Sapphire lvl 3 or higher
// Visual effect change if player has equipped Sapphire level 3 or higher
if (player.getActiveShappireJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, player.getActiveShappireJewel().getEffectId(), 1, 0, 0), 600);

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java vendored
View File

@@ -95,7 +95,7 @@ public class SoulShots implements IItemHandler
player.sendPacket(SystemMessageId.YOUR_SOULSHOTS_ARE_ENABLED);
}
// Visual effect change if player has equipped Ruby lvl 3 or higher
// Visual effect change if player has equipped Ruby level 3 or higher
if (player.getActiveRubyJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, player.getActiveRubyJewel().getEffectId(), 1, 0, 0), 600);

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java vendored
View File

@@ -88,7 +88,7 @@ public class SpiritShot implements IItemHandler
player.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_HAS_BEEN_ENABLED);
}
// Visual effect change if player has equipped Sapphire lvl 3 or higher
// Visual effect change if player has equipped Sapphire level 3 or higher
if (player.getActiveShappireJewel() != null)
{
Broadcast.toSelfAndKnownPlayersInRadius(player, new MagicSkillUse(player, player, player.getActiveShappireJewel().getEffectId(), 1, 0, 0), 600);

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java vendored
View File

@@ -51,9 +51,9 @@ public class AutoPotion implements IVoicedCommandHandler
{
return false;
}
if (activeChar.getLevel() < Config.AUTO_POTION_MIN_LVL)
if (activeChar.getLevel() < Config.AUTO_POTION_MIN_LEVEL)
{
activeChar.sendMessage("You need to be at least " + Config.AUTO_POTION_MIN_LVL + " to use auto potions.");
activeChar.sendMessage("You need to be at least " + Config.AUTO_POTION_MIN_LEVEL + " to use auto potions.");
return false;
}

24
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -122,7 +122,7 @@ public class Kamaloka extends AbstractInstance
* First room information, null if room not spawned.<br>
* Skill is casted on the boss when shaman is defeated and mobs respawn stopped<br>
* Default: 5699 (decrease pdef)<br>
* shaman npcId, minions npcId, skillId, skillLvl
* shaman npcId, minions npcId, skillId, skillLevel
*/
private static final int[][] FIRST_ROOM =
{
@@ -222,7 +222,7 @@ public class Kamaloka extends AbstractInstance
};
/*
* Second room information, null if room not spawned Skill is casted on the boss when all mobs are defeated Default: 5700 (decrease mdef) npcId, skillId, skillLvl
* Second room information, null if room not spawned Skill is casted on the boss when all mobs are defeated Default: 5700 (decrease mdef) npcId, skillId, skillLevel
*/
private static final int[][] SECOND_ROOM =
{
@@ -293,7 +293,7 @@ public class Kamaloka extends AbstractInstance
// skill is casted on the boss when miniboss is defeated
// npcId, x, y, z, skill id, skill level
/*
* Miniboss information, null if miniboss not spawned Skill is casted on the boss when miniboss is defeated Default: 5701 (decrease patk) npcId, x, y, z, skillId, skillLvl
* Miniboss information, null if miniboss not spawned Skill is casted on the boss when miniboss is defeated Default: 5701 (decrease patk) npcId, x, y, z, skillId, skillLevel
*/
private static final int[][] MINIBOSS =
{
@@ -741,10 +741,10 @@ public class Kamaloka extends AbstractInstance
if (world.getParameters().getObject("boss", Npc.class) != null)
{
final int skillId = FIRST_ROOM[world.getParameters().getInt("index")][2];
final int skillLvl = FIRST_ROOM[world.getParameters().getInt("index")][3];
if ((skillId != 0) && (skillLvl != 0))
final int skillLevel = FIRST_ROOM[world.getParameters().getInt("index")][3];
if ((skillId != 0) && (skillLevel != 0))
{
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLvl);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill != null)
{
skill.applyEffects(world.getParameters().getObject("boss", Npc.class), world.getParameters().getObject("boss", Npc.class));
@@ -781,10 +781,10 @@ public class Kamaloka extends AbstractInstance
if (world.getParameters().getObject("boss", Npc.class) != null)
{
final int skillId = SECOND_ROOM[world.getParameters().getInt("index")][1];
final int skillLvl = SECOND_ROOM[world.getParameters().getInt("index")][2];
if ((skillId != 0) && (skillLvl != 0))
final int skillLevel = SECOND_ROOM[world.getParameters().getInt("index")][2];
if ((skillId != 0) && (skillLevel != 0))
{
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLvl);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill != null)
{
skill.applyEffects(world.getParameters().getObject("boss", Npc.class), world.getParameters().getObject("boss", Npc.class));
@@ -803,10 +803,10 @@ public class Kamaloka extends AbstractInstance
if (world.getParameters().getObject("boss", Npc.class) != null)
{
final int skillId = MINIBOSS[world.getParameters().getInt("index")][4];
final int skillLvl = MINIBOSS[world.getParameters().getInt("index")][5];
if ((skillId != 0) && (skillLvl != 0))
final int skillLevel = MINIBOSS[world.getParameters().getInt("index")][5];
if ((skillId != 0) && (skillLevel != 0))
{
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLvl);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill != null)
{
skill.applyEffects(world.getParameters().getObject("boss", Npc.class), world.getParameters().getObject("boss", Npc.class));

4
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java vendored
View File

@@ -44,7 +44,7 @@ public class Q00032_AnObviousLie extends Quest
private static final ItemHolder THREAD = new ItemHolder(1868, 1000);
private static final ItemHolder SUEDE = new ItemHolder(1866, 500);
// Misc
private static final int MIN_LVL = 45;
private static final int MIN_LEVEL = 45;
// Reward
private static final Map<String, Integer> EARS = new HashMap<>();
static
@@ -189,7 +189,7 @@ public class Q00032_AnObviousLie extends Quest
{
if (qs.isCreated())
{
htmltext = (player.getLevel() >= MIN_LVL) ? "30120-01.htm" : "30120-03.htm";
htmltext = (player.getLevel() >= MIN_LEVEL) ? "30120-01.htm" : "30120-03.htm";
}
else if (qs.isStarted())
{