diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 4b4018c5bb..75456f26ef 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2008/09/27
+ * Continues replacing of specialeffect/2 numerics with constants. [Samuray22]
+ * Corrected an If to continue the President's Quest. (bugreport:2276)
2008/09/25
* Rev. 13238 Continues replacing of specialeffect/2 numerics with constants. [L0ne_W0lf]
- A lot of files still remain, but they don't have the proper
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 6d348d2dab..721dc9e301 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Everybody mentioned in the comments
//===== Current Version: =====================================
-//= 1.8
+//= 1.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.6a Small bug fix. (end -> next) care of Lesbian. [L0ne_W0lf]
//= 1.7 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//= 1.8 Fixed character's name and swapped gender dialogues [Lupus]
+//= 1.9 Replaced effect numerics with constants. [Samuray22]
//============================================================
geffen,59,143,0 script Meera 91,{
@@ -462,7 +463,7 @@ geffen_in,22,125,1 script Crumpler 52,{
next;
mes "[Crumpler]";
mes "Help meeeee!";
- specialeffect 92; //"Crumpler" EF_METEORSTORM
+ specialeffect EF_METEORSTORM;
close;
case 2:
mes "[Crumpler]";
@@ -473,7 +474,7 @@ geffen_in,22,125,1 script Crumpler 52,{
mes "Oh sweet lord...";
mes "You're serious...";
next;
- specialeffect 90; //"Crumpler" EF_LORD
+ specialeffect EF_LORD;
mes "[Crumpler]";
mes "ARRRRRGH~!";
mes "IT BUUUURNS!";
diff --git a/npc/custom/morroc_raceway.txt b/npc/custom/morroc_raceway.txt
index d6e074e377..91dcf9efa0 100644
--- a/npc/custom/morroc_raceway.txt
+++ b/npc/custom/morroc_raceway.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= acky (god@acky.com)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version
//===== Description: =========================================
@@ -17,6 +17,7 @@
//=
//= Removed permanent global variables
//= 1.2 Removed Duplicates [Silent]
+//= 1.3 Replaced effect numerics with constants. [Samuray22]
//============================================================
//Warps you into race way
@@ -96,7 +97,7 @@ close;
OnCount4000:
emotion 27;
- specialeffect 267;
+ specialeffect EF_CHIMTO;
announce "[GO!]",1;
set $@race,1;
set $@position,0;
diff --git a/npc/custom/mvm.txt b/npc/custom/mvm.txt
index 72f7fe123d..1240faa486 100644
--- a/npc/custom/mvm.txt
+++ b/npc/custom/mvm.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= acky - god@acky.com
//===== Current Version: =====================================
-//= 1.1.5
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.1.3 Removed Duplicate Names [Silent]
//= 1.1.4 Fixed SummonPad syntax. [KarLaeda]
//= 1.1.5 Some cleanup & optimization [KarLaeda]
+//= 1.2 Replaced effect numerics with constants. [Samuray22]
//============================================================
// Entrance //
@@ -738,7 +739,7 @@ if (#heal == 1 && @healing < 100) goto L_Heal; //Total healing required
set @fighting,0;
set #heal,0;
set @healing,0;
-specialeffect2 364;
+specialeffect2 EF_VALLENTINE2;
announce "Your monster has healed.",19;
end;
diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt
index f920d32b24..eeaa49dd90 100644
--- a/npc/events/StPatrick_2008.txt
+++ b/npc/events/StPatrick_2008.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -28,6 +28,7 @@
//= 1.2 Optimized. Uses only one variable now. [L0ne_W0lf]
//= Corrected EXP rewards, and some typos.
//= 1.3 Corrected random in item function. [L0ne_W0lf]
+//= 1.4 Replaced effect numerics with constants. [Samuray22]
//============================================================
prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{
@@ -298,7 +299,7 @@ OnTouch:
mes "You light the fuse.";
next;
mes "*BOOM!*";
- specialeffect2 90;
+ specialeffect2 EF_LORD;
next;
mes "After A cloud of dust and smoke has";
mes "dissipated,";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index bbd84cc68e..d124f0ec8f 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Brainstorm
//===== Current Version: =====================================
-//= 1.3
+//= 1.3a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 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]
+//= 1.3a Replaced effect numerics with constants (1 was missed). [Samuray22]
//============================================================
// Pumpkin Mojo quest (Event 1)
@@ -703,7 +704,7 @@ nif_fild01,167,113,3 script Masta's chicken#06_hw01 800,{
OnInit:
while(1) {
sleep 180000;
- specialeffect 360;
+ specialeffect EF_BAT2;
end;
}
}
diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt
index 74a7df07e3..cfc357c22a 100644
--- a/npc/events/idul_fitri.txt
+++ b/npc/events/idul_fitri.txt
@@ -3,12 +3,13 @@
//===== By: ==================================================
//= $ephiroth
//===== Current Version: =====================================
-//= 1.0a
+//= 1.1
//===== Compatible With: =====================================
//= eAthena Version
//===== Description: =========================================
//= Info : Official idRO
//= 2006/10/16: 1.0 Release and fully working. [$ephiroth]
+//= 1.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
@@ -17,7 +18,7 @@ prontera,146,92,3 script Cellerb 58,{
mes @npcname$;
if((gettime(6)==10 && (gettime(5)==24 || gettime(5)==25))==0) {
mes "Congratulation! Celebrate Feast Day Of Ramadan Idul Fitri 1427 H.";
- specialeffect 139;
+ specialeffect EF_SANDMAN;
close;
}
mes "Haii......^FF8800"+strcharinfo(0)+"^000000!!";
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 63f67a920e..ca5cf12428 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth]
//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf]
+//= 1.6 Replaced effect numerics with constants. [Samuray22]
//============================================================
payon,140,151,5 script Seiyablem 84,{
@@ -368,8 +369,8 @@ function script Func_Socket {
set .@socketrand,rand(1,100);
if((.@socketrand > getarg(3)) && (.@socketrand < getarg(4)))
{
- if(getarg(4) == 51) specialeffect 90;
- else specialeffect 83;
+ if(getarg(4) == 51) specialeffect EF_LORD;
+ else specialeffect EF_SANCTUARY;
mes "[Seiyablem]";
mes "Great, it seems to be successful.";
mes "It looks pretty well done. Congratulations!";
@@ -385,7 +386,7 @@ function script Func_Socket {
}
else
{
- specialeffect 108;
+ specialeffect EF_FREEZING;
mes "[Seiyablem]";
mes "Wah! ...I am so sorry, it failed.";
mes "However, I am completely innocent.";
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index 8775e39570..2672c6bc10 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Izlude Battle Arena Level 50
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
arena_room,64,138,5 script lvl 50s Waiting Room 124,{
@@ -883,7 +884,7 @@ prt_are_in,129,188,3 script Staff#50-1 67,{
mes "[Staff]";
mes "Let me guide you outside. I hope you had a good time.";
close2;
- specialeffect2 7;
+ specialeffect2 EF_EXIT;
warp "arena_room",100,75;
end;
}
@@ -961,7 +962,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 7;
+ specialeffect2 EF_EXIT;
donpcevent "cast#50::Onnomal1";
warp "arena_room",100,75;
donpcevent "#arn_timer_50::Onstop";
@@ -1012,7 +1013,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 4;
+ specialeffect2 EF_HIT5;
donpcevent "cast#50::Onnomal2";
warp "arena_room",100,75;
donpcevent "#arn_timer_50::Onstop";
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index cac8b6c232..4eb9aafbe9 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.1 Fixed coordinate typo. (bugreport:1663) [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [Samuray22]
//============================================================
arena_room,38,88,5 script lvl 60s Waiting Room 124,{
@@ -880,7 +881,7 @@ prt_are_in,129,135,3 script Staff#60-1 67,{
mes "[Staff]";
mes "Let me guide you outside. I hope you had a good time.";
close2;
- specialeffect2 4;
+ specialeffect2 EF_EXIT;
warp "arena_room",100,75;
end;
}
@@ -958,7 +959,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 4;
+ specialeffect2 EF_EXIT;
donpcevent "cast#60::Onnomal1";
warp "arena_room",100,75;
donpcevent "#arn_timer_60::Onstop";
@@ -1009,7 +1010,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 4;
+ specialeffect2 EF_HIT5;
donpcevent "cast#60::Onnomal2";
warp "arena_room",100,75;
donpcevent "#arn_timer_60::Onstop";
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index 10d55b513e..55132b857b 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Izlude Battle Arena Level 70
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
arena_room,52,42,7 script lvl 70s Waiting Room 124,{
@@ -860,7 +861,7 @@ prt_are_in,129,83,3 script Staff#70-1 67,{
mes "[Staff]";
mes "Let me guide you outside. I hope you had a good time.";
close2;
- specialeffect2 7;
+ specialeffect2 EF_EXIT;
warp "arena_room",100,75;
end;
}
@@ -938,7 +939,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 7;
+ specialeffect2 EF_EXIT;
donpcevent "cast#70::Onnomal1";
warp "arena_room",100,75;
donpcevent "#arn_timer_70::Onstop";
@@ -989,7 +990,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 4;
+ specialeffect2 EF_HIT5;
donpcevent "cast#70::Onnomal2";
warp "arena_room",100,75;
donpcevent "#arn_timer_70::Onstop";
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 985ec7d14d..ca0e881cb3 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Izlude Battle Arena Level 80
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
arena_room,147,42,1 script lvl 80s Waiting Room 124,{
@@ -833,7 +834,7 @@ prt_are_in,181,188,3 script Staff#80-1 67,{
mes "[Staff]";
mes "Let me guide you outside. I hope you had a good time.";
close2;
- specialeffect2 7;
+ specialeffect2 EF_EXIT;
warp "arena_room",100,75;
end;
}
@@ -911,7 +912,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 7;
+ specialeffect2 EF_EXIT;
donpcevent "cast#80::Onnomal1";
warp "arena_room",100,75;
donpcevent "#arn_timer_80::Onstop";
@@ -962,7 +963,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{
mes "See you later~";
close2;
}
- specialeffect2 4;
+ specialeffect2 EF_HIT5;
donpcevent "cast#80::Onnomal2";
warp "arena_room",100,75;
donpcevent "#arn_timer_80::Onstop";
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index eca3e1416a..032731445a 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.0a
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.0a Fixed a typo.
+//= 1.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
arena_room,162,88,3 script Ponox 124,{
@@ -1148,7 +1149,7 @@ prt_are_in,181,135,3 script Staff#party-1 67,{
mes "[Staff]";
mes "Let me guide you outside. I hope you had a good time.";
close2;
- specialeffect2 4;
+ specialeffect2 EF_HIT5;
warp "arena_room",100,75;
end;
}
@@ -1233,7 +1234,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{
donpcevent "alloff#pt::Onon";
donpcevent "Ponox::Onstart";
}
- specialeffect2 4;
+ specialeffect2 EH_HIT5;
donpcevent "cast#pt::Onnomal1";
warp "arena_room",100,75;
end;
@@ -1325,7 +1326,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{
donpcevent "alloff#pt::Onon";
donpcevent "Ponox::Onstart";
}
- specialeffect2 4;
+ specialeffect2 EF_HIT5;
warp "arena_room",100,75;
end;
}
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt
index 1d4ae0c197..f5bf8a320e 100644
--- a/npc/other/gympass.txt
+++ b/npc/other/gympass.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= v1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.0 First version [L0ne_W0lf]
//= 1.1 Fixed the NPC saying you "00" [L0ne_W0lf]
+//= 1.2 Replaced effect numerics with constants. [Samuray22]
//============================================================
payon,173,141,4 script Ripped Cabus#GymPass 899,{
@@ -75,13 +76,13 @@ payon,173,141,4 script Ripped Cabus#GymPass 899,{
mes "and try to feel the burn.";
mes "Ready? Let's do this.";
next;
- specialeffect2 79;
+ specialeffect2 EF_EARTHSPIKE;
next;
- specialeffect2 372;
+ specialeffect2 EF_DEVIL;
next;
- specialeffect2 10;
+ specialeffect2 EF_COIN;
next;
- specialeffect2 62;
+ specialeffect2 EF_SIGHTRASHER;
next;
skill "ALL_INCCARRY",getskilllv("ALL_INCCARRY")+1,0;
delitem 7776,1;
@@ -122,13 +123,13 @@ payon,173,141,4 script Ripped Cabus#GymPass 899,{
mes "as muscle memory. It's won't take";
mes "as long to build 'em back up...";
next;
- specialeffect2 79;
+ specialeffect2 EF_EARTHSPIKE;
next;
- specialeffect2 372;
+ specialeffect2 EF_DEVIL;
next;
- specialeffect2 10;
+ specialeffect2 EF_COIN;
next;
- specialeffect2 62;
+ specialeffect2 EF_SIGHTRASHER;
next;
skill 681,gympassmemory,0;
mes "[Ripped]";
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 651ceaa0cc..0f824b48fc 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.5
+//= 1.7
//===== Compatible With: =====================================
//= Any eAthena Version
//===== Description: =========================================
@@ -16,7 +16,8 @@
//= preventing players from launching another. [SinSloth]
//= 1.4 - Fixed a minor bug added in the last revision. [SinSloth]
//= 1.5 - Applied a fix to players locations which were not rotating properly. [SinSloth]
-//= 1.6- Removed nescesity to win to proceed with quest [Yommy]
+//= 1.6 - Removed nescesity to win to proceed with quest [Yommy]
+//= 1.7 - Replaced effect numerics with constants. [Samuray22]
//============================================================
que_bingo,48,84,5 script Bingo Waiting Room 124,{
@@ -812,7 +813,7 @@ OnInit:
OnTouch:
if($@bingowinner$ != strcharinfo(0)) end;
- specialeffect 183;
+ specialeffect EF_SUI_EXPLOSION;
soundeffect "tming_success.wav",1;
if($@bingoresult == 16) getitem 7515,50;
else getitem 7515,1;
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 464bff9ef2..af2768646c 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
//===== Current Version: =====================================
-//= 2.5a
+//= 2.7
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -40,6 +40,7 @@
//= 2.5 Updated to fall within proper name restrictions. [L0ne_W0lf]
//= 2.5a Corrected a Typo error ";;". [Samuray22]
//= 2.6 Fixed Engel giving back 7 Sobbing Starlight on failing to refine it, bugreport:1473 [Brainstorm]
+//= 2.7 Replaced effect numerics with constants. [Samuray22]
//============================================================
//===== Configuration : ======================================
prontera,1,1,1 script TheSignConfig -1,{
@@ -5397,7 +5398,7 @@ L_Success:
next;
getitem 7178,1;
set signquest,23;
- specialeffect2 94;
+ specialeffect2 EF_YUFITELHIT;
next;
mes "[Engel]";
mes "This was one of the most difficult";
@@ -5967,7 +5968,7 @@ L_FirstTouch:
mes "What the...?";
mes "What's happening?!";
next;
- specialeffect2 9;
+ specialeffect2 EF_ENHANCE;
mes "^3355FFFor some reason, in";
mes "this particular spot, the";
mes "Sobbing Starlight is reacting";
@@ -5976,7 +5977,7 @@ L_FirstTouch:
mes "holding. All the objects are";
mes "violently resonating";
next;
- specialeffect2 99;
+ specialeffect2 EF_FLASHER;
mes "All of a sudden these";
mes "objects emit a bright flash";
mes "of light that envelops your";
@@ -9389,7 +9390,7 @@ geffen,119,49,1 script Fountain#SignFountain 111,{
close;
L_Lament:
- specialeffect2 200;
+ specialeffect2 EF_LEVEL99;
mes "^3355FFAs you approach the fountain, a strange light begins to emit from the Lucifer's Lament in your pocket and from something deep within the fountain's water.";
next;
menu "Throw Lucifer's Lament into the fountain.",L_Throw,"Ignore the light.",-;
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 116e27f49c..6c965e3af7 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
// Samuray22
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.3a Corrected a Typo error ";;". [Samuray22]
//= 1.4 Fixed incorrect variable type used. [L0ne_W0lf]
+//= 1.5 Replaced effect numerics with constants. [Samuray22]
//============================================================
//=======================================================================================================//
@@ -663,7 +664,7 @@ ein_in01,125,99,3 script Tarsha Cherno 850,{
mes "Touching another";
mes "man's wife...?!";
next;
- specialeffect2 147;
+ specialeffect2 EF_EARTHHIT;
percentheal -30,0;
close;
case 2:
@@ -716,7 +717,7 @@ ein_in01,125,99,3 script Tarsha Cherno 850,{
mes "Touching another";
mes "man's wife...?!";
next;
- specialeffect2 147;
+ specialeffect2 EF_EARTHHIT;
percentheal -20,0;
close;
case 4:
@@ -728,7 +729,7 @@ ein_in01,125,99,3 script Tarsha Cherno 850,{
mes "Touching another";
mes "man's wife...?!";
next;
- specialeffect2 147;
+ specialeffect2 EF_EARTHHIT;
percentheal -10,0;
close;
}
@@ -1600,7 +1601,7 @@ airplane_01,238,154,5 script Airship Captain#01 873,{
mes "exaggeration.";
mes "It has really a strong power.";
next;
- specialeffect2 253;
+ specialeffect2 EF_ABSORBSPIRITS;
mes "[Tarlock]";
mes "Did you understand?";
mes "I'll rest a little.";
@@ -1950,7 +1951,7 @@ airplane,236,163,5 script Airship Captain#03 873,{
mes "Rune Stones? Hmm. Well, this";
mes "is goodbye for now, adventurer.";
close2;
- specialeffect2 253;
+ specialeffect2 EF_ABSORBSPIRITS;
set lhz_heart,13;
getexp 700000,400000;
cutin "",255;
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 17056043eb..d5d8fb7d24 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -3,7 +3,7 @@
//===== By ===================================================
//= Fredzilla, MasterOfMuppets
//===== Version ==============================================
-//= 2.2
+//= 2.3
//===== Compatible With ======================================
//= eAthena SVN
//===== Description ==========================================
@@ -28,6 +28,7 @@
//= 2.0a Corrected a Typo error ";;". [Samuray22]
//= 2.1 Added missing checkweights. [L0ne_W0lf]
//= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 2.3 Replaced effect numerics with constants. [Samuray22]
//============================================================
// Ayothaya Ring Quest
@@ -661,7 +662,7 @@ ayo_dun02,91,264,3 script Haggard Man 841,{
mes "I thank you for curing me. Now, it's time for me to resume my training.";
next;
mes "[" +strcharinfo(0)+ "]";
- specialeffect 120;
+ specialeffect EF_CLOAKING;
mes "Wait, I can't let you go! You don't know how hard it was for me to find you! You can't just leave!";
next;
mes "[Annon]";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index e8f9e2fdbe..a8b3cd25a6 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets & SinSloth
//===== Current Version: =====================================
-//= 1.8
+//= 1.9
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.6 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//= 1.7 Corrected locations of warpinside#1. (DarkValmir) [L0ne_W0lf]
//= 1.8 Added missing checkweight. [L0ne_W0lf]
+//= 1.9 Replaced effect numerics with constants. [Samuray22]
//============================================================
//-------------------------------------------------------------------------
@@ -474,7 +475,7 @@ OnSweat:
end;
OnEffect:
- specialeffect 174;
+ specialeffect EF_CHANGECOLD;
end;
}
@@ -703,7 +704,7 @@ OnTouch:
mes "Old Blue Box deep";
mes "inside the drawer.^000000";
close2;
- specialeffect 71;
+ specialeffect EF_CONE;
set hg_herb,13;
getitem 603,1; //Old blue box
getexp 50000,0;
@@ -2665,17 +2666,17 @@ hu_in01,256,40,3 script Herico 897,{
mes "[Herico]";
mes "Then...SPIT THEM OUT!";
percentheal -5,0;
- specialeffect2 3;
+ specialeffect2 EF_HIT4;
next;
mes "[Herico]";
mes "SPIT THEM OUT!";
percentheal -5,0;
- specialeffect2 3;
+ specialeffect2 EF_HIT4;
next;
mes "[Herico]";
mes "I SAID, SPIT THEM OUUUUUT!";
percentheal -5,0;
- specialeffect2 3;
+ specialeffect2 EF_HIT4;
next;
mes "["+strcharinfo(0)+"]";
mes "Err...I was just kidding...";
@@ -3825,16 +3826,16 @@ hu_fild06,168,359,3 script Moks Mushrooms#Mush1 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered mushrooms. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 11)
mes "Collected Moks Mushroom Solution: 1ea ";
@@ -3889,16 +3890,16 @@ hu_fild06,194,341,3 script Moks Mushrooms#Mush2 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered mushrooms. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 11)
mes "Collected Moks Mushroom Solution: 1ea ";
@@ -3953,16 +3954,16 @@ hu_fild06,198,339,3 script Moks Mushrooms#Mush3 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered mushrooms. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 11)
mes "Collected Moks Mushroom Solution: 1ea ";
@@ -4017,16 +4018,16 @@ hugel,209,163,3 script Clam#C1 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Clam Flesh. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 21)
mes "Collected Clam Flesh: 1ea ";
@@ -4081,16 +4082,16 @@ hugel,203,166,3 script Clam#C2 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
- specialeffect 194;
+ specialeffect EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Clam Flesh. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 21)
mes "Collected Clam Flesh: 1ea ";
@@ -4145,16 +4146,16 @@ hugel,217,158,3 script Clam#C3 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Clam Flesh. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 21)
mes "Collected Clam Flesh: 1ea ";
@@ -4209,16 +4210,16 @@ hugel,204,150,3 script Clam#C4 111,{
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
mes "- *Snip Snip* -";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Clam Flesh. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 21)
mes "Collected Clam Flesh: 1ea ";
@@ -4273,16 +4274,16 @@ hu_fild06,155,309,1 script Moks Bugs#Bug1 1053,{
mes "- *Whizz Whizz Bzzzz* -";
mes "- *Whizz Whizz*-";
mes "- *Whizz Whizz*-";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- The bugs quickly ran away. You have failed to gather their shells. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Moks Bugs Shells. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 31)
mes "Collected Moks Bugs Shells: 1ea ";
@@ -4337,16 +4338,16 @@ hu_fild06,218,320,1 script Moks Bugs#Bug2 1053,{
mes "- *Whizz Whizz Bzzzz* -";
mes "- *Whizz Whizz*-";
mes "- *Whizz Whizz*-";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- The bugs quickly ran away. You have failed to gather their shells. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Moks Bugs Shells. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 31)
mes "Collected Moks Bugs Shells: 1ea ";
@@ -4401,16 +4402,16 @@ hu_fild06,249,329,1 script Moks Bugs#Bug3 1053,{
mes "- *Whizz Whizz Bzzzz* -";
mes "- *Whizz Whizz*-";
mes "- *Whizz Whizz*-";
- specialeffect2 71;
+ specialeffect2 EF_CONE;
next;
if(rand(1,5) > 4)
{
mes "- The bugs quickly ran away. You have failed to gather their shells. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Moks Bugs Shells. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 31)
mes "Collected Moks Bugs Shells: 1ea ";
@@ -4470,11 +4471,11 @@ hu_fild06,218,373,1 script Moks Bugs#Bug4 1053,{
if(rand(1,5) > 4)
{
mes "- The bugs quickly ran away. You have failed to gather their shells. -";
- specialeffect2 194;
+ specialeffect2 EF_STUNATTACK;
close;
}
mes "- You have successfully gathered Moks Bugs Shells. -";
- specialeffect2 364;
+ specialeffect2 EF_VALLENTINE2;
set hg_tre,hg_tre+1;
if(hg_tre == 31)
mes "Collected Moks Bugs Shells: 1ea ";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index d0d2eae27a..842d1bb89d 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -71,6 +71,8 @@
//= Changed temp char vars to normal vars, that unset at end.
//= Tube just makes sure you have 1 or more permits.
//= 4.4 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 4.5 Corrected an Incorrect check of the Shinokas_Quest. (bugreport:2276) [Samuray22]
+//= Replaced effect numerics with constants.
//============================================================
lighthalzen,1,1,7 script sneakAddSuber -1,{
@@ -4627,13 +4629,13 @@ L_NoText:
mes "You must remember the";
mes "locations that I am about";
mes "to show you. Get ready...";
- specialeffect2 22;
+ specialeffect2 EF_SIGHT;
next;
mes "[Elder]";
mes "Yaaaaappp ---!";
- specialeffect2 62;
- specialeffect2 225;
- specialeffect2 36;
+ specialeffect2 EF_SIGHTRASHER;
+ specialeffect2 EF_VOLCANO;
+ specialeffect2 EF_PORTAL;
next;
mes "[Elder]";
mes "There! The locations";
@@ -4755,11 +4757,11 @@ L_NoText:
mes "......";
mes ".........";
mes "Hoooooooo...";
- specialeffect2 88;
+ specialeffect2 EF_SUFFRAGIUM;
next;
mes "[Elder]";
mes "Yaaaaapp ---!";
- specialeffect2 86;
+ specialeffect2 EF_ASPERSIO;
next;
mes "[Elder]";
mes "Whew! I've managed";
@@ -4829,7 +4831,7 @@ lhz_in03,32,162,3 script Crippled Girl 53,{
mes "old pendant";
mes "into her hands.^000000";
next;
- specialeffect2 259;
+ specialeffect2 EF_MAPPILLAR3;
mes "...............";
next;
mes "["+strcharinfo(0)+"]";
@@ -5028,7 +5030,7 @@ lhz_in03,32,162,3 script Crippled Girl 53,{
mes "old pendant";
mes "into her hands.^000000";
next;
- specialeffect2 259;
+ specialeffect2 EF_MAPPILLAR3;
mes "......";
next;
mes "["+strcharinfo(0)+"]";
@@ -5191,7 +5193,7 @@ OnTouch:
next;
mes "[????]";
mes "............";
- specialeffect2 36;
+ specialeffect2 EF_PORTAL;
next;
mes "[???]";
mes "^FF0000...I'm sorry...";
@@ -7848,7 +7850,7 @@ L_Mission:
mes "I don't want our enemies";
mes "to discover Shinokas before";
mes "we can get him to talk.";
- if(Shinokas_Quest == 10) set lhz_boss,24;
+ if(Shinokas_Quest == 11) set lhz_boss,24;
else set lhz_boss,23;
close2;
cutin "",255;
@@ -7873,7 +7875,7 @@ L_Mission:
}
else if(lhz_boss == 23)
{
- if(Shinokas_Quest == 10)
+ if(Shinokas_Quest == 11)
{
mes "[Karl]";
mes "Ymir's Heart Pieces?";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 501e61b2ab..3ad0387c99 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.2
+//= 2.3
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -24,6 +24,7 @@
//= 2.0a Corrected a Typo error ";;". [Samuray22]
//= 2.1 Assassins will now get their request item. (bugreport:1220) [L0ne_W0lf]
//= 2.2 Updated Binocular and Stop Post quests. [L0ne_W0lf]
+//= 2.3 Replaced effect numerics with constants. [Samuray22]
//============================================================
//==================================================================================//
@@ -6850,8 +6851,8 @@ moc_fild10,281,148,1 script Upturned Spot#water 111,{
mes "the Rough Wind, and both";
mes "objects violent glow in";
mes "conflict against each other.^000000";
- specialeffect 54;
- specialeffect 56;
+ specialeffect EF_BEGINSPELL2;
+ specialeffect EF_BEGINSPELL4;
next;
cutin "mocseal_ice02.bmp",2;
mes "^3355FFSuddenly, the crest sprayed";
@@ -6859,7 +6860,7 @@ moc_fild10,281,148,1 script Upturned Spot#water 111,{
mes "quickly in mid-air: it seems";
mes "the Wind element neutralized";
mes "this crest's Water element.^000000";
- specialeffect 72;
+ specialeffect EF_SPHERE;
delitem 996,1;
set mao_request,15;
next;
@@ -6904,7 +6905,7 @@ moc_fild10,281,148,1 script Upturned Spot#water 111,{
mes "suddenly causing the air";
mes "to chill and raising the";
mes "waves in the oasis.^000000";
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
delitem 995,1;
set mao_request,114;
next;
@@ -6991,15 +6992,15 @@ moc_fild19,21,33,1 script Unturned Spot#wind 111,{
mes "^3355FFThe Wind elemental crest";
mes "quickly responds to the";
mes "Great Nature stone.^000000";
- specialeffect 56;
- specialeffect 57;
+ specialeffect EF_BEGINSPELL4;
+ specialeffect EF_BEGINSPELL5;
next;
cutin "mocseal_wind02.bmp",2;
mes "^3355FFThe Wind and Earth";
mes "neutralized each other,";
mes "causing the power of the";
mes "Wind in this area to stabilize.^000000";
- specialeffect 72;
+ specialeffect EF_SPHERE;
delitem 997,1;
set mao_request,13;
next;
@@ -7107,7 +7108,7 @@ moc_fild19,21,33,1 script Unturned Spot#wind 111,{
mes "Rough Wind, causing the";
mes "crest to shine brighter and";
mes "the wind to blow stronger.^000000";
- specialeffect 56;
+ specialeffect EF_BEGINSPELL4;
delitem 996,1;
set mao_request,112;
next;
@@ -7166,8 +7167,8 @@ moc_fild12,280,36,1 script Unturned Spot#earth 111,{
mes "and the crest begin to glow";
mes "intensely, as if their powers";
mes "were conflicting.^000000";
- specialeffect 57;
- specialeffect 55;
+ specialeffect EF_BEGINSPELL5;
+ specialeffect EF_BEGINSPELL3;
next;
mes "^3355FFThe Flame Heart then";
mes "quickly vanishes with";
@@ -7175,7 +7176,7 @@ moc_fild12,280,36,1 script Unturned Spot#earth 111,{
mes "This power of this crest";
mes "is now stabilized.^000000";
cutin "mocseal_earth02.bmp",2;
- specialeffect 72;
+ specialeffect EF_SPHERE;
delitem 994,1;
set mao_request,14;
next;
@@ -7226,7 +7227,7 @@ moc_fild12,280,36,1 script Unturned Spot#earth 111,{
mes "causes tremors in the";
mes "ground and sand to flow";
mes "towards the crest.^000000";
- specialeffect 57;
+ specialeffect EF_BEGINSPELL5;
delitem 997,1;
set mao_request,113;
next;
@@ -7281,15 +7282,15 @@ moc_fild07,192,166,1 script Unturned Spot#fire 111,{
mes "it begins to pulse with";
mes "light as the crest glows";
mes "brighter and brighter.^000000";
- specialeffect 55;
- specialeffect 54;
+ specialeffect EF_BEGINSPELL3;
+ specialeffect EF_BEGINSPELL2;
next;
mes "^3355FFThe air in the area";
mes "suddenly chills, and";
mes "your Mystic Frozen";
mes "bursts into cold vapor.^000000";
cutin "mocseal_fire02.bmp",2;
- specialeffect 72;
+ specialeffect EF_SPHERE;
delitem 995,1;
set mao_request,16;
next;
@@ -7332,7 +7333,7 @@ moc_fild07,192,166,1 script Unturned Spot#fire 111,{
mes "Heart, and the crest";
mes "begins to shine as the";
mes "air around you heats up.^000000";
- specialeffect 55;
+ specialeffect EF_BEGINSPELL3;
cutin "mocseal_fire01.bmp",2;
delitem 994,1;
set mao_request,115;
@@ -8463,7 +8464,7 @@ OnTimer5000:
end;
OnTimer6000:
- specialeffect 90;
+ specialeffect EF_LORD;
end;
OnTimer6500:
@@ -8831,7 +8832,7 @@ OnEmotion2:
end;
OnSpell:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
}
@@ -8865,11 +8866,11 @@ OnEmotion:
end;
OnSpell:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
OnSpell2:
- specialeffect 90;
+ specialeffect EF_LORD;
end;
}
@@ -8888,7 +8889,7 @@ OnEmotion:
end;
OnSpell:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
}
@@ -8907,7 +8908,7 @@ OnEmotion:
end;
OnSpell:
- specialeffect 90;
+ specialeffect EF_LORD;
end;
}
@@ -9478,7 +9479,7 @@ OnTimer5000:
end;
OnTimer6000:
- specialeffect 90;
+ specialeffect EF_LORD;
end;
OnTimer6500:
@@ -9857,7 +9858,7 @@ OnEmotion2:
end;
OnSpell:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
}
@@ -9891,11 +9892,11 @@ OnEmotion:
end;
OnSpell:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
OnSpell2:
- specialeffect 90;
+ specialeffect EF_LORD;
end;
}
@@ -9914,7 +9915,7 @@ OnEmotion:
end;
OnSpell:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
}
@@ -9933,7 +9934,7 @@ OnEmotion:
end;
OnSpell:
- specialeffect 90;
+ specialeffect EF_LORD;
end;
}
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 93eb3daf5a..7c95c55d3f 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.8
+//= 2.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -52,6 +52,7 @@
//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
//= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf]
//= 2.8 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 2.9 Replaced effect numerics with constants. [Samuray22]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@@ -3386,7 +3387,7 @@ rachel,265,98,3 script Hamion#aru 930,{
mes "[Hamion]";
mes "Here we go...!";
next;
- specialeffect2 71; //EF_CONE
+ specialeffect2 EF_CONE;
mes "^3355FF*Pzzzz*^000000";
next;
mes "[Hamion]";
@@ -5591,7 +5592,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
mes "you in your travels. Peace";
mes "be with you, "+strcharinfo(0)+".";
set lost_boy,13;
- specialeffect2 253;
+ specialeffect2 EF_ABSORBSPIRITS;
getexp 900000,0;
goto L_End;
}
@@ -6022,7 +6023,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
set MISC_QUEST,MISC_QUEST | 8192;
set ra_tem_q,0;
cutin "",255;
- specialeffect2 253;
+ specialeffect2 EF_ABSORBSPIRITS;
getexp 900000,600000;
end;
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 1698a12a0b..bf6306eac9 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 8696089ce1..50c6837037 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;
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index cb9f7fac48..7e2c9683a6 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= [Ishizu-chan]
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= Any eAthena Version i guess?
//===== Description: =========================================
@@ -22,6 +22,7 @@
//= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.9 Fixed a bug in the last event which allowed an exploit after the first summoning. [SinSloth]
//= 2.0 Cleaned up the trans-only check, and added expanded classes. [L0ne_W0lf]
+//= 2.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
hu_fild01,140,163,5 script Tower Keeper 852,3,3,{
@@ -1864,7 +1865,7 @@ tha_t12,96,58,0 script Stone Statue#thana1 111,{
mes "statue glows even brighter";
mes "with a mysterious light.^000000";
delitem 7426,1;
- specialeffect 55;
+ specialeffect EF_BEGINSPELL3;
enablenpc "tteffect2";
donpcevent "tteffect2::OnGlow";
set $@thana_summon,1;
@@ -1931,7 +1932,7 @@ tha_t12,104,18,0 script Stone Statue#thana2 111,{
mes "statue glows even brighter";
mes "with a mysterious light.^000000";
delitem 7428,1;
- specialeffect 55;
+ specialeffect EF_BEGINSPELL3;
enablenpc "tteffect5";
donpcevent "tteffect5::OnGlow";
set $@thana_summon,3;
@@ -1988,7 +1989,7 @@ tha_t12,128,86,0 script Stone Statue#thana3 111,{
mes "statue glows even brighter";
mes "with a mysterious light.^000000";
delitem 7430,1;
- specialeffect 59;
+ specialeffect EF_BEGINSPELL7;
enablenpc "tteffect1";
donpcevent "tteffect1::OnGlow";
set $@thana_summon,4;
@@ -2046,7 +2047,7 @@ tha_t12,161,58,0 script Stone Statue#thana4 111,{
mes "statue glows even brighter";
mes "with a mysterious light.^000000";
delitem 7427,1;
- specialeffect 57;
+ specialeffect EF_BEGINSPELL5;
enablenpc "tteffect3";
donpcevent "tteffect3::OnGlow";
set $@thana_summon,2;
@@ -2103,7 +2104,7 @@ tha_t12,154,18,0 script Stone Statue#thana5 111,{
mes "Green Charm Stone, the";
mes "statue glows even brighter";
mes "with a mysterious light.^000000";
- specialeffect 56;
+ specialeffect EF_BEGINSPELL4;
enablenpc "tteffect4";
donpcevent "tteffect4::OnGlow";
delitem 7429,1;
@@ -2160,11 +2161,11 @@ OnTimer1000:
OnTimer1500:
OnTimer2000:
OnTimer2500:
- specialeffect 59;
+ specialeffect EF_BEGINSPELL7;
end;
OnTimer3000:
- specialeffect 59;
+ specialeffect EF_BEGINSPELL7;
stopnpctimer;
if($@thana_summon == 6) end;
initnpctimer;
@@ -2190,11 +2191,11 @@ OnTimer1000:
OnTimer1500:
OnTimer2000:
OnTimer2500:
- specialeffect 55;
+ specialeffect EF_BEGINSPELL3;
end;
OnTimer3000:
- specialeffect 55;
+ specialeffect EF_BEGINSPELL3;
stopnpctimer;
if($@thana_summon == 6) end;
initnpctimer;
@@ -2220,11 +2221,11 @@ OnTimer1000:
OnTimer1500:
OnTimer2000:
OnTimer2500:
- specialeffect 57;
+ specialeffect EF_BEGINSPELL5;
end;
OnTimer3000:
- specialeffect 57;
+ specialeffect EF_BEGINSPELL5;
stopnpctimer;
if($@thana_summon == 6) end;
initnpctimer;
@@ -2250,11 +2251,11 @@ OnTimer1000:
OnTimer1500:
OnTimer2000:
OnTimer2500:
- specialeffect 56;
+ specialeffect EF_BEGINSPELL4;
end;
OnTimer3000:
- specialeffect 56;
+ specialeffect EF_BEGINSPELL4;
stopnpctimer;
if($@thana_summon == 6) end;
initnpctimer;
@@ -2280,11 +2281,11 @@ OnTimer1000:
OnTimer1500:
OnTimer2000:
OnTimer2500:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
end;
OnTimer3000:
- specialeffect 54;
+ specialeffect EF_BEGINSPELL2;
stopnpctimer;
if($@thana_summon == 6) end;
initnpctimer;