summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-30 18:31:47 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-30 18:31:47 +0000
commita1ffe5bb6ede51e1fc9c3435ae3b59c7c610ffa2 (patch)
tree43fef2ee968de3655e3585af1c9b31426217ad60
parentbe495c8735fe855cc504d7ad0598d9b1c09b016a (diff)
parentabb20c6dee333483378d8825d433d09a57998e5c (diff)
downloadserverdata-a1ffe5bb6ede51e1fc9c3435ae3b59c7c610ffa2.tar.gz
serverdata-a1ffe5bb6ede51e1fc9c3435ae3b59c7c610ffa2.tar.bz2
serverdata-a1ffe5bb6ede51e1fc9c3435ae3b59c7c610ffa2.tar.xz
serverdata-a1ffe5bb6ede51e1fc9c3435ae3b59c7c610ffa2.zip
Merge branch 'morgan_correction' into 'master'
Morgan correction See merge request legacy/serverdata!658
-rw-r--r--world/map/npc/029-2/morgan.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 48d4133f..7c09fd1d 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -28,19 +28,22 @@ OnInit:
callfunc "PCtoNPCRange";
if(@npc_check) end;
- if (Int >= 5)
- goto L_Welcome;
- goto L_NotMagic;
+ goto L_Welcome;
L_Welcome:
mes "[Morgan]";
mes "\"Greetings traveller. What brings you here?\"";
menu
- "Maybe magnificent magic?", L_Learn,
+ "Maybe magnificent magic?", L_IntCheck,
"Hello. What's that stuff over there by that shady looking character in the hood?", L_Lab,
"Yikes, I'm in the wrong place for sure.", L_Close,
"Just looking around, thanks.", L_Close;
+L_IntCheck:
+ if (Int >= 5)
+ goto L_Learn;
+ goto L_NotMagic;
+
L_Learn:
if (QL_MORGAN == 0)
goto L_NotSeen;