diff options
author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/events/children_week.txt | |
parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/events/children_week.txt')
-rw-r--r-- | npc/events/children_week.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt index 48e9231d6..3ba99ebd2 100644 --- a/npc/events/children_week.txt +++ b/npc/events/children_week.txt @@ -40,7 +40,7 @@ prontera,146,91,5 script Pandit chacha#child07 1_M_PUBMASTER,{ mes "Whenever come back again if you want it..."; close; } - set oversea_event9,1; + oversea_event9 = 1; getitem 11705,10; //Special_White_Potion mes "[Pandit chacha]"; mes "Look. This is a child Potion."; @@ -68,7 +68,7 @@ prontera,146,91,5 script Pandit chacha#child07 1_M_PUBMASTER,{ close2; delitem 745,1; //Wedding_Bouquet delitem 748,1; //Witherless_Rose - set oversea_event9,2; + oversea_event9 = 2; getitem 11705,50; //Special_White_Potion end; } |