Merge branch 'Gumicommit' of https://gitlab.com/Micksha/serverdata into Gumicommit

1 files changed, 273 insertions, 9 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index af4af0af..3eadf1b0 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1314,13 +1314,13 @@ item_db: (
     ViewSprite: 564
     BindOnEquip: false
     BuyingStore: true
-    Delay: 750
+    Delay: 450
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 100;
-        @max = 250;
-        @delay = 25;
+        @min = 180;
+        @max = 360;
+        @delay = 50;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
     ">
@@ -1338,16 +1338,16 @@ item_db: (
     }
     Gender: "SEX_ANY"
     Refine: false
-    ViewSprite: 564
+    ViewSprite: 565
     BindOnEquip: false
     BuyingStore: true
     Delay: 450
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 180;
-        @max = 360;
-        @delay = 50;
+        @min = 250;
+        @max = 450;
+        @delay = 150;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
     ">
@@ -3960,6 +3960,270 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 1
+    Refine: false
+    ViewSprite: 2200
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2700
+    AegisName: "Barrel"
+    Name: "Barrel"
+    Type: "IT_ARMOR"
+    Buy: 150
+    Sell: 50
+    Weight: 400
+    Atk: 0
+    Matk: 0
+    Def: 100
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_L"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2700
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+    OnEquipScript: <"
+        bonus bAspd, -30;
+        bonus bCriticalDef, 15;
+        bonus bAtkRange, -5;
+    ">
+},
+{
+    Id: 2701
+    AegisName: "LeatherShield"
+    Name: "Leather Shield"
+    Type: "IT_ARMOR"
+    Buy: 2000
+    Sell: 250
+    Weight: 100
+    Def: 50
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_L"
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2701
+    BindOnEquip: false
+    BuyingStore: true
+    OnEquipScript: <"
+        bonus bAtkRange, -1;
+    ">
+},
+{
+    Id: 2702
+    AegisName: "WoodenShield"
+    Name: "Wooden Shield"
+    Type: "IT_ARMOR"
+    Buy: 5000
+    Sell: 750
+    Weight: 2450
+    Def: 72
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_L"
+    EquipLv: 12
+    Refine: false
+    ViewSprite: 0
+    BindOnEquip: false
+    BuyingStore: true
+    OnEquipScript: <"
+        bonus bAtkRange, -1;
+    ">
+},
+{
+    Id: 2703
+    AegisName: "SteelShield"
+    Name: "Steel Shield"
+    Type: "IT_ARMOR"
+    Buy: 25000
+    Sell: 2630
+    Weight: 5500
+    Def: 200
+    Matk: -200
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_L"
+    EquipLv: 20
+    Refine: false
+    ViewSprite: 2701
+    BindOnEquip: false
+    BuyingStore: true
+    OnEquipScript: <"
+        bonus bAtkRange, -1;
+    ">
+},
+{
+    Id: 2900
+    AegisName: "Bandana"
+    Name: "Bandana"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 4
+    Atk: 0
+    Matk: 0
+    Def: 40
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2900
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2901
+    AegisName: "PumpkinHat"
+    Name: "Pumpkin Hat"
+    Type: "IT_ARMOR"
+    Buy: 320
+    Sell: 100
+    Weight: 50
+    Atk: 0
+    Matk: 0
+    Def: 20
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 4
+    Refine: false
+    ViewSprite: 2901
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2902
+    AegisName: "FancyHat"
+    Name: "Fancy Hat"
+    Type: "IT_ARMOR"
+    Buy: 320
+    Sell: 100
+    Weight: 11
+    Atk: 0
+    Matk: 0
+    Def: 20
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 4
+    Refine: false
+    ViewSprite: 2902
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2903
+    AegisName: "BrimmedHat"
+    Name: "Brimmed Hat"
+    Type: "IT_ARMOR"
+    Buy: 1000
+    Sell: 240
+    Weight: 20
+    Atk: 0
+    Matk: 0
+    Def: 100
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 8
+    Refine: false
+    ViewSprite: 2903
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2904
+    AegisName: "BrimmedFeatherHat"
+    Name: "Brimmed Feather Hat"
+    Type: "IT_ARMOR"
+    Buy: 1600
+    Sell: 300
+    Weight: 23
+    Atk: 0
+    Matk: 0
+    Def: 110
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 8
+    Refine: false
+    ViewSprite: 2904
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2905
+    AegisName: "BrimmedFlowerHat"
+    Name: "Brimmed Flower Hat"
+    Type: "IT_ARMOR"
+    Buy: 1600
+    Sell: 300
+    Weight: 22
+    Atk: 0
+    Matk: 0
+    Def: 110
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
     EquipLv: 8
@@ -4477,7 +4741,7 @@ item_db: (
     Gender: "SEX_ANY"
     Loc: "EQP_HAND_R"
     WeaponLv: 1
-    EquipLv: 1
+    EquipLv: 15
     Refine: false
     Subtype: "W_DAGGER"
     ViewSprite: 1