Update Pet Database

3 files changed, 585 insertions, 0 deletions

diff --git a/db/pre-re/pet_db.conf b/db/pre-re/pet_db.conf
index 4e66584b0..91f9cb8e8 100644
--- a/db/pre-re/pet_db.conf
+++ b/db/pre-re/pet_db.conf
@@ -56,6 +56,12 @@ pet_db:(
 	AttackRate: attack rate              (int, defaults to 0)
 	DefendRate: Defence attack           (int, defaults to 0)
 	ChangeTargetRate: change target      (int, defaults to 0)
+	Evolve: {
+		EggID: {						 (string, Evolved Pet EggID)
+			Name: Amount                 (items required to perform evolution)
+			...
+		}
+	}
 	AutoFeed: true/false                 (boolean, defaults to false)
 	PetScript: <" Pet Script (can also be multi-line) ">
 	EquipScript: <" Equip Script (can also be multi-line) ">
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index bc3470fd9..3974a911e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -83540,6 +83540,209 @@ item_db: (
 	Type: "IT_PETEGG"
 	Buy: 20
 },
+{
+	Id: 9069
+	AegisName: "Mastering_Egg"
+	Name: "Mastering Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9070
+	AegisName: "Savage_Egg"
+	Name: "Savage Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9071
+	AegisName: "Grand_Peco_Peco_Egg"
+	Name: "Grand Peco Peco Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9087
+	AegisName: "High_Orc_Egg"
+	Name: "High Orc Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9088
+	AegisName: "Angeling_Egg"
+	Name: "Angeling Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9089
+	AegisName: "Am_Mut_Egg"
+	Name: "Am Mut Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9090
+	AegisName: "Little_Isis_Egg"
+	Name: "Little Isis Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9091
+	AegisName: "Choco_Egg"
+	Name: "Choco Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9092
+	AegisName: "Eggring_Egg"
+	Name: "Eggring Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9093
+	AegisName: "Hyegun_Egg"
+	Name: "Hyegun Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9094
+	AegisName: "Leaf_Lunatic_Egg"
+	Name: "Leaf Lunatic Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9095
+	AegisName: "Nine_Tails_Egg"
+	Name: "Nine Tails Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9096
+	AegisName: "Cat_o_Nine_Tails_Egg"
+	Name: "Cat o' Nine Tails Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9097
+	AegisName: "Diabolic_Egg_"
+	Name: "Diabolic Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9098
+	AegisName: "Earth_Deleter_Egg"
+	Name: "Earth Deleter Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9099
+	AegisName: "Teddy_Bear_Egg"
+	Name: "Teddy Bear Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9100
+	AegisName: "Gremlin_Egg"
+	Name: "Gremlin Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9101
+	AegisName: "Scatelon_Egg"
+	Name: "Scatleton Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9102
+	AegisName: "Mummy_Egg"
+	Name: "Mummy Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9103
+	AegisName: "Willow_Egg"
+	Name: "Willow Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9104
+	AegisName: "Roween_Egg"
+	Name: "Roween Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9105
+	AegisName: "Hodremlin_Egg"
+	Name: "Hodremlin Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9106
+	AegisName: "Metaller_Egg"
+	Name: "Metaller Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9107
+	AegisName: "Ancient_Mummy_Egg"
+	Name: "Ancient Mummy Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9108
+	AegisName: "Abandoned_Teddy_Bear_Egg"
+	Name: "Abandoned Teddy Bear Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9109
+	AegisName: "Sweet_Drops_Egg"
+	Name: "Sweet Drops Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9111
+	AegisName: "Phreeoni_Egg"
+	Name: "Phreeoni Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9112
+	AegisName: "Moonlight_Flower_Egg"
+	Name: "Moonlight Flower Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
+{
+	Id: 9113
+	AegisName: "Skelion_Egg"
+	Name: "Skelion Egg"
+	Type: "IT_PETEGG"
+	Buy: 20
+},
 
 //== Pet Accessories =======================================
 {
diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf
index 348fcfcd3..a28da61ff 100644
--- a/db/re/pet_db.conf
+++ b/db/re/pet_db.conf
@@ -56,6 +56,12 @@ pet_db:(
 	AttackRate: attack rate              (int, defaults to 0)
 	DefendRate: Defence attack           (int, defaults to 0)
 	ChangeTargetRate: change target      (int, defaults to 0)
+	Evolve: {
+		EggID: {						 (string, Evolved Pet EggID)
+			Name: Amount                 (items required to perform evolution)
+			...
+		}
+	}
 	AutoFeed: true/false                 (boolean, defaults to false)
 	PetScript: <" Pet Script (can also be multi-line) ">
 	EquipScript: <" Equip Script (can also be multi-line) ">
@@ -88,6 +94,12 @@ pet_db:(
 		bonus(bLuk, 2);
 		bonus(bCritical, 1);
 	">
+	Evolve: {
+		Mastering_Egg: {
+			Leaf_Of_Yggdrasil: 10
+			Unripe_Apple: 3
+		}
+	}
 },
 {
 	Id: 1011
@@ -171,6 +183,15 @@ pet_db:(
 		bonus(bMaxHP, 150);
 		bonus(bMaxSP, -10);
 	">
+	Evolve: {
+		Grand_Peco_Peco_Egg: {
+			Pet_Food: 10
+			Fatty_Chubby_Earthworm: 3
+			Peco_Wing_Feather: 300
+			Pecopeco_Card: 1
+			Fruit_Of_Mastela: 10
+		}
+	}
 },
 {
 	Id: 1023
@@ -199,6 +220,15 @@ pet_db:(
 		bonus(bAtk, 10);
 		bonus(bDef, -3);
 	">
+	Evolve: {
+		High_Orc_Egg: {
+			Horror_Of_Tribe: 3
+			Orcish_Sword: 1
+			Orcish_Voucher: 500
+			Cigar: 1
+			Orc_Warrior_Card: 1
+		}
+	}
 },
 {
 	Id: 1026
@@ -253,6 +283,14 @@ pet_db:(
 		bonus(bMatkRate, -1);
 		bonus(bAtkRate, 1);
 	">
+	Evolve: {
+		Little_Isis_Egg: {
+			Armlet_Of_Obedience: 3
+			Queens_Hair_Ornament: 1
+			Shining_Scales: 300
+			Crystal_Jewel__: 6
+		}
+	}
 },
 {
 	Id: 1031
@@ -392,6 +430,14 @@ pet_db:(
 		bonus(bHPrecovRate, 5);
 		bonus(bMaxHP, 25);
 	">
+	Evolve: {
+		Metaller_Egg: {
+			Singing_Plant: 3
+			Grasshoppers_Leg: 777
+			Yellow_Herb: 200
+			Metaller_Card: 1
+		}
+	}
 },
 {
 	Id: 1056
@@ -448,6 +494,14 @@ pet_db:(
 		bonus(bCritical, 3);
 		bonus(bLuk, -1);
 	">
+	Evolve: {
+		Choco_Egg: {
+			Tropical_Banana: 3
+			Monkey_Doll: 2
+			Cacao: 300
+			Yoyo_Card: 1
+		}
+	}
 },
 {
 	Id: 1063
@@ -475,6 +529,14 @@ pet_db:(
 		bonus(bCritical, 2);
 		bonus(bAtk, 2);
 	">
+	Evolve: {
+		Leaf_Lunatic_Egg: {
+			Great_Leaf: 100
+			Clover: 250
+			Four_Leaf_Clover: 30
+			Leaf_Lunatic_Card: 1
+		}
+	}
 },
 {
 	Id: 1077
@@ -586,6 +648,14 @@ pet_db:(
 		bonus(bMaxHPrate, -3);
 		bonus(bMaxSPrate, -3);
 	">
+	Evolve: {
+		Diabolic_Egg_: {
+			Contracts_In_Shadow: 3
+			Petite_DiablOfs_Wing: 250
+			Sacred_Marks: 30
+			Deviruchi_Card: 1
+		}
+	}
 },
 {
 	Id: 1110
@@ -613,6 +683,14 @@ pet_db:(
 		bonus(bMatkRate, 1);
 		bonus(bAtkRate, -1);
 	">
+	Evolve: {
+		Am_Mut_Egg: {
+			Old_Broom: 3
+			Violet_Dyestuffs: 3
+			Dokkaebi_Horn: 300
+			Gold: 3
+		}
+	}
 },
 {
 	Id: 1113
@@ -641,6 +719,22 @@ pet_db:(
 		bonus(bHit, 3);
 		bonus(bAtk, 3);
 	">
+	Evolve: {
+		Eggring_Egg: {
+			Piece_Of_Egg_Shell: 20
+			Old_Frying_Pan: 10
+			Apple_Juice: 3
+			Eggring_Card: 1
+		}
+/*
+		Sweet_Drops_Egg: {
+			25290: 500
+			Candy: 50
+			Candy_Striper: 50
+			Drops_Card: 1
+		}
+*/
+	}
 },
 {
 	Id: 1155
@@ -669,6 +763,14 @@ pet_db:(
 		bonus(bMdef, -2);
 		bonus(bAspdRate, 1);
 	">
+	Evolve: {
+		Earth_Deleter_Egg: {
+			Shining_Stone: 3
+			Petti_Tail: 100
+			Aloebera: 150
+			Deleter_Card: 1
+		}
+	}
 },
 {
 	Id: 1167
@@ -696,6 +798,14 @@ pet_db:(
 		bonus(bVit, 1);
 		bonus(bMaxHP, 50);
 	">
+	Evolve: {
+		Savage_Egg: {
+			Pet_Food: 10
+			Sweet_Milk: 3
+			Meat: 100
+			Feather: 50
+		}
+	}
 },
 {
 	Id: 1170
@@ -751,6 +861,14 @@ pet_db:(
 		bonus(bVit, 1);
 		bonus2(bResEff, Eff_Stun, 100);
 	">
+	Evolve: {
+		Hyegun_Egg: {
+			Hyegun_Hat: 1
+			Munak_Doll: 100
+			Old_Portrait: 50
+			Hyegun_Card: 1
+		}
+	}
 },
 {
 	Id: 1200
@@ -1647,4 +1765,262 @@ pet_db:(
 		bonus(bCritical, 1);
 	">
 },
+// New Pets [Need Info]
+{
+	Id: 1090
+	SpriteName: "MASTERING"
+	Name: "Mastering"
+	EggItem: "Mastering_Egg"
+	AutoFeed: true
+	Evolve: {
+		Angeling_Egg: {
+			Yellow_Potion: 20
+			Spirit_Chain: 1
+			White_Herb: 50
+			Jellopy: 200
+		}
+	}
+},
+{
+	Id: 1096
+	SpriteName: "ANGELING"
+	Name: "Angeling"
+	EggItem: "Angeling_Egg"
+	AutoFeed: true
+},
+{
+	Id: 1301
+	SpriteName: "AM_MUT"
+	Name: "Am Mut"
+	EggItem: "Am_Mut_Egg"
+	AutoFeed: true
+},
+/*
+{
+	Id: 3636
+	SpriteName: "LITTLE_ISIS"
+	Name: "Little Isis"
+	EggItem: "Little_Isis_Egg"
+	AutoFeed: true
+},
+*/
+{
+	Id: 1214
+	SpriteName: "CHOCO"
+	Name: "Choco"
+	EggItem: "Choco_Egg"
+	AutoFeed: true
+},
+/*
+{
+	Id: 3495
+	SpriteName: "DR_EGGRING"
+	Name: "Eggring"
+	EggItem: "Eggring_Egg"
+	AutoFeed: true
+},
+*/
+{
+	Id: 1512
+	SpriteName: "HYEGUN"
+	Name: "Hyegun"
+	EggItem: "Hyegun_Egg"
+	AutoFeed: true
+},
+/*
+{
+	Id: 3496
+	SpriteName: "DR_LUNATIC"
+	Name: "Leaf Lunatic"
+	EggItem: "Leaf_Lunatic_Egg"
+	AutoFeed: true
+},
+*/
+{
+	Id: 1180
+	SpriteName: "NINE_TAIL"
+	Name: "Nine Tails"
+	EggItem: "Nine_Tails_Egg"
+	AutoFeed: true
+	Evolve: {
+/*
+		Cat_o_Nine_Tails_Egg: {
+			23187: 3
+			Fox_Tail: 999
+			Punisher: 1
+			Nine_Tail_Card: 1
+		}
+*/
+	}
+},
+{
+	Id: 1307
+	SpriteName: "CAT_O_NINE_TAIL"
+	Name: "Cat o' Nine Tails"
+	EggItem: "Cat_o_Nine_Tails_Egg"
+	AutoFeed: true
+	Evolve: {
+/*
+		Moonlight_Flower_Egg: {
+			25375: 30
+			Nine_Tail_Card: 10
+			Sohee_Card: 10
+			Munak_Card: 10
+		}
+*/
+	}
+},
+/*
+{
+	Id: 3669
+	SpriteName: "DIABOLIC2"
+	Name: "Diabolic"
+	EggItem: "Diabolic_Egg_"
+	AutoFeed: true
+},
+*/
+/*
+{
+	Id: 3670
+	SpriteName: "DELETER_2"
+	Name: "Earth Deleter"
+	EggItem: "Earth_Deleter_Egg"
+	AutoFeed: true
+},
+*/
+{
+	Id: 1622
+	SpriteName: "TEDDY_BEAR"
+	Name: "Teddy Bear"
+	EggItem: "Teddy_Bear_Egg"
+	AutoFeed: true
+	Evolve: {
+/*
+		Abandoned_Teddy_Bear_Egg: {
+			23189: 3
+			Cursed_Seal: 300
+			Cardinal_Jewel_: 50
+			Teddy_Bear_Card: 1
+		}
+*/
+	}
+},
+{
+	Id: 1632
+	SpriteName: "GREMLIN"
+	Name: "Gremlin"
+	EggItem: "Gremlin_Egg"
+	AutoFeed: true
+	Evolve: {
+/*
+		Hodremlin_Egg: {
+			23188: 3
+			Damp_Darkness: 50
+			Will_Of_Darkness: 200
+			Hodremlin_Card: 1
+		}
+*/
+	}
+},
+/*
+{
+	Id: 3731
+	SpriteName: "SCATLETON"
+	Name: "Scatleton Crate"
+	EggItem: "Scatleton_Crate"
+	AutoFeed: true
+},
+*/
+{
+	Id: 1041
+	SpriteName: "MUMMY"
+	Name: "Mummy"
+	EggItem: "Mummy_Egg"
+	AutoFeed: true
+	Evolve: {
+/*
+		Ancient_Mummy_Egg: {
+			23256: 3
+			Rune_Of_Darkness: 200
+			Gold: 30
+			Ancient_Mummy_Card: 1
+		}
+*/
+	}
+},
+{
+	Id: 1010
+	SpriteName: "WILOW"
+	Name: "Willow"
+	EggItem: "Willow_Egg"
+	AutoFeed: true
+},
+{
+	Id: 1782
+	SpriteName: "ROWEEN"
+	Name: "Roween"
+	EggItem: "Roween_Egg"
+	AutoFeed: true
+},
+{
+	Id: 1773
+	SpriteName: "HODREMLIN"
+	Name: "Hodremlin"
+	EggItem: "Hodremlin_Egg"
+	AutoFeed: true
+},
+{
+	Id: 1058
+	SpriteName: "METALLER"
+	Name: "Metaller"
+	EggItem: "Metaller_Egg"
+	AutoFeed: true
+},
+{
+	Id: 1297
+	SpriteName: "ANCIENT_MUMMY"
+	Name: "Ancient Mummy"
+	EggItem: "Ancient_Mummy_Egg"
+	AutoFeed: true
+},
+/*{
+	Id: 2995
+	SpriteName: "XM_TEDDY_BEAR"
+	Name: "Abandoned Teddy Bear"
+	EggItem: "Abandoned_Teddy_Bear_Egg"
+	AutoFeed: true
+},
+*/
+/* UNKNOWN MONSTER
+{
+	Id: 0
+	SpriteName: "X"
+	Name: "Sweet Drops"
+	EggItem: "Sweet_Drops_Egg"
+	AutoFeed: true
+},
+*/
+{
+	Id: 1159
+	SpriteName: "PHREEONI"
+	Name: "Phreeoni"
+	EggItem: "Phreeoni_Egg"
+	AutoFeed: true
+},
+{
+	Id: 1150
+	SpriteName: "MOONLIGHT"
+	Name: "Moonlight Flower"
+	EggItem: "Moonlight_Flower_Egg"
+	AutoFeed: true
+},
+/*
+{
+	Id: 3971
+	SpriteName: "SKELION"
+	Name: "Skelion"
+	EggItem: "Skelion_Egg"
+	AutoFeed: true
+},
+*/
 )