summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <mekolat@users.noreply.github.com>2017-05-27 16:27:46 -0400
committergumi <mekolat@users.noreply.github.com>2017-06-03 12:57:29 -0400
commit7a538d27ee8f9194a9fc4988197d90b51e23f32b (patch)
tree36dc646be1ba2a4c1b16af813d0626a375a6b3bb
parent610ae47b9d0250ef9df5abd86c29f0f72c584910 (diff)
downloadhercules-7a538d27ee8f9194a9fc4988197d90b51e23f32b.tar.gz
hercules-7a538d27ee8f9194a9fc4988197d90b51e23f32b.tar.bz2
hercules-7a538d27ee8f9194a9fc4988197d90b51e23f32b.tar.xz
hercules-7a538d27ee8f9194a9fc4988197d90b51e23f32b.zip
remove misceffect from npcs
-rw-r--r--npc/custom/battleground/bg_flavius_01.txt4
-rw-r--r--npc/custom/battleground/bg_flavius_02.txt4
-rw-r--r--npc/custom/battleground/bg_kvm01.txt6
-rw-r--r--npc/custom/battleground/bg_kvm02.txt6
-rw-r--r--npc/custom/battleground/bg_kvm03.txt6
-rw-r--r--npc/custom/battleground/bg_tierra_01.txt6
-rw-r--r--npc/custom/battleground/bg_tierra_02.txt6
-rw-r--r--npc/custom/events/valentinesdayexp.txt4
-rw-r--r--npc/custom/events/xmas_rings_event.txt2
-rw-r--r--npc/custom/woe_controller.txt2
-rw-r--r--npc/events/christmas_2005.txt8
11 files changed, 27 insertions, 27 deletions
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index e4d1ee0b9..ebd695037 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -360,7 +360,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
@@ -382,7 +382,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 6a364aed6..53dd457a9 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -360,7 +360,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
@@ -382,7 +382,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index 6e2e222b2..b4c2db58f 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -35,9 +35,9 @@ OnEnterBG:
bat_c01,54,123,0 script #bat_c01a HIDDEN_NPC,{
end;
-OnKvM01LightA: misceffect 54; end;
-OnKvM01LightB: misceffect 55; end;
-OnKvM01LightC: misceffect 56; end;
+OnKvM01LightA: specialeffect(EF_BEGINSPELL2); end;
+OnKvM01LightB: specialeffect(EF_BEGINSPELL3); end;
+OnKvM01LightC: specialeffect(EF_BEGINSPELL4); end;
}
bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b HIDDEN_NPC
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index c07dee616..ceab556e1 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -35,9 +35,9 @@ OnEnterBG:
bat_c02,54,123,0 script #bat_c02a HIDDEN_NPC,{
end;
-OnKvM02LightA: misceffect 54; end;
-OnKvM02LightB: misceffect 55; end;
-OnKvM02LightC: misceffect 56; end;
+OnKvM02LightA: specialeffect(EF_BEGINSPELL2); end;
+OnKvM02LightB: specialeffect(EF_BEGINSPELL3); end;
+OnKvM02LightC: specialeffect(EF_BEGINSPELL4); end;
}
bat_c02,56,125,0 duplicate(#bat_c02a) #bat_c02b HIDDEN_NPC
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 8e127835c..d748e6795 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -35,9 +35,9 @@ OnEnterBG:
bat_c03,54,123,0 script #bat_c03a HIDDEN_NPC,{
end;
-OnKvM03LightA: misceffect 54; end;
-OnKvM03LightB: misceffect 55; end;
-OnKvM03LightC: misceffect 56; end;
+OnKvM03LightA: specialeffect(EF_BEGINSPELL2); end;
+OnKvM03LightB: specialeffect(EF_BEGINSPELL3); end;
+OnKvM03LightC: specialeffect(EF_BEGINSPELL4); end;
}
bat_c03,56,125,0 duplicate(#bat_c03a) #bat_c03b HIDDEN_NPC
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 0a7500d5b..bcbba50a1 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -416,7 +416,7 @@ OnBGStop:
end;
OnTimer19000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer20000:
@@ -438,7 +438,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
@@ -460,7 +460,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index efd95a782..12d6c291f 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -416,7 +416,7 @@ OnBGStop:
end;
OnTimer19000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer20000:
@@ -438,7 +438,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
@@ -460,7 +460,7 @@ OnBGStop:
end;
OnTimer24000:
- misceffect 83;
+ specialeffect(EF_SANCTUARY);
end;
OnTimer25000:
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index 5119a119f..85fa28d20 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -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
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index 14e288be7..5f619c1db 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -22,7 +22,7 @@ prontera,149,193,4 script WOE Information 2_BOARD1,{
end;
OnAgitStart:
while(agitcheck()) {
- misceffect EF_BEGINSPELL6;
+ specialeffect(EF_BEGINSPELL6);
sleep 425;
}
end;
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index 2d34dc258..cba1581e0 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -108,7 +108,7 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{
mes "~With the number one designer, Louise Kim,~";
mes "~you are the most blessed soul.~";
emotion e_ho;
- misceffect EF_BLESSING;
+ specialeffect(EF_BLESSING);
next;
mes "-Immediately, she puts Rosary in an-";
mes "-unknown liquid and dissolves it.-";
@@ -120,7 +120,7 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{
mes "~With the number one designer, Louise Kim,~";
mes "~you are the luckiest soul.~";
emotion e_ho;
- misceffect EF_GLORIA;
+ specialeffect(EF_GLORIA);
next;
mes "-She starts sewing the hat with -";
mes "-a Cactus Needle and a thread.-";
@@ -131,7 +131,7 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{
mes "~The most talented disigner,~";
mes "~L_O_U_I_S_E K_I_M~";
emotion e_lv;
- misceffect EF_BENEDICTIO;
+ specialeffect(EF_BENEDICTIO);
next;
mes "[Designer Louise Kim]";
mes "Here!! All done~~";
@@ -408,7 +408,7 @@ prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{
donpcevent "Christ#christ02::OnCommandEmotion";
donpcevent "Mas#mas02::OnCommandEmotion";
donpcevent "Event#event02::OnCommandEmotion";
- misceffect EF_HITLINE2;
+ specialeffect(EF_HITLINE2);
delitem Branch_Of_Dead_Tree,5; //Branch_of_Dead_Tree
christ_solo05 = 6;
donpcevent "Happymerry#happymerry02::OnCommandOff";