diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfDion.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfDion.java index ce01d2d5ae30b0224c74e3a8eacf1f34c6ec28e7..2aab00459b8c7626b2a9bf3331611ab8d7110bdf 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfDion.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfDion.java @@ -29,7 +29,7 @@ import com.l2jserver.gameserver.util.Util; * AI for mobs in Plains of Dion (near Floran Village) * @author Gladicek */ -public class PlainsOfDion extends AbstractNpcAI +public final class PlainsOfDion extends AbstractNpcAI { private static final int MONSTERS[] = { @@ -54,6 +54,12 @@ public class PlainsOfDion extends AbstractNpcAI NpcStringId.WHAT_ARE_YOU_LOOKING_AT }; + private PlainsOfDion(String name, String descr) + { + super(name, descr); + addAttackId(MONSTERS); + } + @Override public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isPet) { @@ -83,19 +89,6 @@ public class PlainsOfDion extends AbstractNpcAI return super.onAttack(npc, player, damage, isPet); } - @Override - public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet) - { - npc.setScriptValue(0); - return super.onKill(npc, killer, isPet); - } - - public PlainsOfDion(String name, String descr) - { - super(name, descr); - registerMobs(MONSTERS, QuestEventType.ON_ATTACK, QuestEventType.ON_KILL); - } - public static void main(String[] args) { new PlainsOfDion(PlainsOfDion.class.getSimpleName(), "ai"); diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/CatsEyeBandit.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/CatsEyeBandit.java index 9d6d1fcc861418d73c075e680337de5944ee84cc..f7e11648f6f1c012f97f1c5eee33a06ca568c6ea 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/CatsEyeBandit.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/CatsEyeBandit.java @@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.clientpackets.Say2; * Cat's Eye Bandit (Quest Monster) AI. * @author Gladicek */ -public class CatsEyeBandit extends AbstractNpcAI +public final class CatsEyeBandit extends AbstractNpcAI { // NPC ID private static final int MOB_ID = 27038; @@ -35,6 +35,13 @@ public class CatsEyeBandit extends AbstractNpcAI private static final int BOW = 1181; private static final int DAGGER = 1182; + private CatsEyeBandit(String name, String descr) + { + super(name, descr); + addAttackId(MOB_ID); + addKillId(MOB_ID); + } + @Override public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isPet) { @@ -54,18 +61,10 @@ public class CatsEyeBandit extends AbstractNpcAI if (qs != null) { broadcastNpcSay(npc, Say2.NPC_ALL, NpcStringId.I_MUST_DO_SOMETHING_ABOUT_THIS_SHAMEFUL_INCIDENT); - npc.setScriptValue(0); } return super.onKill(npc, killer, isPet); } - public CatsEyeBandit(String name, String descr) - { - super(name, descr); - addAttackId(MOB_ID); - addKillId(MOB_ID); - } - public static void main(String[] args) { new CatsEyeBandit(CatsEyeBandit.class.getSimpleName(), "ai"); diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java index b09274dc474e2e28b7119be253992520d7c1e9db..bddf26c8071af33bf587098bba0157f1cb6862a2 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java @@ -31,7 +31,7 @@ import com.l2jserver.util.Rnd; * Frightened Ragna Orc AI. * @author Gladicek, malyelfik */ -public class FrightenedRagnaOrc extends AbstractNpcAI +public final class FrightenedRagnaOrc extends AbstractNpcAI { // NPC ID private static final int MOB_ID = 18807; @@ -45,7 +45,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI // Skill private static final SkillHolder SKILL = new SkillHolder(6234, 1); - public FrightenedRagnaOrc(String name, String descr) + private FrightenedRagnaOrc(String name, String descr) { super(name, descr); addAttackId(MOB_ID); @@ -76,7 +76,6 @@ public class FrightenedRagnaOrc extends AbstractNpcAI broadcastNpcSay(npc, Say2.NPC_ALL, msg); cancelQuestTimer("say", npc, null); cancelQuestTimer("reward", npc, player); - npc.setScriptValue(0); return super.onKill(npc, player, isPet); }