From 610ae47b9d0250ef9df5abd86c29f0f72c584910 Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 27 May 2017 16:04:52 -0400 Subject: remove specialeffect2 from npcs --- npc/re/instances/BuwayaCave.txt | 2 +- npc/re/instances/EclageInterior.txt | 2 +- npc/re/instances/MalangdoCulvert.txt | 6 +++--- npc/re/instances/OldGlastHeim.txt | 18 +++++++++--------- npc/re/instances/WolfchevLaboratory.txt | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'npc/re/instances') diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 859d6bd85..094964867 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: - specialeffect2 EF_GUIDEDATTACK; + specialeffect(EF_GUIDEDATTACK, AREA, playerattached()); 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 9ad8519b4..b8aff0a81 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!!!"; - specialeffect2 EF_LORD; + specialeffect(EF_LORD, AREA, playerattached()); 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 1bd76aedb..e954c9b15 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; - specialeffect2 EF_SPHERE; + specialeffect(EF_SPHERE, AREA, playerattached()); progressbar "0xFFFF00",3; - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); 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); - specialeffect2 EF_STEAL; + specialeffect(EF_STEAL, AREA, playerattached()); getitem getarg(2),getarg(3); close; } diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 9f3f29fdf..a1d6884f9 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."); - specialeffect2 EF_BLIND,AREA; + specialeffect(EF_BLIND,AREA, AREA, playerattached()); 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."); - specialeffect2 EF_FREEZE; + specialeffect(EF_FREEZE, AREA, playerattached()); 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."); - specialeffect2 EF_PHARMACY_FAIL; delitem Coagulated_Spell, .@cost; delequip .@part; + specialeffect(EF_PHARMACY_FAIL, AREA, playerattached()); delitem Coagulated_Spell, .@cost; delequip .@part; close; } - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); 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."); - specialeffect2 EF_PHARMACY_FAIL; + specialeffect(EF_PHARMACY_FAIL, AREA, playerattached()); 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."); - specialeffect2 EF_PHARMACY_FAIL; + specialeffect(EF_PHARMACY_FAIL, AREA, playerattached()); delitem Coagulated_Spell, .@cost; delequip .@part; close; } - specialeffect2 EF_REPAIRWEAPON; + specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); 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."); - specialeffect2 EF_PHARMACY_FAIL; + specialeffect(EF_PHARMACY_FAIL, AREA, playerattached()); 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; - specialeffect2 EF_PHARMACY_OK; + specialeffect(EF_PHARMACY_OK, AREA, playerattached()); 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 51e2f8a06..9d0e091b9 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; - specialeffect2 EF_SPHERE; + specialeffect(EF_SPHERE, AREA, playerattached()); progressbar "ffff00", 2; - specialeffect2 EF_SUI_EXPLOSION; + specialeffect(EF_SUI_EXPLOSION, AREA, playerattached()); emotion e_sob; mes "[Pudding]"; mes "Hm.... This equipment cannot accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'."; @@ -1110,7 +1110,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ .@equip_item = getequipid(.@position); specialeffect EF_BEGINSPELL2, AREA, "Sorcerer#Bio4Reward"; progressbar "ffff00", 2; - specialeffect2 EF_FROSTWEAPON; + specialeffect(EF_FROSTWEAPON, AREA, playerattached()); 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]; @@ -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) { - specialeffect2 EF_SUI_EXPLOSION; + specialeffect(EF_SUI_EXPLOSION, AREA, playerattached()); 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 { - specialeffect2 EF_FIREHIT; + specialeffect(EF_FIREHIT, AREA, playerattached()); 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]"; @@ -1932,7 +1932,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ pushpc 0, 10; percentheal -5,0; specialeffect EF_AUTOCOUNTER; - specialeffect2 EF_BASH; + specialeffect(EF_BASH, AREA, playerattached()); mes "You have been wounded by laboratory entrance system attack."; close; } else { -- cgit v1.2.3-70-g09d2