replace Morcant with animated Morcant, update item_db

2 files changed, 310 insertions, 23 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 8dc47c78..091ee625 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4924,7 +4924,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC_MIKHAIL:            185
 	NPC_TROUPE_LEADER:      186
 	NPC_SIMON:              187
-	NPC_MORCANT:            188
+	NPC_CAPTAIN:            188
 	NPC_THAMAS:             189
 	NPC_MORGAN:             190
 	NPC_ZITONI:             191
@@ -5017,6 +5017,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC_SEWER_GATE:         467
 	NPC_SEWER_WHEEL:        468
 	NPC_TREASURE:           469
+	NPC_MORCANT:			470
 
 	NPC_TEST1:              800
 	NPC_PLAYER:             801
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 631b031d..7563b22f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2315,7 +2315,7 @@ item_db: (
 	Slots: 1
 	Loc: "EQP_COSTUME_HEAD_TOP"
 	WeaponLv: 0
-	EquipLv: 25
+	EquipLv: 20
 	Refine: false
 	ViewSprite: 1001
 	BindOnEquip: false
@@ -2336,7 +2336,7 @@ item_db: (
 	Slots: 1
 	Loc: "EQP_COSTUME_HEAD_TOP"
 	WeaponLv: 0
-	EquipLv: 40
+	EquipLv: 32
 	Refine: false
 	ViewSprite: 1002
 	BindOnEquip: false
@@ -2351,13 +2351,13 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 50000
 	Sell: 5000
-	Weight: 100
+	Weight: 50
 	Atk: 40
 	Matk: 80
 	Slots: 1
 	Loc: "EQP_COSTUME_HEAD_TOP"
 	WeaponLv: 0
-	EquipLv: 60
+	EquipLv: 50
 	Refine: false
 	ViewSprite: 1003
 	BindOnEquip: false
@@ -2372,7 +2372,7 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 50000
 	Sell: 5000
-	Weight: 100
+	Weight: 50
 	Atk: 40
 	Matk: 80
 	Slots: 1
@@ -2393,13 +2393,13 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 50000
 	Sell: 5000
-	Weight: 100
+	Weight: 50
 	Atk: 40
 	Matk: 80
 	Slots: 2
 	Loc: "EQP_COSTUME_HEAD_TOP"
 	WeaponLv: 0
-	EquipLv: 20
+	EquipLv: 25
 	Refine: false
 	ViewSprite: 1005
 	BindOnEquip: false
@@ -2414,7 +2414,7 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 50000
 	Sell: 5000
-	Weight: 100
+	Weight: 50
 	Atk: 40
 	Matk: 80
 	Slots: 3
@@ -2435,13 +2435,13 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 50000
 	Sell: 5000
-	Weight: 100
+	Weight: 50
 	Atk: 40
 	Matk: 80
 	Slots: 4
 	Loc: "EQP_COSTUME_HEAD_TOP"
 	WeaponLv: 0
-	EquipLv: 80
+	EquipLv: 60
 	Refine: false
 	ViewSprite: 1007
 	BindOnEquip: false
@@ -2449,6 +2449,120 @@ item_db: (
 		id5505: 4 // Runestones
 	}
 },
+{
+	Id: 1008
+	AegisName: "ToothNecklace"
+	Name: "Tooth Necklace"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 70
+	Atk: 10
+	Matk: 0
+	Slots: 0
+	Loc: "EQP_COSTUME_HEAD_TOP"
+	WeaponLv: 0
+	EquipLv: 10
+	Refine: false
+	ViewSprite: 1008
+	BindOnEquip: false
+},
+{
+	Id: 1009
+	AegisName: "TeethNecklace"
+	Name: "Teeth Necklace"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 100
+	Atk: 20
+	Matk: 0
+	Slots: 1
+	Loc: "EQP_COSTUME_HEAD_TOP"
+	WeaponLv: 0
+	EquipLv: 30
+	Refine: false
+	ViewSprite: 1009
+	BindOnEquip: false
+	AllowCards: {
+		id5505: 1 // Runestones
+	}
+},
+{
+	Id: 1010
+	AegisName: "BarbarianNecklace"
+	Name: "Barbarian Necklace"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 120
+	Atk: 40
+	Matk: 0
+	Slots: 2
+	Loc: "EQP_COSTUME_HEAD_TOP"
+	WeaponLv: 0
+	EquipLv: 50
+	Refine: false
+	ViewSprite: 1010
+	BindOnEquip: false
+	AllowCards: {
+		id5505: 2 // Runestones
+	}
+},
+{
+	Id: 1011
+	AegisName: "HeartNecklace"
+	Name: "Heart Necklace"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 150
+	Atk: 5
+	Matk: 10
+	Slots: 0
+	Loc: "EQP_COSTUME_HEAD_TOP"
+	WeaponLv: 0
+	EquipLv: 5
+	Refine: false
+	ViewSprite: 1011
+	BindOnEquip: false // TODO: Hearts particle effect.
+},
+{
+	Id: 1012
+	AegisName: "MoubooNecklace"
+	Name: "Mouboo Necklace"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 150
+	Atk: 10
+	Matk: 15
+	Slots: 0
+	Loc: "EQP_COSTUME_HEAD_TOP"
+	WeaponLv: 0
+	EquipLv: 15
+	Refine: false
+	ViewSprite: 1012
+	BindOnEquip: false // TODO: Well, what exactly? Transform player into a Mouboo, or even a Moubi?
+},
+{
+	Id: 1013
+	AegisName: "SkullNecklace"
+	Name: "Skull Necklace"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 200
+	Atk: 0
+	Matk: 1
+	Slots: 0
+	Loc: "EQP_COSTUME_HEAD_TOP"
+	WeaponLv: 0
+	EquipLv: 25
+	Refine: false
+	ViewSprite: 1013
+	BindOnEquip: false // TODO: Transform player into a skeleton.
+},
 // Rings
 {
 	Id: 1100
@@ -2714,6 +2828,136 @@ item_db: (
 		id5505: 2 // Runestones
 	}
 },
+// Charms
+{
+	Id: 1200
+	AegisName: "AncientScroll"
+	Name: "Ancient Scroll"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 80
+	Atk: 0
+	Matk: 10
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 25
+	Refine: false
+	ViewSprite: 1200
+	BindOnEquip: false // TODO: Add Buff.
+},
+{
+	Id: 1201
+	AegisName: "Clover"
+	Name: "Clover"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 10
+	Atk: 0
+	Matk: 0
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 20
+	Refine: false
+	ViewSprite: 1201
+	BindOnEquip: false
+	Script: <"
+		bonus bLuk, 5;
+	">
+},
+{
+	Id: 1202
+	AegisName: "FireScroll"
+	Name: "Fire Scroll"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 120
+	Atk: 0
+	Matk: 20
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 45
+	Refine: false
+	ViewSprite: 1202
+	BindOnEquip: false // TODO: Add Buff. 
+},
+{
+	Id: 1203
+	AegisName: "Grimoire"
+	Name: "Grimoire"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 220
+	Atk: 0
+	Matk: 30
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 30
+	Refine: false
+	ViewSprite: 1203
+	BindOnEquip: false // TODO: Add Buff. 
+},
+{
+	Id: 1204
+	AegisName: "HeartofIsis"
+	Name: "Heart of Isis"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 150
+	Atk: 0
+	Matk: 0
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 70
+	Refine: false
+	ViewSprite: 1204
+	BindOnEquip: false // TODO: Add Buff. 
+},
+{
+	Id: 1205
+	AegisName: "ThetaBook"
+	Name: "Theta Book"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 200
+	Atk: 0
+	Matk: 0
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 50
+	Refine: false
+	ViewSprite: 1205
+	BindOnEquip: false // TODO: Add Buff. 
+},
+{
+	Id: 1206
+	AegisName: "FlowerTowel"
+	Name: "Flower Towel"
+	Type: "IT_ARMOR"
+	Buy: 50000
+	Sell: 5000
+	Weight: 100
+	Atk: 0
+	Matk: 0
+	Slots: 0
+	Loc: "EQP_ACC_L"
+	WeaponLv: 0
+	EquipLv: 20
+	Refine: false
+	ViewSprite: 1206
+	BindOnEquip: false // TODO: Add Buff. 
+},
 // Armor
 {
 	Id: 1300
@@ -2897,7 +3141,7 @@ item_db: (
 	Sell: 8500
 	Weight: 1500
 	Def: 28
-	Slots: 0
+	Slots: 1
 	Loc: "EQP_HEAD_MID"
 	WeaponLv: 0
 	EquipLv: 35
@@ -2909,6 +3153,9 @@ item_db: (
 		bonus bStr, 2;
 		bonus bVit, 1;
 	">
+	AllowCards: {
+		id5505: 1 // Runestones
+	}
 },
 {
 	Id: 1310
@@ -2919,13 +3166,16 @@ item_db: (
 	Sell: 13000
 	Weight: 680
 	Def: 18
-	Slots: 0
+	Slots: 1
 	Loc: "EQP_HEAD_MID"
 	WeaponLv: 0
 	EquipLv: 25
 	Refine: false
 	ViewSprite: 1310
 	BindOnEquip: false
+	AllowCards: {
+		id5505: 1 // Runestones
+	}
 },
 {
 	Id: 1311
@@ -2936,7 +3186,7 @@ item_db: (
 	Sell: 45000
 	Weight: 3500
 	Def: 65
-	Slots: 0
+	Slots: 2
 	Loc: "EQP_HEAD_MID"
 	WeaponLv: 0
 	EquipLv: 50
@@ -2952,6 +3202,9 @@ item_db: (
 		nodrop: true
 		noselltonpc: true
 	}
+	AllowCards: {
+		id5505: 2 // Runestones
+	}
 },
 
 // Placeholder Chests
@@ -3141,13 +3394,16 @@ item_db: (
 	Sell: 5000
 	Weight: 100
 	Def: 10
-	Slots: 0
+	Slots: 1
 	Loc: "EQP_HEAD_MID"
 	WeaponLv: 0
 	EquipLv: 10
 	Refine: false
 	ViewSprite: 1322
 	BindOnEquip: false
+	AllowCards: {
+		id5503: 1 // Crude Gems
+	}
 },
 {
 	Id: 1323
@@ -3158,13 +3414,16 @@ item_db: (
 	Sell: 5000
 	Weight: 100
 	Def: 10
-	Slots: 0
+	Slots: 1
 	Loc: "EQP_HEAD_MID"
 	WeaponLv: 0
 	EquipLv: 10
 	Refine: false
 	ViewSprite: 1323
 	BindOnEquip: false
+	AllowCards: {
+		id5505: 1 // Runestones
+	}
 },
 
 // Boots
@@ -3821,6 +4080,7 @@ item_db: (
 	Weight: 5500
 	Def: 12
 	Matk: -200
+	Slots: 1
 	Loc: "EQP_HAND_L"
 	EquipLv: 20
 	Refine: false
@@ -3829,6 +4089,9 @@ item_db: (
 	OnEquipScript: <"
 		bonus bAtkRange, -1;
 	">
+	AllowCards: {
+		id5503: 1 // Crude Gem
+	}
 },
 // Headgear
 {
@@ -4714,7 +4977,7 @@ item_db: (
 		doevent "#SpotlightMaster::OnTouch";
 	">
 	Script: <"
-		skill MG_FIREBALL, 1;
+		skill MG_FIREBOLT, 1;
 		bonus bMatkRate, 10;
 	">
 },
@@ -5126,6 +5389,29 @@ item_db: (
 		id5505: 3 // Runestones
 	}
 },
+{
+	Id: 3528
+	AegisName: "ApprenticeWand"
+	Name: "ApprenticeWand"
+	Type: "IT_WEAPON"
+	Buy: 10000
+	Sell: 1500
+	Weight: 75
+	Atk: 50
+	Matk: 200
+	Def: 10
+	Range: 3
+	Slots: 1
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 20
+	Refine: false
+	Subtype: "W_2HSTAFF"
+	BindOnEquip: false
+	AllowCards: {
+		id5503: 1 // Crude Gems
+	}
+},
 // Pet Eggs
 {
 	Id: 4000
@@ -5347,7 +5633,7 @@ item_db: (
 	Buy: 50000
 	Sell: 6500
 	Script: <"
-		skill AB_HIGHNESSHEAL, 5;
+		skill AB_HIGHNESSHEAL, 3;
 		bonus bMagicAtkDef, 50;
 	">
 	Loc: ["EQP_COSTUME_HEAD_TOP","EQP_COSTUME_HEAD_MID","EQP_HAND_R","EQP_HAND_L","EQP_ACC_L"]
@@ -5361,7 +5647,7 @@ item_db: (
 	Buy: 50000
 	Sell: 6500
 	Script: <"
-		skill MG_FIREBALL, 5;
+		skill MG_FIREBALL, 3;
 		bonus bSplashAddRange, 2;
 	">
 	Loc: ["EQP_COSTUME_HEAD_TOP","EQP_COSTUME_HEAD_MID","EQP_HAND_R","EQP_HAND_L","EQP_ACC_L"]
@@ -5388,7 +5674,7 @@ item_db: (
 	Buy: 50000
 	Sell: 6500
 	Script: <"
-		skill MG_FROSTDIVER, 5;
+		skill MG_FROSTDIVER, 3;
 		bonus bSkillCooldown, 10;
 	">
 	Loc: ["EQP_COSTUME_HEAD_TOP","EQP_COSTUME_HEAD_MID","EQP_HAND_R","EQP_HAND_L","EQP_ACC_L"]
@@ -5402,7 +5688,7 @@ item_db: (
 	Buy: 50000
 	Sell: 6500
 	Script: <"
-		skill MG_NAPALMBEAT, 5;
+		skill MG_NAPALMBEAT, 3;
 	">
 	Loc: ["EQP_COSTUME_HEAD_TOP","EQP_COSTUME_HEAD_MID","EQP_HAND_R","EQP_HAND_L","EQP_ACC_L"]
 },
@@ -5415,7 +5701,7 @@ item_db: (
 	Buy: 50000
 	Sell: 6500
 	Script: <"
-		skill GC_DARKILLUSION, 5;
+		skill MG_LIGHTNINGBOLT, 7;
 	">
 	Loc: ["EQP_COSTUME_HEAD_TOP","EQP_COSTUME_HEAD_MID","EQP_HAND_R","EQP_HAND_L","EQP_ACC_L"]
 },
@@ -5493,7 +5779,7 @@ item_db: (
 	Buy: 35000
 	Sell: 4000
 	Script: <"
-		skill GC_DARKILLUSION, 1;
+		skill MG_LIGHTNINGBOLT, 2;
 	">
 	Loc: ["EQP_COSTUME_HEAD_TOP","EQP_COSTUME_HEAD_MID","EQP_HAND_R","EQP_HAND_L","EQP_ACC_L"]
 },