Merge branch 'master' of gitlab.com:evol/serverdata

Try to resolve conflict by using brute force and ignorance.

3 files changed, 133 insertions, 39 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 5b202174..70c91cfe 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3882,6 +3882,8 @@ constants_db: {
 	NPC_ARTAXE:             134
 	NPC_LUCAS:              135
 	NPC_CALYPSAN:           136
+	NPC_KAYLO:              137
+	NPC_LYDON:              138
 	NPC_ALIGE:              401
 	NPC_ORC_SAILOR:         402
 	NPC_RATTO_SAILOR:       403
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6e507c75..8aedb17e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -139,7 +139,7 @@ item_db: (
     View: 501
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 500
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -169,7 +169,7 @@ item_db: (
     View: 502
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 500
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -203,7 +203,7 @@ item_db: (
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        sc_start SC_ATTHASTE_POTION1, 20000, -5;
+		sc_end SC_POISON;
         heal rand(25, 35), 0;
     ">
 },
@@ -230,7 +230,7 @@ item_db: (
     View: 504
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 500
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -260,7 +260,7 @@ item_db: (
     View: 505
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 500
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -290,7 +290,7 @@ item_db: (
     View: 506
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 500
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -320,7 +320,7 @@ item_db: (
     View: 507
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 500
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -350,11 +350,10 @@ item_db: (
     View: 508
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        sc_start2 SC_POISON, 1, 20, 2500;
+        sc_start SC_POISON, 30000, 0;
         heal rand(10, 20), 0;
     ">
 },
@@ -381,7 +380,7 @@ item_db: (
     View: 509
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 2000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -411,7 +410,6 @@ item_db: (
     View: 510
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -442,7 +440,6 @@ item_db: (
     View: 511
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -473,7 +470,7 @@ item_db: (
     View: 512
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 2000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -562,11 +559,11 @@ item_db: (
     View: 515
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 15000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        sc_start SC_ATTHASTE_POTION1, 20000, 5;
+        sc_start SC_ATTHASTE_POTION1, 15000, 5;
         heal rand(20, 30), 0;
     ">
 },
@@ -593,7 +590,6 @@ item_db: (
     View: 516
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -624,7 +620,7 @@ item_db: (
     View: 517
     BindOnEquip: false
     BuyingStore: false
-    Delay: 5000
+    Delay: 1000
     Trade: {
         nodrop: true
         noselltonpc: true
@@ -654,7 +650,7 @@ item_db: (
     View: 518
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 1000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -684,7 +680,7 @@ item_db: (
     View: 519
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 2000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -696,7 +692,7 @@ item_db: (
     AegisName: "PibberiesInfusion"
     Name: "Pibberies Infusion"
     Type: "IT_HEALING"
-    Buy: 60
+    Buy: 140
     Sell: 20
     Weight: 15
     Atk: 0
@@ -714,11 +710,11 @@ item_db: (
     View: 520
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 2000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        itemheal rand(45, 55), 0;
+        itemheal rand(110, 130), 0;
     ">
 },
 {
@@ -744,7 +740,7 @@ item_db: (
     View: 521
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 2000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -756,7 +752,7 @@ item_db: (
     AegisName: "ClothoLiquor"
     Name: "Clotho Liquor"
     Type: "IT_HEALING"
-    Buy: 500
+    Buy: 600
     Sell: 150
     Weight: 16
     Atk: 0
@@ -774,7 +770,7 @@ item_db: (
     View: 522
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 2000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -786,8 +782,8 @@ item_db: (
     AegisName: "LachesisBrew"
     Name: "Lachesis Brew"
     Type: "IT_HEALING"
-    Buy: 900
-    Sell: 220
+    Buy: 1000
+    Sell: 150
     Weight: 14
     Atk: 0
     Matk: 0
@@ -804,11 +800,11 @@ item_db: (
     View: 523
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 3000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        itemheal rand(1200, 1400), 0;
+        itemheal rand(1100, 1300), 0;
     ">
 },
 {
@@ -816,8 +812,8 @@ item_db: (
     AegisName: "AtroposMixture"
     Name: "Atropos Mixture"
     Type: "IT_HEALING"
-    Buy: 1750
-    Sell: 500
+    Buy: 2450
+    Sell: 300
     Weight: 15
     Atk: 0
     Matk: 0
@@ -834,11 +830,11 @@ item_db: (
     View: 524
     BindOnEquip: false
     BuyingStore: true
-    Delay: 5000
+    Delay: 10000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        itemheal rand(2700, 3300), 0;
+        itemheal rand(2300, 2550), 0;
     ">
 },
 {
@@ -846,8 +842,8 @@ item_db: (
     AegisName: "ElixirOfLife"
     Name: "Elixir Of Life"
     Type: "IT_HEALING"
-    Buy: 3500
-    Sell: 1000
+    Buy: 5000
+    Sell: 500
     Weight: 20
     Atk: 0
     Matk: 0
@@ -864,7 +860,7 @@ item_db: (
     View: 525
     BindOnEquip: false
     BuyingStore: true
-    Delay: 10000
+    Delay: 20000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -894,7 +890,6 @@ item_db: (
     View: 526
     BindOnEquip: false
     BuyingStore: true
-    Delay: 0
     KeepAfterUse: true
     Sprite: 0
     Script: <"
@@ -924,7 +919,7 @@ item_db: (
     View: 527
     BindOnEquip: false
     BuyingStore: true
-    Delay: 10000
+    Delay: 1000
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
@@ -932,6 +927,78 @@ item_db: (
     ">
 },
 {
+    Id: 528
+    AegisName: "Manana"
+    Name: "Manana"
+    Type: "IT_DELAYCONSUME"
+    Buy: 100
+    Sell: 35
+    Weight: 10
+    Job: 0xFFFFFFFF
+    Upper: 0x3F
+    Gender: 2
+    Refine: false
+    View: 528
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 500
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        heal rand(70, 80), 0;
+    ">
+},
+{
+    Id: 529
+    AegisName: "Curshroom"
+    Name: "Curshroom"
+    Type: "IT_HEALING"
+    Buy: 150
+    Sell: 25
+    Weight: 10
+    Job: 0xFFFFFFFF
+    Upper: 0x3F
+    Gender: 2
+    Loc: 0
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    View: 515
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 30000
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        sc_start SC_ATTHASTE_POTION1, 30000, 5;
+		sc_end SC_POISON;
+        heal rand(40, 50), 0;
+    ">
+},
+{
+    Id: 530
+    AegisName: "Carrot"
+    Name: "Carrot"
+    Type: "IT_HEALING"
+    Buy: 30
+    Sell: 8
+    Weight: 3
+    Job: 0xFFFFFFFF
+    Upper: 0x3F
+    Gender: 2
+    Loc: 0
+    Refine: false
+    View: 530
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 500
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        heal rand(20, 30), 0;
+    ">
+},
+{
     Id: 700
     AegisName: "SmallTentacles"
     Name: "Small Tentacles"
@@ -2107,6 +2174,30 @@ item_db: (
 
 },
 {
+    Id: 2701
+    AegisName: "LeatherShield"
+    Name: "Leather Shield"
+    Type: "IT_ARMOR"
+    Buy: 2000
+    Sell: 250
+    Weight: 100
+    Def: 5
+    Job: 0xFFFFFFFF
+    Upper: 0x3F
+    Gender: 2
+    Loc: 32
+    EquipLv: 5
+    Refine: false
+    View: 2701
+    BindOnEquip: false
+    BuyingStore: true
+	OnEquipScript:
+                    <"
+                        bonus bAtkRange, -1;
+                    ">
+
+},
+{
     Id: 2900
     AegisName: "Bandana"
     Name: "Bandana"
@@ -2371,7 +2462,8 @@ item_db: (
     AegisName: "PiouEgg"
     Name: "Piou egg"
     Type: "IT_PETEGG"
-    Buy: 200
+    Buy: 30000
+    Sell: 500
     KeepAfterUse: true
     Script: <"
         bpet;
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index f946e9c7..c56b77fe 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat