aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/entity
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-09-25 19:47:13 +1000
committerAlkalus <draknyte1@hotmail.com>2017-09-25 19:47:13 +1000
commitaa89caded06ab8aa389f8ed0f7fe157e25558d6b (patch)
tree7c6d075a8cc0a052e0da71722a4681ef2b3891bf /src/Java/gtPlusPlus/core/entity
parentf4eefcee265ac46886ce766d5006b97ac193761e (diff)
downloadGT5-Unofficial-aa89caded06ab8aa389f8ed0f7fe157e25558d6b.tar.gz
GT5-Unofficial-aa89caded06ab8aa389f8ed0f7fe157e25558d6b.tar.bz2
GT5-Unofficial-aa89caded06ab8aa389f8ed0f7fe157e25558d6b.zip
% Dark world changes.
Diffstat (limited to 'src/Java/gtPlusPlus/core/entity')
-rw-r--r--src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java12
-rw-r--r--src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java18
2 files changed, 16 insertions, 14 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);
}
/**