diff options
author | Haru <haru@dotalux.com> | 2017-06-03 22:52:17 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2017-06-03 22:52:17 +0200 |
commit | 10cb83a30cc50d757e05924fb29c11fc68abda49 (patch) | |
tree | d25f9efea9b8d07a2ea1d784f08811acf136629a /npc/events/christmas_2005.txt | |
parent | 68059ee62a223edb323abba0bc980faab8ed4b52 (diff) | |
parent | 9913f13573d737b4c54c7cad23b77c6a940fe8f4 (diff) | |
download | hercules-10cb83a30cc50d757e05924fb29c11fc68abda49.tar.gz hercules-10cb83a30cc50d757e05924fb29c11fc68abda49.tar.bz2 hercules-10cb83a30cc50d757e05924fb29c11fc68abda49.tar.xz hercules-10cb83a30cc50d757e05924fb29c11fc68abda49.zip |
Merge pull-request #1746
This is equivalent to, and replaces, commit 19883c583
Diffstat (limited to 'npc/events/christmas_2005.txt')
-rw-r--r-- | npc/events/christmas_2005.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index 0a631cfb6..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~~"; @@ -299,7 +299,7 @@ prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{ mes "........................"; mes "Get lost,you devil!!!!!!"; specialeffect EF_BEGINASURA; - specialeffect2 EF_HIT2; + specialeffect(EF_HIT2, AREA, playerattached()); Hp /= 2; Hp /= 2; close2; @@ -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"; @@ -1173,7 +1173,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "~and tomorrow you'll see~"; mes "~Every wish, one and all,~"; mes "~waiting under the tree.~"; - specialeffect2 EF_GLORIA; + specialeffect(EF_GLORIA, AREA, playerattached()); next; mes "[Oholy]"; mes "Oh, my. You have a wonderful"; |