Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Customizable Force Projector Absorb Effect (#6102)

Browse Source 
* Customizable Force Projector Absorb Effect

* Fix everything

* Custom shield break effect
This commit is contained in:
Matthew Peng
2021-10-10 17:06:59 -04:00
committed by GitHub
parent 9f070323c2
commit 4030e71b31
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/defense/ForceProjector.java
+7 -2
View File
@@ -10,6 +10,7 @@ import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.entities.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.logic.*; import mindustry.logic.*;
@@ -31,13 +32,16 @@ public class ForceProjector extends Block{
public float cooldownNormal = 1.75f; public float cooldownNormal = 1.75f;
public float cooldownLiquid = 1.5f; public float cooldownLiquid = 1.5f;
public float cooldownBrokenBase = 0.35f; public float cooldownBrokenBase = 0.35f;
public Effect absorbEffect = Fx.absorb;
public Effect shieldBreakEffect = Fx.shieldBreak;
public @Load("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
static ForceBuild paramEntity; static ForceBuild paramEntity;
static Effect paramEffect;
static final Cons<Bullet> shieldConsumer = trait -> { static final Cons<Bullet> shieldConsumer = trait -> {
if(trait.team != paramEntity.team && trait.type.absorbable && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){ if(trait.team != paramEntity.team && trait.type.absorbable && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){
trait.absorb(); trait.absorb();
Fx.absorb.at(trait); paramEffect.at(trait);
paramEntity.hit = 1f; paramEntity.hit = 1f;
paramEntity.buildup += trait.damage(); paramEntity.buildup += trait.damage();
} }
@@ -153,7 +157,7 @@ public class ForceProjector extends Block{
if(buildup >= shieldHealth + phaseShieldBoost * phaseHeat && !broken){ if(buildup >= shieldHealth + phaseShieldBoost * phaseHeat && !broken){
broken = true; broken = true;
buildup = shieldHealth; buildup = shieldHealth;
Fx.shieldBreak.at(x, y, realRadius(), team.color); shieldBreakEffect.at(x, y, realRadius(), team.color);
} }
if(hit > 0f){ if(hit > 0f){
@@ -164,6 +168,7 @@ public class ForceProjector extends Block{
if(realRadius > 0 && !broken){ if(realRadius > 0 && !broken){
paramEntity = this; paramEntity = this;
paramEffect = absorbEffect;
Groups.bullet.intersect(x - realRadius, y - realRadius, realRadius * 2f, realRadius * 2f, shieldConsumer); Groups.bullet.intersect(x - realRadius, y - realRadius, realRadius * 2f, realRadius * 2f, shieldConsumer);
} }
} }