Update commented out pets

1 files changed, 129 insertions, 34 deletions

diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf
index 74261eb32..54fcd97dc 100644
--- a/db/re/pet_db.conf
+++ b/db/re/pet_db.conf
@@ -264,7 +264,6 @@ pet_db:(
 		else if (.@intimacy >= PET_INTIMACY_CORDIAL)
 			bonus(bAtkRate, 1);
 	">
-/*
 	Evolve: {
 		Little_Isis_Egg: {
 			Armlet_Of_Obedience: 3
@@ -273,7 +272,6 @@ pet_db:(
 			Crystal_Jewel__: 6
 		}
 	}
-*/
 },
 {
 	Id: 1031
@@ -489,7 +487,6 @@ pet_db:(
 			bonus(bAtk, 2);
 		}
 	">
-/*
 	Evolve: {
 		Leaf_Lunatic_Egg: {
 			Great_Leaf: 100
@@ -498,7 +495,6 @@ pet_db:(
 			Leaf_Lunatic_Card: 1
 		}
 	}
-*/
 },
 {
 	Id: 1077
@@ -600,7 +596,6 @@ pet_db:(
 			bonus(bMaxSPrate, 1);
 		}
 	">
-/*
 	Evolve: {
 		Diabolic_Egg_: {
 			Contracts_In_Shadow: 3
@@ -609,7 +604,6 @@ pet_db:(
 			Deviruchi_Card: 1
 		}
 	}
-*/
 },
 {
 	Id: 1110
@@ -665,7 +659,6 @@ pet_db:(
 			bonus(bAtk, 3);
 		}
 	">
-/*
 	Evolve: {
 		Eggring_Egg: {
 			Piece_Of_Egg_Shell: 20
@@ -680,7 +673,6 @@ pet_db:(
 			Drops_Card: 1
 		}
 	}
-*/
 },
 {
 	Id: 1155
@@ -704,7 +696,6 @@ pet_db:(
 		if (.@intimacy >= PET_INTIMACY_LOYAL)
 			bonus(bAgi, 1);
 	">
-/*
 	Evolve: {
 		Earth_Deleter_Egg: {
 			Shining_Stone: 3
@@ -713,7 +704,6 @@ pet_db:(
 			Deleter_Card: 1
 		}
 	}
-*/
 },
 {
 	Id: 1167
@@ -1604,14 +1594,23 @@ pet_db:(
 			bonus(bMatkRate, 1);
 	">
 },
-/*
 {
 	Id: 3636
 	Name: "Little Isis"
 	EggItem: "Little_Isis_Egg"
 	AutoFeed: true
+	EquipScript: <"
+		.@intimacy = getpetinfo(PETINFO_INTIMACY);
+		if (.@intimacy >= PET_INTIMACY_LOYAL)
+			bonus(bAtkRate, 4);
+		else if (.@intimacy >= PET_INTIMACY_CORDIAL)
+			bonus(bAtkRate, 3);
+		else if (.@intimacy >= PET_INTIMACY_NEUTRAL)
+			bonus(bAtkRate, 2);
+		else
+			bonus(bAtkRate, 1);
+	">
 },
-*/
 {
 	Id: 1214
 	Name: "Choco"
@@ -1633,14 +1632,28 @@ pet_db:(
 		}
 	">
 },
-/*
 {
 	Id: 3495
 	Name: "Eggring"
 	EggItem: "Eggring_Egg"
 	AutoFeed: true
+	EquipScript: <"
+		.@intimacy = getpetinfo(PETINFO_INTIMACY);
+		if (.@intimacy >= PET_INTIMACY_LOYAL) {
+			bonus(bHit, 9);
+			bonus(bAtk, 9);
+		} else if (.@intimacy >= PET_INTIMACY_CORDIAL) {
+			bonus(bHit, 7);
+			bonus(bAtk, 7);
+		} else if (.@intimacy >= PET_INTIMACY_NEUTRAL) {
+			bonus(bHit, 5);
+			bonus(bAtk, 5);
+		} else {
+			bonus(bHit, 3);
+			bonus(bAtk, 3);
+		}
+	">
 },
-*/
 {
 	Id: 1512
 	Name: "Hyegun"
@@ -1665,14 +1678,32 @@ pet_db:(
 		}
 	">
 },
-/*
 {
 	Id: 3496
 	Name: "Leaf Lunatic"
 	EggItem: "Leaf_Lunatic_Egg"
 	AutoFeed: true
+	EquipScript: <"
+		.@intimacy = getpetinfo(PETINFO_INTIMACY);
+		if (.@intimacy >= PET_INTIMACY_LOYAL) {
+			bonus(bCritical, 5);
+			bonus(bAtk, 5);
+			bonus2(bAddRace, RC_Formless, 6);
+			bonus2(bMagicAddRace, RC_Formless, 6);
+		} else if (.@intimacy >= PET_INTIMACY_CORDIAL) {
+			bonus(bCritical, 4);
+			bonus(bAtk, 4);
+			bonus2(bAddRace, RC_Formless, 3);
+			bonus2(bMagicAddRace, RC_Formless, 3);
+		} else if (.@intimacy >= PET_INTIMACY_NEUTRAL) {
+			bonus(bCritical, 3);
+			bonus(bAtk, 3);
+		} else {
+			bonus(bCritical, 2);
+			bonus(bAtk, 2);
+		}
+	">
 },
-*/
 {
 	Id: 1180
 	Name: "Nine Tails"
@@ -1730,22 +1761,57 @@ pet_db:(
 		}
 	}
 },
-/*
 {
 	Id: 3669
 	Name: "Diabolic"
 	EggItem: "Diabolic_Egg_"
 	AutoFeed: true
+	EquipScript: <"
+		.@intimacy = getpetinfo(PETINFO_INTIMACY);
+		if (.@intimacy >= PET_INTIMACY_LOYAL) {
+			bonus(bAtkRate, 2);
+			bonus(bMatkRate, 2);
+			bonus(bMaxHPrate, 2);
+			bonus(bMaxSPrate, 2);
+			bonus5(bAutoSpell, "MG_FIREBOLT", 3, 50, BF_WEAPON|BF_SHORT, 1);
+		} else if (.@intimacy >= PET_INTIMACY_CORDIAL) {
+			bonus(bAtkRate, 2);
+			bonus(bMatkRate, 2);
+			bonus(bMaxHPrate, 1);
+			bonus(bMaxSPrate, 1);
+			bonus5(bAutoSpell, "MG_FIREBOLT", 3, 50, BF_WEAPON|BF_SHORT, 1);
+		} else if (.@intimacy >= PET_INTIMACY_NEUTRAL) {
+			bonus(bAtkRate, 1);
+			bonus(bMatkRate, 1);
+			bonus(bMaxHPrate, 1);
+			bonus(bMaxSPrate, 1);
+		} else {
+			bonus(bAtkRate, 1);
+			bonus(bMatkRate, 1);
+		}
+	">
 },
-*/
-/*
 {
 	Id: 3670
 	Name: "Earth Deleter"
 	EggItem: "Earth_Deleter_Egg"
 	AutoFeed: true
+	EquipScript: <"
+		.@intimacy = getpetinfo(PETINFO_INTIMACY);
+		if (.@intimacy >= PET_INTIMACY_LOYAL) {
+			bonus(bAspdRate, 3);
+			bonus(bAgi, 3);
+		} else if (.@intimacy >= PET_INTIMACY_CORDIAL) {
+			bonus(bAspdRate, 2);
+			bonus(bAgi, 2);
+		} else if (.@intimacy >= PET_INTIMACY_NEUTRAL) {
+			bonus(bAspdRate, 1);
+			bonus(bAgi, 1);
+		} else {
+			bonus(bAspdRate, 1);
+		}
+	">
 },
-*/
 {
 	Id: 1622
 	Name: "Teddy Bear"
@@ -1759,7 +1825,6 @@ pet_db:(
 		else if (.@intimacy >= PET_INTIMACY_CORDIAL)
 			bonus(bMaxSP, 50);
 	">
-/*
 	Evolve: {
 		Abandoned_Teddy_Bear_Egg: {
 			SmallDoll_Needle: 3
@@ -1767,6 +1832,7 @@ pet_db:(
 			Cardinal_Jewel_: 50
 			Teddy_Bear_Card: 1
 		}
+/*
 		Aliot_Egg: {
 			Screw: 500
 			Honey: 100
@@ -1779,8 +1845,8 @@ pet_db:(
 			Bloody_Page: 50
 			Teddy_Bear_Card: 1
 		}
-	}
 */
+	}
 },
 {
 	Id: 1632
@@ -1807,14 +1873,24 @@ pet_db:(
 		}
 	}
 },
-/*
 {
 	Id: 3731
-	Name: "Scatleton Crate"
-	EggItem: "Scatleton_Crate"
-	AutoFeed: true
+	Name: "Scatleton"
+	EggItem: "Scatelon_Egg"
+	FoodItem: "Delicious_Fish"
+	AccessoryItem: "Red_Bell_Necklace"
+	EquipScript: <"
+		if (getpetinfo(PETINFO_INTIMACY) >= PET_INTIMACY_CORDIAL)
+			bonus2(bAddItemHealRate, 579, 100);
+	">
+	Evolve: {
+		Skelion_Egg: {
+			Memory_Of_Gyol: 2
+			Yummy_Meat: 100
+			Cookie_Bat: 100
+		}
+	}
 },
-*/
 {
 	Id: 1041
 	Name: "Mummy"
@@ -1947,22 +2023,37 @@ pet_db:(
 		}
 	">
 },
-/*
 {
 	Id: 2995
 	Name: "Abandoned Teddy Bear"
 	EggItem: "Abandoned_Teddy_Bear_Egg"
 	AutoFeed: true
+	EquipScript: <"
+		.@intimacy = getpetinfo(PETINFO_INTIMACY);
+		if (.@intimacy >= PET_INTIMACY_LOYAL) {
+			bonus(bMaxSP, 150);
+			autobonus("{ bonus2(bSPRegenRate, 40, 1000); }", 30, 5000, BF_MAGIC);
+		} else if (.@intimacy >= PET_INTIMACY_CORDIAL) {
+			bonus(bMaxSP, 150);
+			autobonus("{ bonus2(bSPRegenRate, 30, 1000); }", 30, 5000, BF_MAGIC);
+		} else if (.@intimacy >= PET_INTIMACY_NEUTRAL) {
+			bonus(bMaxSP, 100);
+		} else {
+			bonus(bMaxSP, 50);
+		}
+	">
 },
-*/
-/* UNKNOWN MONSTER
 {
-	Id: 0
+	Id: 3790
 	Name: "Sweet Drops"
 	EggItem: "Sweet_Drops_Egg"
+	FoodItem: "Candy"
 	AutoFeed: true
+	EquipScript: <"
+		if (getpetinfo(PETINFO_INTIMACY) >= PET_INTIMACY_LOYAL)
+			bonus2(bExpAddRace, RC_All, 1);
+	">
 },
-*/
 {
 	Id: 20425
 	Name: "Phreeoni"
@@ -2011,12 +2102,16 @@ pet_db:(
 		}
 	">
 },
-/*
 {
 	Id: 3971
 	Name: "Skelion"
 	EggItem: "Skelion_Egg"
+	FoodItem: "Yummy_Meat"
+	AccessoryItem: "Dark_Mane"
 	AutoFeed: true
+	EquipScript: <"
+		if (getpetinfo(PETINFO_INTIMACY) >= PET_INTIMACY_CORDIAL)
+			bonus2(bAddItemHealRate, 579, 100);
+	">
 },
-*/
 )