From a698578a83a337f779ba60c7133b60660f06a056 Mon Sep 17 00:00:00 2001 From: Emagi Date: Thu, 11 Sep 2025 00:00:06 +0000 Subject: [PATCH] content updates --- SpawnScripts/QeynosHarbor/AlfredIronforge.lua | 31 ++++++++-- .../acrumblingtombsentryPath1.lua | 1 + .../acrumblingtombsentryPath2.lua | 1 + .../acrumblingtombsentryPath3.lua | 1 + .../acrumblingtombsentryPath4.lua | 33 ++++------- .../acrumblingtombsentryPath5.lua | 58 +++++++++++++++++++ .../acrumblingtombsentryRoom.lua | 1 + .../acrumblingtombsentryRoomNarrow.lua | 1 + .../aravenouscubePath3.lua | 57 ++++++++++++++++++ ZoneScripts/Longshadow.lua | 2 +- 10 files changed, 156 insertions(+), 30 deletions(-) create mode 100755 SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath5.lua create mode 100755 SpawnScripts/VerminsSnye_Classic/aravenouscubePath3.lua diff --git a/SpawnScripts/QeynosHarbor/AlfredIronforge.lua b/SpawnScripts/QeynosHarbor/AlfredIronforge.lua index 938f6f90..602dc812 100755 --- a/SpawnScripts/QeynosHarbor/AlfredIronforge.lua +++ b/SpawnScripts/QeynosHarbor/AlfredIronforge.lua @@ -25,8 +25,8 @@ if GetFactionAmount(Spawn, 11) <0 then PlayFlavor(NPC, "", "", "shakefist", 0, 0, Spawn) elseif GetTradeskillLevel(Spawn)<9 and GetTradeskillClass(Spawn)== 1 then NotSkilled(NPC,Spawn) -elseif GetTradeskillLevel(Spawn)==9 and GetTradeskillClass(Spawn)== 1 then - Dialog1(NPC,Spawn) +elseif GetTradeskillLevel(Spawn)>=9 and GetTradeskillClass(Spawn)== 1 then + Dialog1(NPC,Spawn) elseif GetTradeskillClass(Spawn)>1 then AlreadySkilled(NPC,Spawn) elseif GetTradeskillClass(Spawn)<1 then @@ -34,7 +34,11 @@ elseif GetTradeskillClass(Spawn)<1 then end end - +function TSLevelCheck(NPC,Spawn) + if GetTradeskillLevel(Spawn) >10 then + SetTradeskillLevel(Spawn,10) + end +end function NotSkilled(NPC,Spawn) FaceTarget(NPC, Spawn) @@ -85,11 +89,15 @@ function Crafter(NPC, Spawn) end function CrafterYes1(NPC, Spawn) + if GetClientVersion(Spawn) <= 546 then + CrafterYes2(NPC,Spawn) + else window = CreateOptionWindow(); AddOptionWindowOption(window, " Become a Crafstman", "Become proficient in the arts of a Craftsman. You will learn to craft food, drink, furniture, staves, bows, shields, arrows, and instruments in this profession. [This can not be undone!]", 0, 26, "CrafterYes2") AddOptionWindowOption(window, " Reconsider", "Stay an Artisan. You will not advance beyond tradeskill level 9. Return to Alfred Ironforge when you've made your decission.", 2, 13, "Cancel") SendOptionWindow(window, Spawn, "Are you sure you wish to become a Craftsman?", "Cancel") end +end function CrafterYes2(NPC, Spawn) FaceTarget(NPC, Spawn) @@ -99,6 +107,7 @@ function CrafterYes2(NPC, Spawn) SendPopUpMessage(Spawn, "Congratulations! You have chosen the path of the Craftsman.",250,250,200) PlaySound(Spawn, "sounds/test/endquest.wav", GetX(Spawn), GetY(Spawn), GetZ(Spawn), Spawn) end + TSLevelCheck(NPC,Spawn) FinalHail(NPC,Spawn) end @@ -116,21 +125,26 @@ function Outfitter(NPC, Spawn) end function OutfitterYes1(NPC, Spawn) - window = CreateOptionWindow(); + if GetClientVersion(Spawn) <= 546 then + CrafterYes2(NPC,Spawn) + else + window = CreateOptionWindow(); AddOptionWindowOption(window, " Become a Outfitter", "Become proficient in the arts of an Outfitter. You will learn to craft weapons and armor for all classes in this profession. [This can not be undone!]", 0, 32, "OutfitterYes2") AddOptionWindowOption(window, " Reconsider", "Stay an Artisan. You will not advance beyond tradeskill level 9. Return to Alfred Ironforge when you've made your decission.", 2, 13, "Cancel") SendOptionWindow(window, Spawn, "Are you sure you wish to become a Outfitter?", "Cancel") end +end function OutfitterYes2(NPC, Spawn) FaceTarget(NPC, Spawn) if GetTradeskillClass(Spawn)== 1 then SetTradeskillClass(Spawn,6) - SendMessage(Spawn, "Congratulations! You have chosen the path of the Outfitter.","yellow") + SendMessage(Spawn, "Congratulations! You have chosen the path of the Outfitter.","yellow") SendPopUpMessage(Spawn, "Congratulations! You have chosen the path of the Outfitter.",250,250,200) PlaySound(Spawn, "sounds/test/endquest.wav", GetX(Spawn), GetY(Spawn), GetZ(Spawn), Spawn) end + TSLevelCheck(NPC,Spawn) FinalHail(NPC,Spawn) end @@ -148,11 +162,15 @@ function Scholar(NPC, Spawn) end function ScholarYes1(NPC, Spawn) - window = CreateOptionWindow(); + if GetClientVersion(Spawn) <= 546 then + CrafterYes2(NPC,Spawn) + else + window = CreateOptionWindow(); AddOptionWindowOption(window, " Become a Scholar", "Become proficient in the arts of a Scholar. You will learn to craft spell scrolls, combat scrolls, potions, poisons, and jewelry in this profession. [This can not be undone!]", 0, 3807, "ScholarYes2") AddOptionWindowOption(window, " Reconsider", "Stay an Artisan. You will not advance beyond tradeskill level 9. Return to Alfred Ironforge when you've made your decission.", 2, 13, "Cancel") SendOptionWindow(window, Spawn, "Are you sure you wish to become a Scholar?", "Cancel") end +end function ScholarYes2(NPC, Spawn) FaceTarget(NPC, Spawn) @@ -162,6 +180,7 @@ function ScholarYes2(NPC, Spawn) SendPopUpMessage(Spawn, "Congratulations! You have chosen the path of the Scholar.",250,250,200) PlaySound(Spawn, "sounds/test/endquest.wav", GetX(Spawn), GetY(Spawn), GetZ(Spawn), Spawn) end + TSLevelCheck(NPC,Spawn) FinalHail(NPC,Spawn) end diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath1.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath1.lua index 5bd37d52..218837a6 100644 --- a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath1.lua +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath1.lua @@ -10,6 +10,7 @@ require "SpawnScripts/Generic/NPCModule" function spawn(NPC, Spawn) NPCModule(NPC, Spawn) + RandomWeapons(NPC) AddTimer(NPC, 6000, "ChoosePath") end diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath2.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath2.lua index 4048a322..6e02c27e 100644 --- a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath2.lua +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath2.lua @@ -11,6 +11,7 @@ require "SpawnScripts/Generic/NPCModule" function spawn(NPC, Spawn) NPCModule(NPC, Spawn) AddTimer(NPC, 6000, "ChoosePath") + RandomWeapons(NPC) end function hailed(NPC, Spawn) diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath3.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath3.lua index 73bc16ad..1ec8e46a 100644 --- a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath3.lua +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath3.lua @@ -10,6 +10,7 @@ require "SpawnScripts/Generic/NPCModule" function spawn(NPC, Spawn) NPCModule(NPC, Spawn) + RandomWeapons(NPC) AddTimer(NPC, 6000, "ChoosePath") end diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath4.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath4.lua index c6ac2ad9..f7a63e5b 100644 --- a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath4.lua +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath4.lua @@ -10,6 +10,7 @@ require "SpawnScripts/Generic/NPCModule" function spawn(NPC, Spawn) NPCModule(NPC, Spawn) + RandomWeapons(NPC) AddTimer(NPC, 6000, "ChoosePath") end @@ -31,30 +32,16 @@ function ChoosePath(NPC) end function Path1(NPC) - MovementLoopAddLocation(NPC, 189.41 + MakeRandomInt(-2,2), -7.06, -163.67 + MakeRandomInt(-2,2), 2, MakeRandomInt(3,5)) - MovementLoopAddLocation(NPC, 193.51, -6.45, -163.3, 2, 0) - MovementLoopAddLocation(NPC, 199.45, -6.97, -163.96, 2, 0) - MovementLoopAddLocation(NPC, 203.12 + MakeRandomInt(-2,2), -7.05, -165.61 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 199.84 + MakeRandomInt(-2,2), -7, -164.35 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 194.41, -6.57, -163.82, 2, 0) - MovementLoopAddLocation(NPC, 183.93 + MakeRandomInt(-2,2), -7.05, -163.79 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 194.01, -6.48, -163.17, 2, 0) - MovementLoopAddLocation(NPC, 199.73 + MakeRandomInt(-2,2), -6.99, -163.72 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") + MovementLoopAddLocation(NPC, 95.63 + MakeRandomInt(-2,2), -0.73, -45.79 + MakeRandomInt(-2,2), 2, MakeRandomInt(3,5)) + MovementLoopAddLocation(NPC, 95.27 + MakeRandomInt(-2,2), -0.6, -41.39 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 95.25 + MakeRandomInt(-2,2), -0.66, -44.78 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 95.74 + MakeRandomInt(-2,2), -0.56, -52.44 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") end function Path2(NPC) - MovementLoopAddLocation(NPC, 189.41 + MakeRandomInt(-2,2), -7.06, -163.67 + MakeRandomInt(-2,2), 2, MakeRandomInt(3,5)) - MovementLoopAddLocation(NPC, 183.33, -7.07, -163.46, 2, 0) - MovementLoopAddLocation(NPC, 178.57 + MakeRandomInt(-2,2), -7, -164.75 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 181.23, -7.03, -163.9, 2, 0) - MovementLoopAddLocation(NPC, 184.23 + MakeRandomInt(-2,2), -7.03, -163.62 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 179.8, -6.99, -163.97, 2, 0) - MovementLoopAddLocation(NPC, 173.98, -6.99, -167.12, 2, 0) - MovementLoopAddLocation(NPC, 171.95 + MakeRandomInt(-2,2), -6.83, -169.86 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 177.44 + MakeRandomInt(-2,2), -7.03, -164.7 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 184.32, -7.03, -163.56, 2, 0) - MovementLoopAddLocation(NPC, 193, -6.46, -163.07, 2, 0) - MovementLoopAddLocation(NPC, 199.43 + MakeRandomInt(-2,2), -6.97, -163.56 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) - MovementLoopAddLocation(NPC, 194.2, -6.54, -163.52, 2, 0) - MovementLoopAddLocation(NPC, 178.81 + MakeRandomInt(-2,2), -6.99, -164.41 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") + MovementLoopAddLocation(NPC, 95.63 + MakeRandomInt(-2,2), -0.73, -45.79 + MakeRandomInt(-2,2), 2, MakeRandomInt(3,5)) + MovementLoopAddLocation(NPC, 95.77 + MakeRandomInt(-2,2), -0.84, -48.67 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 95.97 + MakeRandomInt(-2,2), -0.49, -52.86 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 95.74 + MakeRandomInt(-2,2), -0.81, -47.74 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 95.54 + MakeRandomInt(-2,2), -0.62, -41.12 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") end \ No newline at end of file diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath5.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath5.lua new file mode 100755 index 00000000..a2f1dce5 --- /dev/null +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath5.lua @@ -0,0 +1,58 @@ +--[[ + Script Name : SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryPath5.lua + Script Author : lordpazuzu + Script Date : 2025.09.10 08:09:05 + Script Purpose : + : +--]] + +require "SpawnScripts/Generic/NPCModule" + +function spawn(NPC, Spawn) + NPCModule(NPC, Spawn) + RandomWeapons(NPC) + AddTimer(NPC, 6000, "ChoosePath") +end + +function hailed(NPC, Spawn) + FaceTarget(NPC, Spawn) +end + +function respawn(NPC) + spawn(NPC) +end + +function ChoosePath(NPC) + SetPath = MakeRandomInt(1,3) + if SetPath == 1 then + Path1(NPC) + elseif SetPath == 2 then + Path2(NPC) + elseif SetPath == 3 then + Path3(NPC) + end +end + +function Path1(NPC) + MovementLoopAddLocation(NPC, 78.53 + MakeRandomInt(-2,2), -0.03, -32.46 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 87.75, 0.56, -32.45, 2, 0) + MovementLoopAddLocation(NPC, 90.84 + MakeRandomInt(-2,2), -0.13, -34.14 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 84.72 + MakeRandomInt(-2,2), 0, -32.7 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 74.5 + MakeRandomInt(-2,2), -0.11, -32.7 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") +end + +function Path2(NPC) + MovementLoopAddLocation(NPC, 78.53 + MakeRandomInt(-2,2), -0.03, -32.46 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 87.75, 0.56, -32.45, 2, 0) + MovementLoopAddLocation(NPC, 90.84 + MakeRandomInt(-2,2), -0.13, -34.14 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 84.72 + MakeRandomInt(-2,2), 0, -32.7 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 74.5 + MakeRandomInt(-2,2), -0.11, -32.7 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") +end + +function Path3(NPC) + MovementLoopAddLocation(NPC, 78.53 + MakeRandomInt(-2,2), -0.03, -32.46 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 72.09 + MakeRandomInt(-2,2), -0.1, -32.75 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 78.71 + MakeRandomInt(-2,2), -0.01, -32.34 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 71.74 + MakeRandomInt(-2,2), -0.08, -32.75 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") +end + diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoom.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoom.lua index c47bf5b0..ae593feb 100644 --- a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoom.lua +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoom.lua @@ -11,6 +11,7 @@ require "SpawnScripts/Generic/NPCModule" function spawn(NPC) NPCModule(NPC, Spawn) RandomMovement(NPC, Spawn, 4, -4, 2, 8, 15) + RandomWeapons(NPC) end function hailed(NPC, Spawn) diff --git a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoomNarrow.lua b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoomNarrow.lua index 68ccc3e1..884a179a 100644 --- a/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoomNarrow.lua +++ b/SpawnScripts/VerminsSnye_Classic/acrumblingtombsentryRoomNarrow.lua @@ -11,6 +11,7 @@ require "SpawnScripts/Generic/NPCModule" function spawn(NPC) NPCModule(NPC, Spawn) RandomMovement(NPC, Spawn, 3, -3, 2, 8, 15) + RandomWeapons(NPC) end function hailed(NPC, Spawn) diff --git a/SpawnScripts/VerminsSnye_Classic/aravenouscubePath3.lua b/SpawnScripts/VerminsSnye_Classic/aravenouscubePath3.lua new file mode 100755 index 00000000..e2e5983b --- /dev/null +++ b/SpawnScripts/VerminsSnye_Classic/aravenouscubePath3.lua @@ -0,0 +1,57 @@ +--[[ + Script Name : SpawnScripts/VerminsSnye_Classic/aravenouscubePath3.lua + Script Author : lordpazuzu + Script Date : 2025.09.10 07:09:51 + Script Purpose : + : +--]] + +require "SpawnScripts/Generic/NPCModule" + +function spawn(NPC, Spawn) + NPCModule(NPC, Spawn) + AddTimer(NPC, 6000, "ChoosePath") +end + +function hailed(NPC, Spawn) + FaceTarget(NPC, Spawn) +end + +function respawn(NPC) + spawn(NPC) +end + +function ChoosePath(NPC) + SetPath = MakeRandomInt(1,2) + if SetPath == 1 then + Path1(NPC) + elseif SetPath == 2 then + Path2(NPC) + end +end + +function Path1(NPC) + MovementLoopAddLocation(NPC, 124.46 + MakeRandomInt(-2,2), -2.48, -61.78 + MakeRandomInt(-2,2), 2, MakeRandomInt(3,5)) + MovementLoopAddLocation(NPC, 131.05, -4.35, -54.59, 2, 0) + MovementLoopAddLocation(NPC, 134.89 + MakeRandomInt(-2,2), -5.26, -50.93 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 131.59, -4.34, -54.76, 2, 0) + MovementLoopAddLocation(NPC, 127.74 + MakeRandomInt(-2,2), -3.5, -59.14 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 134.75 + MakeRandomInt(-2,2), -5.12, -51.59 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 130.81, -4.55, -55.63, 2, 0) + MovementLoopAddLocation(NPC, 125.48, -2.85, -60.76, 2, 0) + MovementLoopAddLocation(NPC, 121.05 + MakeRandomInt(-2,2), -2.52, -63.01 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") +end + +function Path2(NPC) + MovementLoopAddLocation(NPC, 124.46 + MakeRandomInt(-2,2), -2.48, -61.78 + MakeRandomInt(-2,2), 2, MakeRandomInt(3,5)) + MovementLoopAddLocation(NPC, 121.71, -2.51, -63.03, 2, 0) + MovementLoopAddLocation(NPC, 116.02, -2.13, -63.46, 2, 0) + MovementLoopAddLocation(NPC, 108.89 + MakeRandomInt(-2,2), -0.86, -63.34 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 114.35, -2.17, -63.08, 2, 0) + MovementLoopAddLocation(NPC, 120.79 + MakeRandomInt(-2,2), -2.52, -62.54 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 110.39 + MakeRandomInt(-2,2), -1.27, -63.12 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15)) + MovementLoopAddLocation(NPC, 119.59, -2.52, -63.01, 2, 0) + MovementLoopAddLocation(NPC, 124.97, -2.76, -60.73, 2, 0) + MovementLoopAddLocation(NPC, 127.9 + MakeRandomInt(-2,2), -3.76, -57.98 + MakeRandomInt(-2,2), 2, MakeRandomInt(8,15), "ChoosePath") +end + diff --git a/ZoneScripts/Longshadow.lua b/ZoneScripts/Longshadow.lua index 914acb6b..ddea2e24 100755 --- a/ZoneScripts/Longshadow.lua +++ b/ZoneScripts/Longshadow.lua @@ -22,4 +22,4 @@ end function KnowledgePortal(Zone,Player) SendPopUpMessage(Player, "The Destroyed Knowledge Portal", 255, 255, 0) - end \ No newline at end of file + end