Wands (don't expect a lot outta them) + Arkim notes because Fate won't make in time.

3 files changed, 77 insertions, 4 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f3b6e770d..407b36d43 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9364,7 +9364,6 @@ item_db: (
 	Weight: 120
 	Atk: 50
 	Matk: 0
-	Def: 0
 	Loc: "EQP_HAND_R"
 	WeaponLv: 1
 	EquipLv: 5
@@ -9400,7 +9399,6 @@ item_db: (
 	Weight: 958
 	Atk: 175
 	Matk: 0
-	Def: 0
 	Loc: "EQP_HAND_R"
 	WeaponLv: 1
 	EquipLv: 37
@@ -10805,6 +10803,79 @@ item_db: (
 		bonus bAtkEle,Ele_Holy;
 	">
 },
+// <!-- Magical Weapons -->
+{
+	Id: 7000
+	AegisName: "TrainingWand"
+	Name: "Training Wand"
+	Type: "IT_WEAPON"
+	Buy: 200
+	Sell: 80
+	Weight: 158
+	Atk: 0
+	Matk: 50
+	Loc: "EQP_HAND_R"
+	WeaponLv: 1
+	EquipLv: 20
+	Refine: true
+	Subtype: "W_STAFF"
+	ViewSprite: 7000
+	BuyingStore: true
+},
+{
+	Id: 7001
+	AegisName: "NoviceWand"
+	Name: "Novice Wand"
+	Type: "IT_WEAPON"
+	Buy: 2000
+	Sell: 800
+	Weight: 158
+	Atk: 0
+	Matk: 100
+	Loc: "EQP_HAND_R"
+	WeaponLv: 1
+	EquipLv: 40
+	Refine: true
+	Subtype: "W_STAFF"
+	ViewSprite: 7001
+	BuyingStore: true
+},
+{
+	Id: 7002
+	AegisName: "ApprenticeWand"
+	Name: "Apprentice Wand"
+	Type: "IT_WEAPON"
+	Buy: 20000
+	Sell: 8000
+	Weight: 158
+	Atk: 0
+	Matk: 150
+	Loc: "EQP_HAND_R"
+	WeaponLv: 1
+	EquipLv: 60
+	Refine: true
+	Subtype: "W_STAFF"
+	ViewSprite: 7002
+	BuyingStore: true
+},
+{
+	Id: 7003
+	AegisName: "LeaderWand"
+	Name: "Leader Wand"
+	Type: "IT_WEAPON"
+	Buy: 200000
+	Sell: 80000
+	Weight: 158
+	Atk: 0
+	Matk: 200
+	Loc: "EQP_HAND_R"
+	WeaponLv: 1
+	EquipLv: 80
+	Refine: true
+	Subtype: "W_STAFF"
+	ViewSprite: 7003
+	BuyingStore: true
+},
 {
 	Id: 7420
 	AegisName: "DeathPenality"
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 8c0711725..8e287f445 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -29,7 +29,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 		TwoHandAxe: 0~200		(int, defaults to 200)
 		Mace: 0~200				(int, defaults to 200)
 		TwoHandMace: 0~200		(int, defaults to 200)
-		Rod: 0~200				(int, defaults to 200)
+		Rod: 0~200				(int, defaults to 200) (W_STAFF)
 		Bow: 0~200				(int, defaults to 200)
 		Knuckle: 0~200			(int, defaults to 200)
 		Instrumen: 0~200		(int, defaults to 200)
diff --git a/npc/015-3/arkim.txt b/npc/015-3/arkim.txt
index f37772430..ea5e82fa5 100644
--- a/npc/015-3/arkim.txt
+++ b/npc/015-3/arkim.txt
@@ -116,8 +116,10 @@ L_Research:
         switch (@menu) {
             case 4:
                mesq l("@@ is developing these potions.", "Wyara"); break;
+            case 5:
+               mesq l("@@ is developing these potions.", "Fate, in Nivalis,"); break; // TODO: Missing NPC
             default:
-               mesq l("@@ is developing these potions.", "Jesusalva"); // TODO: Fate, Clotho, Lachesis and Atropos
+               mesq l("@@ is developing these potions.", "Jesusalva"); // TODO: Clotho, Lachesis and Atropos
                break;
         }