Replacing specialeffect/2 numerics with constants in quests.

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

7 files changed, 82 insertions, 75 deletions

diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 6a7d20f92..8db0871be 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen, Samuray22
 //===== Current Version: ===================================== 
-//= 2.1a
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 2.0 Rescripted (and re-added) Bio Ethics quest. [L0ne_W0lf]
 //= 2.1 Fixed a Resurrection -> Homunculus Resurrection. [L0ne_W0lf]
 //= 2.1a Deleted some unused Variables in Bio Ethics quest. [Samuray22]
+//= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
@@ -678,7 +679,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				}
 				next;
 				set ALCHE_SK,9;
-				specialeffect 183; //"Pisruik" EF_SUI_EXPLOSION
+				specialeffect EF_SUI_EXPLOSION;
 				mes "[Pisruik]";
 				mes "Ah!";
 				mes "M-my face!";
@@ -782,7 +783,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				}
 				next;
 				set ALCHE_SK,9;
-				specialeffect 183; //"Pisruik" EF_SUI_EXPLOSION
+				specialeffect EF_SUI_EXPLOSION;
 				mes "[Pisruik]";
 				mes "Ah!";
 				mes "M-my face!";
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index bef886b26..8a0664345 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Quests for skills: Venom Knife, Sonic Acceleration
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 in_moc_16,14,27,5	script	Assassin#realman	884,{
@@ -45,7 +46,7 @@ in_moc_16,14,27,5	script	Assassin#realman	884,{
 			mes "technique. Always basics";
 			mes "before the specifics. Now,";
 			mes "why don't you give it a try?";
-			specialeffect 65; //"Assassin#realman" EF_INVENOM
+			specialeffect EF_INVENOM;
 			next;
 			mes "[Killtin]";
 			mes "Good... Very good...";
@@ -54,7 +55,7 @@ in_moc_16,14,27,5	script	Assassin#realman	884,{
 			mes "you forgot how to do this";
 			mes "skill? I suppose that all you";
 			mes "needed was a quick refresher.";
-			specialeffect2 65; // EF_INVENOM
+			specialeffect2 EF_INVENOM;
 			next;
 			mes "[Killtin]";
 			mes "Alright, I think it's";
@@ -213,7 +214,7 @@ in_moc_16,14,27,5	script	Assassin#realman	884,{
 							mes "technique. Always basics";
 							mes "before the specifics. Now,";
 							mes "why don't you give it a try?";
-							specialeffect 65; //"Assassin#realman" EF_INVENOM
+							specialeffect EF_INVENOM;
 							next;
 							mes "[Killtin]";
 							mes "Hey, that's pretty good.";
@@ -223,7 +224,7 @@ in_moc_16,14,27,5	script	Assassin#realman	884,{
 							mes "bit of credit for my excellent";
 							mes "instruction. Ah, very nice.";
 							next;
-							specialeffect2 65; // EF_INVENOM
+							specialeffect2 EF_INVENOM;
 							next;
 							mes "[Killtin]";
 							mes "Alright, you may need";
@@ -318,7 +319,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "like this. Then, as smoothly";
 			mes "and quickly as possible, shift";
 			mes "your weight over to this side.";
-			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			specialeffect EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Watch carefully, this";
@@ -327,7 +328,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "are and the angle of my";
 			mes "arms? This is the form that";
 			mes "you've got to memorize.";
-			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			specialeffect EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Alright, that's all";
@@ -335,7 +336,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "please try it so I can give";
 			mes "you feedback on your form.";
 			next;
-			specialeffect2 121; // EF_SONICBLOW
+			specialeffect2 EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Hmm, you're shifting";
@@ -344,7 +345,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "help if your center of";
 			mes "gravity was like this...";
 			next;
-			specialeffect2 121; // EF_SONICBLOW
+			specialeffect2 EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Ah, you're so very";
@@ -405,7 +406,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 		mes "like this. Then, as smoothly";
 		mes "and quickly as possible, shift";
 		mes "your weight over to this side.";
-		specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+		specialeffect EF_SONICBLOW;
 		next;
 		mes "[Esmille]";
 		mes "Watch carefully, this";
@@ -414,7 +415,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 		mes "are and the angle of my";
 		mes "arms? This is the form that";
 		mes "you've got to memorize.";
-		specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+		specialeffect EF_SONICBLOW;
 		next;
 		mes "[Esmille]";
 		mes "Alright, that's all";
@@ -422,7 +423,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 		mes "please try it so I can give";
 		mes "you feedback on your form.";
 		next;
-		specialeffect2 121; // EF_SONICBLOW
+		specialeffect2 EF_SONICBLOW;
 		next;
 		mes "[Esmille]";
 		mes "Hmm, you're shifting";
@@ -431,7 +432,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 		mes "help if your center of";
 		mes "gravity was like this...";
 		next;
-		specialeffect2 121; // EF_SONICBLOW
+		specialeffect2 EF_SONICBLOW;
 		next;
 		mes "[Esmille]";
 		mes "That's a little better.";
@@ -440,7 +441,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 		mes "and follow through with";
 		mes "the stabbing motion.";
 		next;
-		specialeffect2 121; // EF_SONICBLOW
+		specialeffect2 EF_SONICBLOW;
 		next;
 		mes "[Esmille]";
 		mes "Ah, you're so very";
@@ -448,7 +449,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 		mes "Focus more on smoothly";
 		mes "transitioning from your";
 		mes "stance to executed action.";
-		specialeffect2 121; // EF_SONICBLOW
+		specialeffect2 EF_SONICBLOW;
 		next;
 		mes "[Esmille]";
 		mes "Yes, that's it...!";
@@ -496,7 +497,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "like this. Then, as smoothly";
 			mes "and quickly as possible, shift";
 			mes "your weight over to this side.";
-			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			specialeffect EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Watch carefully, this";
@@ -505,7 +506,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "are and the angle of my";
 			mes "arms? This is the form that";
 			mes "you've got to memorize.";
-			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			specialeffect EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Alright, that's all";
@@ -513,7 +514,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "please try it so I can give";
 			mes "you feedback on your form.";
 			next;
-			specialeffect2 121; // EF_SONICBLOW
+			specialeffect2 EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Hmm, you're shifting";
@@ -522,7 +523,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "help if your center of";
 			mes "gravity was like this...";
 			next;
-			specialeffect2 121; // EF_SONICBLOW
+			specialeffect2 EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "That's a little better.";
@@ -531,7 +532,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "and follow through with";
 			mes "the stabbing motion.";
 			next;
-			specialeffect2 121; // EF_SONICBLOW
+			specialeffect2 EF_SONICBLOW;
 			next;
 			mes "[Esmille]";
 			mes "Yes, that's it...!";
@@ -743,7 +744,7 @@ OnTouch:
 		mes "is slightly ajar. You";
 		mes "momentarily catch a glint";
 		mes "of something shining inside.^000000";
-		specialeffect 71; //"Old Coffin#1" EF_CONE
+		specialeffect EF_CONE;
 		next;
 		while(1) {
 			switch(select("Put your hand inside:Inspect the coffin's opening:Lift the lid:Turn the coffin upside down:Ignore it")) {
@@ -807,7 +808,7 @@ OnTouch:
 		mes "is slightly ajar. You";
 		mes "momentarily catch a glint";
 		mes "of something shining inside.^000000";
-		specialeffect 71; //"Old Coffin#2" EF_CONE
+		specialeffect EF_CONE;
 		next;
 		while(1) {
 			switch(select("Put your hand inside:Inspect the coffin's opening:Lift the lid:Turn the coffin upside down:Ignore it")) {
@@ -885,7 +886,7 @@ OnTouch:
 in_sphinx2,13,163,0	script	Stone Statue#qsk_as	-1,7,7,{
 OnTouch:
 	if (ASSN_SK == 3) {
-		specialeffect 71; //"Stone Statue#1" EF_CONE
+		specialeffect EF_CONE;
 		mes "^3355FFThis ancient stone statue";
 		mes "is covered with cracks and";
 		mes "looks close to falling apart.";
@@ -893,7 +894,7 @@ OnTouch:
 		mes "peers out from beneath one of";
 		mes "the feet. The ground appears";
 		mes "soft enough to dig through...^000000";
-		specialeffect 71; //"Old Coffin#2" EF_CONE
+		specialeffect EF_CONE;
 		next;
 		if (select("Dig to retrieve the shining object:Ignore it") == 1) {
 			mes "^3355FFAs your fingers dig into";
@@ -920,7 +921,7 @@ OnTouch:
 in_sphinx2,13,146,0	script	Stone Statue#qsk_as2	-1,7,7,{
 OnTouch:
 	if (ASSN_SK == 3) {
-		specialeffect 71; //"Stone Statue#1" EF_CONE
+		specialeffect EF_CONE;
 		mes "^3355FFThis ancient stone statue";
 		mes "is covered with cracks and";
 		mes "looks close to falling apart.";
@@ -928,7 +929,7 @@ OnTouch:
 		mes "peers out from beneath one of";
 		mes "the feet. The ground appears";
 		mes "soft enough to dig through...^000000";
-		specialeffect 71; //"Old Coffin#2" EF_CONE
+		specialeffect EF_CONE;
 		next;
 		if (select("Dig to retrieve the shining object:Ignore it") == 1) {
 			mes "^3355FFAs your fingers dig into";
@@ -954,7 +955,7 @@ OnTouch:
 moc_pryd04,85,96,0	script	กก#crypt	-1,3,3,{
 OnTouch:
 	if (ASSN_SK == 4) {
-		specialeffect 71; //"กก#crypt" EF_CONE
+		specialeffect EF_CONE;
 		mes "^3355FFThere's something";
 		mes "glimmering beneath";
 		mes "the surface of the water...^000000";
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index 91f62cc2a..7108c054d 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -24,6 +24,7 @@
 //= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.6 Added missing checkweights. [L0ne_W0lf]
+//= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
@@ -428,7 +429,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 				mes "Kkkkuuurrirrreeee";
 				mes "Oooumm guandlejdl";
 				mes "Woooo Ei ei ei ei......";
-				specialeffect 295; //EF_TALK_FROSTJOKE
+				specialeffect EF_TALK_FROSTJOKE;
 				next;
 				mes "[Riott]";
 				mes "Pang's Voice is used to";
@@ -486,7 +487,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 				mes "voices yours, is this voice";
 				mes "mine. Head spinning, head";
 				mes "spinning, head spinning...!''";
-				specialeffect2 295; // EF_TALK_FROSTJOKE
+				specialeffect2 EF_TALK_FROSTJOKE;
 				delitem 7277,1; //Munak_Doll
 				skill "BA_PANGVOICE",1,0;
 				set qskill_bard,9;
@@ -568,7 +569,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 				mes "voices yours, is this voice";
 				mes "mine. Head spinning, head";
 				mes "spinning, head spinning...!''";
-				specialeffect2 295; // EF_TALK_FROSTJOKE
+				specialeffect2 EF_TALK_FROSTJOKE;
 				delitem 574,5; //Egg
 				skill 1010,1,0;
 				set qskill_bard,9;
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 6429fb5bd..06f465c5d 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.4a Changed NPC location [Yommy]
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 comodo,204,172,5	script	Canell#qsk_dan01	724,{
@@ -45,7 +46,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "Ow...!";
 				mes "Th-that whip!";
 				mes "I-i-it huuuurts!";
-				specialeffect2 1; // EF_HIT2
+				specialeffect2 EF_HIT2;
 				percentheal -5,0;
 				close;
 			}
@@ -61,7 +62,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "What the...? Ack!";
 			mes "S-stop wh-whipping";
 			mes "me! It... It stiiings!";
-			specialeffect2 1; // EF_HIT2
+			specialeffect2 EF_HIT2;
 			percentheal -10,0;
 			next;
 			mes "[Canell]";
@@ -85,7 +86,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "Not that whip";
 				mes "again! Arrgh, it's--";
 				mes "It hurts so much!";
-				specialeffect2 1; // EF_HIT2
+				specialeffect2 EF_HIT2;
 				percentheal -10,0;
 				close;
 			}
@@ -143,7 +144,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "I am irresistable!";
 				mes "I am the most attractive";
 				mes "woman in the whole world!";
-				specialeffect2 99; // EF_FLASHER
+				specialeffect2 EF_FLASHER;
 				next;
 				mes "^3355FFYour self esteem has";
 				mes "sky rocketed. Fortunately,";
@@ -160,7 +161,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "^FF00001 Crystal Mirror^000000!? Now go";
 				mes "and get it before I find";
 				mes "reason to punish you!";
-				specialeffect 107; //"Canell#qsk_dan01" EF_CLAYMORE
+				specialeffect EF_CLAYMORE;
 				close;
 			}
 		}
@@ -229,7 +230,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			next;
 			mes "[Canell]";
 			mes "Bam!";
-			specialeffect2 1; // EF_HIT2
+			specialeffect2 EF_HIT2;
 			percentheal -5,0;
 			next;
 			mes "["+ strcharinfo(0) +"]";
@@ -279,14 +280,14 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "O-ow!";
 				mes "P-please...!";
 				mes "Not the whip again!";
-				specialeffect2 1; // EF_HIT2
+				specialeffect2 EF_HIT2;
 				percentheal -5,0;
 				close;
 			case 3:
 				mes "["+ strcharinfo(0) +"]";
 				mes "Un, deux, trois~";
 				Emotion e_no1,1;
-				specialeffect2 99; // EF_FLASHER
+				specialeffect2 EF_FLASHER;
 				next;
 				mes "[Canell]";
 				mes "Great, that's exactly";
@@ -315,7 +316,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "^3355FFYou have finally learned";
 				mes "the Charming Wink skill.^000000";
 				set DANCER_SK,9;
-				specialeffect2 253; // EF_ABSORBSPIRITS
+				specialeffect2 EF_ABSORBSPIRITS;
 				skill "DC_WINKCHARM",1,0;
 				close;
 			}
@@ -358,7 +359,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			next;
 			mes "^3355FFYou have learned the";
 			mes "Charming Wink skill.^000000";
-			specialeffect2 253; // EF_ABSORBSPIRITS
+			specialeffect2 EF_ABSORBSPIRITS;
 			skill "DC_WINKCHARM",1,0;
 			close;
 		}
@@ -389,7 +390,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "handsome~";
 			mes "^333333*Wink~*^000000";
 			Emotion e_kis;
-			specialeffect2 364; // EF_VALLENTINE2
+			specialeffect2 EF_VALLENTINE2;
 			next;
 			mes "^3355FFStrangely enough,";
 			mes "her wink has made";
@@ -561,7 +562,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "her fists and laughs";
 				mes "maniacally to herself.^000000";
 				percentheal -10,0;
-				specialeffect2 1; // EF_HIT2
+				specialeffect2 EF_HIT2;
 				Emotion e_dots,1;
 				delitem 970,1; //Alchol
 				delitem 512,1; //Apple
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 2e4a42fe7..44dd9f46b 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Quests for skills: Redempito
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 prt_church,111,112,1	script	Sister Linus	79,{
@@ -298,7 +299,7 @@ prt_church,111,112,1	script	Sister Linus	79,{
 					}
 
 					if (.@success) {
-						specialeffect2 14; // EF_HEALSP
+						specialeffect2 EF_HEALSP;
 						mes "[Sister Linus]";
 						mes "Congratulations!";
 						mes "You successfully";
@@ -313,7 +314,7 @@ prt_church,111,112,1	script	Sister Linus	79,{
 						close;
 					}
 					else {
-						specialeffect2 53; // EF_POISONHIT
+						specialeffect2 EF_POISONHIT;
 						mes "[Sister Linus]";
 						mes "Oh no! I'm sorry,";
 						mes "but you failed to";
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index c1bbec12d..9d417cc1a 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.6b
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 1.6 Bug fixes as pointed out by Brainstorm in bugreport:351 [L0ne_W0lf]
 //= 1.6a Fixed(?) antoher problem (NPCs not disabling) hopefully. [L0ne_W0lf]
 //= 1.6b Corrected a Typo error with "rouge". (bugreport:909) [Samuray22]
+//= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 in_rogue,359,177,0	script	#killershow01	-1,{
@@ -53,9 +54,9 @@ OnInit:
 
 OnTouch:
 	if (ROG_SK == 10) {
-		specialeffect2 174; // EF_CHANGECOLD
-		specialeffect 175; //"Killer#Rogueguild" EF_CHANGEWIND
-		specialeffect2 348; // EF_LIGHTSPHERE
+		specialeffect2 EF_CHANGECOLD;
+		specialeffect EF_CHANGEWIND;
+		specialeffect2 EF_LIGHTSPHERE;
 		set ROG_SK,11;
 		mes "[Killer]";
 		mes "Wh-what have";
@@ -92,15 +93,15 @@ OnTouch:
 				set .@lim_1,.@lim_1 + 1;
 				set .@move_1,rand(1,3);
 				if (.@move_1 == 1) {
-					specialeffect 174; //"Killer#Rogueguild" EF_CHANGECOLD
+					specialeffect EF_CHANGECOLD;
 					if (select("Block him to the Left:Block him to the Right:Block his Retreat") == 1) {
 						mes "^3355FFThe killer remains";
 						mes "unable to move and looks";
 						mes "incredibly confused! Right";
 						mes "now, you're using the Close";
 						mes "Confine skill perfectly!^000000";
-						specialeffect 204; //"Killer#Rogueguild" EF_POTION1
-						specialeffect2 210; // EF_POTION7
+						specialeffect EF_POTION1;
+						specialeffect2 EF_POTION7;
 						next;
 					}
 					else {
@@ -114,15 +115,15 @@ OnTouch:
 					}
 				}
 				else if (.@move_1 == 2) {
-					specialeffect 175; //"Killer#Rogueguild" EF_CHANGEWIND
+					specialeffect EF_CHANGEWIND;
 					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 2) {
 						mes "^3355FFThe killer remains";
 						mes "unable to move and looks";
 						mes "incredibly confused! Right";
 						mes "now, you're using the Close";
 						mes "Confine skill perfectly!^000000";
-						specialeffect 204; //"Killer#Rogueguild" EF_POTION1
-						specialeffect2 210; // EF_POTION7
+						specialeffect EF_POTION1;
+						specialeffect2 EF_POTION7;
 						next;
 					}
 					else {
@@ -136,15 +137,15 @@ OnTouch:
 					}
 				}
 				else if (.@move_1 == 3) {
-					specialeffect 177; //"Killer#Rogueguild" EF_CHANGEEARTH
+					specialeffect EF_CHANGEEARTH;
 					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 3) {
 						mes "^3355FFThe killer remains";
 						mes "unable to move and looks";
 						mes "incredibly confused! Right";
 						mes "now, you're using the Close";
 						mes "Confine skill perfectly!^000000";
-						specialeffect 204; //"Killer#Rogueguild" EF_POTION1
-						specialeffect2 210; // EF_POTION7
+						specialeffect EF_POTION1;
+						specialeffect2 EF_POTION7;
 						next;
 					}
 					else {
@@ -189,7 +190,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
 			mes "resulting from transcending,";
 			mes "eh? Then I will teach you the";
 			mes "Close Confine skill once again.";
-			specialeffect2 348; // EF_LIGHTSPHERE
+			specialeffect2 EF_LIGHTSPHERE;
 			skill 1005,1,0;
 			set ROG_SK,13;
 			close;
@@ -340,14 +341,14 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
 				mes "I'll show you the skill";
 				mes "that you covet so much...";
 				mes "^FF0000Close Confine^000000!";
-				specialeffect 174; //"Haijara Greg#rogueguild" EF_CHANGECOLD
-				specialeffect2 175; // EF_CHANGEWIND
+				specialeffect EF_CHANGECOLD;
+				specialeffect2 EF_CHANGEWIND;
 				next;
 				mes "[Haijara Greg]";
 				mes "Hmpf. Now you are";
 				mes "helpless, allowing";
 				mes "me to do this: ^FF0000Back Stab^000000!";
-				specialeffect2 190; // EF_COMBOATTACK5
+				specialeffect2 EF_COMBOATTACK5;
 				percentheal -95,0;
 				next;
 				mes "[Haijara Greg]";
@@ -460,7 +461,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
 				mes "Stop! P-please, stop";
 				mes "that man! We can't let";
 				mes "him steal that book!";
-				specialeffect 190; //"Haijara Greg#rogueguild" EF_COMBOATTACK5
+				specialeffect EF_COMBOATTACK5;
 				donpcevent "Killer#Rogueguild::OnEnable";
 				set ROG_SK,10;
 				close;
@@ -544,7 +545,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
 					mes "practice, and that you become^FFFFFF ^000000 as great a legend as Chae Takbae.";
 					set ROG_SK,12;
 					skill 1005,1,0;
-					specialeffect2 348; // EF_LIGHTSPHERE
+					specialeffect2 EF_LIGHTSPHERE;
 					close;
 				}
 				mes "[Haijara Greg]";
@@ -556,7 +557,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
 				mes "thanks again for your help.";
 				set ROG_SK,12;
 				skill 1005,1,0;
-				specialeffect2 348; // EF_LIGHTSPHERE
+				specialeffect2 EF_LIGHTSPHERE;
 				close;
 			}
 			mes "[Haijara Greg]";
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index 2b190e063..1e8f67419 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Quests for skills: Sight Blaster
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 gef_tower,115,36,4	script	Meow#q_wiz	876,{
@@ -26,7 +27,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	876,{
 				mes "Alright, here's your lesson!";
 				next;
 				mes "^3355FF*BAM! BOOM! CRASH!*^000000";
-				specialeffect2 183; // EF_SUI_EXPLOSION
+				specialeffect2 EF_SUI_EXPLOSION;
 				next;
 				mes "[Meow]";
 				mes "Don't you dare get";
@@ -40,7 +41,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	876,{
 				mes "the Sight Blaster skill before";
 				mes "Meow can administer another";
 				mes "vicious beating to you.";
-				specialeffect2 253; // EF_ABSORBSPIRITS
+				specialeffect2 EF_ABSORBSPIRITS;
 				skill "WZ_SIGHTBLASTER",1,0;
 				next;
 				mes "[Meow]";
@@ -264,7 +265,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	876,{
 			mes "you to cast Sight before you";
 			mes "can activate it. Now try it.";
 			next;
-			specialeffect2 183; // EF_SUI_EXPLOSION
+			specialeffect2 EF_SUI_EXPLOSION;
 			mes "^3355FF*BAM! BOOM!*^000000";
 			next;
 			mes "[Meow]";
@@ -288,7 +289,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	876,{
 			mes "You actually learned it!";
 			mes "That took way too much effort,";
 			mes "but at least we're done here.";
-			specialeffect2 253; // EF_ABSORBSPIRITS
+			specialeffect2 EF_ABSORBSPIRITS;
 			delitem 991,10; //Crystal_Blue
 			delitem 993,10; //Yellow_Live
 			delitem 990,10; //Boody_Red