diff options
author | gumi <mekolat@users.noreply.github.com> | 2017-05-27 17:00:28 -0400 |
---|---|---|
committer | gumi <mekolat@users.noreply.github.com> | 2017-06-03 12:57:33 -0400 |
commit | b0b071305f967ae836722e7518455ee06089de01 (patch) | |
tree | 4f8da981a8fff79abb1d61be1bae6c46cb33add9 /npc/re | |
parent | 7a538d27ee8f9194a9fc4988197d90b51e23f32b (diff) | |
download | hercules-b0b071305f967ae836722e7518455ee06089de01.tar.gz hercules-b0b071305f967ae836722e7518455ee06089de01.tar.bz2 hercules-b0b071305f967ae836722e7518455ee06089de01.tar.xz hercules-b0b071305f967ae836722e7518455ee06089de01.zip |
convert specialeffect calls with strings to use GID
Diffstat (limited to 'npc/re')
-rw-r--r-- | npc/re/cities/dewata.txt | 8 | ||||
-rw-r--r-- | npc/re/events/halloween_2014.txt | 18 | ||||
-rw-r--r-- | npc/re/instances/BangungotHospital.txt | 10 | ||||
-rw-r--r-- | npc/re/instances/WolfchevLaboratory.txt | 54 | ||||
-rw-r--r-- | npc/re/jobs/2e/kagerou_oboro.txt | 14 | ||||
-rw-r--r-- | npc/re/jobs/3-1/archbishop.txt | 2 | ||||
-rw-r--r-- | npc/re/jobs/3-2/genetic.txt | 12 | ||||
-rw-r--r-- | npc/re/jobs/3-2/sura.txt | 4 | ||||
-rw-r--r-- | npc/re/jobs/novice/academy.txt | 10 | ||||
-rw-r--r-- | npc/re/quests/eden/eden_iro.txt | 4 | ||||
-rw-r--r-- | npc/re/quests/quests_brasilis.txt | 6 | ||||
-rw-r--r-- | npc/re/quests/quests_malaya.txt | 24 |
12 files changed, 83 insertions, 83 deletions
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 850165b0e..064cdc461 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -569,10 +569,10 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ L_Wish: mes "Mysterious energy comes out from the shrine."; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew1"; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew2"; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew3"; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew4"; + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew1")); + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew2")); + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew3")); + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew4")); next; mes "You have received the shrine's blessing."; specialeffect(EF_BLESSING, AREA, playerattached()); diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt index 8940a867a..50786f2e9 100644 --- a/npc/re/events/halloween_2014.txt +++ b/npc/re/events/halloween_2014.txt @@ -170,7 +170,7 @@ mes "[Mighty Priest]"; mes "Dear Odin, show me your love!"; mes "Heal me with your love! Great!! Bam!!!!!"; - specialeffect EF_HEAL2,AREA,"Exhausted Priest#pron14hal"; + specialeffect(EF_HEAL2, AREA, getnpcid(0, "Exhausted Priest#pron14hal")); emotion e_swt, 1; next; mes "[Mighty Priest]"; @@ -1373,8 +1373,8 @@ niflheim,193,186,6 script Bonfire Spirit#14hal 4_TRACE,{ OnTimer21000: OnTimer23000: OnTimer25000: - specialeffect EF_TORCH,AREA,"Bonfire Spirit#14hal"; - specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal"; + specialeffect(EF_TORCH, AREA, getnpcid(0, "Bonfire Spirit#14hal")); + specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal")); end; OnTimer5000: @@ -1383,16 +1383,16 @@ niflheim,193,186,6 script Bonfire Spirit#14hal 4_TRACE,{ OnTimer13000: OnTimer14000: OnTimer16000: - specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal"; + specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal")); end; OnTimer19000: npctalk "Oh, No! The fire is dying!!!! Fire!!!!!!!!!!!!"; - specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal"; + specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal")); end; OnTimer20000: - specialeffect EF_SIGHTRASHER,AREA,"Bonfire Spirit#14hal"; + specialeffect(EF_SIGHTRASHER, AREA, getnpcid(0, "Bonfire Spirit#14hal")); end; OnTimer27000: @@ -1543,7 +1543,7 @@ prt_church,96,91,4 script Spiritual Sister#14hal 1_F_PRIEST,5,5,{ mes "This is enough. I can make it soon."; mes "Odin Crystal power! with Holy light!!!!"; next; - specialeffect EF_HOLYHIT,AREA,"Spiritual Sister#14hal"; + specialeffect(EF_HOLYHIT, AREA, getnpcid(0, "Spiritual Sister#14hal")); mes "[Sister Haley]"; mes "Whoa~ It's done."; mes "Hold ^0000cd this in your pocket^000000 and go to the crowd with live and dead ones, you will see who is dead or live."; @@ -1691,7 +1691,7 @@ xmas_in,160,175,1 script Worried Wife#14hal 4_F_05,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "It's almost ran out.. Why not he wakes up.."; mes "Oh!!"; - specialeffect EF_RESURRECTION,AREA,"Richard#14hal02"; + specialeffect(EF_RESURRECTION, AREA, getnpcid(0, "Richard#14hal02")); next; mes "[Richard]"; mes "Uhh.. Umm.."; @@ -1726,7 +1726,7 @@ xmas_in,160,175,1 script Worried Wife#14hal 4_F_05,{ next; mes "[Richard's Daughter]"; mes "Dad!!!"; - specialeffect EF_SONICBLOWHIT,AREA,"Richard#14hal02"; + specialeffect(EF_SONICBLOWHIT, AREA, getnpcid(0, "Richard#14hal02")); next; mes "[Richard]"; mes "O, Ouch!!!"; diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index 424626ac9..9e8e836c4 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,instance_npcname("#Memorial Start"); + specialeffect(EF_BAT2, AREA, getnpcid(0, 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,instance_npcname("#Patternwarp45"); + specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45"))); end; OnTimer7000: mapannounce instance_mapname("1@ma_h"),"Bangungot: I never die!!!!",bc_map,"0xFF82FF"; - specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45"); + specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, 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,instance_npcname("#Patternwarp45"); + specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45"))); end; OnTimer21000: mapannounce instance_mapname("1@ma_h"),"Bangungot: I cannot die this way...!!!!",bc_map,"0xFF82FF"; - specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45"); + specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45"))); end; OnTimer30000: donpcevent instance_npcname("#Summon Pillar")+"::OnReset"; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 9d0e091b9..d6c5516e5 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1108,7 +1108,7 @@ 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, "Sorcerer#Bio4Reward"; + specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Sorcerer#Bio4Reward")); progressbar "ffff00", 2; specialeffect(EF_FROSTWEAPON, AREA, playerattached()); delitem Goast_Chill, 10; @@ -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, "Sorcerer#Bio4Reward"; + specialeffect(EF_BEGINSPELL3, AREA, getnpcid(0, "Sorcerer#Bio4Reward")); progressbar "ffff00", 2; if (.@socket_type == 3) delitem Blood_Thirst, 10; @@ -1608,42 +1608,42 @@ que_lhz,1,1,0 script #Eventctrl FAKE_NPC,{ end; OnTimer1000: - specialeffect EF_SUI_EXPLOSION,AREA, "#01"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#01")); specialeffect EF_BEGINASURA, "Human Guinea pig#01"; end; OnTimer2000: - specialeffect EF_SUI_EXPLOSION,AREA, "#02"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#02")); specialeffect EF_BEGINASURA, "Human Guinea pig#02"; end; OnTimer3000: - specialeffect EF_SUI_EXPLOSION,AREA, "#03"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#03")); specialeffect EF_BEGINASURA, "Human Guinea pig#03"; end; OnTimer4000: - specialeffect EF_SUI_EXPLOSION,AREA, "#04"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#04")); specialeffect EF_BEGINASURA, "Human Guinea pig#04"; end; OnTimer5000: - specialeffect EF_SUI_EXPLOSION,AREA, "#05"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#05")); specialeffect EF_BEGINASURA, "Human Guinea pig#05"; end; OnTimer6000: - specialeffect EF_SUI_EXPLOSION,AREA, "#06"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#06")); specialeffect EF_BEGINASURA, "Human Guinea pig#06"; end; OnTimer7000: - specialeffect EF_SUI_EXPLOSION,AREA, "#07"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#07")); specialeffect EF_BEGINASURA, "Human Guinea pig#07"; end; OnTimer8000: - specialeffect EF_SUI_EXPLOSION,AREA, "#08"; + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#08")); specialeffect EF_BEGINASURA, "Human Guinea pig#08"; stopnpctimer; end; @@ -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, instance_npcname("Valve#2_"+.@i+""); + specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, 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,instance_npcname("Seyren Windsor#boss01"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Seyren Windsor#boss01"))); end; OnTimer2000: - specialeffect EF_SPHERE,AREA,instance_npcname("Cecile Damon#boss02"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Cecile Damon#boss02"))); end; OnTimer3000: mapannounce instance_mapname("1@lhz"),"Whisper: Do not approach more...",bc_map,"0x7DCBF0"; - specialeffect EF_SPHERE,AREA,instance_npcname("Gertie Wie#boss03"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Gertie Wie#boss03"))); end; OnTimer4000: - specialeffect EF_SPHERE,AREA,instance_npcname("Eremes Guile#boss04"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, 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,instance_npcname("Trentini#boss05"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Trentini#boss05"))); end; OnTimer6000: - specialeffect EF_SPHERE,AREA,instance_npcname("Chen Liu#boss06"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, 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,instance_npcname("Alphochio Basil#boss07"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Alphochio Basil#boss07"))); end; OnTimer8000: - specialeffect EF_SPHERE,AREA,instance_npcname("Flamel Emul#boss08"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, 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,instance_npcname("Randel Lawrence#boss09"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Randel Lawrence#boss09"))); end; OnTimer10000: - specialeffect EF_SPHERE,AREA,instance_npcname("Celia Alde#boss10"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Celia Alde#boss10"))); end; OnTimer11000: mapannounce instance_mapname("1@lhz"),"Whisper: Leave now....",bc_map,"0x7DCBF0"; - specialeffect EF_SPHERE,AREA,instance_npcname("Kathryne Keyron#boss11"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Kathryne Keyron#boss11"))); end; OnTimer12000: - specialeffect EF_SPHERE,AREA,instance_npcname("Margaretha Sorin#boss12"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, 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,instance_npcname("Howard Alt-Eisen#boss13"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Howard Alt-Eisen#boss13"))); end; OnTimer14000: - specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Gren#boss14"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Gren#boss14"))); end; OnTimer15000: - specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Roke#boss15"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Roke#boss15"))); end; OnTimer16000: - specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Dree#boss16"); + specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Dree#boss16"))); end; OnTimer17000: diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index a77ed1390..efb1faf03 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -1990,15 +1990,15 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ mes "[Red Leopard Joe]"; mes "Let's now create a new prototype weapon."; next; - specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_01"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_01")); mes "[Red Leopard Joe]"; mes "Feel free to use tools from here, and..."; next; - specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_02"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02")); mes "[Red Leopard Joe]"; mes "...there..."; next; - specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_03"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03")); setquest 5142; mes "[Red Leopard Joe]"; mes "...and everywhere else. Now let's begin!!"; @@ -2183,15 +2183,15 @@ L_Weapon: next; switch(select("Crafting tools?", "I don't have enough materials.", "How do you expect me to make a weapon?" + getarg(0))) { case 1: - specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_01"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_01")); mes "[Red Leopard Joe]"; mes "Feel free to use tools from here, and..."; next; - specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_02"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02")); mes "[Red Leopard Joe]"; mes "...there..."; next; - specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_03"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03")); mes "[Red Leopard Joe]"; mes "...and everywhere else."; close; @@ -2199,7 +2199,7 @@ L_Weapon: mes "[Red Leopard Joe]"; mes "You haven't brought enough materials?"; next; - specialeffect EF_GUIDEDATTACK,AREA,"Drawer#ko"; + specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Drawer#ko")); mes "[Red Leopard Joe]"; mes "Then we'll have to pay a visit to the village. Try the ^FF0000drawer^000000 over there. It'll take you to the village."; close; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index bc83b8c81..6b04533db 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1262,7 +1262,7 @@ OnTouch: mes "So bright and warm...."; next; mes "- Shoooo -"; - specialeffect EF_CLOAKING,AREA,"Valkyrie Anguhilde#end"; + specialeffect(EF_CLOAKING, AREA, getnpcid(0, "Valkyrie Anguhilde#end")); hideonnpc "Valkyrie Anguhilde#end"; emotion e_omg,1; next; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index cc7874f38..e85819f97 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -189,11 +189,11 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "- Zooooooooooooooooing -"; specialeffect EF_ENDURE; next; - specialeffect EF_REPAIRWEAPON,AREA,"#from1to2gen"; + specialeffect(EF_REPAIRWEAPON, AREA, getnpcid(0, "#from1to2gen")); mes "- (Screeching Sounds)!!! -"; mes "- (Screeching)!!! -"; next; - specialeffect EF_CRASHEARTH,AREA,"#from1to2gen"; + specialeffect(EF_CRASHEARTH, AREA, getnpcid(0, "#from1to2gen")); mes "- Bump! Bump! Bump! -"; next; mes "[Devries]"; @@ -451,8 +451,8 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "Damn!"; next; if (job_gen == 60) { - specialeffect EF_FLASHER,AREA,"Super Cultivator#gen"; - specialeffect EF_PHARMACY_OK,AREA,"Super Cultivator#gen"; + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Super Cultivator#gen")); + specialeffect(EF_PHARMACY_OK, AREA, getnpcid(0, "Super Cultivator#gen")); mes "[Devries]"; mes "Popo, look at that!"; mes "That's really a mysterious plant!"; @@ -485,8 +485,8 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ job_gen = 62; changequest 2215,2216; } else { - specialeffect EF_SPELLBREAKER,AREA,"Super Cultivator#gen"; - specialeffect EF_PHARMACY_FAIL,AREA,"Super Cultivator#gen"; + specialeffect(EF_SPELLBREAKER, AREA, getnpcid(0, "Super Cultivator#gen")); + specialeffect(EF_PHARMACY_FAIL, AREA, getnpcid(0, "Super Cultivator#gen")); mes "[Devries]"; mes "Uh oh! You failed, Popo."; mes "It didn't grow at all, it's withered already."; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 3eae13edf..567469d46 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -130,8 +130,8 @@ ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{ next; mes "[King Crab & Sludge Worm]"; mes "Aaaaaahhhhhhhhk!!!!!!!!"; - specialeffect EF_FIRESPLASHHIT,AREA,"King Crab#job_shu"; - specialeffect EF_FIRESPLASHHIT,AREA,"Sludge Worm#job_shu"; + specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "King Crab#job_shu")); + specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "Sludge Worm#job_shu")); next; mes "- What is that amazing power? -"; mes "- I've never seen this -"; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 853c124d9..1b6576737 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -2317,7 +2317,7 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{ close(); } if (questprogress(7478) == 1 && !questprogress(7479)) { - specialeffect(EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)); + specialeffect(EF_STEAL, AREA, getnpcid(0, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN))); donpcevent("Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable"); emotion(e_gasp, 1); emotion(e_heh); @@ -5664,7 +5664,7 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{ mes("^0000cd[Come to me, honey~]^000000"); next(); enablenpc("Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN)); - specialeffect(EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN)); + specialeffect(EF_PORTAL, AREA, getnpcid(0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN))); mes("[Etinifni]"); mes("What's up? Where am I?"); next(); @@ -5750,7 +5750,7 @@ izlude,99,138,3 script Romantic Male#iz 4_M_SITDOWN,{ mes("[Romantic Male]"); mes("Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?"); next(); - specialeffect(EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)); + specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN))); emotion(e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)); mes("[Romantic Male]"); mes("Honey~~ I love you!! Sweetheart~"); @@ -5784,7 +5784,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes("[Romantic Female]"); mes("You are tired of sitting, aren't you?"); next(); - specialeffect(EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)); + specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN))); emotion(e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)); mes("[Romantic Female]"); mes("My sweetheart!!! I love you!!!"); @@ -5792,7 +5792,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes("[Romantic Male]"); mes("Yes, thank you for sharing your SP! You are also tired, aren't you?"); next(); - specialeffect(EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN)); + specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN))); emotion(e_kis2, 0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN)); mes("[Romantic Male]"); mes("My sweetheart!! I love you!!!"); diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 9c6148736..874e514a3 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -835,8 +835,8 @@ OnInit: initnpctimer; end; OnTimer5000: - specialeffect EF_REFINEOK,AREA,"Suhnmi#eden"; - specialeffect EF_REFINEOK,AREA,"Mighty Hammer#ed"; + specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Suhnmi#eden")); + specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Mighty Hammer#ed")); initnpctimer; end; } diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 8597f056e..ad7aed094 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -828,7 +828,7 @@ brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{ brasilis,56,224,7 script Mage Paje#bra 4_M_BIBI,{ mes "[Mage Paje]"; mes "Abracadabra~"; - specialeffect EF_POISONHIT,AREA,"Poring#bra"; + specialeffect(EF_POISONHIT, AREA, getnpcid(0, "Poring#bra")); setarray .@display[0], 4_NFCOCK, 4_CAT, 4_PORING; setnpcdisplay "Poring#bra",.@display[rand(3)]; if (brazil_gua != 5) close; @@ -950,7 +950,7 @@ OnTouch_: mes "Smelling! This smell is from a human!"; mes "Somewhere, a human!"; mes "I got it. You are!!!"; - specialeffect EF_HIT1,AREA,"Jaguar#bra"; + specialeffect(EF_HIT1, AREA, getnpcid(0, "Jaguar#bra")); emotion e_omg,1; next; mes "[Jaguar]"; @@ -1875,7 +1875,7 @@ bra_dun02,71,200,3 script Water lily#bra HIDDEN_NPC,{ next; mes "- munch -"; mes "- mumble mumble mumble -"; - specialeffect EF_POTION7,AREA,"Recluse#bra"; + specialeffect(EF_POTION7, AREA, getnpcid(0, "Recluse#bra")); next; mes "[Jasi]"; mes "Uh, this taste... is!"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 12c5cc2ca..542b7c2cd 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -7330,14 +7330,14 @@ malaya,55,72,4 script Nurse#ma_n1 4_F_NURSE,{ close; } mes "The voice seems to be coming from the bushes near the entrance of the hospital."; - specialeffect EF_STEAL,AREA,"Bushes#ma"; + specialeffect(EF_STEAL, AREA, getnpcid(0, "Bushes#ma")); malaya_bang = 13; changequest 11293,11294; close; } else if (malaya_bang == 13) { mes "The voice seems to be coming from the bushes near the entrance of the hospital."; mes "Let's check around."; - specialeffect EF_STEAL,AREA,"Bushes#ma"; + specialeffect(EF_STEAL, AREA, getnpcid(0, "Bushes#ma")); close; } else if (malaya_bang == 14) { mes "[Nurse Las]"; @@ -8789,11 +8789,11 @@ ma_fild01,172,223,6 script Tattooist#pin 4_M_BARYO_OLD,{ next; mes "The Tattooist placed the Ancient Grudges around the workplace."; next; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05"; + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#01")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#02")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#03")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#04")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#05")); mes "The Ancient Grudge lit up and tools starts to glow. He smiled satisfyingly at the glowing tools and materials."; next; mes "And then "+.@name$+" stared intensely at the doll as if to remember every detail of it in his head."; @@ -8903,11 +8903,11 @@ ma_fild01,172,223,6 script Tattooist#pin 4_M_BARYO_OLD,{ } mes "He held up the powder in both hands and then blew it onto the drawing."; next; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04"; - specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05"; + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#01")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#02")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#03")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#04")); + specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#05")); mes "All Ancient Grudges started to burn and then the glowing light from the "+.@name$+" drawing faded away."; next; specialeffect EF_LIGHTSPHERE; |