Merge branch 'master' into 'master'

more improvements for the rusty pick's npc's

See merge request evol/serverdata!138

7 files changed, 109 insertions, 46 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 7c768daf..6f4665da 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1276,9 +1276,9 @@ item_db: (
     AegisName: "Beer"
     Name: "Beer"
     Type: "IT_HEALING"
-    Buy: 250
-    Sell: 50
-    Weight: 50
+    Buy: 90
+    Sell: 20
+    Weight: 20
     Job: {
         All: true
     }
@@ -1291,8 +1291,8 @@ item_db: (
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 250;
-        @max = 450;
+        @min = 60;
+        @max = 110;
         @delay = 8;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
@@ -1327,26 +1327,53 @@ item_db: (
 },
 {
     Id: 565
+    AegisName: "BottleOfWater"
+    Name: "Bottle of Water"
+    Type: "IT_HEALING"
+    Buy: 60
+    Sell: 5
+    Weight: 25
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 565
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 450
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 70;
+        @max = 100;
+        @delay = 15;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 566
     AegisName: "CherryCake"
     Name: "Cherry Cake"
     Type: "IT_HEALING"
-    Buy: 800
-    Sell: 75
-    Weight: 35
+    Buy: 100
+    Sell: 15
+    Weight: 10
     Job: {
         All: true
     }
     Gender: "SEX_ANY"
     Refine: false
-    ViewSprite: 565
+    ViewSprite: 566
     BindOnEquip: false
     BuyingStore: true
     Delay: 450
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 250;
-        @max = 450;
+        @min = 20;
+        @max = 35;
         @delay = 150;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
diff --git a/maps/re/008-2-2.mcache b/maps/re/008-2-2.mcache
index c718dfc6..439b9b7c 100644
--- a/maps/re/008-2-2.mcache
+++ b/maps/re/008-2-2.mcache
diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache
index 321ece09..2f2ec9a0 100644
--- a/maps/re/008-3-0.mcache
+++ b/maps/re/008-3-0.mcache
diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt
index 48ad1120..c64efa40 100644
--- a/npc/008-2-2/barron.txt
+++ b/npc/008-2-2/barron.txt
@@ -27,6 +27,6 @@ speech S_LAST_NEXT,
 
 OnInit:
     .sex = G_MALE;
-    .distance = 2;
+    .distance = 3;
     end;
 }
diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt
index 9b3980ed..52efda05 100644
--- a/npc/008-2-2/melania.txt
+++ b/npc/008-2-2/melania.txt
@@ -9,8 +9,8 @@
     speech
         l("Hello Sir."),
         l("Welcome to the Rusty Pick. Sorry, we have no room left today."),
-        l("One advice: Don't take the things the Drinkers say too serious. They are sitting here and drinking all day."),
-        lg("I wish you a beautiful day.");
+        l("One advice: Don't take the things those drinkers say too serious. They are sitting here and drinking all day."),
+        l("I wish you a beautiful day.");
 
     close;
 
diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt
index 2013c326..a418b4e2 100644
--- a/npc/008-2-2/melinda.txt
+++ b/npc/008-2-2/melinda.txt
@@ -26,43 +26,43 @@ function StartConversation {
  
 mes "";
 mesn;
-mesq l("Hi, sweetie! Want a fresh beer for 170 Florin?");
+mesq l("Hi, sweetie! Want a fresh beer for 90 Florin?");
 switch (select(l("Sure! [Don't tip]"),
                l("Sure! [Tip 5 Florin]"),
                l("Sure! [Tip 10 Florin]"),
                l("Nah, maybe later.")))
 {
     case 1:
-        if (Zeny < 170)
+        if (Zeny < 90)
             goto L_NoMoney;
         getinventorylist;
         if (@inventorylist_count == 100 && countitem("Beer") == 0)
             goto L_TooMany;
-        set Zeny, Zeny - 170;
+        set Zeny, Zeny - 90;
         getitem Beer, 1;
         mes "";
         mesn;
         mesq l("Pff... Nickel nurser!");
         goto L_Close;
     case 2:
-        if (Zeny < 175)
+        if (Zeny < 95)
             goto L_NoMoney;
         getinventorylist;
         if (@inventorylist_count == 100 && countitem("Beer") == 0)
             goto L_TooMany;
-        set Zeny, Zeny - 175;
+        set Zeny, Zeny - 95;
         getitem "Beer", 1;
         mes "";
         mesn;
         mesq l("Thanks for the tip!");
         goto L_Close;
     case 3:
-        if (Zeny < 180)
+        if (Zeny < 100)
             goto L_NoMoney;
         getinventorylist;
         if (@inventorylist_count == 100 && countitem("Beer") == 0)
             goto L_TooMany;
-        set Zeny, Zeny - 180;
+        set Zeny, Zeny - 100;
         getitem "Beer", 1;
         mes "";
         mesn;
@@ -116,39 +116,55 @@ OnInit:
     .sex = G_FEMALE;
     .distance = 5;
     .speed = 300;
-    initmovegraph "barkeeper",  43, 30,
-                  "kfahr",      45, 36,
+    initmovegraph "startspot",  40, 29,
+                  "barkeeper",  43, 30,
+                  "kfahr_r",    45, 36,
+                  "kfahr_l",    43, 35,
                   "l_table_b",  36, 36,
                   "l_table_r",  38, 33,
                   "m_table_l",  39, 33,
                   "m_table_b",  41, 36,
-                  "r_table_r",  46, 32,
+                  "r_table_r",  46, 33,
+                  "fireplace",  36, 28,
+                  "firewood",   33, 28,
+                  "to_basement",   52, 32,
+                  "basement_entrance", 24, 25,
+                  "basement_cabinet",  30,31,
+                  "cabinet",    42, 28,
                   "bucket",     46, 30;
                  
                  
                  
-     setmovegraphcmd "barkeeper",  "kfahr",      1,  "dir 4; wait 1",
-                     "barkeeper",  "r_table_r",  1,  "dir 2; wait 1",
-                     "kfahr",      "barkeeper",  1,  "dir 4; wait 1; say Another round for kfahr's table.;"
+     setmovegraphcmd "startspot",  "firewood",   1,  "dir 4; wait 5",
+                     "firewood",   "fireplace",  1,  "dir 4; wait 3",
+                     "fireplace",  "startspot",  1,  "dir 0; wait 10",
+                     
+                     "startspot",  "l_table_b",  1,   "dir 4; wait 3",
+                     "l_table_b",  "l_table_r",  1,  "dir 2; wait 3", 
+                     "l_table_r",  "m_table_l",  1,  "dir 6; wait 3",
+                     "m_table_l",  "m_table_b",  1,  "dir 4; wait 3",
+                     "m_table_b",  "r_table_r",  1,  "dir 2; wait 3",
+                     "r_table_r",  "bucket",     1,  "dir 4; wait 1; emote 1;"
+                                                     "wait 15; moveon", 
+                     "bucket",     "startspot",  1,  "dir 0; wait 5",
+                     
+                     "startspot",  "kfahr_r",    2,  "dir 4; wait 5",
+                     "kfahr_r",    "barkeeper",  1,  "dir 4; wait 1;" 
+                                                     "say Another round for kfahr's table.;"
                                                      "wait 1; say They sure are thirsty today;"
-                                                     "wait 1; moveon",
-                     "kfahr",      "bucket",     1,  "dir 4; wait 1; emote 1;"// todo: find angry emote
-                                                     "wait 15; moveon",
-                     "kfahr",      "r_table_r",  1,  "dir 2; wait 1",
-                     "bucket",     "l_table_b",  1,  "dir 4; wait 1",
-                     "bucket",     "l_table_r",  1,  "dir 2; wait 1",
-                     "bucket",     "m_table_l",  1,  "dir 3; wait 1",
-                     "bucket",     "m_table_b",  1,  "dir 4; wait 1",
-                     "bucket",     "r_table_r",  1,  "dir 2; wait 1",
-                     "bucket",     "kfahr",      1,  "dir 4; wait 1",
-                     "l_table_b",  "barkeeper",  1,  "dir 4; wait 1",
-                     "l_table_b",  "bucket",     1,  "dir 4; wait 1; emote 1;" // todo: find angry emote
-                                                     "wait 15; moveon",
-                     "l_table_b",  "m_table_l",  1,  "dir 1; wait 1",
-                     "m_table_b",  "l_table_b",  1,  "dir 4; wait 1",
-                     "r_table_r",  "kfahr",      1,  "dir 4; wait 1",
-                     "m_table_l",  "bucket",     1,  "dir 4; wait 1",
-                     "l_table_r",  "kfahr",      1,  "dir 4; wait 1";
+                                                     "wait 5; moveon",
+                     "barkeeper",  "kfahr_l",    1,  "dir 6; wait 3;"
+                                                     "say Cheers!;"
+                                                     "wait 3; moveon",
+                     "kfahr_l",    "startspot",  1,  "dir 0; wait 10",  
+                     
+                     "startspot",         "to_basement",   1,  "dir 4; warp 008-2-5 basement_entrance",
+                     "basement_entrance", "basement_cabinet", 1, "dir 4; wait 5",
+                     "basement_cabinet",  "basement_entrance", 1, "dir 4; warp 008-2-2 to_basement",
+                     "to_basement",       "cabinet",   1,  "dir 4; wait 5",
+                     "cabinet",           "startspot",  1,  "dir 0; wait 15";
+                     
+     
                      
    
     firstmove "wait 8";    
diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt
index 823e62c8..861843f7 100644
--- a/npc/008-2-2/shop.txt
+++ b/npc/008-2-2/shop.txt
@@ -11,15 +11,35 @@ OnInit:
     tradertype(NST_MARKET);
 
     sellitem Beer, -1, 50;
-
+    sellitem Bread, -1, 50;
+    sellitem RedPlushWine, -1, 50;
+    sellitem Cheese, -1, 50;
+    sellitem CherryCake, -1, 50;
+    sellitem SmallHealing, -1, 50;
+    
     .sex = G_OTHER;
     .distance = 10;
     end;
 
 OnClock0000:
     restoreshopitem Beer, 20;
+    restoreshopitem Bread, 20;
+    restoreshopitem RedPlushWine, 20;
+    restoreshopitem Cheese, 20;
+    restoreshopitem CherryCake, 20;
+    restoreshopitem SmallHealing, 20;
 OnClock0800:
     restoreshopitem Beer, 20;
+    restoreshopitem Bread, 20;
+    restoreshopitem RedPlushWine, 20;
+    restoreshopitem Cheese, 20;
+    restoreshopitem CherryCake, 20;
+    restoreshopitem SmallHealing, 20;
 OnClock1600:
     restoreshopitem Beer, 20;
+    restoreshopitem Bread, 20;
+    restoreshopitem RedPlushWine, 20;
+    restoreshopitem Cheese, 20;
+    restoreshopitem CherryCake, 20;
+    restoreshopitem SmallHealing, 20;
 }