Target Owner for Barriers on Reflection

This commit is contained in:
Kam committed 2026-02-28 19:43:01 -05:00
1 parent 1a0ce41e00
commit d3d9dd352a
8 files changed
+54 -8

No files matched your search

@@ -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
@@ -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);
}
@@ -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<String, Float> 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;
}
@@ -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)
@@ -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;
}
@@ -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());
@@ -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());