diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java index dcf3e5c06..cfe3b27d5 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityDome.java @@ -44,7 +44,7 @@ public class RenderAbilityDome extends RenderEnergyBarrier { float outerScale = 1.0f + dome.getOuterColorWidth() * 0.1f; float outerAlpha = dome.getOuterColorAlpha() * healthPercent; GL11.glDepthMask(false); - renderSphere(dome.getOuterColor(), outerAlpha + flashAlpha, radius * outerScale, 8); + renderSphere(dome.getOuterColor(), outerAlpha + (dome.getOuterColorAlpha() > 0 ? flashAlpha : 0), radius * outerScale, 8); } // TODO: Skybox Feature diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java index d341082b5..1b382fec4 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java +++ b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityPanel.java @@ -67,7 +67,7 @@ public class RenderAbilityPanel extends RenderEnergyBarrier { float outerScale = 1.0f + panel.getOuterColorWidth() * 0.15f; float outerAlpha = panel.getOuterColorAlpha() * healthPercent; GL11.glDepthMask(false); - renderPanel(panel.getOuterColor(), outerAlpha + flashAlpha, + renderPanel(panel.getOuterColor(), outerAlpha + (panel.getOuterColorAlpha() > 0 ? flashAlpha : 0), width * 0.5f * outerScale, height * 0.5f * outerScale, panelThickness * 1.5f); GL11.glDepthMask(true); } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java index 1217c85d5..bfd48a3b3 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java @@ -40,6 +40,7 @@ public class EnergyBarrierData { // Reflection: rebound projectiles that fail to break the barrier public boolean reflect = false; public float reflectStrengthPct = 25.0f; + public boolean targetOwner = false; /** * Per-projectile-type damage multipliers. @@ -139,6 +140,14 @@ public class EnergyBarrierData { this.reflectStrengthPct = Math.max(0.0f, Math.min(100.0f, reflectStrengthPct)); } + public boolean isTargetOwner() { + return targetOwner; + } + + public void setTargetOwner(boolean targetOwner) { + this.targetOwner = targetOwner; + } + // ==================== NBT ==================== public void writeNBT(NBTTagCompound nbt) { @@ -155,6 +164,7 @@ public class EnergyBarrierData { nbt.setFloat("barrierMeleeMult", meleeDamageMultiplier); nbt.setBoolean("barrierReflect", reflect); nbt.setFloat("barrierReflectStrPct", reflectStrengthPct); + nbt.setBoolean("barrierTargetOwner", targetOwner); NBTTagCompound multNbt = new NBTTagCompound(); for (Map.Entry entry : damageMultipliers.entrySet()) { @@ -177,6 +187,7 @@ public class EnergyBarrierData { meleeDamageMultiplier = nbt.hasKey("barrierMeleeMult") ? nbt.getFloat("barrierMeleeMult") : 1.0f; reflect = nbt.hasKey("barrierReflect") && nbt.getBoolean("barrierReflect"); setReflectStrengthPct(nbt.hasKey("barrierReflectStrPct") ? nbt.getFloat("barrierReflectStrPct") : 25.0f); + targetOwner = nbt.hasKey("barrierTargetOwner") && nbt.getBoolean("barrierTargetOwner"); damageMultipliers.clear(); if (nbt.hasKey("barrierMultipliers")) { @@ -200,6 +211,7 @@ public class EnergyBarrierData { copy.meleeDamageMultiplier = meleeDamageMultiplier; copy.reflect = reflect; copy.reflectStrengthPct = reflectStrengthPct; + copy.targetOwner = targetOwner; copy.damageMultipliers = new HashMap<>(damageMultipliers); return copy; } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java index d18a8f2eb..38cbb177d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java @@ -282,6 +282,14 @@ public abstract class AbilityBarrier extends AbilityEnergy { barrierData.setReflectStrengthPct(strengthPct); } + public boolean isTargetOwner() { + return barrierData.targetOwner; + } + + public void setTargetOwner(boolean targetOwner) { + barrierData.targetOwner = targetOwner; + } + // Melee data public boolean isMeleeEnabled() { return barrierData.meleeEnabled; @@ -364,6 +372,9 @@ public abstract class AbilityBarrier extends AbilityEnergy { .hover("ability.hover.reflect")); defs.add(FieldDef.floatField("ability.reflectStrength", this::getReflectStrengthPct, this::setReflectStrengthPct) .range(0, 100).visibleWhen(this::isReflect)); + defs.add(FieldDef.boolField("ability.targetOwner", this::isTargetOwner, this::setTargetOwner) + .hover("ability.hover.targetOwner") + .visibleWhen(this::isReflect)); defs.add(FieldDef.boolField("ability.meleeEnabled", this::isMeleeEnabled, this::setMeleeEnabled) .hover("ability.hover.meleeEnabled")); defs.add(FieldDef.floatField("ability.meleeDamageMultiplier", this::getMeleeDamageMultiplier, this::setMeleeDamageMultiplier) diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java index 3ae05c655..d6ffdad9e 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java @@ -712,10 +712,14 @@ public class EntityAbilityBeam extends EntityEnergyProjectile { resetHeadOffsets(); resetTrailStorage(); - // Disable homing and free aim — reflected beams fly straight. - homingData.setHoming(false); + // Free aim only works for the original caster freeAim = false; - setTargetEntityId(-1); + + // If targeting owner, keep homing so beam tracks back to caster + if (!barrier.getBarrierData().isTargetOwner()) { + homingData.setHoming(false); + setTargetEntityId(-1); + } } return reflected; } diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java index 3c948d0f0..1619b15e1 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java @@ -568,12 +568,21 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { } sourceAbility = null; + // Save original owner before transfer for potential target retargeting + int originalOwnerId = ownerEntityId; + Entity barrierOwner = barrier.getOwnerEntity(); if (barrierOwner != null) { setOwnerEntityId(barrierOwner.getEntityId()); trackProjectile(this); } - setTargetEntityId(-1); + + // Target Owner: set the reflected projectile's target to the original caster + if (barrier.getBarrierData().isTargetOwner() && originalOwnerId != -1) { + setTargetEntityId(originalOwnerId); + } else { + setTargetEntityId(-1); + } setInnerColor(barrier.getInnerColor()); setOuterColor(barrier.getOuterColor()); diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index 02a124ae3..634842ada 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -582,14 +582,22 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { } sourceAbility = null; + // Save original owner before transfer for potential target retargeting + int originalOwnerId = ownerEntityId; + Entity barrierOwner = barrier.getOwnerEntity(); if (barrierOwner != null) { setOwnerEntityId(barrierOwner.getEntityId()); // Ensure ownership-sensitive systems can query this projectile under the new owner. trackProjectile(this); } - // Old homing target may now be the new owner or ally; clear it after reflection. - setTargetEntityId(-1); + + // Target Owner: set the reflected projectile's target to the original caster + if (barrier.getBarrierData().isTargetOwner() && originalOwnerId != -1) { + setTargetEntityId(originalOwnerId); + } else { + setTargetEntityId(-1); + } setInnerColor(barrier.getInnerColor()); setOuterColor(barrier.getOuterColor()); diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 1e757a1c1..53debe9b1 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -2132,6 +2132,8 @@ ability.hover.solid=Entities cannot pass through the barrier boundary ability.hover.knockbackEnabled=Repulsion field pushing entities away from barrier surface ability.hover.absorbing=Damage dealt to the caster is redirected to the barrier's health ability.hover.reflect=Rebounds non-breaking projectiles and reduces their damage by Strength +ability.targetOwner=Target Owner +ability.hover.targetOwner=Sets the reflected projectile's target to the original caster. With homing enabled, the projectile will home toward its former caster. ability.hover.meleeEnabled=Barrier can be hit and damaged by melee attacks