From abb20c6dee333483378d8825d433d09a57998e5c Mon Sep 17 00:00:00 2001 From: Led Mitz Date: Sun, 30 Apr 2023 18:31:46 +0000 Subject: Morgan correction --- client-data | 2 +- world/map/npc/029-2/morgan.txt | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client-data b/client-data index 4901f5c5..22e2ed11 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 4901f5c5e7879b529f2bdba6455fd5317812efd3 +Subproject commit 22e2ed11665d41f5a2e25bc48a14c3f6097c57f1 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; -- cgit v1.2.3-60-g2f50