% Dark world changes.

3 files changed, 31 insertions, 24 deletions

diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
index 0c650ed3f2..cc3fe24df1 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
@@ -30,6 +30,8 @@ public class EntitySickBlaze extends EntityBlaze {
 	@Override
 	protected void applyEntityAttributes() {
 		super.applyEntityAttributes();
+		this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(20.0D);
+		this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(1.5D);
 		this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(6.0D);
 	}
 
@@ -103,8 +105,8 @@ public class EntitySickBlaze extends EntityBlaze {
 		}
 
 		if (this.rand.nextInt(24) == 0) {
-			this.worldObj.playSoundEffect(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire",
-					1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F);
+			/*this.worldObj.playSoundEffect(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire",
+					1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F);*/
 		}
 
 		if (!this.onGround && this.motionY < 0.0D) {
@@ -112,7 +114,7 @@ public class EntitySickBlaze extends EntityBlaze {
 		}
 
 		for (int i = 0; i < 2; ++i) {
-			this.worldObj.spawnParticle("largesmoke", this.posX + (this.rand.nextDouble() - 0.5D) * this.width,
+			this.worldObj.spawnParticle("crit", this.posX + (this.rand.nextDouble() - 0.5D) * this.width,
 					this.posY + this.rand.nextDouble() * this.height,
 					this.posZ + (this.rand.nextDouble() - 0.5D) * this.width, 0.0D, 0.0D, 0.0D);
 		}
@@ -180,7 +182,7 @@ public class EntitySickBlaze extends EntityBlaze {
 
 	@Override
 	protected Item getDropItem() {
-		return Items.blaze_rod;
+		return Items.slime_ball;
 	}
 
 	/**
@@ -203,7 +205,7 @@ public class EntitySickBlaze extends EntityBlaze {
 			int j = this.rand.nextInt(2 + p_70628_2_);
 
 			for (int k = 0; k < j; ++k) {
-				this.dropItem(Items.blaze_rod, 1);
+				this.dropItem(getDropItem(), 1);
 			}
 		}
 	}
diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
index f3fe16b984..2cbd00bf2c 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
@@ -31,15 +31,15 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
 		this.setSize(1.4F, 2.9F);
 		this.getNavigator().setAvoidsWater(true);
 		this.tasks.addTask(1, new EntityAIAttackOnCollide(this, 1.0D, true));
-		this.tasks.addTask(2, new EntityAIMoveTowardsTarget(this, 0.9D, 32.0F));
-		this.tasks.addTask(3, new EntityAIMoveThroughVillage(this, 0.6D, true));
-		this.tasks.addTask(4, new EntityAIMoveTowardsRestriction(this, 1.0D));
-		this.tasks.addTask(5, new EntityAIWander(this, 0.6D));
-		this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
-		this.tasks.addTask(7, new EntityAILookIdle(this));
+		//this.tasks.addTask(2, new EntityAIMoveTowardsTarget(this, 0.9D, 32.0F));
+		//this.tasks.addTask(3, new EntityAIMoveThroughVillage(this, 0.6D, true));
+		this.tasks.addTask(2, new EntityAIMoveTowardsRestriction(this, 1.0D));
+		this.tasks.addTask(3, new EntityAIWander(this, 0.6D));
+		this.tasks.addTask(4, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
+		this.tasks.addTask(5, new EntityAILookIdle(this));
 		this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false));
-		this.targetTasks.addTask(2,
-				new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, true, IMob.mobSelector));
+		//this.targetTasks.addTask(2,
+				//new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, true, IMob.mobSelector));
 	}
 
 	@Override
@@ -220,7 +220,7 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
 
 	@Override
 	protected void func_145780_a(int p_145780_1_, int p_145780_2_, int p_145780_3_, Block p_145780_4_) {
-		this.playSound("mob.irongolem.walk", 1.0F, 1.0F);
+		//this.playSound("mob.irongolem.walk", 1.0F, 1.0F);
 	}
 
 	/**
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index e4f0741b09..ccd977a87e 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -11,7 +11,14 @@ import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
 import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.entity.passive.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -77,20 +84,18 @@ public class Biome_DarkWorld {
 			this.spawnableCaveCreatureList.clear();
 			
 			//Enemies
-			this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 5, 1, 5));			
-
-			this.spawnableMonsterList.add(new SpawnListEntry(EntitySickBlaze.class, 5, 1, 5));
-			this.spawnableMonsterList.add(new SpawnListEntry(EntityStaballoyConstruct.class, 5, 1, 5));
+			this.spawnableMonsterList.add(new SpawnListEntry(EntitySickBlaze.class, 10, 4, 10));			
+			this.spawnableMonsterList.add(new SpawnListEntry(EntitySickBlaze.class, 60, 1, 2));
+			this.spawnableMonsterList.add(new SpawnListEntry(EntityStaballoyConstruct.class, 30, 1, 2));
+			//this.spawnableMonsterList.add(new SpawnListEntry(EntityStaballoyConstruct.class, 5, 1, 5));
 			
-			/**addToMonsterSpawnLists(EntityBlaze.class, 5, 1, 5);
+			addToMonsterSpawnLists(EntityBlaze.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntityCaveSpider.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntityCreeper.class, 4, 1, 2);
 			addToMonsterSpawnLists(EntityEnderman.class, 5, 1, 5);
-			addToMonsterSpawnLists(EntityMagmaCube.class, 5, 1, 5);
-			addToMonsterSpawnLists(EntityPigZombie.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntitySkeleton.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntitySpider.class, 5, 1, 5);
-			addToMonsterSpawnLists(EntityZombie.class, 5, 1, 5);**/
+			addToMonsterSpawnLists(EntityZombie.class, 5, 1, 5);
 
 			//Passive
 			this.spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 5, 5, 10));
@@ -120,8 +125,8 @@ public class Biome_DarkWorld {
 		
 		@SuppressWarnings("unchecked")
 		private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c){
-			this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c));
-			//this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
+			//this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c));
+			this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
 			return true;
 		}