2 files changed, 157 insertions, 1 deletions
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index da475ac7f..d7a2099bb 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -8329,6 +8329,132 @@ mob_db: (
 		FluoPowder: 570
 	}
 },
+{
+	Id: 1219
+	SpriteName: "Pollet"
+	Name: "Pollet"
+	Lv: 45
+	Hp: 13255
+	Sp: 0
+	Exp: 5700
+	JExp: 50
+	AttackRange: 1
+	Attack: [81, 93]
+	Def: 80
+	Mdef: 90
+	Stats: {
+		Str: 22
+		Agi: 30
+		Vit: 46
+		Int: 30
+		Dex: 40
+		Luk: 25
+	}
+	ViewRange: 6
+	ChaseRange: 14
+	Race: 2
+	Element: (1, 2)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+		CastSensorChase: true
+	}
+	MoveSpeed: 320
+	AttackDelay: 1872
+	AttackMotion: 672
+	DamageMotion: 200
+	Drops: {
+		IceCube: 210
+		IcedBottle: 55
+		IceGladius: 1
+	}
+},
+{
+	Id: 1220
+	SpriteName: "EnergyBall"
+	Name: "Energy Ball"
+	Lv: 1
+	Hp: 2032
+	Sp: 0
+	Exp: 5
+	JExp: 8
+	AttackRange: 1
+	Attack: [81, 93]
+	Def: 80
+	Mdef: 90
+	Stats: {
+		Str: 50
+		Agi: 66
+		Vit: 76
+		Int: 30
+		Dex: 80
+		Luk: 41
+	}
+	ViewRange: 16
+	ChaseRange: 17
+	Race: 2
+	Element: (4, 2)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		Aggressive: true
+		ChangeChase: true
+		CastSensorChase: true
+	}
+	MoveSpeed: 300
+	AttackDelay: 1872
+	AttackMotion: 672
+	DamageMotion: 200
+	Drops: {
+		SulfurPowder: 100
+	}
+},
+{
+	Id: 1220
+	SpriteName: "PsiConscience"
+	Name: "Psi Conscience"
+	Lv: 120
+	Hp: 48016
+	Sp: 0
+	Exp: 70132
+	JExp: 200
+	AttackRange: 4
+	Attack: [81, 93]
+	Def: 80
+	Mdef: 90
+	Stats: {
+		Str: 50
+		Agi: 65
+		Vit: 76
+		Int: 30
+		Dex: 99
+		Luk: 99
+	}
+	ViewRange: 14
+	ChaseRange: 14
+	Race: 2
+	Element: (0, 1)
+	Mode: {
+		CanAttack: true
+		Aggressive: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+		CastSensorChase: true
+		Boss: true
+	}
+	AttackDelay: 3072
+	AttackMotion: 672
+	DamageMotion: 200
+	Drops: {
+		Brainstem: 1700
+		StrangeCoin: 1000
+		BronzeGift: 500
+		SacredManaPotion: 5
+	}
+},
 // Reserved
 {
 	Id: 1500
@@ -8354,7 +8480,7 @@ mob_db: (
 	ViewRange: 9
 	ChaseRange: 14
 	Race: 2
-	Element: (2, 3)
+	Element: (0, 1)
 	Mode: {
 		CanMove: true
 		CanAttack: true
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 7a219b401..8877371f7 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -1237,5 +1237,35 @@ SKILL_COND2 = {
 		}
 	}
 
+	/**********************************************************************/
+    // Note: Cannot explode if poisoned (Poison arrows, anyone?!)
+	EnergyBall: {
+		NPC_SELFDESTRUCTION: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 3
+			Rate: 10000
+			CastTime: 200
+			Delay: 3000
+			Cancelable: true
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYSTATUSOFF"
+			ConditionData: "SC_POISON"
+		}
+	}
+
+	/**********************************************************************/
+	PsiConscience: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 3
+			Rate: 10000
+			CastTime: 100
+			Delay: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			val0: 1220
+		}
+    }
+
 }
 )