summaryrefslogtreecommitdiff
path: root/npc/cities/payon.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
committershennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
commitbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch)
tree79f9aec5171e8aed2d701bf67167f260e05f41db /npc/cities/payon.txt
parent239d480487e24294975f35ed55f210837ad1088e (diff)
parentce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff)
downloadhercules-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/cities/payon.txt')
-rw-r--r--npc/cities/payon.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 3bbe52908..a5607b412 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -840,7 +840,7 @@ OnTouch:
close;
}
if (BaseLevel > 30) {
- set .@oldman_random,rand(1,2);
+ .@oldman_random = rand(1,2);
if (.@oldman_random == 1) {
mes "[Guard]";
mes "Hey...";