Improved chloro rounds logic

70000hp · Aug 30, 2023 · fb2d80d · fb2d80d
1 parent 99f9bc7
commit fb2d80d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/hbm/handler/BulletConfiguration.java b/src/main/java/com/hbm/handler/BulletConfiguration.java
@@ -182,7 +182,8 @@ public BulletConfiguration setToGuided() {
 	}
 
 	public BulletConfiguration getChlorophyte() {
-		this.bntUpdate = BulletConfigFactory.getHomingBehavior(20, 360);
+		this.bntUpdate = BulletConfigFactory.getHomingBehavior(30, 180);
+		this.bntHurt = BulletConfigFactory.getPenHomingBehavior();
 		this.dmgMin *= 2F;
 		this.dmgMax *= 2F;
 		this.wear *= 0.5;

diff --git a/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java b/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java
@@ -483,7 +483,7 @@ public void behaveUpdate(EntityBulletBaseNT bullet) {
 	}
 
 	public static IBulletUpdateBehaviorNT getHomingBehavior(final double range, final double angle) {
-		
+
 		IBulletUpdateBehaviorNT onUpdate = new IBulletUpdateBehaviorNT() {
 
 			@Override
@@ -502,7 +502,6 @@ public void behaveUpdate(EntityBulletBaseNT bullet) {
 
 					Vec3 delta = Vec3.createVectorHelper(target.posX - bullet.posX, target.posY + target.height / 2 - bullet.posY, target.posZ - bullet.posZ);
 					delta = delta.normalize();
-
 					double vel = Vec3.createVectorHelper(bullet.motionX, bullet.motionY, bullet.motionZ).lengthVector();
 
 					bullet.motionX = delta.xCoord * vel;
@@ -537,6 +536,10 @@ private void chooseTarget(EntityBulletBaseNT bullet) {
 						double deltaAngle = BobMathUtil.getCrossAngle(mot, delta);
 
 						if(deltaAngle < targetAngle) {
+							//Checks if the bullet is not already inside the entity's bounding box, so it doesn't pick the same target
+							if(bullet.getConfig().doesPenetrate && bullet.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, bullet.boundingBox.expand(2, 2, 2)) == null) {
+								continue;
+							}
 							target = e;
 							targetAngle = deltaAngle;
 						}
@@ -551,4 +554,9 @@ private void chooseTarget(EntityBulletBaseNT bullet) {
 
 		return onUpdate;
 	}
+	/** Resets the bullet's target **/
+	public static IBulletHurtBehaviorNT getPenHomingBehavior(){
+		return (bullet, hit) -> bullet.getEntityData().setInteger("homingTarget", 0);
+	}
+
 }