summaryrefslogtreecommitdiff
path: root/npc/re/instances
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/instances')
-rw-r--r--npc/re/instances/BangungotHospital.txt10
-rw-r--r--npc/re/instances/BuwayaCave.txt2
-rw-r--r--npc/re/instances/EclageInterior.txt2
-rw-r--r--npc/re/instances/MalangdoCulvert.txt6
-rw-r--r--npc/re/instances/OldGlastHeim.txt18
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt66
6 files changed, 52 insertions, 52 deletions
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 9e8e836c4..424626ac9 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -406,7 +406,7 @@ OnInstanceInit:
disablenpc instance_npcname("#Memorial Start_time");
end;
OnEnable:
- specialeffect(EF_BAT2, AREA, getnpcid(0, instance_npcname("#Memorial Start")));
+ specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start");
initnpctimer;
end;
OnDisable:
@@ -892,19 +892,19 @@ OnStopTimer:
end;
OnTimer1000:
mapannounce instance_mapname("1@ma_h"),"- Bangungot's Pillar of Spirit is curing Bangungot. If you don't hunt it now, he will fully recover!! -",bc_map,"0xFF8200";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
end;
OnTimer7000:
mapannounce instance_mapname("1@ma_h"),"Bangungot: I never die!!!!",bc_map,"0xFF82FF";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
end;
OnTimer14000:
mapannounce instance_mapname("1@ma_h"),"Bangungot: If you dare, kill me!! I will revive soon!!!",bc_map,"0xFF82FF";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
end;
OnTimer21000:
mapannounce instance_mapname("1@ma_h"),"Bangungot: I cannot die this way...!!!!",bc_map,"0xFF82FF";
- specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
+ specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
end;
OnTimer30000:
donpcevent instance_npcname("#Summon Pillar")+"::OnReset";
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 094964867..859d6bd85 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -323,7 +323,7 @@ OnTimer35000:
disablenpc instance_npcname("#box_call");
end;
OnTouch:
- specialeffect(EF_GUIDEDATTACK, AREA, playerattached());
+ specialeffect2 EF_GUIDEDATTACK;
warp instance_mapname("1@ma_c"),33,112;
end;
OnDisable:
diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt
index b8aff0a81..9ad8519b4 100644
--- a/npc/re/instances/EclageInterior.txt
+++ b/npc/re/instances/EclageInterior.txt
@@ -147,7 +147,7 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{
next;
mes "[" + strcharinfo(PC_NAME) + "]";
mes "No...way!!!";
- specialeffect(EF_LORD, AREA, playerattached());
+ specialeffect2 EF_LORD;
percentheal -99,0;
soundeffect "wander_man_move.wav",1;
sc_start SC_BLIND,60000,0;
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index e954c9b15..1bd76aedb 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -200,9 +200,9 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{
mes "[Madeca]";
mes "I can't give you compensation for an expired request, so let me check if any of yours have expired.";
next;
- specialeffect(EF_SPHERE, AREA, playerattached());
+ specialeffect2 EF_SPHERE;
progressbar "0xFFFF00",3;
- specialeffect(EF_STEAL, AREA, playerattached());
+ specialeffect2 EF_STEAL;
switch(.@i) {
case 1: // General Culvert Daily Service
if (questprogress(12271,PLAYTIME) == 2)
@@ -273,7 +273,7 @@ L_CheckQuest:
mes "You've punished ^0000ff"+getarg(1)+"^000000!";
mes "Here's your pay!";
erasequest getarg(0);
- specialeffect(EF_STEAL, AREA, playerattached());
+ specialeffect2 EF_STEAL;
getitem getarg(2),getarg(3);
close;
}
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index a1d6884f9..9f3f29fdf 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -1970,7 +1970,7 @@ OnTimer80000:
next;
mes("[Hugin]");
mes("Varmundt's time is stopped by me. And your time will be distorted soon.");
- specialeffect(EF_BLIND,AREA, AREA, playerattached());
+ specialeffect2 EF_BLIND,AREA;
soundeffect "_blind.wav",0;
next;
mes("[Hugin]");
@@ -1981,7 +1981,7 @@ OnTimer80000:
next;
mes("[Hugin]");
mes("Now, let me remove your memory. If you see me again, that will be brand new.");
- specialeffect(EF_FREEZE, AREA, playerattached());
+ specialeffect2 EF_FREEZE;
close2;
getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
warp .@map$,.@x,.@y;
@@ -2466,10 +2466,10 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
}
if (.@random > .@scs) {
mes("Arrggg, we failed. Better luck next time.");
- specialeffect(EF_PHARMACY_FAIL, AREA, playerattached()); delitem Coagulated_Spell, .@cost; delequip .@part;
+ specialeffect2 EF_PHARMACY_FAIL; delitem Coagulated_Spell, .@cost; delequip .@part;
close;
}
- specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
+ specialeffect2 EF_REPAIRWEAPON;
delitem Coagulated_Spell, .@cost;
delequip .@part;
mes("[Hugin's Magic Master]");
@@ -2531,7 +2531,7 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
}
if (.@random > .@scs) {
mes("Arrggg, we failed. Better luck next time.");
- specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
+ specialeffect2 EF_PHARMACY_FAIL;
delitem Coagulated_Spell, .@cost;
delequip .@part;
close;
@@ -2550,12 +2550,12 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
}
if (.@random > .@scs) {
mes("Arrggg, we failed. Better luck next time.");
- specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
+ specialeffect2 EF_PHARMACY_FAIL;
delitem Coagulated_Spell, .@cost;
delequip .@part;
close;
}
- specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
+ specialeffect2 EF_REPAIRWEAPON;
delitem Coagulated_Spell, .@cost;
delequip .@part;
mes("[Hugin's Magic Master]");
@@ -2651,7 +2651,7 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
if (.@random > .@chance) {
mes("[Hugin's Craftsman]");
mes("Arrggg, we failed. Better luck next time.");
- specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
+ specialeffect2 EF_PHARMACY_FAIL;
delitem .@item, .@cost;
delequip .@part;
close;
@@ -2659,7 +2659,7 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
mes("[Hugin's Craftsman]");
mesf("Yuhuu~ we succeed. There you go... A slot has been added to your ^FF0000%s^000000. Thank you for believing in me.", getitemname(.@equip_id));
delitem .@item, .@cost;
- specialeffect(EF_PHARMACY_OK, AREA, playerattached());
+ specialeffect2 EF_PHARMACY_OK;
delequip .@part;
// todo: read aegis name and attach "_" to worn constant
if (.@equip_id == Temporal_Str_Boots) {
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index d6c5516e5..51e2f8a06 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -982,9 +982,9 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
mes "[Pudding]";
mes "Before! I need to check if this equipment can accept the power.";
next;
- specialeffect(EF_SPHERE, AREA, playerattached());
+ specialeffect2 EF_SPHERE;
progressbar "ffff00", 2;
- specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
+ specialeffect2 EF_SUI_EXPLOSION;
emotion e_sob;
mes "[Pudding]";
mes "Hm.... This equipment cannot accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'.";
@@ -1108,9 +1108,9 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
if (.@menu==2){ .@equip_card[3] = 0; }
else { .@equip_card[2] = 0; }
.@equip_item = getequipid(.@position);
- specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Sorcerer#Bio4Reward"));
+ specialeffect EF_BEGINSPELL2, AREA, "Sorcerer#Bio4Reward";
progressbar "ffff00", 2;
- specialeffect(EF_FROSTWEAPON, AREA, playerattached());
+ specialeffect2 EF_FROSTWEAPON;
delitem Goast_Chill, 10;
delequip .@position;
getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
@@ -1303,7 +1303,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
setarray .@equip_card[0], getequipcardid(.@position,0),getequipcardid(.@position,1),getequipcardid(.@position,2),getequipcardid(.@position,3);
.@equip_card[(.@socket_type-1)] = .@enchant;
.@equip_item = getequipid(.@position);
- specialeffect(EF_BEGINSPELL3, AREA, getnpcid(0, "Sorcerer#Bio4Reward"));
+ specialeffect EF_BEGINSPELL3, AREA, "Sorcerer#Bio4Reward";
progressbar "ffff00", 2;
if (.@socket_type == 3)
delitem Blood_Thirst, 10;
@@ -1311,7 +1311,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
delitem Will_Of_Warrior, 10;
delequip .@position;
if (.@enchant == 0) {
- specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
+ specialeffect2 EF_SUI_EXPLOSION;
emotion e_otl;
mes "[Pudding]";
mes "...Well....the equipment could not accept the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" and it got destroyed.";
@@ -1319,7 +1319,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
enable_items;
end;
} else {
- specialeffect(EF_FIREHIT, AREA, playerattached());
+ specialeffect2 EF_FIREHIT;
getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
emotion e_ho;
mes "[Pudding]";
@@ -1608,42 +1608,42 @@ que_lhz,1,1,0 script #Eventctrl FAKE_NPC,{
end;
OnTimer1000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#01"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#01";
specialeffect EF_BEGINASURA, "Human Guinea pig#01";
end;
OnTimer2000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#02"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#02";
specialeffect EF_BEGINASURA, "Human Guinea pig#02";
end;
OnTimer3000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#03"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#03";
specialeffect EF_BEGINASURA, "Human Guinea pig#03";
end;
OnTimer4000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#04"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#04";
specialeffect EF_BEGINASURA, "Human Guinea pig#04";
end;
OnTimer5000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#05"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#05";
specialeffect EF_BEGINASURA, "Human Guinea pig#05";
end;
OnTimer6000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#06"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#06";
specialeffect EF_BEGINASURA, "Human Guinea pig#06";
end;
OnTimer7000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#07"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#07";
specialeffect EF_BEGINASURA, "Human Guinea pig#07";
end;
OnTimer8000:
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#08"));
+ specialeffect EF_SUI_EXPLOSION,AREA, "#08";
specialeffect EF_BEGINASURA, "Human Guinea pig#08";
stopnpctimer;
end;
@@ -1932,7 +1932,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
pushpc 0, 10;
percentheal -5,0;
specialeffect EF_AUTOCOUNTER;
- specialeffect(EF_BASH, AREA, playerattached());
+ specialeffect2 EF_BASH;
mes "You have been wounded by laboratory entrance system attack.";
close;
} else {
@@ -2442,7 +2442,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
OnTimer63000:
for(.@i = 1; .@i < 7; .@i++) {
- specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, instance_npcname("Valve#2_"+.@i+"")));
+ specialeffect EF_SUI_EXPLOSION, AREA, instance_npcname("Valve#2_"+.@i+"");
disablenpc instance_npcname("Valve#2_"+.@i+"");
}
'broken_pipes += 1;
@@ -2846,73 +2846,73 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
OnTimer1000:
mapannounce instance_mapname("1@lhz"),"Whisper: Who are you....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Seyren Windsor#boss01")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Seyren Windsor#boss01");
end;
OnTimer2000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Cecile Damon#boss02")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Cecile Damon#boss02");
end;
OnTimer3000:
mapannounce instance_mapname("1@lhz"),"Whisper: Do not approach more...",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Gertie Wie#boss03")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Gertie Wie#boss03");
end;
OnTimer4000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Eremes Guile#boss04")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Eremes Guile#boss04");
end;
OnTimer5000:
mapannounce instance_mapname("1@lhz"),"Whisper: This is a very dangerous place..",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Trentini#boss05")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Trentini#boss05");
end;
OnTimer6000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Chen Liu#boss06")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Chen Liu#boss06");
end;
OnTimer7000:
mapannounce instance_mapname("1@lhz"),"Whisper: You won't go out alive....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Alphochio Basil#boss07")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Alphochio Basil#boss07");
end;
OnTimer8000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Flamel Emul#boss08")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Flamel Emul#boss08");
end;
OnTimer9000:
mapannounce instance_mapname("1@lhz"),"Whisper: If you don't want to be a part of us....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Randel Lawrence#boss09")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Randel Lawrence#boss09");
end;
OnTimer10000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Celia Alde#boss10")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Celia Alde#boss10");
end;
OnTimer11000:
mapannounce instance_mapname("1@lhz"),"Whisper: Leave now....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Kathryne Keyron#boss11")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Kathryne Keyron#boss11");
end;
OnTimer12000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Margaretha Sorin#boss12")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Margaretha Sorin#boss12");
end;
OnTimer13000:
mapannounce instance_mapname("1@lhz"),"Whisper: Before this place is thoroughly filled with sorrow and pain....",bc_map,"0x7DCBF0";
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Howard Alt-Eisen#boss13")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Howard Alt-Eisen#boss13");
end;
OnTimer14000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Gren#boss14")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Gren#boss14");
end;
OnTimer15000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Roke#boss15")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Roke#boss15");
end;
OnTimer16000:
- specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Dree#boss16")));
+ specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Dree#boss16");
end;
OnTimer17000: