From fef85fbb0517b03714ef097f2bbb61839d8e05f3 Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 6 Nov 2007 04:59:35 +0000
Subject: Fixed errors in the Halloween 2006 event script.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11677 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt             |  1 +
 npc/events/halloween_2006.txt | 59 ++++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d9558d8b5..1fcdc74ba 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/11/05
+	* Rev 11677 Fixed errors in the Halloween 2006 event script. :P [L0ne_W0lf]
 	* Rev 11676 Added the Halloween 2006 event script. [L0ne_W0lf]
 	* Rev 11675 Added the Christmas 2005 event script. [L0ne_W0lf]
 	* Rev 11661 Fixed a bug in Orange Potion creating. Copy&Pasting = bad.[L0ne_W0lf]
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index 68f025ff1..8e8d60684 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Brainstorm
 //===== Current Version: =====================================
-//= 1.1
+//= 1.1a
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First semi-working conversion. [Brainstorm]
 //= 1.1 Refined Brainstorm's conversion. [L0ne_W0lf]
+//= 1.1a Minor fixes. (Screwed up weight checks somehow) [L0ne_W0lf]
 //============================================================
 
 // Pumpkin Mojo quest (Event 1)
@@ -39,13 +40,13 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 		close;
 	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000)
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
+	if (.@now_weight < 2000) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
 		close;
 	}
 	if (countitem(7609) > 0) {
@@ -246,13 +247,13 @@ geffen,145,132,3	script	Hoirin#06_hw	729,{
 		close;
 	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000)
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
+	if (.@now_weight < 2000) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
 		close;
 	}
 	if (halloween < 100) {
@@ -412,13 +413,13 @@ nif_in,19,32,3	script	Deviruchi#06_hw	738,{
 		close;
 	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000)
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
+	if (.@now_weight < 2000) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
 		close;
 	}
 	mes "[Loli Ruri]";
@@ -514,13 +515,13 @@ nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
 		close;
 	}*/
 	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000)
-		mes "^3355FFWait a second!"
-		mes "Right now, you're carrying"
-		mes "too many things with you."
-		mes "Please come back after"
-		mes "using the Kafra Service"
-		mes "to store some of your items.^000000"
+	if (.@now_weight < 2000) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
 		close;
 	}
 	if (halloween == 101) {
-- 
cgit v1.2.3-60-g2f50