Finish moving the NPC data around, but - does it work?

Who knows...

1 files changed, 41 insertions, 119 deletions

diff --git a/npc/003-1/events.txt b/npc/003-1/events.txt
index 75148ee6d..dee279fa5 100644
--- a/npc/003-1/events.txt
+++ b/npc/003-1/events.txt
@@ -68,6 +68,7 @@ OnValentine:
 
 /////////////////////////////////////////////////////////////////////////////////
 function handleEaster {
+    // Handle rewards before anything else
     if (EASTER_YEAR != gettime(GETTIME_YEAR)) {
         EASTER_YEAR=gettime(GETTIME_YEAR);
         if (strcharinfo(0) == $@easter_name$[0]) {
@@ -76,9 +77,7 @@ function handleEaster {
             mesc l("For the first place in Easter, you gained a Bhopper Fluffy."), 3;
             mesc l("Remember to give it a balanced diet of Aquadas to make it happy."), 3;
             next;
-        }
-        else
-        {
+        } else {
             .@pos=array_find($@easter_name$, strcharinfo(0));
             // 0 (aka top 1) is not an appliable winner
             if (.@pos > 0) {
@@ -149,97 +148,9 @@ function handleEaster {
 
 /////////////////////////////////////////////////////////////////////////////////
 function handleValentine {
-    return;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////////
-function handleStPatrick {
-    return;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////////
-function handleAurora {
-    return;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// DO NOT REMOVE
-}
-
-// Valentine Day
-003-1,47,53,0	script	Demure#ValentineFinal_	NPC_FEMALE,{
     mesn;
     mesq l("Valentine Day is over!");
-    if (#VALENTINE_SENT+#VALENTINE_OPENED <= 0)
-        close;
-
+    next;
     mes "##B"+l("Top 10 - Valentine Day")+"##b";
     mes("1." +$@valentine_name$[0]+" ("+$@valentine_value[0]+")");
     mes("2." +$@valentine_name$[1]+" ("+$@valentine_value[1]+")");
@@ -251,7 +162,12 @@ function handleAurora {
     mes("8." +$@valentine_name$[7]+" ("+$@valentine_value[7]+")");
     mes("9." +$@valentine_name$[8]+" ("+$@valentine_value[8]+")");
     mes("10."+$@valentine_name$[9]+" ("+$@valentine_value[9]+")");
+
+    if (#VALENTINE_SENT+#VALENTINE_OPENED <= 0)
+        close;
     next;
+
+    // Handle rewards
     #VALENTINE_SENT=0;
     #VALENTINE_OPENED=0;
     #VALENTINE_RECEIVED=0;
@@ -279,23 +195,7 @@ function handleAurora {
 
     if (strcharinfo(0) == .@name$[0])
         mesc l("You gained a @@ for the #1 place on the event. Remember to feed it @@, or it may run away from you.", getitemlink(DoggyDog), getitemlink(AnimalBones));
-
-    close;
-
-OnInit:
-    .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, Cap);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, RedStockings);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, BunnyEars);
-    setunitdata(.@npcId, UDT_WEAPON, GMRobe);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
-
-    .sex = G_FEMALE;
-    .distance = 5;
-
-    disablenpc(.name$);
-    end;
+    return;
 }
 
 
@@ -320,8 +220,9 @@ OnInit:
 
 
 
-// St. Patrick Day
-003-1,47,53,0	script	Patrick Saulc_	NPC_WEIRDGREEN,{
+
+/////////////////////////////////////////////////////////////////////////////////
+function handleStPatrick {
     mesn;
     mesc l("It's St. Patrick Event!"), 3;
     mes l("At 00:00, 06:00, 12:00, 15:00, 18:00 and 21:00 server time");
@@ -330,16 +231,19 @@ OnInit:
     mes l("They have 10x more chance to drop a @@, so it is a great deal!", getitemlink(FourLeafClover));
     mes l("Also, hidden in a forest which is not either hot or cold, is the Gold Pot Cauldron...");
     mes l("You can get daily something from it, but unless you're green like me, you will have no luck...");
-    close;
+    return;
+}
+
+
+
+
+
+
+
+
+
 
-OnInit:
-    .sex = G_OTHER;
-    .distance = 5;
 
-    if ($EVENT$ != "Patrick")
-        disablenpc(.name$);
-    end;
-}
 
 
 
@@ -353,6 +257,15 @@ OnInit:
 
 
 
+/////////////////////////////////////////////////////////////////////////////////
+function handleAurora {
+    return;
+}
+
+
+
+
+
 
 
 
@@ -365,3 +278,12 @@ OnInit:
 
 
 
+
+
+
+
+
+
+// DO NOT REMOVE
+}
+