Merge branch 'legion' into 'master'

Legion

See merge request evol/serverdata!190

3 files changed, 161 insertions, 9 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 2dc59cd7..ecee9e3f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -3177,6 +3177,28 @@ item_db: (
     ">
 },
 {
+    Id: 1310
+    AegisName: "LegionIronArmor"
+    Name: "Legion's Iron Armor"
+    Type: "IT_ARMOR"
+    Buy: 55000
+    Sell: 13000
+    Weight: 680
+    Atk: 0
+    Matk: 0
+    Def: 550
+    Range: 0
+    Slots: 0
+    Loc: "EQP_HEAD_MID"
+    WeaponLv: 0
+    EquipLv: 25
+    Refine: false
+    ViewSprite: 1310
+    BindOnEquip: false
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 1800
     AegisName: "LousyMoccasins"
     Name: "Lousy Moccasins"
@@ -4289,7 +4311,7 @@ item_db: (
     Buy: 104800
     Sell: 1750
     Weight: 1200
-    Atk: 2000
+    Atk: 600
     Matk: 0
     Def: 200
     Range: 2
@@ -4442,6 +4464,28 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 3514
+    AegisName: "Halberd"
+    Name: "Halberd"
+    Type: "IT_WEAPON"
+    Buy: 25000
+    Sell: 7500
+    Weight: 1200
+    Atk: 600
+    Matk: 0
+    Def: 80
+    Range: 2
+    Slots: 0
+    Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+    WeaponLv: 1
+    EquipLv: 20
+    Refine: false
+    Subtype: "W_2HAXE"
+    BindOnEquip: false
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 4000
     AegisName: "PiouEgg"
     Name: "Piou egg"
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 12709953..42cacaad 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1002,7 +1002,7 @@ mob_db: (
 },
 {
     Id: 1023
-    SpriteName: "mouboo"
+    SpriteName: "Mouboo"
     Name: "Mouboo"
     Lv: 16
     Hp: 2600
@@ -1043,13 +1043,13 @@ mob_db: (
 },
 {
     Id: 1024
-    SpriteName: "slime"
+    SpriteName: "Slime"
     Name: "Green Slime"
     Lv: 10
     Hp: 1200
     Sp: 0
     Exp: 30
-    JExp: 0
+    JExp: 1
     AttackRange: 1
     Attack: [200, 400]
     Def: 15
@@ -1087,12 +1087,12 @@ mob_db: (
 },
 {
     Id: 1025
-    SpriteName: "slime-littleslime"
+    SpriteName: "LittleSlime"
     Name: "Little Green Slime"
     Lv: 8
     Hp: 500
     Sp: 0
-    Exp: 20
+    Exp: 12
     JExp: 0
     AttackRange: 1
     Attack: [150, 250]
@@ -1103,7 +1103,7 @@ mob_db: (
         Agi: 10
         Vit: 15
         Int: 1
-        Dex: 30
+        Dex: 20
         Luk: 5
     }
     ViewRange: 2
@@ -1121,7 +1121,7 @@ mob_db: (
     MoveSpeed: 1100
     AttackDelay: 2462
     AttackMotion: 864
-    DamageMotion: 1026
+    DamageMotion: 466
     MvpExp: 0
     Drops: {
         MaggotSlime: 550
@@ -2726,6 +2726,114 @@ mob_db: (
 	}
 },
 {
+	Id: 1066
+	SpriteName: "LegionSwordswoman"
+	Name: "Legion Swordswoman"
+	Lv: 20
+	Hp: 2845
+	Sp: 0
+	Exp: 22
+	JExp: 3
+	AttackRange: 1
+	Attack: [125, 150]
+	Def: 35
+	Mdef: 5
+	Stats: {
+		Str: 15
+		Agi: 10
+		Vit: 25
+		Int: 5
+		Dex: 20
+		Luk: 10
+	}
+	ViewRange: 6
+	ChaseRange: 9
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 280
+	AttackDelay: 870
+	AttackMotion: 672
+	DamageMotion: 400
+},
+{
+	Id: 1067
+	SpriteName: "LegionHalberdier"
+	Name: "Legion Halberdier"
+	Lv: 22
+	Hp: 3618
+	Sp: 0
+	Exp: 27
+	JExp: 4
+	AttackRange: 2
+	Attack: [215, 240]
+	Def: 40
+	Mdef: 0
+	Stats: {
+		Str: 10
+		Agi: 5
+		Vit: 30
+		Int: 5
+		Dex: 40
+		Luk: 10
+	}
+	ViewRange: 6
+	ChaseRange: 9
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 380
+	AttackDelay: 2170
+	AttackMotion: 954
+	DamageMotion: 620
+},
+{
+	Id: 1068
+	SpriteName: "LegionLieutenant"
+	Name: "Legion Lieutenant"
+	Lv: 30
+	Hp: 5412
+	Sp: 0
+	Exp: 54
+	JExp: 8
+	AttackRange: 2
+	Attack: [312, 325]
+	Def: 50
+	Mdef: 0
+	Stats: {
+		Str: 20
+		Agi: 30
+		Vit: 20
+		Int: 10
+		Dex: 40
+		Luk: 10
+	}
+	ViewRange: 6
+	ChaseRange: 9
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 260
+	AttackDelay: 870
+	AttackMotion: 454
+	DamageMotion: 420
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 8a3421fc..d1a08402 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -217,7 +217,7 @@ mob_skill_db:(
 	}
 
 	/**********************************************************************/
-	slime: {
+	Slime: {
 		NPC_SUMMONMONSTER: {
 			SkillState: "MSS_DEAD"
 			SkillLevel: 2