summaryrefslogtreecommitdiff
path: root/npc/custom/events
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/events')
-rw-r--r--npc/custom/events/cluckers.txt4
-rw-r--r--npc/custom/events/disguise.txt2
-rw-r--r--npc/custom/events/valentinesdayexp.txt6
-rw-r--r--npc/custom/events/xmas_rings_event.txt2
4 files changed, 7 insertions, 7 deletions
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index fbdbbed3f..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) {
- specialeffect2 2;
+ 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!...........";
- specialeffect2 72;
+ 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 5119a119f..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...";
@@ -58,9 +58,9 @@ prontera,156,172,4 script Tine 1_M_MERCHANT,{
OnInit:
//559,Hand-made_Chocolate
- setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }";
+ setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; specialeffect(EF_MAGNUS, AREA, playerattached()); }";
//560,Hand-made_White_Chocolate
- setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }";
+ setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; specialeffect(EF_MAGNUS, AREA, playerattached()); }";
//2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(GETTIME_HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 05e4f40f6..633f09cf7 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -91,7 +91,7 @@ prontera,156,174,4 script Snower 4_M_06,{
OnInit:
//Santa's Hat
- setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 338;}}";
+ setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_RAINBOW, AREA, playerattached()); end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_SPHERE, AREA, playerattached());} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_ANGEL2, AREA, playerattached());}}";
//Gold Xmas Ring
setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(\"AL_HEAL\")){skill \"TF_HIDING\",4+isequipped(2637);}else{skill \"AL_HEAL\",1+4*isequipped(2637);} }";
//Silver Xmas Ring