Merge pull request #47 from MadCamel/master

Simple annual Halloween event

3 files changed, 86 insertions, 0 deletions

diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index aa47af45..8324c8e6 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -421,6 +421,7 @@
 
 // Add new entries above here. For dyed entries,add to the bottom of the 2000s.
 
+1197,   SkeletonCharm,                  Skeleton Charm,                     5,      0,          0,          10,         0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     { callfunc "CheckMunro"; }
 1198,   JackOSoul,                      Jack O Soul,                        3,      100000,     1,          1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 1199,   Arrow,                          Arrow,                              10,     2,          1,          1,          20,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {}
 1200,   Bow,                            Bow,                                4,      1000,       500,        20,         20,     0,      5,      0,      0,      2,      34,         1,      4,      11,     {},                                                                     {}
diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt
index ae18387c..bd87b3f4 100644
--- a/world/map/npc/026-1/_import.txt
+++ b/world/map/npc/026-1/_import.txt
@@ -4,3 +4,5 @@ map: 026-1.gat
 npc: npc/026-1/_mobs.txt
 npc: npc/026-1/_warps.txt
 npc: npc/026-1/sign.txt
+npc: npc/026-1/munro.txt
+
diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt
new file mode 100644
index 00000000..d5498389
--- /dev/null
+++ b/world/map/npc/026-1/munro.txt
@@ -0,0 +1,83 @@
+026-1.gat,24,37,0|script|Munro|183,
+{
+    mes "[Munro]";
+    mes "\"Whoh dude...\"";
+    next;
+    mes "[Munro]";
+    mes "\"Man.. I don't know how I got here.. freaky..\"";
+    next;
+    mes "[Munro]";
+    mes "\"Hey dude, what's that on your face? It's creeping me out!\"";
+    menu
+        "There is nothing on my face..", L_Nothing,
+        "What, This skin?",-;
+    mes "[Munro]";
+    mes "\"Skin? Whoh far-out man.. This must be that weirdo place my brother Parua told me about..\"";
+    next;
+    mes "Munro stares at you vacantly for a moment";
+    next;
+    mes "Munro's eye-holes suddenly seem more aware";
+    next;
+    mes "[Munro]";
+    mes "\"WHOH! SKIN? d.....dude! How can you stand having that stuff all over you? That's gotta suck!\"";
+    next;
+    mes "[Munro]";
+    mes "\"Here dude.. Take this. It won't get rid of that groady skin but it'll at least make you LOOK normal..\"";
+    getitem "SkeletonCharm",1;
+    next;
+    mes "[Munro]";
+    mes "\"I have a lot of these man.. a LOT. Take all you want man.. Just remember they only work when I'm around to power them. Freaky-deaky skull power you know?\"";
+    close;
+    goto L_Exit;
+
+L_Nothing:
+    mes "[Munro]";
+    mes "\"Oh.. ok dude! Whatever you say!\"";
+    goto L_Exit;
+
+L_Exit:
+    close;
+    end;
+}
+
+026-1.gat,25,37,0|script|#AnnualHalloween|-1,
+{
+    end;
+
+OnInit:
+    initnpctimer;
+    end;
+
+OnTimer1000:
+    set $@isHalloween, 0;
+    if ((gettime(6) == 9 && gettime(5) >= 27) || (gettime(6) == 10 && gettime(5) <= 5) || debug)
+        set $@isHalloween, 1;
+
+    if ($@isHalloween)
+        goto L_enablemunro;
+
+    goto L_disablemunro;
+
+
+L_enablemunro:
+    enablenpc "Munro";
+    goto L_End;
+    
+L_disablemunro:
+    disablenpc "Munro";
+
+L_End:
+    end;
+}
+
+
+function|script|CheckMunro|,
+{
+    if ((gettime(6) == 9 && gettime(5) >= 27) || (gettime(6) == 10 && gettime(5) <= 5) || debug)
+        goto L_Return;
+
+    unequipbyid @slotId;
+
+L_Return:
+    return;
+}