From b524e1d096ffa8f05c7fea873d7f55eb82e99875 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 29 Jun 2018 10:37:21 -0300 Subject: Delete ShipQuests_Nard, it doesn't exist --- db/quest_db.conf | 5 +---- npc/002-1/arpan.txt | 1 - npc/002-3/juliet.txt | 1 - npc/002-4/nard.txt | 5 ----- npc/016-1/doors.txt | 2 -- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/db/quest_db.conf b/db/quest_db.conf index f691b09dc..1766a398f 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -42,10 +42,7 @@ quest_db: ( Id: 3 Name: "ShipQuests_Peter" }, -{ - Id: 4 - Name: "ShipQuests_Nard" -}, +// ID 4 is free { Id: 5 Name: "ShipQuests_Knife" diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt index af8c22bc7..7124518db 100644 --- a/npc/002-1/arpan.txt +++ b/npc/002-1/arpan.txt @@ -92,7 +92,6 @@ L_EquipDone: showavatar NPC_MAGIC_ARPAN; .@q = getq(ShipQuests_Arpan); - .@q_nard = getq(ShipQuests_Nard); .@q_julia = getq(ShipQuests_Julia); if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt index b598f7cfd..d7f8f09b4 100644 --- a/npc/002-3/juliet.txt +++ b/npc/002-3/juliet.txt @@ -141,7 +141,6 @@ function mainMenu { do { - .@q3 = getq(ShipQuests_Nard); .@q4 = getq(General_Narrator); select diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt index 508f629e3..50cc60cb3 100644 --- a/npc/002-4/nard.txt +++ b/npc/002-4/nard.txt @@ -11,7 +11,6 @@ 002-4,25,26,0 script Nard NPC_NARD,{ showavatar NPC_NARD; // this is handled by avatars.xml - .@nard = getq(ShipQuests_Nard); // TODO .@narrator = getq(General_Narrator); .@price=1500; @@ -70,10 +69,6 @@ L_MenuQuest: mesq l("Why we're going Tulimshar, you may ask? Because well, believe me, if you want to find out anything, the best place to ask around is Tulim!"); LOCATION$ = "Candor"; - //inventoryplace JohanneKey, 1; - //setq ShipQuests_Nard, 1; - //getitem JohanneKey, 1; - close; diff --git a/npc/016-1/doors.txt b/npc/016-1/doors.txt index 42065a9bf..66e679803 100644 --- a/npc/016-1/doors.txt +++ b/npc/016-1/doors.txt @@ -7,8 +7,6 @@ 016-1,21,25,0 script #MarineToOutside NPC_HIDDEN,0,0,{ OnTouch: - .@nard = getq(ShipQuests_Nard); - if (LOCATION$ == "Hurns") { warp "012-1", 141, 65; close; -- cgit v1.2.3-60-g2f50