From 937202e881e76a9fd7a3c2b988f14ca01dce264d Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 17 May 2020 13:51:05 -0300
Subject: Prepare to deprecate and unify 003-1 NPCs

---
 npc/commands/event.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'npc/commands')

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 0b18dcbd0..9079a2d03 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -12,10 +12,9 @@ function	script	sClear	{
         if ($EVENT$ != "Easter") {
             DelItemFromEveryPlayer(SilverEasteregg);
             DelItemFromEveryPlayer(GoldenEasteregg);
-            disablenpc "Lilica#final";
         } else {
         	.@nb = query_sql("SELECT c.name, i.amount FROM `inventory` AS i, `char` AS c WHERE i.nameid=834 AND i.char_id=c.char_id ORDER BY i.amount DESC LIMIT 10", $@easter_name$, $@easter_value);
-            enablenpc "Lilica#final";
+            setnpcdisplay("Aurora", "Lilica#final", NPC_EASTER);
         }
 
         // Delete all Christmas stuff
@@ -45,13 +44,12 @@ function	script	sClear	{
             // Remove event items
             DelItemFromEveryPlayer(LoveLetter);
             DelItemFromEveryPlayer(BoxOfChocolates);
-            disablenpc "Demure#ValentineFinal";
         } else if ($EVENT$ == "Valentine") {
             htdelete $@VALENTINE_GIFTSTACKS;
             htdelete $@VALENTINE_LOVELETTER;
             $@VALENTINE_GIFTSTACKS=0;
             $@VALENTINE_LOVELETTER=0;
-            enablenpc "Demure#ValentineFinal";
+            donpcevent "Aurora::OnValentine";
         }
 
         // Longer EXP rate controls
@@ -331,7 +329,7 @@ function	script	GlobalEventMenu	{
                 $EVENT$="Patrick";
                 $@PATRICK_DAYMAX=31;
                 enablenpc "sPatrick";
-                enablenpc "Patrick Saulc";
+                setnpcdisplay("Aurora", "Patrick Saulc", NPC_WEIRDGREEN);
                 enablenpc "St. Patrick Gold Pot";
                 donpcevent "St. Patrick Gold Pot::OnForcedMove";
                 logmes "Enabled ST. PATRICK DAY event (until day 31).", LOGMES_ATCOMMAND;
-- 
cgit v1.2.3-70-g09d2