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

Moved EventType to a separate class.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-24 17:05:10 +00:00
parent 4f5e72d88d
commit 90352a0447
25 changed files with 166 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Barakiel.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
/*
@@ -30,7 +31,7 @@ public class Barakiel extends Quest
{
super(-1, "ai/bosses");
addEventId(BARAKIEL, Quest.QuestEventType.ON_ATTACK);
addEventId(BARAKIEL, EventType.ON_ATTACK);
}
// FIXME: Mobius - AI does nothing?

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java vendored
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.Announcements;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
@@ -93,8 +94,8 @@ public class Core extends Quest
for (int mob : mobs)
{
addEventId(mob, Quest.QuestEventType.ON_KILL);
addEventId(mob, Quest.QuestEventType.ON_ATTACK);
addEventId(mob, EventType.ON_KILL);
addEventId(mob, EventType.ON_ATTACK);
}
_firstAttacked = false;

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Golkonda.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
/*
@@ -30,7 +31,7 @@ public class Golkonda extends Quest
{
super(-1, "ai/bosses");
addEventId(GOLKONDA, Quest.QuestEventType.ON_ATTACK);
addEventId(GOLKONDA, EventType.ON_ATTACK);
}
// FIXME: Mobius - AI does nothing?

7
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gordon.java vendored
View File

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.spawn.Spawn;
@@ -108,9 +109,9 @@ public class Gordon extends Quest
{
super(-1, "ai/bosses");
addEventId(GORDON, Quest.QuestEventType.ON_KILL);
addEventId(GORDON, Quest.QuestEventType.ON_ATTACK);
addEventId(GORDON, Quest.QuestEventType.ON_SPAWN);
addEventId(GORDON, EventType.ON_KILL);
addEventId(GORDON, EventType.ON_ATTACK);
addEventId(GORDON, EventType.ON_SPAWN);
// wait 2 minutes after Start AI
startQuestTimer("check_ai", 120000, null, null, true);

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Hallate.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
/*
@@ -30,7 +31,7 @@ public class Hallate extends Quest
{
super(-1, "ai/bosses");
addEventId(HALLATE, Quest.QuestEventType.ON_ATTACK);
addEventId(HALLATE, EventType.ON_ATTACK);
}
// FIXME: Mobius - AI does nothing?

7
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java vendored
View File

@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.spawn.Spawn;
import org.l2jmobius.gameserver.model.zone.type.BossZone;
@@ -65,9 +66,9 @@ public class IceFairySirra extends Quest
for (int mob : mobs)
{
// TODO:
addEventId(mob, Quest.QuestEventType.QUEST_START);
addEventId(mob, Quest.QuestEventType.QUEST_TALK);
addEventId(mob, Quest.QuestEventType.NPC_FIRST_TALK);
addEventId(mob, EventType.QUEST_START);
addEventId(mob, EventType.QUEST_TALK);
addEventId(mob, EventType.NPC_FIRST_TALK);
}
init();

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Kernon.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
/*
@@ -30,7 +31,7 @@ public class Kernon extends Quest
{
super(-1, "ai/bosses");
addEventId(KERNON, Quest.QuestEventType.ON_ATTACK);
addEventId(KERNON, EventType.ON_ATTACK);
}
// FIXME: Mobius - AI does nothing?

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.Announcements;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
@@ -57,8 +58,8 @@ public class Orfen extends Quest
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);
final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN);
addEventId(ORFEN, Quest.QuestEventType.ON_KILL);
addEventId(ORFEN, Quest.QuestEventType.ON_ATTACK);
addEventId(ORFEN, EventType.ON_KILL);
addEventId(ORFEN, EventType.ON_ATTACK);
switch (status)
{

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java vendored
View File

@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.Announcements;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.zone.type.BossZone;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
@@ -84,8 +85,8 @@ public class QueenAnt extends Quest
};
for (int mob : mobs)
{
addEventId(mob, Quest.QuestEventType.ON_KILL);
addEventId(mob, Quest.QuestEventType.ON_ATTACK);
addEventId(mob, EventType.ON_KILL);
addEventId(mob, EventType.ON_ATTACK);
}
_zone = GrandBossManager.getInstance().getZone(-21610, 181594, -5734);

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java vendored
View File

@@ -47,6 +47,7 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.spawn.Spawn;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
@@ -132,10 +133,10 @@ public class VanHalter extends Quest
32066
};
addEventId(29062, Quest.QuestEventType.ON_ATTACK);
addEventId(29062, EventType.ON_ATTACK);
for (int mob : mobs)
{
addEventId(mob, Quest.QuestEventType.ON_KILL);
addEventId(mob, EventType.ON_KILL);
}
// GrandBossManager.getInstance().addBoss(29062);

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java vendored
View File

@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.zone.type.BossZone;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
@@ -157,8 +158,8 @@ public class Zaken extends Quest
}
}, 2000L, 600000L);
addEventId(ZAKEN, Quest.QuestEventType.ON_KILL);
addEventId(ZAKEN, Quest.QuestEventType.ON_ATTACK);
addEventId(ZAKEN, EventType.ON_KILL);
addEventId(ZAKEN, EventType.ON_ATTACK);
_Zone = GrandBossManager.getInstance().getZone(55312, 219168, -3223);

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java vendored
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.util.Util;
@@ -62,8 +63,8 @@ public class Monastery extends Quest
public Monastery()
{
super(-1, "ai");
registerMobs(MOBS_1, QuestEventType.ON_AGGRO_RANGE_ENTER, QuestEventType.ON_SPAWN, QuestEventType.ON_SPELL_FINISHED);
registerMobs(MOBS_2, QuestEventType.ON_SPELL_FINISHED);
registerMobs(MOBS_1, EventType.ON_AGGRO_RANGE_ENTER, EventType.ON_SPAWN, EventType.ON_SPELL_FINISHED);
registerMobs(MOBS_2, EventType.ON_SPELL_FINISHED);
}
@Override

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java vendored
View File

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -136,8 +137,8 @@ public class SummonMinions extends Quest
for (int mob : mobs)
{
addEventId(mob, Quest.QuestEventType.ON_KILL);
addEventId(mob, Quest.QuestEventType.ON_ATTACK);
addEventId(mob, EventType.ON_KILL);
addEventId(mob, EventType.ON_ATTACK);
}
}

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java vendored
View File

@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -112,7 +113,7 @@ public class Transform extends Quest
for (int mob : mobsKill)
{
addEventId(mob, Quest.QuestEventType.ON_KILL);
addEventId(mob, EventType.ON_KILL);
}
final int[] mobsAttack =
@@ -132,7 +133,7 @@ public class Transform extends Quest
for (int mob : mobsAttack)
{
addEventId(mob, Quest.QuestEventType.ON_ATTACK);
addEventId(mob, EventType.ON_ATTACK);
}
}