From 11559679db9c2cff7838076d52b05ad19dd529e5 Mon Sep 17 00:00:00 2001 From: Reid Date: Tue, 4 Sep 2012 01:49:13 +0200 Subject: Remove ShipQuests_TreasureChest const, and replace it by the fourth value of ShipQuests_Darlin. --- db/const.txt | 5 ++--- db/questvars.txt | 7 +++---- npc/000-1/chest.txt | 20 +++++++++++--------- npc/000-1/darlin.txt | 17 +++++++++-------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/db/const.txt b/db/const.txt index 89e6b2ef..11afd160 100644 --- a/db/const.txt +++ b/db/const.txt @@ -208,6 +208,5 @@ ShipQuests_Nard 4 ShipQuests_Knife 5 ShipQuests_ArpanMoney 6 ShipQuests_Door 7 -ShipQuests_TreasureChest 8 -ShipQuests_Darlin 9 -ShipQuests_Couwan 10 +ShipQuests_Darlin 8 +ShipQuests_Couwan 9 diff --git a/db/questvars.txt b/db/questvars.txt index 2241c3f1..dd7554b2 100644 --- a/db/questvars.txt +++ b/db/questvars.txt @@ -11,10 +11,9 @@ ShipQuests,3,1 // ShipQuests_Julia 0 ShipQuests,15,16 // ShipQuests_Peter 1 ShipQuests,3,4 // ShipQuests_Alige 2 ShipQuests,3,256 // ShipQuests_Arpan 3 -ShipQuests,3,16384 // ShipQuests_Nard 4 +ShipQuests,3,32768 // ShipQuests_Nard 4 ShipQuests,1,1024 // ShipQuests_Knife 5 ShipQuests,1,2048 // ShipQuests_ArpanMoney 6 ShipQuests,1,4096 // ShipQuests_Door 7 -ShipQuests,1,8192 // ShipQuests_TreasureChest 8 -ShipQuests,3,65536 // ShipQuests_Darlin 9 -ShipQuests,3,262144 // ShipQuests_Couwan 10 +ShipQuests,3,8192 // ShipQuests_Darlin 8 +ShipQuests,3,131072 // ShipQuests_Couwan 9 diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index a6cc1ca4..984c8a80 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -4,16 +4,18 @@ // Hal9000 // Reid // Description: -// An opening treasure chest. -// Variable: -// ShipQuests_TreasureChest -// Values: -// 0 Not opened. -// 1 Opened. +// A treasure chest, with some... Treasures inside. +// Variable: +// x ShipQuests_Darlin +// Values: +// 0 Never talked with Darlin. +// 1 Spoke, and received quest. +// 2 Opened the treasure chest. +// 3 Get back to Darlin. 000-1.gat,83,70,0 script Chest#1 316;2,{ - set @q, getq(ShipQuests_TreasureChest); + set @q, getq(ShipQuests_Darlin); if (getnpcdir ("") == 4) goto l_Give; setnpcdir 2; @@ -22,8 +24,8 @@ close; l_Give: - if (@q > 0) goto l_Close; - setq ShipQuests_TreasureChest, 1; + if (@q > 1) goto l_Close; + setq ShipQuests_Darlin, 2; set zeny, zeny + 400; getitem 508, 1; getitem 509, 1; diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt index adef7742..3d5bcfe5 100644 --- a/npc/000-1/darlin.txt +++ b/npc/000-1/darlin.txt @@ -4,18 +4,19 @@ // Description: // Darlin talks from the top of the tall mast. // Variable: -// 0x ShipQuests_Darlin +// x ShipQuests_Darlin // Values: -// 00 Does not speak -// 01 Speak & Quest -// 02 +// 0 Never talked with Darlin. +// 1 Spoke, and received quest. +// 2 Opened the treasure chest. +// 3 Get back to Darlin. 000-1.gat,89,89,0,1 script Darlin 103;14,{ mesn; set @q, getq(ShipQuests_Darlin); - if (@q == 1) goto l_QuestGiven; - if (@q > 1) goto l_QuestDone; + if (@q == 2) goto l_QuestGiven; + if (@q > 2) goto l_QuestDone; mesq l("HEY! HEY YOU!"); next; @@ -142,7 +143,7 @@ l_QuestGiven: menu l("I forgot where it was..."), -, - rif(getq(ShipQuests_Darlin) == 1, l("Yes, it's a chest.")), l_Chest, + rif(getq(ShipQuests_Darlin) == 2, l("Yes, it's a chest.")), l_Chest, l("Oh, nothing important."), l_Nothing; mes ""; @@ -167,7 +168,7 @@ l_Chest: next; mesq l("IF YOU FIND SOMETHING, THEN IT'S GREAT!"); - setq ShipQuests_Darlin, 2; + setq ShipQuests_Darlin, 3; goto l_Menu; l_DangerAround: -- cgit v1.2.3-60-g2f50