test hat location + add HAS quest + candor battle warp

2 files changed, 174 insertions, 8 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index d7643c728..49b2fc530 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -174,6 +174,10 @@ quest_db: (
     Name: "TulimsharQuest_Sarah"
 },
 {
+    Id: 36
+    Name: "CandorQuest_HAS"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 8f96f60cf..1b3921f5c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8074,6 +8074,33 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 1321
+    AegisName: "CandorShirt"
+    Name: "Candor Shirt"
+    Type: "IT_ARMOR"
+    Buy: 120
+    Sell: 50
+    Weight: 200
+    Atk: 0
+    Matk: 170
+    Def: 2
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_MID"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 1321
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 1800
     AegisName: "LousyMoccasins"
     Name: "Lousy Moccasins"
@@ -8155,6 +8182,33 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 1803
+    AegisName: "CandorBoots"
+    Name: "Candor Boots"
+    Type: "IT_ARMOR"
+    Buy: 600
+    Sell: 180
+    Weight: 18
+    Atk: 0
+    Matk: 0
+    Def: 15
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_SHOES"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 1803
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 2000
     AegisName: "Armbands"
     Name: "Armbands"
@@ -8695,6 +8749,33 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 2217
+    AegisName: "CandorShorts"
+    Name: "Candor Shorts"
+    Type: "IT_ARMOR"
+    Buy: 1200
+    Sell: 250
+    Weight: 15
+    Atk: 0
+    Matk: 0
+    Def: 14
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 11
+    Refine: false
+    ViewSprite: 2217
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 2500
     AegisName: "WeddingRing"
     Name: "Wedding Ring"
@@ -10111,7 +10192,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_COSTUME_HEAD_TOP" 
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10138,7 +10219,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_COSTUME_HEAD_MID"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10165,7 +10246,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_COSTUME_HEAD_LOW"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10192,7 +10273,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_COSTUME_GARMENT"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10219,7 +10300,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_AMMO"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10246,7 +10327,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_SHADOW_ARMOR"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10273,7 +10354,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_SHADOW_WEAPON"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10300,7 +10381,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: "EQP_HEAD_TOP"
+    Loc: "EQP_SHADOW_SHIELD"
     WeaponLv: 0
     EquipLv: 8
     Refine: false
@@ -10311,6 +10392,60 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 2939
+    AegisName: "CandorHeadBnad"
+    Name: "Candor Head Band"
+    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_SHADOW_ARMS"
+    WeaponLv: 0
+    EquipLv: 4
+    Refine: false
+    ViewSprite: 2939
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2940
+    AegisName: "GraduationCap"
+    Name: "Graduation Cap"
+    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_SHADOW_ACC_R"
+    WeaponLv: 0
+    EquipLv: 4
+    Refine: false
+    ViewSprite: 2940
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 3200
     AegisName: "Shemagh"
     Name: "Shemagh"
@@ -10351,6 +10486,33 @@ item_db: (
     BuyingStore: true
 },
 {
+    Id: 3202
+    AegisName: "GraduationCapot"
+    Name: "Graduation Capot"
+    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: 2940
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 3500
     AegisName: "Knife"
     Name: "Knife"