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/custom/events/valentinesdayexp.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/custom/events/valentinesdayexp.txt')
| -rw-r--r-- | npc/custom/events/valentinesdayexp.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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; } }"; |