From 5ec3585e02d86283e30bf535ecbe8874c9a7fc99 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 24 Aug 2018 10:41:14 -0300
Subject: Fix bugs. Mostly that, but Mogguns are not a coal monster.

Of course, I did NOT review any change, but mogguns somehow caught
my attention. We already have plenty coal monsters. Moggun must drop something
- anything - else. Even the [Ice Gladius] is allowed there.
---
 db/re/item_db.conf | 51 ++++++++++++++++++++++++++++++++-------------------
 db/re/mob_db.conf  | 24 ++++++++++++------------
 db/re/pet_db.conf  |  2 +-
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0c227eb8c..92d40ae97 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2364,25 +2364,25 @@ item_db: (
 	Delay: 500
 	UseEffect: "EFFECT_HEAL"
 	Script: <"
-        switch (rand(1,3)) {
-            case 1:
-                .@mid=CloverPatch;
-                break;
-            case 2:
-                .@mid=ChagashroomField;
-                break;
-            default:
-                .@mid=PlushroomField;
-                break;
-        }
-        .@am=rand(1,2);
-        .@name$=strmobinfo(1, .@mid);
+		switch (rand(1,3)) {
+			case 1:
+				.@mid=CloverPatch;
+				break;
+			case 2:
+				.@mid=ChagashroomField;
+				break;
+			default:
+				.@mid=PlushroomField;
+				break;
+		}
+		.@am=rand(1,2);
+		.@name$=strmobinfo(1, .@mid);
 		if (@useType == 1) {
 			if (!getmapxy(.@map$, .@x, .@y, 0)) {
 				monster(.@map$, .@x, .@y, .@name$, .@mid, .@am);
 				//$TREE_PLANTED=$TREE_PLANTED+1; // Not a tree.... right?
 			}
-        }
+		}
 	">
 },
 {
@@ -8431,7 +8431,7 @@ item_db: (
 	ViewSprite: 2944
 	BuyingStore: true
 	Script: <"
-        bonus2 bAddEle,Ele_Water,10;
+		bonus2 bAddEle,Ele_Water,10;
 	">
 },
 {
@@ -8658,8 +8658,8 @@ item_db: (
 	}
 	Script: <"
 		bonus bCriticalRate,100;
-        bonus2 bSubEle,Ele_Holy,-25;
-        bonus2 bSubEle,Ele_Dark,25;
+		bonus2 bSubEle,Ele_Holy,-25;
+		bonus2 bSubEle,Ele_Dark,25;
 	">
 },
 {
@@ -9701,7 +9701,7 @@ item_db: (
 {
 	Id: 4000
 	AegisName: "PiouEgg"
-	Name: "Piou egg"
+	Name: "Piou Egg"
 	Type: "IT_PETEGG"
 	Buy: 30000
 	Sell: 1000
@@ -9714,7 +9714,7 @@ item_db: (
 {
 	Id: 4001
 	AegisName: "BhopEgg"
-	Name: "Bhopper egg"
+	Name: "Bhopper Egg"
 	Type: "IT_PETEGG"
 	Buy: 90000
 	Sell: 4000
@@ -9789,6 +9789,19 @@ item_db: (
 		bpet;
 	">
 },
+{
+	Id: 4007
+	AegisName: "ForestShroomEgg"
+	Name: "Forest Shroom Egg"
+	Type: "IT_PETEGG"
+	Buy: 30000
+	Sell: 1000
+	Weight: 300
+	KeepAfterUse: true
+	Script: <"
+		bpet;
+	">
+},
 
 //
 // Dyes
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 0a551245a..90e09a42c 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -2260,8 +2260,8 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 480
 	Drops: {
-	    Coal: 1000
 		WhiteFur: 800
+		Coal: 500
 		WhiteFur: 400
 		Diamond: 11
 	}
@@ -6704,8 +6704,8 @@ mob_db: (
 	AttackMotion: 472
 	DamageMotion: 280
 	Drops: {
-	    Potatoz: 1300
-	    Moss: 500
+		Potatoz: 1300
+		Moss: 500
 		GrassSeeds: 300
 		Carrot: 11
 		Emerald: 4
@@ -7330,9 +7330,9 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 480
 	Drops: {
-	    SulphurPowder: 1000
-	    SulphurPowder: 900
-	    SulphurPowder: 800
+		SulfurPowder: 1000
+		SulfurPowder: 900
+		SulfurPowder: 800
 		Skull: 500
 		Bone: 300
 		Bone: 100
@@ -7377,15 +7377,15 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 480
 	Drops: {
-	    CasinoCoins: 9500
-	    Coal: 9000
-	    IronOre: 8500
-	    CactusDrink: 8000
+		CasinoCoins: 9500
+		Coal: 9000
+		IronOre: 8500
+		CactusDrink: 8000
 		CactusPotion: 7000
 		CoinBag: 6000
 		Coal: 5000
 		IronOre: 2000
-	    Ruby: 100
+		Ruby: 100
 	}
 },
-)
\ No newline at end of file
+)
diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf
index cfc6ccb97..5fdda5a79 100644
--- a/db/re/pet_db.conf
+++ b/db/re/pet_db.conf
@@ -170,7 +170,7 @@ pet_db:(
     SpriteName: "ForestShrommy"
     Name: "Forest Shroomy"
     TamingItem: "Chagashroom"
-    EggItem: "ForestShroom"
+    EggItem: "ForestShroomEgg"
     FoodItem: "Moss"
     FoodEffectiveness: 200
     HungerDelay: 60
-- 
cgit v1.2.3-60-g2f50