* Continues replacing of specialeffect/2 numerics with constants.

* Corrected an If to continue the President's Quest. (bugreport:2276)

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

2 files changed, 30 insertions, 28 deletions

diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 1698a12a0..bf6306eac 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 1.2 Updated several aspects of the script. [L0ne_W0lf]
 //= 1.3 Minor Touchups to quest. [L0ne_W0lf]
 //= 1.3a Changed some " + name +" to strcharinfo(0) [Samuray22]
+//= 1.4 Replaced effect numerics with constants. [Samuray22]
 //============================================================
 
 prt_fild08,175,374,3	script	Bard#brising	51,{
@@ -3163,7 +3164,7 @@ OnEmoGasp:
 que_god02,175,55,4	script	#doppelganger2	739,{
 
 OnCast:
-	specialeffect 59;
+	specialeffect EF_BEGINSPELL7;
 	end;
 }
 
@@ -3174,7 +3175,7 @@ OnEmoGasp:
 	end;
 
 OnCast:
-	specialeffect 59;
+	specialeffect EF_BEGINSPELL7;
 	end;
 }
 
@@ -3412,7 +3413,7 @@ que_god02,178,127,3	script	Valkyrie#1	811,{
 			next;
 			mes "[Valkyrie]";
 			mes "Your soul and spirit will be reborn in Valhalla as a holy warrior preparing for the holy war.";
-			specialeffect2 42;
+			specialeffect2 EF_BLESSING;
 			next;
 			mes "[Valkyrie]";
 			mes "And...";
@@ -3497,7 +3498,7 @@ que_god02,178,127,3	script	Valkyrie#1	811,{
 			mes "[Valkyrie]";
 			mes "Your soul and";
 			mes "spirit will be reborn in Valhalla as a holy warrior preparing for the holy war.";
-			specialeffect2 42;
+			specialeffect2 EF_BLESSING;
 			next;
 			mes "[Valkyrie]";
 			mes "And...";
@@ -4338,7 +4339,7 @@ mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
 		close;
 	}
 	if ((god_brising > 42) && (god_brising < 50)) {
-		specialeffect 109;
+		specialeffect EF_BUBBLE;
 		mes "[Echoing Voice]";
 		mes "Alfrik: confirmed.";
 		mes "Dvalin: confirmed.";
@@ -4354,25 +4355,25 @@ mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
 		next;
 		switch(select("20!","How should I know?!","40!","42!" )) {
 		case 1:
-			specialeffect 109;
+			specialeffect EF_BUBBLE;
 			mes "[Echoing Voice]";
 			mes "Failed.";
 			mes "Failed...";
 			close;
 		case 2:
-			specialeffect 109;
+			specialeffect EF_BUBBLE;
 			mes "[Echoing Voice]";
 			mes "Failed.";
 			mes "Failed...";
 			close;
 		case 3:
-			specialeffect 109;
+			specialeffect EF_BUBBLE;
 			mes "[Echoing Voice]";
 			mes "Failed.";
 			mes "Failed...";
 			close;
 		case 4:
-			specialeffect 109;
+			specialeffect EF_BUBBLE;
 			mes "[Echoing Voice]";
 			mes "...Confirmed.";
 			mes "Shutting down barrier.";
@@ -4486,7 +4487,7 @@ mjolnir_09,87,129,3	script	Berling#1	826,{
 				next;
 				mes "[Berling]";
 				mes "Memorize all five lines of this song exactly. Now take this golden teardrop and please seek out Grer.";
-				specialeffect2 84;
+				specialeffect2 EF_IMPOSITIO;
 				set god_brising,44;
 				close2;
 				hideonnpc "Berling#1";
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 8696089ce..50c683703 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.4 Minor Touchups to quest. [L0ne_W0lf]
 //= 1.5 Fixed missing close2 in Rebarev Doug. [L0ne_w0lf]
 //= 1.6 Corrected mismatched variables. [L0ne_W0lf]
+//= 1.7 Replaced effect numerics with constants. [Samuray22]
 //============================================================
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
@@ -3142,28 +3143,28 @@ niflheim,109,254,0	script	Egnigem	796,{
 			mes "I'm going to";
 			mes "imbue you with the";
 			mes "^666666last vestiges of my strength^000000...";
-			specialeffect 57;
-			specialeffect2 152;
+			specialeffect EF_BEGINSPELL5;
+			specialeffect2 EF_HOLYHIT;
 			next;
 			mes "[Egnigem]";
 			mes "May the heavens";
 			mes "answer me as I call upon the";
 			mes "light of justice that empowers the defenders of truth, and threaten the enemies of peace.";
-			specialeffect 58;
-			specialeffect2 152;
+			specialeffect EF_BEGINSPELL6;
+			specialeffect2 EF_HOLYHIT;
 			next;
 			mes "[Egnigem]";
 			mes "May you always shine with";
 			mes "the light of truth. Let the light within you eradicate the shadows";
 			mes "of deception, fear and malice.";
-			specialeffect 58;
-			specialeffect2 152;
+			specialeffect EF_BEGINSPELL6;
+			specialeffect2 EF_HOLYHIT;
 			next;
 			mes "[Egnigem]";
 			mes "By the holy power";
 			mes "invested in me, I humbly bestow upon you my remaining strength. Fight honorably, and do not lose sight of righteousness.";
-			specialeffect 60;
-			specialeffect2 245;
+			specialeffect EF_LOCKON;
+			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
 			set BaseExp,BaseExp+1220358;
 			close;
@@ -3180,28 +3181,28 @@ niflheim,109,254,0	script	Egnigem	796,{
 			mes "I'm going to";
 			mes "imbue you with the";
 			mes "^666666last vestiges of my strength^000000...";
-			specialeffect 57;
-			specialeffect2 152;
+			specialeffect EF_BEGINSPELL5;
+			specialeffect2 EF_HOLYHIT;
 			next;
 			mes "[Egnigem]";
 			mes "May the heavens";
 			mes "answer me as I call upon the";
 			mes "light of justice that empowers the defenders of truth, and threaten the enemies of peace.";
-			specialeffect 58;
-			specialeffect2 152;
+			specialeffect EF_BEGINSPELL6;
+			specialeffect2 EF_HOLYHIT;
 			next;
 			mes "[Egnigem]";
 			mes "May you always shine with";
 			mes "the light of truth. Let the light within you eradicate the shadows";
 			mes "of deception, fear and malice.";
-			specialeffect 58;
-			specialeffect2 152;
+			specialeffect EF_BEGINSPELL6;
+			specialeffect2 EF_HOLYHIT;
 			next;
 			mes "[Egnigem]";
 			mes "By the holy power";
 			mes "invested in me, I humbly bestow upon you my remaining strength. Fight honorably, and do not lose sight of righteousness.";
-			specialeffect 60;
-			specialeffect2 245;
+			specialeffect EF_LOCKON;
+			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
 			getexp 1220358,0;
 			close;