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/re/quests/eden/eden_common.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/re/quests/eden/eden_common.txt')
| -rw-r--r-- | npc/re/quests/eden/eden_common.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 7c6be1aa4..b814c7ba1 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -202,7 +202,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ case 1: mes "[Eden Teleport Officer]"; mes "Let's go to our secret base!"; - set nak_warp,strnpcinfo(2); + nak_warp = strnpcinfo(2); close2; warp "moc_para01",31,14; end; @@ -324,10 +324,10 @@ moc_para01,16,22,7 script Old Adventurer#eden 4_M_HUMERCHANT,{ } moc_para01,182,48,3 script Eden's Chief#eden 4_COOK,{ - set .@eggf,rand(1,118); - set .@eggf_1,.@eggf + 1; - set .@eggf_2,.@eggf + 2; - set .@eggf_6,.@eggf + 6; + .@eggf = rand(1,118); + .@eggf_1 = .@eggf + 1; + .@eggf_2 = .@eggf + 2; + .@eggf_6 = .@eggf + 6; mes "[Eden's Chief]"; mes ""+.@eggf+".. "+.@eggf_1+"... "+.@eggf_2+".... "+.@eggf_6+"..?"; next; |