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/god_se_festival.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/god_se_festival.txt')
| -rw-r--r-- | npc/events/god_se_festival.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 54bf2b6d3..3b7dd50e8 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -45,7 +45,7 @@ yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{ } yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ - set .@GID, getcharid(2); + .@GID = getcharid(2); if (countitem(7840) > 0) { mes "[Rmimi Ravies]"; mes "This is the flower."; @@ -166,7 +166,7 @@ OnDisable: OnStart: initnpctimer; - set $@gqse_festival,1; + $@gqse_festival = 1; end; OnCall: @@ -197,7 +197,7 @@ OnCall: OnOver: killmonster "yuno","Rmimi Ravies#gq_fes01::OnMyMobDead"; - set $@gqse_festival,0; + $@gqse_festival = 0; stopnpctimer; end; @@ -423,7 +423,7 @@ rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{ } rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ - set .@GID, getcharid(2); + .@GID = getcharid(2); if (countitem(7840) > 0) { mes "[Rhehe Ravies]"; mes "A flower!!"; @@ -548,7 +548,7 @@ OnDisable: OnStart: initnpctimer; - set $@gqse_festival,1; + $@gqse_festival = 1; end; OnCall: @@ -579,7 +579,7 @@ OnCall: OnOver: killmonster "rachel","Rhehe Ravies#gq_fes03::OnMyMobDead"; - set $@gqse_festival,0; + $@gqse_festival = 0; stopnpctimer; end; |