From 2220bc9d33d948db3fe695ff7c4f12cabaf1f3b8 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 29 Jun 2018 10:39:01 -0300 Subject: Sanitize quest log [skip ci] --- db/quest_db.conf | 7 ++----- npc/003-2/estard.txt | 14 +++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/db/quest_db.conf b/db/quest_db.conf index 1766a398f..006736f43 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -65,10 +65,7 @@ quest_db: ( }, // ID 11 to 30: General quests -{ - Id: 11 - Name: "General_Rumly" -}, +// ID 11 is free { Id: 12 Name: "General_Narrator" @@ -79,7 +76,7 @@ quest_db: ( }, { Id: 14 - Name: "General_Janus" + Name: "General_Guild" }, { Id: 15 diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt index 71dab35cc..bedd577c2 100644 --- a/npc/003-2/estard.txt +++ b/npc/003-2/estard.txt @@ -3,7 +3,7 @@ // Jesusalva // Description: // Manages party and guild. -// General_Janus +// General_Guild // 0 - Allows Party Creation // 1 - Allows Guild Creation, Party is already allowed @@ -28,7 +28,7 @@ speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring me @@ GP.", .@party_price); } else { Zeny = Zeny - .@party_price; - setq General_Janus, 1; + setq General_Guild, 1; skill NV_BASIC, 7, 0; speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Awesome, come back if you ever want to create a larger group!"); @@ -85,15 +85,15 @@ do { // Beta users by-pass check. - if (getskilllv(NV_BASIC) > 6 && !getq(General_Janus)) { - setq General_Janus, 1; + if (getskilllv(NV_BASIC) > 6 && !getq(General_Guild)) { + setq General_Guild, 1; } select l("What service do you offer?"), - rif(!getq(General_Janus), l("I would like to create a party.")), - rif(getq(General_Janus) && getcharid(2) <= 0 && countitem(Emperium) == 0, l("I would like to create a guild.")), - rif(getq(General_Janus) && getcharid(2) > 0, l("I would like to open Guild Storage.")), + rif(!getq(General_Guild), l("I would like to create a party.")), + rif(getq(General_Guild) && getcharid(2) <= 0 && countitem(Emperium) == 0, l("I would like to create a guild.")), + rif(getq(General_Guild) && getcharid(2) > 0, l("I would like to open Guild Storage.")), menuaction(l("Quit")); switch (@menu) -- cgit v1.2.3-60-g2f50