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/quests/newgears | |
| 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/quests/newgears')
| -rw-r--r-- | npc/quests/newgears/2004_headgears.txt | 16 | ||||
| -rw-r--r-- | npc/quests/newgears/2010_headgears.txt | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 722509fbc..eb07fb029 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -1927,10 +1927,10 @@ alde_alche,88,180,0 script Muscle Man#Alarm Mask 4_M_ALCHE_A,{ enablenpc " #Alarm Mask Man2"; enablenpc " #Alarm Mask Man3"; enablenpc " #Alarm Mask Man4"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man1"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man2"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man3"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man4"; + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man1")); + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man2")); + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man3")); + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man4")); initnpctimer; if (countitem(Needle_Of_Alarm) > 2999 && countitem(Mr_Scream) > 0) { if (select("Give him items", "Cancel") == 1) { @@ -2042,10 +2042,10 @@ OnTimer4000: disablenpc " #Alarm Mask Man2"; disablenpc " #Alarm Mask Man3"; disablenpc " #Alarm Mask Man4"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man1"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man2"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man3"; - specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man4"; + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man1")); + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man2")); + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man3")); + specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man4")); stopnpctimer; end; } diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt index 7fb5178b8..16d76d5e6 100644 --- a/npc/quests/newgears/2010_headgears.txt +++ b/npc/quests/newgears/2010_headgears.txt @@ -778,8 +778,8 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap RODA_FROG,1,1,{ next; mes "[King Froggie Vll]"; mes "I hearby give " + strcharinfo(PC_NAME) + ", our hero, this Frog Hat."; - specialeffect2 EF_MAPPILLAR2; - specialeffect2 EF_BLESSING; + specialeffect(EF_MAPPILLAR2, AREA, playerattached()); + specialeffect(EF_BLESSING, AREA, playerattached()); erasequest 5004; 2009_hat = 6; getitem Frog_Cap,1; //Frog_Cap |