* 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

9 files changed, 41 insertions, 35 deletions

diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index 803428a75..e210e688b 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -4,7 +4,7 @@
 //= Perkka, Scriptor, LightFighter
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=		old married players divorcing, optimized, fixed a bug [Lupus]
 //= 1.3 Wedding variable 'wedding_sign' is now unset on divorce. [L0ne_W0lf]
 //= 1.4 Removed ifpartneron check, fixed typo in percentheal. [L0ne_W0lf]
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================ 
 
 nif_in,190,112,5	script	Deviruchi#divorce	738,{
@@ -192,8 +193,8 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 		mes "being hopelessly married";
 		mes "^FF0000for the rest of your life.^000000";
 		next;
-		specialeffect 244; //EF_MAGICROD
-		specialeffect2 372; //EF_DEVIL
+		specialeffect EF_MAGICROD;
+		specialeffect2 EF_DEVIL;
 		set wedding_sign,0;
 		set zeny,zeny-2500000;
 		percentheal -100,-100;
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index d0f2da57a..daf654e20 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN (Trunk, r12752+)
 //===== Description: =========================================
@@ -15,6 +15,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. Please report bugs. [L0ne_W0lf]
 //= 1.1 Corrected a minor typo. [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 //============================================================
@@ -7486,14 +7487,14 @@ OnDisable:
 OnTouchNPC:
 	if ($@mon_race_2_1 == 0) {
 		emotion e_lv;
-		specialeffect 68; //"#poring1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster 1 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_1,1;
 		donpcevent "#poring1::OnDisable";
 	}
 	else {
 		emotion e_lv;
-		specialeffect 68; //"#poring1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster 1 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_2,1;
 		donpcevent "#poring1::OnDisable";
@@ -7530,14 +7531,14 @@ OnDisable:
 OnTouchNPC:
 	if ($@mon_race_2_1 == 0) {
 		emotion e_ho;
-		specialeffect 68; //"#lunatic1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster 2 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_1,2;
 		donpcevent "#lunatic1::OnDisable";
 	}
 	else {
 		emotion e_ho;
-		specialeffect 68; //"#lunatic1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster 2 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_2,2;
 		donpcevent "#lunatic1::OnDisable";
@@ -7574,14 +7575,14 @@ OnDisable:
 OnTouchNPC:
 	if ($@mon_race_2_1 == 0) {
 		emotion e_heh;
-		specialeffect 68; //"#savagebebe1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster 3 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_1,3;
 		donpcevent "#savagebebe1::OnDisable";
 	}
 	else {
 		emotion e_heh;
-		specialeffect 68; //"#savagebebe1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster 3 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_2,3;
 		donpcevent "#savagebebe1::OnDisable";
@@ -7618,14 +7619,14 @@ OnDisable:
 OnTouchNPC:
 	if ($@mon_race_2_1 == 0) {
 		emotion e_kis;
-		specialeffect 68; //"#desertwolf1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster 4 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_1,4;
 		donpcevent "#desertwolf1::OnDisable";
 	}
 	else {
 		emotion e_kis;
-		specialeffect 68; //"#desertwolf1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster 4 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_2,4;
 		donpcevent "#desertwolf1::OnDisable";
@@ -7662,14 +7663,14 @@ OnDisable:
 OnTouchNPC:
 	if ($@mon_race_2_1 == 0) {
 		emotion e_gg;
-		specialeffect 68; //"#deviruchi1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster 5 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_1,5;
 		donpcevent "#deviruchi1::OnDisable";
 	}
 	else {
 		emotion e_gg;
-		specialeffect 68; //"#deviruchi1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster 5 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_2,5;
 		donpcevent "#deviruchi1::OnDisable";
@@ -7706,14 +7707,14 @@ OnDisable:
 OnTouchNPC:
 	if ($@mon_race_2_1 == 0) {
 		emotion e_pif;
-		specialeffect 68; //"#baphomet1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster 6 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_1,6;
 		donpcevent "#baphomet1::OnDisable";
 	}
 	else {
 		emotion e_pif;
-		specialeffect 68; //"#baphomet1" EF_MVP
+		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster 6 has reached the Finish Line!",bc_map,"0x66FFCC";
 		set $@mon_race_2_2,6;
 		donpcevent "#baphomet1::OnDisable";
@@ -12296,7 +12297,7 @@ p_track02,32,45,3	script	Eccentric Scholar#double	755,{
 	mes "I must complete";
 	mes "my calculations!";
 	mes "Now, where was I...?";
-	specialeffect 107; //"Eccentric Scholar#double" EF_CLAYMORE
+	specialeffect EF_CLAYMORE;
 	emotion e_an;
 	close;
 }
diff --git a/npc/other/turbotrack/Expert_16.txt b/npc/other/turbotrack/Expert_16.txt
index a85343014..fadd60bd5 100644
--- a/npc/other/turbotrack/Expert_16.txt
+++ b/npc/other/turbotrack/Expert_16.txt
@@ -1319,7 +1319,7 @@ turbo_e_16,253,364,0	duplicate(Warp_e_16)	Warp#e_16_7	-1,2,2
 
 turbo_e_16,307,55,0	script	trap_e16#F1::TurboTrap_e16	-1,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_e4#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1374,7 +1374,7 @@ turbo_e_16,332,36,0	duplicate(TurboTrap_e16)	trap_e16#F41	139,1,1
 
 turbo_e_16,336,56,0	script	trap_e16#F42::TurboTrap_e16_2	139,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_e4#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
diff --git a/npc/other/turbotrack/Expert_4.txt b/npc/other/turbotrack/Expert_4.txt
index 191446975..7b5010e55 100644
--- a/npc/other/turbotrack/Expert_4.txt
+++ b/npc/other/turbotrack/Expert_4.txt
@@ -1237,7 +1237,7 @@ turbo_e_4,253,364,0	duplicate(Warp_e_4)	Warp#e_4_7	-1,2,2,{
 
 turbo_e_4,307,55,0	script	trap_e4#F1::TurboTrap_e4	139,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_e4#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1292,7 +1292,7 @@ turbo_e_4,332,36,0	duplicate(TurboTrap_e4)	trap_e4#F41	139,1,1
 
 turbo_e_4,336,56,0	script	trap_e4#F42::TurboTrap_e4_2	-1,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_e4#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
diff --git a/npc/other/turbotrack/Expert_8.txt b/npc/other/turbotrack/Expert_8.txt
index 5da66bd13..8bfef4bbb 100644
--- a/npc/other/turbotrack/Expert_8.txt
+++ b/npc/other/turbotrack/Expert_8.txt
@@ -1241,7 +1241,7 @@ turbo_e_8,253,364,0	duplicate(Warp_e_8)	Warp#e_8_7	-1,2,2
 
 turbo_e_8,307,55,0	script	trap_e8#F1::TurboTrap_e8	-1,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_e4#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1296,7 +1296,7 @@ turbo_e_8,332,36,0	duplicate(TurboTrap_e8)	trap_e8#F41	139,1,1
 
 turbo_e_8,336,56,0	script	trap_e8#F42::TurboTrap_e8_2	-1,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_e4#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
diff --git a/npc/other/turbotrack/Normal_16.txt b/npc/other/turbotrack/Normal_16.txt
index 004086ff8..2651ed5fb 100644
--- a/npc/other/turbotrack/Normal_16.txt
+++ b/npc/other/turbotrack/Normal_16.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed small official bug. [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 turbo_room,91,135,3	script	Normal mode - 16 person	124,{
@@ -1319,7 +1320,7 @@ turbo_n_16,253,364,0	duplicate(Warp_n_16)	Warp#n_16_7	-1,2,2
 
 turbo_n_16,307,55,0	script	trap_n16#F1::TurboTrap_n16	-1,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_e4#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1374,7 +1375,7 @@ turbo_n_16,332,36,0	duplicate(TurboTrap_n16)	trap_n16#F41	139,1,1
 
 turbo_n_16,336,56,0	script	trap_n16#F42::TurboTrap_n16_2	139,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_e4#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
diff --git a/npc/other/turbotrack/Normal_4.txt b/npc/other/turbotrack/Normal_4.txt
index c79b83276..4dd65eab0 100644
--- a/npc/other/turbotrack/Normal_4.txt
+++ b/npc/other/turbotrack/Normal_4.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed small official bug. [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 turbo_room,77,135,3	script	Normal mode - 4 person	124,{
@@ -1236,7 +1237,7 @@ turbo_n_4,253,364,0	duplicate(Warp_n_4)	Warp#n_4_7	-1,2,2,{
 
 turbo_n_4,307,55,0	script	trap_n4#F1::TurboTrap_n4	139,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_n4#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1291,7 +1292,7 @@ turbo_n_4,332,36,0	duplicate(TurboTrap_n4)	trap_n4#F41	139,1,1
 
 turbo_n_4,336,56,0	script	trap_n4#F42::TurboTrap_n4_2	-1,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_n4#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
diff --git a/npc/other/turbotrack/Normal_8.txt b/npc/other/turbotrack/Normal_8.txt
index 9259aee72..f1a22589c 100644
--- a/npc/other/turbotrack/Normal_8.txt
+++ b/npc/other/turbotrack/Normal_8.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed small official bug. [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 turbo_room,84,135,3	script	Normal mode - 8 person	124,{
@@ -1240,7 +1241,7 @@ turbo_n_8,253,364,0	duplicate(Warp_n_8)	Warp#n_8_7	-1,2,2
 
 turbo_n_8,307,55,0	script	trap_n8#F1::TurboTrap_n8	-1,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_e4#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1295,7 +1296,7 @@ turbo_n_8,332,36,0	duplicate(TurboTrap_n8)	trap_n8#F41	139,1,1
 
 turbo_n_8,336,56,0	script	trap_n8#F42::TurboTrap_n8_2	-1,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_e4#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
diff --git a/npc/other/turbotrack/Normal_Solo.txt b/npc/other/turbotrack/Normal_Solo.txt
index 7f4e9355c..2419f8677 100644
--- a/npc/other/turbotrack/Normal_Solo.txt
+++ b/npc/other/turbotrack/Normal_Solo.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed small official bug. [L0ne_W0lf]
 //= 1.2 Fixed end timer not enabling warp. (bugreport:1682) [L0ne_W0lf]
+//= 1.3 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 turbo_room,72,132,3	script	Solo Mode#n1	124,{
@@ -1163,7 +1164,7 @@ turbo_n_1,253,364,0	duplicate(Warp_n_1)	Warp#n_1_7	-1,2,2,{
 
 turbo_n_1,307,55,0	script	trap_n1#F1::TurboTrap_n1	139,1,1,{
 OnTouch:
-	specialeffect 106; //"trap_n1#F1" EF_BLASTMINEBOMB
+	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;
@@ -1218,7 +1219,7 @@ turbo_n_1,332,36,0	duplicate(TurboTrap_n1)	trap_n1#F41	139,1,1
 
 turbo_n_1,336,56,0	script	trap_n1#F42::TurboTrap_n1_2	-1,1,1,{
 OnTouch:
-	specialeffect 108; //"trap_n1#F42" EF_FREEZING
+	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
 		percentheal -1,0;