From 2d241c23d89be5810d2bf51c28ad76084bf95182 Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 27 May 2017 17:42:42 -0400 Subject: add missing constants to specialeffect calls --- npc/custom/battleground/bg_flavius_01.txt | 4 ++-- npc/custom/battleground/bg_flavius_02.txt | 4 ++-- npc/custom/battleground/bg_kvm01.txt | 4 ++-- npc/custom/battleground/bg_kvm02.txt | 4 ++-- npc/custom/battleground/bg_kvm03.txt | 4 ++-- npc/custom/battleground/bg_tierra_01.txt | 6 +++--- npc/custom/battleground/bg_tierra_02.txt | 6 +++--- npc/custom/etc/airplane.txt | 4 ++-- npc/custom/etc/mvp_arena.txt | 4 ++-- npc/custom/events/cluckers.txt | 4 ++-- npc/custom/events/disguise.txt | 2 +- npc/custom/events/valentinesdayexp.txt | 2 +- npc/custom/quests/may_hats.txt | 2 +- npc/quests/quests_juperos.txt | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) (limited to 'npc') diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt index ebd695037..73ab603c9 100644 --- a/npc/custom/battleground/bg_flavius_01.txt +++ b/npc/custom/battleground/bg_flavius_01.txt @@ -333,7 +333,7 @@ bat_b01,390,13,5 script Therapist in battle#fl12 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -341,7 +341,7 @@ bat_b01,10,293,5 script Therapist in battle#fl11 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt index 53dd457a9..e970a0711 100644 --- a/npc/custom/battleground/bg_flavius_02.txt +++ b/npc/custom/battleground/bg_flavius_02.txt @@ -333,7 +333,7 @@ bat_b02,390,13,5 script Therapist in battle#fl22 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -341,7 +341,7 @@ bat_b02,10,293,5 script Therapist in battle#fl21 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt index b4c2db58f..a66e202e3 100644 --- a/npc/custom/battleground/bg_kvm01.txt +++ b/npc/custom/battleground/bg_kvm01.txt @@ -286,7 +286,7 @@ bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -294,7 +294,7 @@ bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt index ceab556e1..f1637069a 100644 --- a/npc/custom/battleground/bg_kvm02.txt +++ b/npc/custom/battleground/bg_kvm02.txt @@ -286,7 +286,7 @@ bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -294,7 +294,7 @@ bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt index d748e6795..612047dcb 100644 --- a/npc/custom/battleground/bg_kvm03.txt +++ b/npc/custom/battleground/bg_kvm03.txt @@ -286,7 +286,7 @@ bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -294,7 +294,7 @@ bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt index bcbba50a1..2640723b3 100644 --- a/npc/custom/battleground/bg_tierra_01.txt +++ b/npc/custom/battleground/bg_tierra_01.txt @@ -381,7 +381,7 @@ bat_a01,53,377,3 script Guillaume Vintenar#tv1 4_M_KY_HEAD,{ bat_a01,60,216,3 script Ghost#tv13 4_GHOSTRING,{ mes "[Ghost in valley]"; mes "Boo...Boo..."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -389,7 +389,7 @@ bat_a01,53,377,3 script Therapist in battle#tv12 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -397,7 +397,7 @@ bat_a01,45,18,3 script Therapist in battle#tv11 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt index 12d6c291f..98b604fd7 100644 --- a/npc/custom/battleground/bg_tierra_02.txt +++ b/npc/custom/battleground/bg_tierra_02.txt @@ -381,7 +381,7 @@ bat_a02,53,377,3 script Guillaume Vintenar#tv2 4_M_KY_HEAD,{ bat_a02,60,216,3 script Ghost#tv23 4_GHOSTRING,{ mes "[Ghost in valley]"; mes "Boo...Boo..."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -389,7 +389,7 @@ bat_a02,53,377,3 script Therapist in battle#tv22 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } @@ -397,7 +397,7 @@ bat_a02,45,18,3 script Therapist in battle#tv21 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; - specialeffect(312, AREA, playerattached()); + specialeffect(EF_HEAL, AREA, playerattached()); close; } diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index 6644756de..2487acb1f 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -244,7 +244,7 @@ Board: L_Yes: if($destination!=getarg(0))goto Notime; warp "airplane", 105, 72; - specialeffect(501, AREA, playerattached()); + specialeffect(EF_CASTSPIN, AREA, playerattached()); L_Nope: mes "^FF0000[Porter]^000000"; mes "Have a good day. Thank you for traveling with Airship."; @@ -356,7 +356,7 @@ Lyes: if($destination == 250)goto Notime; if($destination != @dockky)goto Notime; warp $locationsmap$[$destination], $locationsx[$destination], $locationsy[$destination]; - specialeffect(501, AREA, playerattached()); + specialeffect(EF_CASTSPIN, AREA, playerattached()); Lnope: mes "^FF0000[Airplane Attendant]^000000"; diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt index ddf075bde..a86e64aae 100644 --- a/npc/custom/etc/mvp_arena.txt +++ b/npc/custom/etc/mvp_arena.txt @@ -36,7 +36,7 @@ quiz_00,49,31,4 script MVP Arena Guide 4_M_TWTEAMAN,{ mes "There are eight rooms per Keeper, and sixteen MVPs in total."; close; case 2: - specialeffect(313, AREA, playerattached()); + specialeffect(EF_HEAL2, AREA, playerattached()); percentheal 100,100; close; case 3: @@ -77,7 +77,7 @@ function script Protector { warp getarg(0),102,102; end; case 2: - specialeffect(313, AREA, playerattached()); + specialeffect(EF_HEAL2, AREA, playerattached()); percentheal 100,100; close; case 3: diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index a249c8a40..7047ca00e 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -21,7 +21,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ set .@GMAccess,80; // GM level required to access NPC if (.startcluck) { - specialeffect(2, AREA, playerattached()); + specialeffect(EF_HIT3, AREA, playerattached()); switch(rand(15)) { case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break; case 1: npctalk "Cluuuuuck!~"; break; @@ -40,7 +40,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ default: if (rand(50) < 4) { npctalk "WOOF!..........."; - specialeffect(72, AREA, playerattached()); + specialeffect(EF_SPHERE, AREA, playerattached()); announce "[Cluck! Cluck! Boom!] " + strcharinfo(PC_NAME) + " squeezed out the prize! Well done!",0; getitem $cluck_item_id,$cluck_item_amount; set .startcluck,0; diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index cd44d1767..b9071d162 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -178,7 +178,7 @@ OnTimer30000: set .Change,0; setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; npctalk "You took too long to guess what I was. Please wait 10 seconds while I disguise again."; - specialeffect 725; + specialeffect EF_DETECT2; set $MonsterName$,""; deletepset 1; stopnpctimer; diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index 85fa28d20..33339dcd9 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -25,7 +25,7 @@ prontera,156,172,4 script Tine 1_M_MERCHANT,{ mes "The legend says that on 14th February... on the Day of Saint Valentine..."; mes "Only in Run-Midgard kingdom..."; next; - specialeffect 417; + specialeffect EF_HITBODY; mes "[Tine]"; mes "Some married chocolate lovers almost double their experience at trainings!"; mes "But everything isn't so simply..."; diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index a1864f96f..d4103874f 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -17,7 +17,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ mes callfunc("F_Hi"); mes "I can make some items for you."; mes "They are quite rare novadays..."; - specialeffect 417; + specialeffect EF_HITBODY; next; switch (select("Bird Nest", "Lion Mask", "Skeleton Manteau", "Fashion Hip Sack", "Sales Banner", "Leave")) { case 1: diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index de7bccb43..2f2bb0956 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -1733,7 +1733,7 @@ OnMyMobDead: mapannounce "juperos_02","Have you come seeking Juperos?! It no longer exists...",bc_map,"0xFF0000"; else if (.MyMobs == 0) { mapannounce "juperos_02","Have you come to see me? Fine! Find me first!",bc_map,"0xFF0000"; - specialeffect(563, AREA, playerattached()); + specialeffect(EF_SCREEN_QUAKE, AREA, playerattached()); soundeffectall "earth_quake.wav",0; disablenpc "3F Gate Switch#jupe"; donpcevent "Restricted Area#jupe::OnEnable"; @@ -4303,7 +4303,7 @@ jupe_ele_r,51,98,0 script Switch#ufe CLEAR_NPC,{ disablenpc "Switch#ufe"; enablenpc "Switch On#ufe"; initnpctimer; - specialeffect(563, AREA, playerattached()); + specialeffect(EF_SCREEN_QUAKE, AREA, playerattached()); soundeffectall "earth_quake.wav",0; close2; cutin "5-1",255; -- cgit v1.2.3-60-g2f50