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/re/cities | |
| 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/re/cities')
| -rw-r--r-- | npc/re/cities/dewata.txt | 14 | ||||
| -rw-r--r-- | npc/re/cities/malangdo.txt | 2 | ||||
| -rw-r--r-- | npc/re/cities/mora.txt | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index d140a0d24..064cdc461 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -543,13 +543,13 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ else if (.@stat & 32 && .@bonus) consumeitem 12068; //Luk_Dish03 else if (.@stat & 64) { - specialeffect2 EF_ANGEL; + specialeffect(EF_ANGEL, AREA, playerattached()); mes "- A celestial entity gives you a blessing. -"; next; } else if (.@stat & 128) { mes "- The shrine envelops you in a loving aura. -"; if ((Sex == SEX_FEMALE && compare(.@wish$,.@wishes$[26])) || (Sex == SEX_MALE && compare(.@wish$,.@wishes$[27]))) - specialeffect2 EF_LIGHTSPHERE; + specialeffect(EF_LIGHTSPHERE, AREA, playerattached()); next; } mes "It feels like this wish could come true."; @@ -569,13 +569,13 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ L_Wish: mes "Mysterious energy comes out from the shrine."; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew1"; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew2"; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew3"; - specialeffect EF_FLASHER,AREA,"Small Shrine#dew4"; + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew1")); + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew2")); + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew3")); + specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew4")); next; mes "You have received the shrine's blessing."; - specialeffect2 EF_BLESSING; + specialeffect(EF_BLESSING, AREA, playerattached()); next; return; } diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index f4ac6300a..2397b8c06 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -314,7 +314,7 @@ malangdo,147,117,3 script Innkeeper#malang 4_CAT_REST,{ if (countitem(Malang_Sp_Can) > 4) { delitem Malang_Sp_Can,5; percentheal 100,100; - specialeffect2 EF_HEALSP; + specialeffect(EF_HEALSP, AREA, playerattached()); mes "[Innkeeper]"; mes "Now relax."; emotion e_kis; diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index 1b231024c..a58ee4463 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -1032,7 +1032,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ mes "*thud*"; mes "You feel a sudden impact on the back of your head."; mes "Your sight is going blurry."; - specialeffect2 EF_HIT1; + specialeffect(EF_HIT1, AREA, playerattached()); sc_start SC_BLIND,20000,0; next; mes "You feel somebody rummaging through your pockets before you pass out."; |