diff --git a/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java b/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java
index 0b726613b698513cdb01a82ea6df163672bb20ba..5e67961f40413009f051c0c52a949c88e89ee7f8 100644
--- a/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java
+++ b/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java
@@ -22,19 +22,19 @@ import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+import ai.npc.AbstractNpcAI;
/**
* MC Show AI.
@@ -385,7 +385,7 @@ public class MC_Show extends AbstractNpcAI
{
autoChat(npc, MESSAGES[6], Say2.NPC_SHOUT);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(-56511, -56647, -2008, 36863));
- npc.broadcastPacket(new PlaySound(1, "NS22_F", 0, 0, 0, 0, 0));
+ npc.broadcastPacket(Music.NS22_F.getPacket());
addSpawn(SINGERS[0], -56344, -56328, -2008, 32768, false, 224000);
addSpawn(SINGERS[1], -56552, -56245, -2008, 36863, false, 224000);
addSpawn(SINGERS[1], -56546, -56426, -2008, 28672, false, 224000);
@@ -413,7 +413,7 @@ public class MC_Show extends AbstractNpcAI
else if (event.equalsIgnoreCase("10"))
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(-56483, -56665, -2034, 32768));
- npc.broadcastPacket(new PlaySound(1, "TP05_F", 0, 0, 0, 0, 0));
+ npc.broadcastPacket(Music.TP05_F.getPacket());
startQuestTimer("npc1_1", 3000, addSpawn(CIRCUS[0], -56495, -56375, -2008, 32768, false, 101000), null);
startQuestTimer("npc2_1", 3000, addSpawn(CIRCUS[0], -56491, -56289, -2008, 32768, false, 101000), null);
startQuestTimer("npc3_1", 3000, addSpawn(CIRCUS[1], -56502, -56246, -2008, 32768, false, 101000), null);
diff --git a/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
index 023698a15fec99101857cc39031fe49391b1f948..41b8948f978efdafb86c2a57852fef0ea709d6f8 100644
--- a/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
+++ b/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
@@ -22,11 +22,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.L2Party;
@@ -43,12 +42,13 @@ import com.l2jserver.gameserver.model.zone.type.L2NoRestartZone;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.serverpackets.Earthquake;
import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.util.Broadcast;
import com.l2jserver.gameserver.util.Util;
+import ai.npc.AbstractNpcAI;
+
/**
* Antharas AI.
* @author St3eT
@@ -275,7 +275,7 @@ public final class Antharas extends AbstractNpcAI
_antharas.teleToLocation(181323, 114850, -7623, 32542);
setStatus(IN_FIGHT);
_lastAttack = System.currentTimeMillis();
- zone.broadcastPacket(new PlaySound("BS02_A"));
+ zone.broadcastPacket(Music.BS02_A_10000.getPacket());
startQuestTimer("CAMERA_1", 23, _antharas, null);
break;
}
@@ -680,7 +680,7 @@ public final class Antharas extends AbstractNpcAI
_antharas = null;
notifyEvent("DESPAWN_MINIONS", null, null);
zone.broadcastPacket(new SpecialCamera(npc, 1200, 20, -10, 0, 10000, 13000, 0, 0, 0, 0, 0));
- zone.broadcastPacket(new PlaySound("BS01_D"));
+ zone.broadcastPacket(Music.BS01_D_10000.getPacket());
addSpawn(CUBE, 177615, 114941, -7709, 0, false, 900000);
long respawnTime = (Config.ANTHARAS_SPAWN_INTERVAL + getRandom(-Config.ANTHARAS_SPAWN_RANDOM, Config.ANTHARAS_SPAWN_RANDOM)) * 3600000;
setRespawn(respawnTime);
diff --git a/dist/game/data/scripts/ai/individual/Baium/Baium.java b/dist/game/data/scripts/ai/individual/Baium/Baium.java
index ba2174ad60c02d7ef1eebecdbeeaa6d5656064fe..f46933efc0762743eef171c880dae01802e61849 100644
--- a/dist/game/data/scripts/ai/individual/Baium/Baium.java
+++ b/dist/game/data/scripts/ai/individual/Baium/Baium.java
@@ -18,12 +18,11 @@
*/
package ai.individual.Baium;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.Location;
@@ -42,10 +41,11 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.Earthquake;
import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
+import ai.npc.AbstractNpcAI;
+
/**
* Baium AI.
* @author St3eT
@@ -230,7 +230,7 @@ public final class Baium extends AbstractNpcAI
if (npc != null)
{
zone.broadcastPacket(new Earthquake(npc.getX(), npc.getY(), npc.getZ(), 40, 10));
- zone.broadcastPacket(new PlaySound("BS02_A"));
+ zone.broadcastPacket(Music.BS02_A_6000.getPacket());
}
break;
}
@@ -555,7 +555,7 @@ public final class Baium extends AbstractNpcAI
{
setStatus(DEAD);
addSpawn(TELE_CUBE, TELEPORT_CUBIC_LOC, false, 900000);
- zone.broadcastPacket(new PlaySound("BS01_D"));
+ zone.broadcastPacket(Music.BS01_D_10000.getPacket());
long respawnTime = (Config.BAIUM_SPAWN_INTERVAL + getRandom(-Config.BAIUM_SPAWN_RANDOM, Config.BAIUM_SPAWN_RANDOM)) * 3600000;
setRespawn(respawnTime);
startQuestTimer("CLEAR_STATUS", respawnTime, null, null);
diff --git a/dist/game/data/scripts/ai/individual/Beleth.java b/dist/game/data/scripts/ai/individual/Beleth.java
index de79234412c1cb46354387452921ab8576de1396..28bced493660a8dd0a1ce4ead85864bb9565f17c 100644
--- a/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/dist/game/data/scripts/ai/individual/Beleth.java
@@ -21,12 +21,11 @@ package ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -46,12 +45,13 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.network.serverpackets.DoorStatusUpdate;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.network.serverpackets.StaticObject;
import com.l2jserver.gameserver.util.Util;
+import ai.npc.AbstractNpcAI;
+
/**
* Beleth's AI.
* @author Treat, Sahar
@@ -161,7 +161,7 @@ public final class Beleth extends AbstractNpcAI
_camera3 = addSpawn(29122, new Location(16323, 213170, -9357));
_camera4 = addSpawn(29123, new Location(16323, 214917, -9356));
- ZONE.broadcastPacket(new PlaySound(1, "BS07_A", 1, _camera1.getObjectId(), _camera1.getX(), _camera1.getY(), _camera1.getZ()));
+ ZONE.broadcastPacket(Music.BS07_A_10000.getPacket());
ZONE.broadcastPacket(new SpecialCamera(_camera1, 400, 75, -25, 0, 2500, 0, 0, 1, 0, 0));
ZONE.broadcastPacket(new SpecialCamera(_camera1, 400, 75, -25, 0, 2500, 0, 0, 1, 0, 0));
@@ -476,7 +476,7 @@ public final class Beleth extends AbstractNpcAI
_beleth.doDie(null);
_camera1 = addSpawn(29122, new Location(16323, 213170, -9357));
- _camera1.broadcastPacket(new PlaySound(1, "BS07_D", 1, _camera1.getObjectId(), _camera1.getX(), _camera1.getY(), _camera1.getZ()));
+ _camera1.broadcastPacket(Music.BS07_D_10000.getPacket());
ZONE.broadcastPacket(new SpecialCamera(_camera1, 400, 290, 25, 0, 10000, 0, 0, 1, 0, 0));
ZONE.broadcastPacket(new SpecialCamera(_camera1, 400, 290, 25, 0, 10000, 0, 0, 1, 0, 0));
diff --git a/dist/game/data/scripts/ai/individual/Core.java b/dist/game/data/scripts/ai/individual/Core.java
index d92b0ec694c881ef4f92a4ddaae245e9cd366384..aa4c4a9ea43699962e3a8ffbfbbda68291ec90b9 100644
--- a/dist/game/data/scripts/ai/individual/Core.java
+++ b/dist/game/data/scripts/ai/individual/Core.java
@@ -21,9 +21,8 @@ package ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -33,7 +32,8 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+import ai.npc.AbstractNpcAI;
/**
* Core AI.
@@ -112,7 +112,7 @@ public final class Core extends AbstractNpcAI
public void spawnBoss(L2GrandBossInstance npc)
{
GrandBossManager.getInstance().addBoss(npc);
- npc.broadcastPacket(new PlaySound(1, "BS01_A", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
+ npc.broadcastPacket(Music.BS01_A_10000.getPacket());
// Spawn minions
L2Attackable mob;
for (int i = 0; i < 5; i++)
@@ -189,7 +189,7 @@ public final class Core extends AbstractNpcAI
if (npc.getId() == CORE)
{
int objId = npc.getObjectId();
- npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, objId, npc.getX(), npc.getY(), npc.getZ()));
+ npc.broadcastPacket(Music.BS02_D_10000.getPacket());
npc.broadcastPacket(new NpcSay(objId, Say2.NPC_ALL, npc.getId(), NpcStringId.A_FATAL_ERROR_HAS_OCCURRED));
npc.broadcastPacket(new NpcSay(objId, Say2.NPC_ALL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN));
npc.broadcastPacket(new NpcSay(objId, Say2.NPC_ALL, npc.getId(), NpcStringId.DOT_DOT_DOT_DOT_DOT_DOT));
diff --git a/dist/game/data/scripts/ai/individual/DrChaos.java b/dist/game/data/scripts/ai/individual/DrChaos.java
index 24e3def619be86a981e242894eacfefde2849cdb..bfd7d387d1ad63ec128df1b85c50c4c739001ac2 100644
--- a/dist/game/data/scripts/ai/individual/DrChaos.java
+++ b/dist/game/data/scripts/ai/individual/DrChaos.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
/**
@@ -103,7 +102,6 @@ public final class DrChaos extends Quest
L2Npc golem = addSpawn(CHAOS_GOLEM, 94640, -112496, -3336, 0, false, 0);
_IsGolemSpawned = true;
startQuestTimer("6", 1000, golem, player);
- player.sendPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
}
break;
}
diff --git a/dist/game/data/scripts/ai/individual/Orfen.java b/dist/game/data/scripts/ai/individual/Orfen.java
index d07737065334bb1b62078478069d507bb9871ddf..59c7f67f543e3fce0ea54898f40c4735558cbfce 100644
--- a/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/dist/game/data/scripts/ai/individual/Orfen.java
@@ -21,11 +21,10 @@ package ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -41,7 +40,8 @@ import com.l2jserver.gameserver.model.zone.type.L2BossZone;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+import ai.npc.AbstractNpcAI;
/**
* Orfen's AI
@@ -150,7 +150,7 @@ public final class Orfen extends AbstractNpcAI
public void spawnBoss(L2GrandBossInstance npc)
{
GrandBossManager.getInstance().addBoss(npc);
- npc.broadcastPacket(new PlaySound(1, "BS01_A", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
+ npc.broadcastPacket(Music.BS01_A_7000.getPacket());
startQuestTimer("check_orfen_pos", 10000, npc, null, true);
// Spawn minions
int x = npc.getX();
@@ -327,7 +327,7 @@ public final class Orfen extends AbstractNpcAI
{
if (npc.getId() == ORFEN)
{
- npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
+ npc.broadcastPacket(Music.BS02_D_7000.getPacket());
GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
// Calculate Min and Max respawn times randomly.
long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
diff --git a/dist/game/data/scripts/ai/individual/QueenAnt.java b/dist/game/data/scripts/ai/individual/QueenAnt.java
index 39678601ea6e2ab387c5849277e72072b8b6ed4a..3054cb52506ea70e550830fe02c3379e2b7bcc4f 100644
--- a/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -21,10 +21,9 @@ package ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.StatsSet;
@@ -39,7 +38,8 @@ import com.l2jserver.gameserver.model.skills.CommonSkill;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.zone.type.L2BossZone;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+import ai.npc.AbstractNpcAI;
/**
* Queen Ant's AI
@@ -150,7 +150,7 @@ public final class QueenAnt extends AbstractNpcAI
GrandBossManager.getInstance().addBoss(npc);
startQuestTimer("action", 10000, npc, null, true);
startQuestTimer("heal", 1000, null, null, true);
- npc.broadcastPacket(new PlaySound(1, "BS01_A", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
+ npc.broadcastPacket(Music.BS01_A_10000.getPacket());
_queen = npc;
_larva = (L2MonsterInstance) addSpawn(LARVA, -21600, 179482, -5846, getRandom(360), false, 0);
}
@@ -331,7 +331,7 @@ public final class QueenAnt extends AbstractNpcAI
int npcId = npc.getId();
if (npcId == QUEEN)
{
- npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
+ npc.broadcastPacket(Music.BS02_D_10000.getPacket());
GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
// Calculate Min and Max respawn times randomly.
long respawnTime = Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM);
diff --git a/dist/game/data/scripts/ai/individual/Valakas.java b/dist/game/data/scripts/ai/individual/Valakas.java
index 466c478f210715baa5d68825a47696d0ae38e23b..ad5436df98ecb3e607b7029a1f920d6f94b793dd 100644
--- a/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/dist/game/data/scripts/ai/individual/Valakas.java
@@ -21,13 +21,12 @@ package ai.individual;
import java.util.ArrayList;
import java.util.List;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.StatsSet;
@@ -40,11 +39,12 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.zone.type.L2BossZone;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.util.Util;
+import ai.npc.AbstractNpcAI;
+
/**
* Valakas' AI.
* @author Tryskell
@@ -202,7 +202,7 @@ public final class Valakas extends AbstractNpcAI
// Sound + socialAction.
for (L2PcInstance plyr : ZONE.getPlayersInside())
{
- plyr.sendPacket(new PlaySound(1, "B03_A", 0, 0, 0, 0, 0));
+ plyr.sendPacket(Music.BS03_A_10000.getPacket());
plyr.sendPacket(new SocialAction(npc.getObjectId(), 3));
}
@@ -427,7 +427,7 @@ public final class Valakas extends AbstractNpcAI
cancelQuestTimer("skill_task", npc, null);
// Launch death animation.
- ZONE.broadcastPacket(new PlaySound(1, "B03_D", 0, 0, 0, 0, 0));
+ ZONE.broadcastPacket(Music.B03_D_10000.getPacket());
ZONE.broadcastPacket(new SpecialCamera(npc, 1200, 20, -10, 0, 10000, 13000, 0, 0, 0, 0, 0));
startQuestTimer("die_1", 300, npc, null); // 300
diff --git a/dist/game/data/scripts/ai/npc/Alarm/Alarm.java b/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
index 3fd4ffda76befd9eefc710597e0753c9c134a9e1..db2ec5af10a119e3abb106a01856260091bd6641 100644
--- a/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
+++ b/dist/game/data/scripts/ai/npc/Alarm/Alarm.java
@@ -22,7 +22,7 @@ import quests.Q00184_ArtOfPersuasion.Q00184_ArtOfPersuasion;
import quests.Q00185_NikolasCooperation.Q00185_NikolasCooperation;
import ai.npc.AbstractNpcAI;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.QuestState;
@@ -238,7 +238,7 @@ public final class Alarm extends AbstractNpcAI
final L2PcInstance player = npc.getVariables().getObject("player0", L2PcInstance.class);
if (player != null)
{
- playSound(player, QuestSound.ITEMSOUND_SIREN);
+ playSound(player, Sound.ITEMSOUND_SIREN);
}
return super.onSpawn(npc);
}
diff --git a/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java b/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
index a7719b65616f999c49bbfb6be6776d670868defd..3354266902344d9163cda2bc17ab6be0eb9e7807 100644
--- a/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
+++ b/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
@@ -26,7 +26,7 @@ import java.util.Map;
import quests.Q00230_TestOfTheSummoner.Q00230_TestOfTheSummoner;
import ai.npc.AbstractNpcAI;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
@@ -120,7 +120,7 @@ public final class Servitors extends AbstractNpcAI
final L2Npc killer = (L2Npc) event.getAttacker();
final List<Integer> items = MONSTERS.get(killer.getId());
giveItems(master, items.get(2), 1); // Crystal of Defeat
- playSound(master, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ playSound(master, Sound.ITEMSOUND_QUEST_ITEMGET);
takeItems(master, items.get(1), -1); // Crystal of Inprogress
takeItems(master, items.get(0), -1); // Crystal of Starting
}
diff --git a/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java b/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
index 3c3c7782615968d0a9ef53f7fa7fd2f6fbd95d35..ed1236a9be9e41d435faad40252ee8c8b26ee1ae 100644
--- a/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
+++ b/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
@@ -18,7 +18,7 @@
*/
package ai.npc.Teleports.OracleTeleport;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -267,7 +267,7 @@ public final class OracleTeleport extends AbstractNpcAI
}
st.set("id", Integer.toString(i));
st.setState(State.STARTED);
- playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+ playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT);
htmltext = "ziggurat_rift.htm";
player.teleToLocation(new Location(-114755, -179466, -6752));
}
@@ -294,7 +294,7 @@ public final class OracleTeleport extends AbstractNpcAI
i++;
}
st.set("id", Integer.toString(i));
- playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+ playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT);
player.teleToLocation(new Location(-80157, 111344, -4901));
player.setIsIn7sDungeon(true);
}
@@ -311,7 +311,7 @@ public final class OracleTeleport extends AbstractNpcAI
i++;
}
st.set("id", Integer.toString(i));
- playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+ playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT);
player.teleToLocation(new Location(-81261, 86531, -5157));
player.setIsIn7sDungeon(true);
}