* Continues replacing of specialeffect/2 numerics with constants.

- A lot of files still remain, but they don't have the proper effect names in commented in beside the ID. ;P
	

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13238 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 22 insertions, 20 deletions

diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index 82cba5f96..91d5dede4 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Brainstorm
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First semi-working conversion. [Brainstorm]
 //= 1.1 Refined Brainstorm's conversion. [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 // Louise's Santa Hat (Event 1)
@@ -95,7 +96,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "~With the number one designer, Louise Kim,~";
 					mes "~you are the most blessed soul.~";
 					emotion e_ho;
-					misceffect 42; //EF_BLESSING
+					misceffect EF_BLESSING;
 					next;
 					mes "-Immediately, she puts Rosary in an-";
 					mes "-unknown liquid and dissolves it.-";
@@ -107,7 +108,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "~With the number one designer, Louise Kim,~";
 					mes "~you are the luckiest soul.~";
 					emotion e_ho;
-					misceffect 75; //EF_GLORIA
+					misceffect EF_GLORIA;
 					next;
 					mes "-She starts sewing the hat with -";
 					mes "-a Cactus Needle and a thread.-";
@@ -118,7 +119,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "~The most talented disigner,~";
 					mes "~L_O_U_I_S_E K_I_M~";
 					emotion e_lv;
-					misceffect 91; //EF_BENEDICTIO
+					misceffect EF_BENEDICTIO;
 					next;
 					mes "[Designer Louise Kim]";
 					mes "Here!! All done~~";
@@ -272,21 +273,21 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 		case 3:
 			mes "[Enjoy]";
 			mes "......";
-			specialeffect 42; //EF_BLESSING
+			specialeffect EF_BLESSING;
 			next;
 			mes "[Enjoy]";
 			mes ".............";
-			specialeffect 37; //EF_INCAGIDEX
+			specialeffect EF_INCAGIDEX;
 			next;
 			mes "[Enjoy]";
 			mes "........................";
-			specialeffect 254; //EF_STEELBODY
+			specialeffect EF_STEELBODY;
 			next;
 			mes "[Enjoy]";
 			mes "........................";
 			mes "Get lost,you devil!!!!!!";
-			specialeffect 328; //EF_BEGINASURA
-			specialeffect2 1; //EF_HIT2
+			specialeffect EF_BEGINASURA;
+			specialeffect2 EF_HIT2;
 			set Hp,Hp/2;
 			set Hp,Hp/2;
 			close2;
@@ -938,7 +939,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 		mes "[Oholy]";
 		mes "Joy to the world!";
 		mes "The Lord has come.";
-		specialeffect 75; //EF_GLORIA
+		specialeffect EF_GLORIA;
 		next;
 		if (Sex) {
 			mes "[Oholy]";
@@ -1150,7 +1151,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "~wherever you are;~";
 			mes "~Tomorrow is Christmas~";
 			mes "~beneath every star.~";
-			specialeffect 75; //EF_GLORIA
+			specialeffect EF_GLORIA;
 			next;
 			mes "-Your mind is overwhelmed by her singing-";
 			mes "-You started humming then,-";
@@ -1161,7 +1162,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "~and tomorrow you'll see~";
 			mes "~Every wish, one and all,~";
 			mes "~waiting under the tree.~";
-			specialeffect2 75; //EF_GLORIA
+			specialeffect2 EF_GLORIA;
 			next;
 			mes "[Oholy]";
 			mes "Oh, my. You have a wonderful";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index 64fef4c0d..bbd84cc68 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Brainstorm
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -15,6 +15,7 @@
 //= 1.1 Refined Brainstorm's conversion. [L0ne_W0lf]
 //= 1.1a Minor fixes. (Screwed up weight checks somehow) [L0ne_W0lf]
 //= 1.2 Added missing checkweights. [L0ne_W0lf]
+//= 1.3 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 // Pumpkin Mojo quest (Event 1)
@@ -111,7 +112,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			mes "[Cool Devi]";
 			mes "says he.";
 			next;
-			specialeffect 362; //EF_LEVEL99
+			specialeffect EF_LEVEL99;
 			mes "[Excited Jack]";
 			mes "Lalala~ lalala~";
 			mes " ";
@@ -120,7 +121,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			delitem 5134,1; //Pumpkin_Hat
 			getitem 5202,1; //Pumpkin_Hat_
 			next;
-			specialeffect 1; //EF_HIT2
+			specialeffect EF_HIT2;
 			mes "[Gloomy Jack]";
 			mes "My aura is not like it used to be. Maybe I need more Pumpkin Mojo.";
 			mes " ";
@@ -155,7 +156,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			mes "[Cool Devi]";
 			mes "says he.";
 			next;
-			specialeffect 362; //EF_LEVEL99
+			specialeffect EF_LEVEL99;
 			mes "[Excited Jack]";
 			mes "Lalala~ lalala~";
 			mes " ";
@@ -165,7 +166,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			delitem 2226, 1;//Cap
 			getitem 5202, 1;//Pumpkin_Hat_
 			next;
-			specialeffect 1; //EF_HIT2
+			specialeffect EF_HIT2;
 			mes "[Gloomy Jack]";
 			mes "My aura is not like it used to be. Maybe I need more Pumpkin Mojo.";
 			mes " ";
@@ -307,9 +308,9 @@ geffen,145,132,3	script	Hoirin#06_hw	729,{
 				mes "[Hoirin]";
 				mes "You are right!";
 				mes "You brought all things right. Give it to me!!";
-				specialeffect2 1; //EF_HIT1
+				specialeffect2 EF_HIT1;
 				next;
-				specialeffect 148; //EF_PIERCESELF
+				specialeffect EF_PIERCESELF;
 				mes "[Hoirin]";
 				mes "Abracadabra~~";
 				mes "Abracadabra~~!";
@@ -647,7 +648,7 @@ nif_fild01,167,113,3	script	Masta's chicken#06_hw01	800,{
 		input @inputstr$;
 		if( @inputstr$ == "Return" ) {
 			emotion e_omg;
-			specialeffect 34; //EF_TELEPORTATION
+			specialeffect EF_TELEPORTATION;
 			mes "The magic spell has been casted.";
 			set halloween, 103;
 			disablenpc "Masta's chicken#"+strnpcinfo(1);