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

Proper name for SkillTable skill getter.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-06-16 23:02:33 +00:00
parent c6058f29cb
commit c0261a2539
217 changed files with 668 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java vendored
View File

@@ -92,7 +92,7 @@ public class HotSprings extends Quest
{
final Effect info = creature.getFirstEffect(diseaseId);
final int skillLevel = (info == null) ? 1 : (info.getSkill().getLevel() < 10) ? info.getSkill().getLevel() + 1 : 10;
final Skill skill = SkillTable.getInstance().getInfo(diseaseId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(diseaseId, skillLevel);
if ((skill != null) && !npc.isCastingNow() && !npc.isSkillDisabled(skill))
{
npc.setTarget(creature);

8
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java vendored
View File

@@ -690,12 +690,12 @@ public class Antharas extends Quest
case 29074:
case 29075:
{
skill = SkillTable.getInstance().getInfo(5097, 1);
skill = SkillTable.getInstance().getSkill(5097, 1);
break;
}
case 29076:
{
skill = SkillTable.getInstance().getInfo(5094, 1);
skill = SkillTable.getInstance().getSkill(5094, 1);
break;
}
}
@@ -932,12 +932,12 @@ public class Antharas extends Quest
case 29074:
case 29075:
{
skill = SkillTable.getInstance().getInfo(5097, 1);
skill = SkillTable.getInstance().getSkill(5097, 1);
break;
}
case 29076:
{
skill = SkillTable.getInstance().getInfo(5094, 1);
skill = SkillTable.getInstance().getSkill(5094, 1);
break;
}
}

8
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java vendored
View File

@@ -270,7 +270,7 @@ public class Baium extends Quest
else if (((_lastAttackVsBaiumTime + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0)))
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4135, 1));
npc.doCast(SkillTable.getInstance().getSkill(4135, 1));
if (GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM) != AWAKE)
{
cancelQuestTimer("baium_despawn", npc, null);
@@ -398,7 +398,7 @@ public class Baium extends Quest
if (sk4258 == 0)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4258, 1));
npc.doCast(SkillTable.getInstance().getSkill(4258, 1));
}
}
// update a variable with the last action against baium
@@ -500,7 +500,7 @@ public class Baium extends Quest
_target = getRandomTarget(npc);
if (_target != null)
{
_skill = SkillTable.getInstance().getInfo(getRandomSkill(npc), 1);
_skill = SkillTable.getInstance().getSkill(getRandomSkill(npc), 1);
}
}
@@ -508,7 +508,7 @@ public class Baium extends Quest
Skill skill = _skill;
if (skill == null)
{
skill = SkillTable.getInstance().getInfo(getRandomSkill(npc), 1);
skill = SkillTable.getInstance().getSkill(getRandomSkill(npc), 1);
}
if ((target == null) || target.isDead() || !(_zone.isInsideZone(target)))
{

2
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java vendored
View File

@@ -217,7 +217,7 @@ public class Orfen extends Quest
{
attacker.teleToLocation(npc.getX(), npc.getY(), npc.getZ());
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4064, 1));
npc.doCast(SkillTable.getInstance().getSkill(4064, 1));
}
}
else

8
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java vendored
View File

@@ -304,8 +304,8 @@ public class QueenAnt extends Quest
{
getIntoPosition(nurse, _larva);
nurse.setTarget(_larva);
nurse.doCast(SkillTable.getInstance().getInfo(4020, 1));
nurse.doCast(SkillTable.getInstance().getInfo(4024, 1));
nurse.doCast(SkillTable.getInstance().getSkill(4020, 1));
nurse.doCast(SkillTable.getInstance().getSkill(4024, 1));
}
continue;
}
@@ -315,7 +315,7 @@ public class QueenAnt extends Quest
{
getIntoPosition(nurse, _queen);
nurse.setTarget(_queen);
nurse.doCast(SkillTable.getInstance().getInfo(4020, 1));
nurse.doCast(SkillTable.getInstance().getSkill(4020, 1));
}
continue;
}
@@ -325,7 +325,7 @@ public class QueenAnt extends Quest
{
getIntoPosition(_nurses.get(k), nurse);
_nurses.get(k).setTarget(nurse);
_nurses.get(k).doCast(SkillTable.getInstance().getInfo(4020, 1));
_nurses.get(k).doCast(SkillTable.getInstance().getSkill(4020, 1));
}
}
if (notCasting && (nurse.getTarget() != null))

92
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java vendored
View File

@@ -193,7 +193,7 @@ public class Valakas extends Quest
if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 4)))
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4691, 4));
npc.doCast(SkillTable.getInstance().getSkill(4691, 4));
}
}
else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4.0))
@@ -201,7 +201,7 @@ public class Valakas extends Quest
if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 3)))
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4691, 3));
npc.doCast(SkillTable.getInstance().getSkill(4691, 3));
}
}
else if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0))
@@ -209,13 +209,13 @@ public class Valakas extends Quest
if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 2)))
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4691, 2));
npc.doCast(SkillTable.getInstance().getSkill(4691, 2));
}
}
else if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 1)))
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4691, 1));
npc.doCast(SkillTable.getInstance().getSkill(4691, 1));
}
}
else if (event.equals("launch_random_skill"))
@@ -389,7 +389,7 @@ public class Valakas extends Quest
if (sk4258 == 0)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4258, 1));
npc.doCast(SkillTable.getInstance().getSkill(4258, 1));
}
}
if (attacker.getZ() < (npc.getZ() + 200))
@@ -415,7 +415,7 @@ public class Valakas extends Quest
i_ai3 = 0;
i_ai4 = 0;
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4687, 1));
npc.doCast(SkillTable.getInstance().getSkill(4687, 1));
i_quest0 = 1;
}
}
@@ -687,45 +687,45 @@ public class Valakas extends Quest
{
if (Rnd.get(100) < 20)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 15)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else if ((Rnd.get(100) < 15) && (i0 == 1) && (i_quest0 == 1))
{
skill = SkillTable.getInstance().getInfo(4685, 1);
skill = SkillTable.getInstance().getSkill(4685, 1);
i_quest0 = 0;
}
else if ((Rnd.get(100) < 10) && (i1 == 1))
{
skill = SkillTable.getInstance().getInfo(4688, 1);
skill = SkillTable.getInstance().getSkill(4688, 1);
}
else if (Rnd.get(100) < 35)
{
skill = SkillTable.getInstance().getInfo(4683, 1);
skill = SkillTable.getInstance().getSkill(4683, 1);
}
else if (Rnd.nextBoolean())
{
skill = SkillTable.getInstance().getInfo(4681, 1); // left hand
skill = SkillTable.getInstance().getSkill(4681, 1); // left hand
}
else
{
skill = SkillTable.getInstance().getInfo(4682, 1); // right hand
skill = SkillTable.getInstance().getSkill(4682, 1); // right hand
}
}
else if (Rnd.get(100) < 20)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 15)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else
{
skill = SkillTable.getInstance().getInfo(4684, 1);
skill = SkillTable.getInstance().getSkill(4684, 1);
}
}
else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4))
@@ -741,45 +741,45 @@ public class Valakas extends Quest
{
if (Rnd.get(100) < 5)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 10)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else if ((Rnd.get(100) < 10) && (i0 == 1) && (i_quest0 == 1))
{
skill = SkillTable.getInstance().getInfo(4685, 1);
skill = SkillTable.getInstance().getSkill(4685, 1);
i_quest0 = 0;
}
else if ((Rnd.get(100) < 10) && (i1 == 1))
{
skill = SkillTable.getInstance().getInfo(4688, 1);
skill = SkillTable.getInstance().getSkill(4688, 1);
}
else if (Rnd.get(100) < 20)
{
skill = SkillTable.getInstance().getInfo(4683, 1);
skill = SkillTable.getInstance().getSkill(4683, 1);
}
else if (Rnd.nextBoolean())
{
skill = SkillTable.getInstance().getInfo(4681, 1); // left hand
skill = SkillTable.getInstance().getSkill(4681, 1); // left hand
}
else
{
skill = SkillTable.getInstance().getInfo(4682, 1); // right hand
skill = SkillTable.getInstance().getSkill(4682, 1); // right hand
}
}
else if (Rnd.get(100) < 5)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 10)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else
{
skill = SkillTable.getInstance().getInfo(4684, 1);
skill = SkillTable.getInstance().getSkill(4684, 1);
}
}
else if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0))
@@ -795,45 +795,45 @@ public class Valakas extends Quest
{
if (Rnd.get(100) < 0)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 5)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1))
{
skill = SkillTable.getInstance().getInfo(4685, 1);
skill = SkillTable.getInstance().getSkill(4685, 1);
i_quest0 = 0;
}
else if ((Rnd.get(100) < 10) && (i1 == 1))
{
skill = SkillTable.getInstance().getInfo(4688, 1);
skill = SkillTable.getInstance().getSkill(4688, 1);
}
else if (Rnd.get(100) < 15)
{
skill = SkillTable.getInstance().getInfo(4683, 1);
skill = SkillTable.getInstance().getSkill(4683, 1);
}
else if (Rnd.nextBoolean())
{
skill = SkillTable.getInstance().getInfo(4681, 1); // left hand
skill = SkillTable.getInstance().getSkill(4681, 1); // left hand
}
else
{
skill = SkillTable.getInstance().getInfo(4682, 1); // right hand
skill = SkillTable.getInstance().getSkill(4682, 1); // right hand
}
}
else if (Rnd.get(100) < 0)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 5)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else
{
skill = SkillTable.getInstance().getInfo(4684, 1);
skill = SkillTable.getInstance().getSkill(4684, 1);
}
}
else
@@ -849,45 +849,45 @@ public class Valakas extends Quest
{
if (Rnd.get(100) < 0)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 10)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1))
{
skill = SkillTable.getInstance().getInfo(4685, 1);
skill = SkillTable.getInstance().getSkill(4685, 1);
i_quest0 = 0;
}
else if ((Rnd.get(100) < 10) && (i1 == 1))
{
skill = SkillTable.getInstance().getInfo(4688, 1);
skill = SkillTable.getInstance().getSkill(4688, 1);
}
else if (Rnd.get(100) < 15)
{
skill = SkillTable.getInstance().getInfo(4683, 1);
skill = SkillTable.getInstance().getSkill(4683, 1);
}
else if (Rnd.nextBoolean())
{
skill = SkillTable.getInstance().getInfo(4681, 1); // left hand
skill = SkillTable.getInstance().getSkill(4681, 1); // left hand
}
else
{
skill = SkillTable.getInstance().getInfo(4682, 1); // right hand
skill = SkillTable.getInstance().getSkill(4682, 1); // right hand
}
}
else if (Rnd.get(100) < 0)
{
skill = SkillTable.getInstance().getInfo(4690, 1);
skill = SkillTable.getInstance().getSkill(4690, 1);
}
else if (Rnd.get(100) < 10)
{
skill = SkillTable.getInstance().getInfo(4689, 1);
skill = SkillTable.getInstance().getSkill(4689, 1);
}
else
{
skill = SkillTable.getInstance().getInfo(4684, 1);
skill = SkillTable.getInstance().getSkill(4684, 1);
}
}
}

42
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java vendored
View File

@@ -231,7 +231,7 @@ public class Zaken extends Quest
if (sk4223 == 1) // use night face if zaken have day face
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4224, 1));
npc.doCast(SkillTable.getInstance().getSkill(4224, 1));
_ai1 = npc.getX();
_ai2 = npc.getY();
_ai3 = npc.getZ();
@@ -239,7 +239,7 @@ public class Zaken extends Quest
if (sk4227 == 0) // use zaken regeneration
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4227, 1));
npc.doCast(SkillTable.getInstance().getSkill(4227, 1));
}
if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ATTACK) && (_ai0 == 0))
{
@@ -362,7 +362,7 @@ public class Zaken extends Quest
_ai2 = Y_COORDS[i2] + Rnd.get(650);
_ai3 = Z_COORDS[i2];
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
npc.doCast(SkillTable.getInstance().getSkill(4222, 1));
}
}
}
@@ -411,13 +411,13 @@ public class Zaken extends Quest
else if (sk4223 == 0) // use day face if not night time
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4223, 1));
npc.doCast(SkillTable.getInstance().getSkill(4223, 1));
_quest2 = 3;
}
if (sk4227 == 1) // when switching to day time, cancel zaken night regen
{
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4242, 1));
npc.doCast(SkillTable.getInstance().getSkill(4242, 1));
}
if (Rnd.get(40) < 1)
{
@@ -426,7 +426,7 @@ public class Zaken extends Quest
_ai2 = Y_COORDS[i2] + Rnd.get(650);
_ai3 = Z_COORDS[i2];
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
npc.doCast(SkillTable.getInstance().getSkill(4222, 1));
}
startQuestTimer("1001", 30000, npc, null);
break;
@@ -434,7 +434,7 @@ public class Zaken extends Quest
case "1002":
{
_quest0 = 0;
npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
npc.doCast(SkillTable.getInstance().getSkill(4222, 1));
_ai0 = 0;
break;
}
@@ -767,7 +767,7 @@ public class Zaken extends Quest
if (sk4258 == 0)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4258, 1));
npc.doCast(SkillTable.getInstance().getSkill(4258, 1));
}
}
final Creature originalAttacker = isPet ? attacker.getPet() : attacker;
@@ -779,22 +779,22 @@ public class Zaken extends Quest
if (i0 < 1)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4216, 1));
npc.doCast(SkillTable.getInstance().getSkill(4216, 1));
}
else if (i0 < 2)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4217, 1));
npc.doCast(SkillTable.getInstance().getSkill(4217, 1));
}
else if (i0 < 4)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4219, 1));
npc.doCast(SkillTable.getInstance().getSkill(4219, 1));
}
else if (i0 < 8)
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4218, 1));
npc.doCast(SkillTable.getInstance().getSkill(4218, 1));
}
else if (i0 < 15)
{
@@ -807,14 +807,14 @@ public class Zaken extends Quest
if (attacker != ((Attackable) npc).getMostHated())
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4221, 1));
npc.doCast(SkillTable.getInstance().getSkill(4221, 1));
}
}
}
if (Rnd.nextBoolean() && (attacker == ((Attackable) npc).getMostHated()))
{
npc.setTarget(attacker);
npc.doCast(SkillTable.getInstance().getInfo(4220, 1));
npc.doCast(SkillTable.getInstance().getSkill(4220, 1));
}
}
if ((getTimeHour() >= 5) && (npc.getCurrentHp() < ((npc.getMaxHp() * _quest2) / 4.0)))
@@ -825,7 +825,7 @@ public class Zaken extends Quest
_ai2 = Y_COORDS[i2] + Rnd.get(650);
_ai3 = Z_COORDS[i2];
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4222, 1));
npc.doCast(SkillTable.getInstance().getSkill(4222, 1));
}
}
return super.onAttack(npc, attacker, damage, isPet);
@@ -900,22 +900,22 @@ public class Zaken extends Quest
if (i0 < 1)
{
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4216, 1));
npc.doCast(SkillTable.getInstance().getSkill(4216, 1));
}
else if (i0 < 2)
{
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4217, 1));
npc.doCast(SkillTable.getInstance().getSkill(4217, 1));
}
else if (i0 < 4)
{
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4219, 1));
npc.doCast(SkillTable.getInstance().getSkill(4219, 1));
}
else if (i0 < 8)
{
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4218, 1));
npc.doCast(SkillTable.getInstance().getSkill(4218, 1));
}
else if (i0 < 15)
{
@@ -928,14 +928,14 @@ public class Zaken extends Quest
if (player != ((Attackable) npc).getMostHated())
{
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4221, 1));
npc.doCast(SkillTable.getInstance().getSkill(4221, 1));
}
}
}
if (Rnd.nextBoolean() && (player == ((Attackable) npc).getMostHated()))
{
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4220, 1));
npc.doCast(SkillTable.getInstance().getSkill(4220, 1));
}
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/AncientEgg.java vendored
View File

@@ -42,7 +42,7 @@ public class AncientEgg extends Quest
public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet)
{
attacker.setTarget(attacker);
attacker.doCast(SkillTable.getInstance().getInfo(SIGNAL, 1));
attacker.doCast(SkillTable.getInstance().getSkill(SIGNAL, 1));
return null;
}

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java vendored
View File

@@ -83,7 +83,7 @@ public class Monastery extends Quest
case 22124:
case 22126:
{
final Skill skill = SkillTable.getInstance().getInfo(4589, 8);
final Skill skill = SkillTable.getInstance().getSkill(4589, 8);
npc.doCast(skill);
break;
}
@@ -139,7 +139,7 @@ public class Monastery extends Quest
case 22126:
case 22127:
{
final Skill skill = SkillTable.getInstance().getInfo(4589, 8);
final Skill skill = SkillTable.getInstance().getSkill(4589, 8);
npc.doCast(skill);
break;
}

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java vendored
View File

@@ -115,7 +115,7 @@ public class KetraOrcSupport extends Quest
// Haste: Requires 6 Buffalo Horns
};
private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1);
private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getSkill(4578, 1);
/**
* Names of missions which will be automatically dropped if the alliance is broken.
@@ -163,7 +163,7 @@ public class KetraOrcSupport extends Quest
htmltext = "31372-4.htm";
st.takeItems(HORN, buffInfo[1]);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(buffInfo[0], 1));
npc.doCast(SkillTable.getInstance().getSkill(buffInfo[0], 1));
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
}
}

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java vendored
View File

@@ -114,7 +114,7 @@ public class VarkaSilenosSupport extends Quest
// Haste: Requires 6 Nepenthese Seeds
};
private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1);
private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getSkill(4578, 1);
/**
* Names of missions which will be automatically dropped if the alliance is broken.
@@ -162,7 +162,7 @@ public class VarkaSilenosSupport extends Quest
htmltext = "31379-4.htm";
st.takeItems(SEED, buffInfo[1]);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(buffInfo[0], 1));
npc.doCast(SkillTable.getInstance().getSkill(buffInfo[0], 1));
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
}
}

12
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java vendored
View File

@@ -247,7 +247,7 @@ public class Q230_TestOfTheSummoner extends Quest
st.giveItems(CRYSTAL_OF_PROGRESS_1, 1); // give Starting Crystal
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4126, 1));
npc.doCast(SkillTable.getInstance().getSkill(4126, 1));
}
// CAMONIELL
else if (event.equals("30636-02.htm"))
@@ -267,7 +267,7 @@ public class Q230_TestOfTheSummoner extends Quest
st.giveItems(CRYSTAL_OF_PROGRESS_2, 1);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4126, 1));
npc.doCast(SkillTable.getInstance().getSkill(4126, 1));
}
// BELTHUS
else if (event.equals("30637-02.htm"))
@@ -287,7 +287,7 @@ public class Q230_TestOfTheSummoner extends Quest
st.giveItems(CRYSTAL_OF_PROGRESS_3, 1);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4126, 1));
npc.doCast(SkillTable.getInstance().getSkill(4126, 1));
}
// BASILLA
else if (event.equals("30638-02.htm"))
@@ -307,7 +307,7 @@ public class Q230_TestOfTheSummoner extends Quest
st.giveItems(CRYSTAL_OF_PROGRESS_4, 1);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4126, 1));
npc.doCast(SkillTable.getInstance().getSkill(4126, 1));
}
// CELESTIEL
else if (event.equals("30639-02.htm"))
@@ -327,7 +327,7 @@ public class Q230_TestOfTheSummoner extends Quest
st.giveItems(CRYSTAL_OF_PROGRESS_5, 1);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4126, 1));
npc.doCast(SkillTable.getInstance().getSkill(4126, 1));
}
// BRYNTHEA
else if (event.equals("30640-02.htm"))
@@ -347,7 +347,7 @@ public class Q230_TestOfTheSummoner extends Quest
st.giveItems(CRYSTAL_OF_PROGRESS_6, 1);
npc.setTarget(player);
npc.doCast(SkillTable.getInstance().getInfo(4126, 1));
npc.doCast(SkillTable.getInstance().getSkill(4126, 1));
}
return htmltext;

2
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java vendored
View File

@@ -148,7 +148,7 @@ public class Q365_DevilsLegacy extends Quest
htmltext = "30092-06.htm";
// Curse effect !
final Skill skill = SkillTable.getInstance().getInfo(4082, 1);
final Skill skill = SkillTable.getInstance().getSkill(4082, 1);
if ((skill != null) && (player.getFirstEffect(skill) == null))
{
skill.getEffects(npc, player);

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java vendored
View File

@@ -233,7 +233,7 @@ public class Q421_LittleWingsBigAdventure extends Quest
// Curse if the registered objectId is the wrong one (switch flutes).
htmltext = "30747-18.htm";
final Skill skill = SkillTable.getInstance().getInfo(4167, 1);
final Skill skill = SkillTable.getInstance().getSkill(4167, 1);
if ((skill != null) && (player.getFirstEffect(skill) == null))
{
skill.getEffects(npc, player);
@@ -309,7 +309,7 @@ public class Q421_LittleWingsBigAdventure extends Quest
// Tree curses the killer.
if ((Rnd.get(100) < 30) && (originalKiller != null))
{
final Skill skill = SkillTable.getInstance().getInfo(4243, 1);
final Skill skill = SkillTable.getInstance().getSkill(4243, 1);
if ((skill != null) && (originalKiller.getFirstEffect(skill) == null))
{
skill.getEffects(npc, originalKiller);

4
L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java vendored
View File

@@ -169,7 +169,7 @@ public class Q501_ProofOfClanAlliance extends Quest
st.takeItems(SYMBOL_OF_LOYALTY, 1);
st.takeItems(SYMBOL_OF_LOYALTY, 1);
st.giveItems(ANTIDOTE_RECIPE_LIST, 1);
SkillTable.getInstance().getInfo(4082, 1).getEffects(npc, player);
SkillTable.getInstance().getSkill(4082, 1).getEffects(npc, player);
startQuestTimer("poison", 60000, npc, player, true);
st.playSound(QuestState.SOUND_MIDDLE);
}
@@ -521,7 +521,7 @@ public class Q501_ProofOfClanAlliance extends Quest
public void castSkill(NpcInstance npc, PlayerInstance player, int skillId)
{
final Skill skill = SkillTable.getInstance().getInfo(skillId, 1);
final Skill skill = SkillTable.getInstance().getSkill(skillId, 1);
npc.setTarget(player);
npc.doCast(skill);
}