From 361331cbdcdd12577e992c69383ae0e31929512c Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 3 Dec 2012 00:41:17 +0100 Subject: Add new function in every script where getitem is called. --- npc/000-1/ale.txt | 15 ++++----------- npc/000-1/astapolos.txt | 15 ++++----------- npc/000-1/chest.txt | 4 ++++ npc/000-1/couwan.txt | 6 ++++-- npc/000-1/gugli.txt | 2 ++ npc/000-1/gulukan.txt | 15 ++++----------- npc/000-1/jalad.txt | 15 ++++----------- npc/000-1/muller.txt | 15 ++++----------- npc/000-1/tibbo.txt | 15 ++++----------- npc/000-2-1/chest.txt | 4 ++++ npc/000-2-3/box.txt | 24 ++++++++++-------------- npc/000-2-3/nard.txt | 12 ++++++++---- 12 files changed, 56 insertions(+), 86 deletions(-) diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 72fb0ab5..c7fe20e9 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -31,8 +31,10 @@ mesq l("Hmm... Let's see, take this one."); next; - getinventorylist; - if ((checkweight("AquadaBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 714; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Ale, 1; getitem "AquadaBox", 1; @@ -65,15 +67,6 @@ l_CallFunc: close; -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anymore of these boxes for now."); - next; - mesq l("You should come back when you'll have some free space."); - - close; - l_Bottom: mes ""; mesn; diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index 1a853906..8d5a16db 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -59,8 +59,10 @@ mesq lg("You have been so nice to me. So please, take one."); next; - getinventorylist; - if ((checkweight("CroconutBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 715; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Astapolos, 1; getitem "CroconutBox", 1; @@ -68,15 +70,6 @@ mesn; mesq l("Good luck! And don't forget to visit Peter and our little friends when you will be back onboard!"); - close; - -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anymore of these boxes for now."); - next; - mesq l("You should come back when you'll have some free space."); - close; l_Whyning: diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index 119b0b39..af9cc9a8 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -25,6 +25,10 @@ l_Give: if (@q > 1) goto l_Close; + set @item, 515; + set @count, 3; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Darlin, 2; set zeny, zeny + 400; getitem SeaDrops, 1; diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index 5969fce1..a1f1847b 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -44,8 +44,10 @@ mesq l("Yeye ask too much but do too less. Take this box and stop talking."); next; - getinventorylist; - if ((checkweight("FishBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 713; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + mesn "Narrator"; mes col(l("Couwan hands you a box full of fish."), 9); getitem "FishBox", 1; diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index 2f402688..d5af9185 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -98,6 +98,8 @@ l_SailorNames: next; mesq l("Do you need any other information?"); + goto l_Menu; + l_CollectSmthing: mes ""; mesn; diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index 5feba413..c6742742 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -53,8 +53,10 @@ l_Continue2: mesq l("Anyway I am glad I can give you some of these yoyoxs."); next; - getinventorylist; - if ((checkweight("CroconutBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 715; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Gulukan, 1; getitem "CroconutBox", 1; @@ -127,15 +129,6 @@ l_RandomC: close; -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anymore of these yoyox for now."); - next; - mesq l("Yoiis should come back when yey'll have some free space."); - - close; - l_Bottom: mes ""; mesn; diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index 44183c45..bede7b34 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -39,8 +39,10 @@ mesq l("Surely. Take this box full of @@s.", getitemlink("Plushroom")); next; - getinventorylist; - if ((checkweight("PlushroomBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 716; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Jalad, 1; getitem "PlushroomBox", 1; @@ -73,15 +75,6 @@ l_CallFunc: close; -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anymore of these boxes for now."); - next; - mesq l("You should come back when you'll have some free space."); - - close; - l_Bottom: mes ""; mesn; diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index b8277783..4dca2338 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -43,8 +43,10 @@ mesq l("Well then... Take this one!"); next; - getinventorylist; - if ((checkweight("PlushroomBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 716; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_QMuller, 1; getitem "PlushroomBox", 1; @@ -77,15 +79,6 @@ l_CallFunc: close; -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anymore of these boxes for now."); - next; - mesq l("You should come back when you'll have some free space."); - - close; - l_Bottom: mes ""; mesn; diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index c601f364..448662ba 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -40,8 +40,10 @@ mesq l("Bring this box to Gugli. He will be extremely happy!"); next; - getinventorylist; - if ((checkweight("AquadaBox", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 714; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Tibbo, 1; getitem "AquadaBox", 1; @@ -73,15 +75,6 @@ l_CallFunc: close; -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anymore of these boxes for now."); - next; - mesq l("You should come back when you'll have some free space."); - - close; - l_Top: mes ""; mesn; diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index 74f859e2..680f9e98 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -22,6 +22,10 @@ l_Give: if (@q > 1) goto l_Close; + set @item, 1300; + set @count, 2; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Arpan, 2; getitem "CreasedShirt", 1; getitem "CreasedShorts", 1; diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt index 12f5b10b..0866993a 100644 --- a/npc/000-2-3/box.txt +++ b/npc/000-2-3/box.txt @@ -63,8 +63,10 @@ mesq l("Now go outside and talk with Gugli, he'll tell you what we need."); next; - getinventorylist; - if ((checkweight("JohanneKey", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 718; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Nard, 1; getitem "JohanneKey", 1; @@ -86,27 +88,21 @@ l_Give: mesn "Nard"; mesq l("You are now part of the crew. Thanks again for your help."); - getinventorylist; - if ((checkweight("Bandana", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 2900; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Nard, 3; getitem "Bandana", 1; // Need to add a skill for the crew at this line. close; -l_Inventory; - mes ""; - mesn; - mesq l("It looks like you can't carry anything else for now."); - next; - mesq l("You should come back when you'll have some free space."); - - close; - l_Already: mes ""; mesn "Nard"; - mesq l("You already took a Bandana, please put this one back in the box."); + mesq l("You already took a Bandana, please put this one back in the box."); + close; } diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index 6f0ceaf4..dafbb3b2 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -96,8 +96,10 @@ l_NeedContent: mesq l("Now go outside and talk with Gugli, he'll tell you what we need."); next; - getinventorylist; - if ((checkweight("JohanneKey", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 718; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Nard, 1; getitem "JohanneKey", 1; @@ -182,8 +184,10 @@ l_ChefQuestComplete: mesq l("You are now officially part of my crew! Thanks again for your help."); next; - getinventorylist; - if ((checkweight("Bandana", 1) == 0) || (@inventorylist_count == 100)) goto l_Inventory; + set @item, 2900; + set @count, 1; + callfunc "InventoryPlace", @item, @count; + setq ShipQuests_Nard, 4; getitem "Bandana", 1; // Need to add a skill for the crew at this line. -- cgit v1.2.3-60-g2f50