Merge branch 'trithodex-master-patch-orangedye' into 'master'

Trithodex master patch orangedye

See merge request TMW2/serverdata!53

2 files changed, 68 insertions, 28 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 5d23eb005..3468d3cae 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -229,6 +229,10 @@ quest_db: (
 	Id: 67
 	Name: "TulimsharQuest_Cyndala"
 },
+{
+	Id: 68
+	Name: "TulimsharQuest_Laranja"
+},
 
 // ID 71 to 90: Halinarzo Quests
 {
diff --git a/npc/016-1/laranja.txt b/npc/016-1/laranja.txt
index 35e3b6373..d7de07224 100644
--- a/npc/016-1/laranja.txt
+++ b/npc/016-1/laranja.txt
@@ -1,38 +1,85 @@
 // TMW2 Script
 // Author:
 //    Saulc
+//    Povo
 // Description:
 //  Laranja, orange in portuges is a orange dye seller in ship
 
-016-1,25,24,0	script	Laranja	NPC_F_SHOPKEEPER,{
+016-1,25,24,0	script	Laranja	NPC_FEMALE,{
 
     mesn;
     mesq l("I'm Laranja.");
     next;
     mesn;
-    mesq l("My father lead a dye fabric, I'm in charge to sell @@ around the world.", getitemlink(OrangeDye));
+    mesq l("My father runs a dye business, I'm in charge of selling %s around the world.", getitemlink(OrangeDye));
     next;
     mesn;
-    mesq l("Would you like to buy some?");
+    mesq l("How can I help you?");
     mes "";
     menu
-        l("Yeah sure let's Trade."), -,
-        l("Sorry another day maybe."), L_Close;
+        l("Orange Dye? How much does it cost?"), -,
+        l("Nothing. Take care!"), L_Quit;
 
-    // Restock shop if needed (ULTRA EXPERIMENTAL)
-    // It won't work if instance_id() is 0, but that should be Nard@Candor.
-    if (instance_id()) {
-        if ('day != gettime(5)) {
-            'day=gettime(5);
-            restoreshopitem OrangeDye, -1, 3;
-        }
+L_Dye:
+    mesn;
+    mesq l("Thanks to pirate activity, dye has become more difficult to obtain lately.");
+    mesq l("In fact, %s is considered by most to be rare these days.", getitemlink(OrangeDye));
+    next;
+    if (BaseLevel < 45) { 
+        mesn; 
+        mesq l("Since supplies are limited, I currently prioritize orders placed by higher level players.");
+        mesq l("Come back when you are stronger and we can trade.");
+        next;
+        goto L_Quit;
+    }
+    
+    mesn;
+    mesq l("I can trade some with you. Just bring me the following cash payment and supplies:");
+    mes "";
+    mesq l("%s/%s GP",fnum(Zeny), fnum(3000));
+    mesq l("%d/%d %s",countitem(BottleOfTonoriWater), 1, getitemlink(BottleOfTonoriWater));
+    mesq l("%d/%d %s",countitem(GambogeHerb), 60, getitemlink(GambogeHerb));
+    mesq l("%d/%d %s",countitem(AlizarinHerb), 70, getitemlink(AlizarinHerb));
+    mesq l("%d/%d %s",countitem(Piberries), 5, getitemlink(Piberries));
+    mesq l("%d/%d %s",countitem(PileOfAsh), 5, getitemlink(PileOfAsh)); 
+    compareandsetq TulimsharQuest_Laranja, 0, 1;
+    next;
+    select
+        l("Yeah, I need one."),
+        l("No thank you.");
+    mes "";
+    if (@menu == 2)
+        goto L_Quit;
+    if (countitem(BottleOfTonoriWater) >= 1 &&
+          countitem(GambogeHerb) >= 60 &&
+          countitem(AlizarinHerb) >= 75 &&
+          countitem(Piberries) >= 5 &&
+          countitem(PileOfAsh) >= 5 && Zeny >= 1500) {
+        inventoryplace OrangeDye, 1, EmptyBottle, 1;
+        delitem BottleOfTonoriWater, 1;
+        delitem GambogeHerb,60;
+        delitem AlizarinHerb, 70;
+        delitem Piberries, 5;
+        delitem PileOfAsh, 5;
+        Zeny=Zeny-1500;
+        getitem OrangeDye, 1;
+        getitem EmptyBottle, 1;
+        if (getq(TulimsharQuest_Laranja) == 1) {
+            setq TulimsharQuest_Laranja, 2;
+            getexp 9000, 0;
+        }   
+        
+        mesn;
+        mesq l("Pleasure doing business with you! Do you want any more?");
+        next;
+        goto L_Dye;
+    } else {
+        mesn;
+        mesq l("Looks like you are a bit short on supplies. Come back when you have everything I need.");
     }
-
-    closedialog;
-    shop instance_npcname(.name$);
     close;
 
-L_Close:
+L_Quit:
     closedialog;
     goodbye;
     close;
@@ -48,11 +95,8 @@ OnInit:
 
     .sex = G_FEMALE;
     .distance = 4;
-    tradertype(NST_MARKET);
-
-    sellitem OrangeDye, -1, 3;
     end;
-
+    
 OnInstanceInit:
     .@npcId = getnpcid(instance_npcname(.name$));
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
@@ -61,14 +105,6 @@ OnInstanceInit:
     setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 10);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 9);
-    tradertype(NST_MARKET);
 
-    sellitem OrangeDye, -1, 3;
-    'day=gettime(5);
     end;
-
-OnClock2000:
-    restoreshopitem OrangeDye, -1, 3;
-    end;
-
 }