output packet change from CreatureSay to NpcSay in several jython scripts, require [L2127]

datapack_development/data/scripts/ai/group_template/feedable_beasts.py

@@ -7,7 +7,7 @@ from net.sf.l2j.gameserver.idfactory import IdFactory
 from net.sf.l2j.gameserver.datatables import NpcTable
 from net.sf.l2j.gameserver.model.actor.instance import L2TamedBeastInstance
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.gameserver.serverpackets import SocialAction
 from net.sf.l2j.util import Rnd;
 
@@ -178,11 +178,11 @@ class feedable_beasts(JQuest) :
             # also, perform a rare random chat
             rand = Rnd.get(20)
             if rand > 4 : pass
-            elif rand == 0 : npc.broadcastPacket(CreatureSay(objectId,0,nextNpc.getName(), player.getName()+", will you show me your hideaway?"))
-            elif rand == 1 : npc.broadcastPacket(CreatureSay(objectId,0,nextNpc.getName(), player.getName()+", whenever I look at spice, I think about you."))
-            elif rand == 2 : npc.broadcastPacket(CreatureSay(objectId,0,nextNpc.getName(), player.getName()+", you do not need to return to the village.  I will give you strength"))
-            elif rand == 3 : npc.broadcastPacket(CreatureSay(objectId,0,nextNpc.getName(), "Thanks, "+player.getName()+".  I hope I can help you"))
-            elif rand == 4 : npc.broadcastPacket(CreatureSay(objectId,0,nextNpc.getName(), player.getName()+", what can I do to help you?"))
+            elif rand == 0 : npc.broadcastPacket(NpcSay(objectId,0,nextNpc.getNpcId(), player.getName()+", will you show me your hideaway?"))
+            elif rand == 1 : npc.broadcastPacket(NpcSay(objectId,0,nextNpc.getNpcId(), player.getName()+", whenever I look at spice, I think about you."))
+            elif rand == 2 : npc.broadcastPacket(NpcSay(objectId,0,nextNpc.getNpcId(), player.getName()+", you do not need to return to the village.  I will give you strength"))
+            elif rand == 3 : npc.broadcastPacket(NpcSay(objectId,0,nextNpc.getNpcId(), "Thanks, "+player.getName()+".  I hope I can help you"))
+            elif rand == 4 : npc.broadcastPacket(NpcSay(objectId,0,nextNpc.getNpcId(), player.getName()+", what can I do to help you?"))
 
         # if not trained, the newly spawned mob will automatically be agro against its feeder
         # (what happened to "never bite the hand that feeds you" anyway?!)
@@ -239,7 +239,7 @@ class feedable_beasts(JQuest) :
 
             # rare random talk...
             if Rnd.get(20) == 0 :
-                npc.broadcastPacket(CreatureSay(objectId,0,npc.getName(),self.Text[growthLevel][Rnd.get(len(self.Text[growthLevel]))]))
+                npc.broadcastPacket(NpcSay(objectId,0,npc.getNpcId(),self.Text[growthLevel][Rnd.get(len(self.Text[growthLevel]))]))
 
             if growthLevel > 0 :
                 # check if this is the same player as the one who raised it from growth 0.
@@ -261,7 +261,7 @@ class feedable_beasts(JQuest) :
                           "What can I help you with?",
                           "I am not here only for food!",
                           "Yam, yam, yam, yam, yam!"]
-                npc.broadcastPacket(CreatureSay(objectId,0,npc.getName(),mytext[Rnd.get(len(mytext))]))
+                npc.broadcastPacket(NpcSay(objectId,0,npc.getNpcId(),mytext[Rnd.get(len(mytext))]))
         return
 
     def onKill (self,npc,player,isPet):

datapack_development/data/scripts/ai/individual/core.py

@@ -1,7 +1,7 @@
 import sys
 from net.sf.l2j.util import Rnd
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.gameserver.serverpackets import PlaySound
 
 # Boss: Core
@@ -18,11 +18,11 @@ class core(JQuest) :
         objId=npc.getObjectId()
         if self.FirstAttacked:
            if Rnd.get(100) : return
-           npc.broadcastPacket(CreatureSay(objId,0,"Core","Removing intruders."))
+           npc.broadcastPacket(NpcSay(objId,0,npc.getNpcId(),"Removing intruders."))
         else :
            self.FirstAttacked = True
-           npc.broadcastPacket(CreatureSay(objId,0,"Core","A non-permitted target has been discovered."))
-           npc.broadcastPacket(CreatureSay(objId,0,"Core","Starting intruder removal system."))
+           npc.broadcastPacket(NpcSay(objId,0,npc.getNpcId(),"A non-permitted target has been discovered."))
+           npc.broadcastPacket(NpcSay(objId,0,npc.getNpcId(),"Starting intruder removal system."))
         return 
 
     def onKill(self,npc,player,isPet):
@@ -30,9 +30,9 @@ class core(JQuest) :
         if npcId == self.Core:
             objId=npc.getObjectId()
             npc.broadcastPacket(PlaySound(1, "BS02_D", 1, objId, npc.getX(), npc.getY(), npc.getZ()))
-            npc.broadcastPacket(CreatureSay(objId,0,"Core","A fatal error has occurred."))
-            npc.broadcastPacket(CreatureSay(objId,0,"Core","System is being shut down..."))
-            npc.broadcastPacket(CreatureSay(objId,0,"Core","......"))
+            npc.broadcastPacket(NpcSay(objId,0,npcId,"A fatal error has occurred."))
+            npc.broadcastPacket(NpcSay(objId,0,npcId,"System is being shut down..."))
+            npc.broadcastPacket(NpcSay(objId,0,npcId,"......"))
             self.FirstAttacked = False
             self.addSpawn(31842,16502,110165,-6394,0,False,900000)
             self.addSpawn(31842,18948,110166,-6397,0,False,900000)

datapack_development/data/scripts/quests/114_ResurrectionOfAnOldManager/__init__.py

@@ -7,7 +7,7 @@ from net.sf.l2j.gameserver.datatables import SpawnTable
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.gameserver.serverpackets import ExShowScreenMessage
 
 qn = "114_ResurrectionOfAnOldManager"
@@ -147,7 +147,7 @@ class Quest (JQuest) :
     elif event == "32047-15a.htm" :
        if self.isSpawned == 0 :
           golem = st.addSpawn(Guardian,96977,-110625,-3280,0,False,900000)
-          golem.broadcastPacket(CreatureSay(golem.getObjectId(),0,"Wendy'\s Guardian","You, "+player.getName()+", you attacked Wendy. Prepare to die!"))
+          golem.broadcastPacket(NpcSay(golem.getObjectId(),0,golem.getNpcId(),"You, "+player.getName()+", you attacked Wendy. Prepare to die!"))
           golem.setRunning()
           golem.addDamageHate(player,0,999)
           golem.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player)
@@ -353,7 +353,7 @@ class Quest (JQuest) :
    npcId = npc.getNpcId()
    if st.getState() == State.STARTED and st.getInt("cond") == 10:
       if npcId == Guardian :
-         npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,"Wendy'\s Guardian","This enemy is far too powerful for me to fight. I must withdraw"))
+         npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npcId,"This enemy is far too powerful for me to fight. I must withdraw"))
          st.set("cond","11")
          st.playSound("ItemSound.quest_middle")
 

datapack_development/data/scripts/quests/115_TheOtherSideOfTruth/__init__.py

@@ -5,7 +5,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 
 qn = "115_TheOtherSideOfTruth"
 
@@ -76,7 +76,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_middle")
        st.set("cond","9")
        man = st.addSpawn(Suspicious,104562,-107598,-3688,0,False,4000)
-       man.broadcastPacket(CreatureSay(man.getObjectId(),0,"Suspicious Man","We meet again."))
+       man.broadcastPacket(NpcSay(man.getObjectId(),0,man.getNpcId(),"We meet again."))
        self.startQuestTimer("2",3700,man,player)
        st.giveItems(Report,1)
     elif event == "Sculpture-04.htm" :
@@ -87,7 +87,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_middle")
        st.set("cond","8")
        man = st.addSpawn(Suspicious,117890,-126478,-2584,0,False,4000)
-       man.broadcastPacket(CreatureSay(man.getObjectId(),0,"Suspicious Man","This looks like the right place..."))
+       man.broadcastPacket(NpcSay(man.getObjectId(),0,man.getNpcId(),"This looks like the right place..."))
        self.startQuestTimer("1",3700,man,player)
        htmltext = "Sculpture-04.htm"
        if st.getInt(str(Sculpture1)) == 0 and st.getInt(str(Sculpture2)) == 0:
@@ -95,9 +95,9 @@ class Quest (JQuest) :
     elif event == "Sculpture-05.htm" :
        st.set(str(npc.getNpcId()),"1")
     elif event == "1" :
-       npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,"Suspicious Man","I see someone. Is this fate?"))
+       npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getNpcId(),"I see someone. Is this fate?"))
     elif event == "2" :
-       npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,"Suspicious Man","Don't bother trying to find out more about me. Follow your own destiny."))
+       npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getNpcId(),"Don't bother trying to find out more about me. Follow your own destiny."))
     return htmltext
 
 

datapack_development/data/scripts/quests/21_HiddenTruth/__init__.py

@@ -7,7 +7,7 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 from net.sf.l2j.gameserver.model import L2CharPosition
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 
 qn = "21_HiddenTruth"
 
@@ -49,12 +49,12 @@ class Quest (JQuest) :
             st.playSound("SkillSound5.horror_02")
             st.set("cond","2")
             ghost = st.addSpawn(31524,51432,-54570,-3136,1800000)
-            ghost.broadcastPacket(CreatureSay(ghost.getObjectId(),0,ghost.getName(),"Who awoke me?"))
+            ghost.broadcastPacket(NpcSay(ghost.getObjectId(),0,ghost.getNpcId(),"Who awoke me?"))
         elif event == "31524-06.htm" :
             st.set("cond","3")
             st.playSound("ItemSound.quest_middle")
             ghost = self.addSpawn(31525,npc)
-            ghost.broadcastPacket(CreatureSay(ghost.getObjectId(),0,ghost.getName(),"My master has instructed me to be your guide, "+ player.getName()))
+            ghost.broadcastPacket(NpcSay(ghost.getObjectId(),0,ghost.getNpcId(),"My master has instructed me to be your guide, "+ player.getName()))
             self.startQuestTimer("1",1,ghost,player)
             self.startQuestTimer("despawn",1800000,ghost,player)
         elif event == "31526-03.htm" :

datapack_development/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py

@@ -3,7 +3,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.gameserver.ai import CtrlIntention
 
 qn = "22_TragedyInVonHellmannForest"
@@ -27,7 +27,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/23_LidiasHeart/__init__.py

@@ -3,7 +3,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 
 qn = "23_LidiasHeart"
 
@@ -65,7 +65,7 @@ class Quest (JQuest) :
         elif event == "31523-02.htm":
             st.playSound("SkillSound5.horror_02")
             ghost = st.addSpawn(31524,51432,-54570,-3136,1800000)
-            ghost.broadcastPacket(CreatureSay(ghost.getObjectId(),0,ghost.getName(),"Who awoke me?"))
+            ghost.broadcastPacket(NpcSay(ghost.getObjectId(),0,ghost.getNpcId(),"Who awoke me?"))
         elif event == "31523-05.htm":
             st.startQuestTimer("ghost_timer",10000)
         elif event == "ghost_timer":

datapack_development/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/__init__.py

@@ -4,7 +4,7 @@ from net.sf.l2j.gameserver import GameTimeController
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 
 qn = "24_InhabitantsOfTheForrestOfTheDead"
 
@@ -36,7 +36,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) : 

datapack_development/data/scripts/quests/334_TheWishingPotion/__init__.py

@@ -7,7 +7,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest        import State
 from net.sf.l2j.gameserver.model.quest        import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets      import CreatureSay
+from net.sf.l2j.gameserver.serverpackets      import NpcSay
 from net.sf.l2j.gameserver.datatables         import SpawnTable
 
 qn = "334_TheWishingPotion"
@@ -70,7 +70,7 @@ def check_ingredients(st,required) :
     return 1
 
 def autochat(npc,text) :
-    if npc: npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,npc.getName(),text))
+    if npc: npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getNpcId(),text))
     return
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/335_TheSongOfTheHunter/__init__.py

@@ -4,7 +4,7 @@ from net.sf.l2j.gameserver.model.quest          import State
 from net.sf.l2j.gameserver.model.quest          import QuestState
 from net.sf.l2j.gameserver.model.quest.jython   import QuestJython as JQuest
 from net.sf.l2j.util                            import Rnd
-from net.sf.l2j.gameserver.serverpackets        import CreatureSay
+from net.sf.l2j.gameserver.serverpackets        import NpcSay
 
 qn = "335_TheSongOfTheHunter"
 
@@ -275,7 +275,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 def HasRequestCompleted(st,level) :

datapack_development/data/scripts/quests/384_WarehouseKeepersPastime/30182-11.htm

@@ -1,5 +1,5 @@
 <html><body>Warehouse Freightman Cliff:<br>
-I arranged the numbers 1 through 9 on the panel. Don't peek!<br>I've learned the hard way that I must get your payment in advance. Some players run away when they realize that they don't have a chance of winning the game. If you quit during game play, you will forfeit your wager. Is this agreeable?<br>Now select 6 numbers between 1 and 9. Pick your first number. <br
+I arranged the numbers 1 through 9 on the panel. Don't peek!<br>I've learned the hard way that I must get your payment in advance. Some players run away when they realize that they don't have a chance of winning the game. If you quit during game play, you will forfeit your wager. Is this agreeable?<br>Now select 6 numbers between 1 and 9. Pick your first number. <br>
 <a action="bypass -h Quest 384_WarehouseKeepersPastime select_1-1">1</a>&nbsp;&nbsp;&nbsp;&nbsp;  
 <a action="bypass -h Quest 384_WarehouseKeepersPastime select_1-2">2</a>&nbsp;&nbsp;&nbsp;&nbsp;  
 <a action="bypass -h Quest 384_WarehouseKeepersPastime select_1-3">3</a>&nbsp;&nbsp;&nbsp;&nbsp;  

datapack_development/data/scripts/quests/420_LittleWings/__init__.py

@@ -5,7 +5,7 @@ from net.sf.l2j import Config
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 
 qn = "420_LittleWings"
 
@@ -545,7 +545,7 @@ class Quest (JQuest):
                else:
                   st.playSound("ItemSound.quest_itemget")   
                st.giveItems(eggs,numItems)
-               npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,npc.getName(),"If the eggs get taken, we're dead!"))
+               npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getNpcId(),"If the eggs get taken, we're dead!"))
   #fairy stone destruction    
     elif id == State.STARTED and cond < 5 and st.getQuestItemsCount(FRY_STN_DLX) == 1 :
       if npcId in range(20589,20600)+[20719]:

datapack_development/data/scripts/quests/501_ProofOfClanAlliance/__init__.py

@@ -4,7 +4,7 @@
 # v1.1.r0 2008.03.27: Update/Rewrite by Emperorc
 import sys
 from net.sf.l2j.gameserver.datatables         import SkillTable
-from net.sf.l2j.gameserver.serverpackets      import CreatureSay 
+from net.sf.l2j.gameserver.serverpackets      import NpcSay 
 from net.sf.l2j.gameserver.serverpackets      import MagicSkillUse
 from net.sf.l2j.gameserver.model.quest        import State
 from net.sf.l2j.gameserver.model.quest        import QuestState
@@ -312,7 +312,7 @@ class Quest (JQuest) :
          if (self.chests - wins) == 12 or (wins < 4 and not leaderst.getRandom(4)) :
              wins += 1
              leaderst.set("chest_wins",str(wins))
-             npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,npc.getName(),"###### BINGO! ######"))
+             npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getNpcId(),"###### BINGO! ######"))
          self.chests += 1
      elif npcId in MOBS.keys() :
          st = player.getQuestState(qn)

datapack_development/data/scripts/quests/503_PursuitClanAmbition/__init__.py

@@ -4,7 +4,7 @@
 import sys
 from java.util                                 import Iterator
 from net.sf.l2j.util                           import Rnd
-from net.sf.l2j.gameserver.serverpackets       import CreatureSay
+from net.sf.l2j.gameserver.serverpackets       import NpcSay
 from net.sf.l2j.gameserver.model.quest         import State
 from net.sf.l2j.gameserver.model.quest         import QuestState
 from net.sf.l2j.gameserver.model.quest.jython  import QuestJython as JQuest
@@ -288,11 +288,11 @@ class Quest (JQuest) :
     elif event == "30766-04.htm":
       st.set("cond","9")
       spawnedNpc=st.addSpawn(30766,160622,21230,-3710,90000)
-      spawnedNpc.broadcastPacket(CreatureSay(spawnedNpc.getObjectId(),0,spawnedNpc.getName(),"Blood and Honour."))
+      spawnedNpc.broadcastPacket(NpcSay(spawnedNpc.getObjectId(),0,spawnedNpc.getNpcId(),"Blood and Honour."))
       spawnedNpc=st.addSpawn(30759,160665,21209,-3710,90000)
-      spawnedNpc.broadcastPacket(CreatureSay(spawnedNpc.getObjectId(),0,spawnedNpc.getName(),"Ambition and Power"))
+      spawnedNpc.broadcastPacket(NpcSay(spawnedNpc.getObjectId(),0,spawnedNpc.getNpcId(),"Ambition and Power"))
       spawnedNpc=st.addSpawn(30758,160665,21291,-3710,90000)
-      spawnedNpc.broadcastPacket(CreatureSay(spawnedNpc.getObjectId(),0,spawnedNpc.getName(),"War and Death"))
+      spawnedNpc.broadcastPacket(NpcSay(spawnedNpc.getObjectId(),0,spawnedNpc.getNpcId(),"War and Death"))
     elif event == "30766-08.htm":
       st.takeItems(Scepter_Judgement,-1)
       exit503(0,st)
@@ -534,7 +534,7 @@ class Quest (JQuest) :
         else:
           if npcId == 27181:                # Imperial Gravekeeper
             spawnedNpc=leader_st.addSpawn(30765,120000)
-            npc.broadcastPacket(CreatureSay(spawnedNpc.getObjectId(),0,spawnedNpc.getName(),"Curse of the gods on the one that defiles the property of the empire!"))
+            npc.broadcastPacket(NpcSay(spawnedNpc.getObjectId(),0,spawnedNpc.getNpcId(),"Curse of the gods on the one that defiles the property of the empire!"))
             leader_st.set("ImpGraveKeeper","3")
             self.ImpGraveKepperStat = 1
           else:

datapack_development/data/scripts/quests/604_DaimontheWhiteEyedPart2/__init__.py

@@ -4,7 +4,7 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState 
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest 
 from net.sf.l2j.gameserver.datatables import SpawnTable 
-from net.sf.l2j.gameserver.serverpackets import CreatureSay 
+from net.sf.l2j.gameserver.serverpackets import NpcSay 
 from net.sf.l2j.util import Rnd
 
 qn = "604_DaimontheWhiteEyedPart2" 
@@ -31,7 +31,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray() 
     if chars != None: 
        for pc in chars : 
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text) 
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text) 
           pc.sendPacket(sm) 
 
 class Quest (JQuest) : 

datapack_development/data/scripts/quests/609_MagicalPowerOfWaterPart1/__init__.py

@@ -3,7 +3,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from java.util import Iterator
 
 qn = "609_MagicalPowerOfWaterPart1"
@@ -30,7 +30,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/610_MagicalPowerOfWaterPart2/__init__.py

@@ -4,7 +4,7 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 from net.sf.l2j.gameserver.datatables import SpawnTable
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.util import Rnd
 
 qn = "610_MagicalPowerOfWaterPart2"
@@ -35,7 +35,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/615_MagicalPowerOfFirePart1/__init__.py

@@ -3,7 +3,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from java.util import Iterator
 
 qn = "615_MagicalPowerOfFirePart1"
@@ -30,7 +30,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/616_MagicalPowerOfFirePart2/__init__.py

@@ -4,7 +4,7 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 from net.sf.l2j.gameserver.datatables import SpawnTable
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.util import Rnd
 
 qn = "616_MagicalPowerOfFirePart2"
@@ -35,7 +35,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/625_TheFinestIngredientsPart2/__init__.py

@@ -4,7 +4,7 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 from net.sf.l2j.gameserver.datatables import SpawnTable
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.util import Rnd
 
 qn = "625_TheFinestIngredientsPart2"
@@ -33,7 +33,7 @@ def AutoChat(npc,text) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
 class Quest (JQuest) :

datapack_development/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py

@@ -6,7 +6,7 @@ from net.sf.l2j.gameserver.ai                 import CtrlIntention
 from net.sf.l2j.gameserver.model.quest        import State
 from net.sf.l2j.gameserver.model.quest        import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
-from net.sf.l2j.gameserver.serverpackets      import CreatureSay
+from net.sf.l2j.gameserver.serverpackets      import NpcSay
 from net.sf.l2j.gameserver.serverpackets      import SocialAction
 from net.sf.l2j.gameserver.serverpackets      import ActionFailed
 
@@ -225,7 +225,7 @@ class Quest (JQuest) :
                htmltext = "32243-01.htm"
                if st.getInt("angel") == 0 and self.isAngelSpawned == 0 :
                   angel = st.addSpawn(27332,36198,191949,-3728,180000)
-                  angel.broadcastPacket(CreatureSay(angel.getObjectId(),0,angel.getName(),player.getName()+"! Step back from the confounded box! I will take it myself!"))
+                  angel.broadcastPacket(NpcSay(angel.getObjectId(),0,angel.getNpcId(),player.getName()+"! Step back from the confounded box! I will take it myself!"))
                   angel.setRunning()
                   angel.addDamageHate(player,0,999)
                   angel.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player)
@@ -233,7 +233,7 @@ class Quest (JQuest) :
                   self.startQuestTimer("angel_cleanup",180000,angel,player)
                elif self.isKatenarSpawned == 0 and st.getInt("angel") == 1:
                   katenar = st.addSpawn(32242,36110,191921,-3712,60000)
-                  katenar.broadcastPacket(CreatureSay(katenar.getObjectId(),0,katenar.getName(),"I am late!"))
+                  katenar.broadcastPacket(NpcSay(katenar.getObjectId(),0,katenar.getNpcId(),"I am late!"))
                   self.isKatenarSpawned == 1
                   self.startQuestTimer("katenar_cleanup",60000,katenar,player)
                   htmltext = "32243-02.htm"
@@ -250,10 +250,10 @@ class Quest (JQuest) :
         if npcId == Angel and cond == 12:
             st.set("angel","1")
             self.isAngelSpawned = 0
-            npc.broadcastPacket(CreatureSay(npc.getObjectId(),0,npc.getName(),"Grr. I've been hit..."))
+            npc.broadcastPacket(NpcSay(npc.getObjectId(),0,npc.getNpcId(),"Grr. I've been hit..."))
             if self.isKatenarSpawned == 0 :
                   katenar = st.addSpawn(32242,36110,191921,-3712,60000)
-                  katenar.broadcastPacket(CreatureSay(katenar.getObjectId(),0,katenar.getName(),"I am late!"))
+                  katenar.broadcastPacket(NpcSay(katenar.getObjectId(),0,katenar.getNpcId(),"I am late!"))
                   self.isKatenarSpawned == 1
                   self.startQuestTimer("katenar_cleanup",60000,katenar,player)
         if npcId == Wyrm and st.getQuestItemsCount(Heart) < 10 and cond == 15 and st.getRandom(100) <= 25:

datapack_development/data/scripts/quests/SagasSuperclass/__init__.py

@@ -3,7 +3,7 @@ import sys
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
-from net.sf.l2j.gameserver.serverpackets import CreatureSay
+from net.sf.l2j.gameserver.serverpackets import NpcSay
 from net.sf.l2j.gameserver.ai import CtrlIntention
 from net.sf.l2j.gameserver.serverpackets import MagicSkillUse
 from net.sf.l2j.gameserver.model import L2World
@@ -91,7 +91,7 @@ class Quest (JQuest) :
     chars = npc.getKnownList().getKnownPlayers().values().toArray()
     if chars != None:
        for pc in chars :
-          sm = CreatureSay(npc.getObjectId(), 0, npc.getName(), text)
+          sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
           pc.sendPacket(sm)
 
  def AddSpawn(self, st,mob) :

datapack_development/data/scripts/quests/documentation.txt

@@ -99,7 +99,7 @@ These functions, their triggers, and the parameters passed into the script are d
 9) onSpawn (self, npc)
 	Currently the only function that has no reference to a player.  It is triggered whenever an NPC spawns or
 	respawns and passes a reference to the newly (re)spawned NPC.  It is useful for initializations, starting
-	quest timers, displaying chat (CreatureSay), and more.
+	quest timers, displaying chat (NpcSay), and more.
 	The parameter "npc" contains a reference to the exact instance of the NPC who just (re)spawned.
 10) onFactionCall(self, npc, caller, attacker, isPet)
 	Triggered when an npc is called by another npc in the same faction.