apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked Monolith Aggro Rate #162

Merged
SenseiKiwi merged 4 commits from master into master 2014-05-06 07:48:03 +00:00
Conversation 0 Commits 4 Files Changed 1 +27 -22
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 03ab75b80c - Show all commits

49
src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
View File

@@ -22,6 +22,7 @@ import StevenDimDoors.mod_pocketDim.world.PocketProvider;
public class MobMonolith extends EntityFlying implements IMob public class MobMonolith extends EntityFlying implements IMob
{ {
private static final short MAX_AGGRO = 200; private static final short MAX_AGGRO = 200;
private static final short MAX_AGGRO_CAP = 100;
private static final int MAX_TEXTURE_STATE = 18; private static final int MAX_TEXTURE_STATE = 18;
private static final int MAX_SOUND_COOLDOWN = 200; private static final int MAX_SOUND_COOLDOWN = 200;
private static final int MAX_AGGRO_RANGE = 35; private static final int MAX_AGGRO_RANGE = 35;
@@ -34,6 +35,7 @@ public class MobMonolith extends EntityFlying implements IMob
public float pitchLevel; public float pitchLevel;
private short aggro = 0; private short aggro = 0;
private int soundTime = 0; private int soundTime = 0;
private final short aggroCap;
private static DDProperties properties = null; private static DDProperties properties = null;
@@ -42,6 +44,7 @@ public class MobMonolith extends EntityFlying implements IMob
super(world); super(world);
this.setSize(WIDTH, HEIGHT); this.setSize(WIDTH, HEIGHT);
this.noClip = true; this.noClip = true;
this.aggroCap = (short) (this.rand.nextInt(MAX_AGGRO_CAP + 1)+20);
if (properties == null) if (properties == null)
properties = DDProperties.instance(); properties = DDProperties.instance();
} }
@@ -55,7 +58,7 @@ public class MobMonolith extends EntityFlying implements IMob
@Override @Override
public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) public boolean attackEntityFrom(DamageSource par1DamageSource, float par2)
{ {
if (!(par1DamageSource == DamageSource.inWall)) if (par1DamageSource != DamageSource.inWall)
{ {
this.aggro = MAX_AGGRO; this.aggro = MAX_AGGRO;
} }
@@ -90,7 +93,7 @@ public class MobMonolith extends EntityFlying implements IMob
protected void applyEntityAttributes() protected void applyEntityAttributes()
{ {
super.applyEntityAttributes(); super.applyEntityAttributes();
this.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth).setAttribute(10); this.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth).setAttribute(57005);
} }
@Override @Override
@@ -174,29 +177,31 @@ public class MobMonolith extends EntityFlying implements IMob
// If we're working on the client side, retrieve aggro level from dataWatcher // If we're working on the client side, retrieve aggro level from dataWatcher
if (!this.worldObj.isRemote) if (!this.worldObj.isRemote)
{ {
//Server side.. // Server side...
//aggro constantly decreases at a rate that varies with the current amount of aggro. // Rapidly increase the aggro level if this Monolith can see the player
if(aggro > 0) if (visibility)
{ {
this.aggro -= (short)(this.aggro/(this.MAX_AGGRO/4)); if (this.worldObj.provider instanceof LimboProvider)
{
aggro++;
}
else
{
// Aggro increases faster outside of Limbo
aggro += 4;
}
} }
if(player != null) else
{ {
//monoliths increase aggro slightly if the player is near, but slowly and to a cap. if (aggro > aggroCap)
aggro+= 1.5-(this.getDistanceToEntity(player)/this.MAX_AGGRO_RANGE); {
// Decrease aggro over time
//rapidly increase aggro if the monolith has line of sight to the player. aggro--;
if(visibility) }
{ else if (player != null && (aggro < aggroCap))
//reduce the rate at which aggro increases in limbo {
if(this.worldObj.provider instanceof LimboProvider) // Increase aggro if a player is within range and aggro < aggroCap
{ aggro++;
aggro+=1.5;
}
else
{
aggro+=3;
}
} }
} }
// Clamp the aggro level // Clamp the aggro level