Merge pull request #1476 from MarianArlt/cop-5-1-amulet

CoP 5-1 Player obtains Mysterious Amulet and Light of Vahzl
project-topaz · Nov 6, 2020 · 9ca0c84 · 9ca0c84
2 parents f780862 + d8486e5
commit 9ca0c84
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/scripts/zones/AlTaieu/Zone.lua b/scripts/zones/AlTaieu/Zone.lua
@@ -45,6 +45,7 @@ function onEventFinish(player, csid, option)
             tpz.ki.LIGHT_OF_MEA
         }
         player:setCharVar("PromathiaStatus", 1)
+        player:delKeyItem(tpz.ki.MYSTERIOUS_AMULET_DRAINED)
         player:addKeyItem(tpz.ki.LIGHT_OF_ALTAIEU)
         player:messageSpecial(ID.text.AMULET_SHATTERED, tpz.ki.MYSTERIOUS_AMULET)
         player:messageSpecial(ID.text.LIGHT_STOLEN, copCraigLights[math.random(#copCraigLights)])

diff --git a/scripts/zones/Beaucedine_Glacier/Zone.lua b/scripts/zones/Beaucedine_Glacier/Zone.lua
@@ -53,6 +53,8 @@ function onEventUpdate(player, csid, option)
         quests.rainbow.onEventUpdate(player)
     elseif csid == 116 then
         player:updateEvent(0, 0, 0, 0, 0, 4)
+    elseif csid == 206 then
+        player:updateEvent(0, tpz.ki.MYSTERIOUS_AMULET)
     end
 end
 

diff --git a/scripts/zones/Promyvion-Vahzl/IDs.lua b/scripts/zones/Promyvion-Vahzl/IDs.lua
@@ -18,6 +18,8 @@ zones[tpz.zone.PROMYVION_VAHZL] =
         OVERFLOWING_MEMORIES    = 7211, -- It appears to be a barrier woven from the energy of overflowing memories...
         ON_NM_SPAWN             = 7215, -- You sense a dark, empty presence...
         EERIE_GREEN_GLOW        = 7217, -- The sphere is emitting an eerie green glow.
+        AMULET_RETURNED         = 7260, -- The mysterious amulet has been returned to you.
+        LIGHT_OF_VAHZL          = 7261, -- You cannot remember when exactly, but you have obtained the light of Vahzl!
         POPPED_NM_OFFSET        = 7297, -- Remnants of a cerebrator lie scattered about the area.
     },
     mob =

diff --git a/scripts/zones/Promyvion-Vahzl/Zone.lua b/scripts/zones/Promyvion-Vahzl/Zone.lua
@@ -47,6 +47,10 @@ end
 function onEventFinish(player, csid, option)
     if csid == 50 then
         player:setCharVar("PromathiaStatus", 1)
+        player:addKeyItem(tpz.ki.MYSTERIOUS_AMULET_DRAINED)
+        player:addKeyItem(tpz.ki.LIGHT_OF_VAHZL)
+        player:messageSpecial(ID.text.AMULET_RETURNED, tpz.ki.MYSTERIOUS_AMULET)
+        player:messageSpecial(ID.text.LIGHT_OF_VAHZL, tpz.ki.LIGHT_OF_VAHZL)
     elseif csid == 45 and option == 1 then
         player:setPos(-379.947, 48.045, 334.059, 192, 9) -- To Pso'Xja {R}
     end

diff --git a/scripts/zones/PsoXja/npcs/_i99.lua b/scripts/zones/PsoXja/npcs/_i99.lua
@@ -36,8 +36,6 @@ function onEventFinish(player, csid, option)
         player:setCharVar("PromathiaStatus", 0)
         player:completeMission(COP, tpz.mission.id.cop.THE_ENDURING_TUMULT_OF_WAR)
         player:addMission(COP, tpz.mission.id.cop.DESIRES_OF_EMPTINESS)
-        player:addKeyItem(tpz.ki.LIGHT_OF_VAHZL)
-        player:messageSpecial(ID.text.KEYITEM_OBTAINED, tpz.ki.LIGHT_OF_VAHZL)
         player:setPos(-14.744, 0.036, -119.736, 1, 22) -- To Floor 1 {R}
     elseif (csid == 50 and option == 1) then
         player:setPos(-14.744, 0.036, -119.736, 1, 22) -- To Floor 1 {R}