yawaflua/Informatis
1
0
Fork 0
mirror of https://github.com/yawaflua/Informatis.git synced 2025-12-10 03:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Partially tested turret/unit range rework, still missing some of the original functionality

Browse Source
This commit is contained in:
buthed010203
2021-07-26 14:08:10 -04:00
parent a30856e242
commit 1318328544
1 changed files with 45 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/UnitInfo/core/Main.java
View File

@@ -1,35 +1,21 @@
package UnitInfo.core; package UnitInfo.core;
import UnitInfo.ui.FreeBar; import UnitInfo.ui.*;
import arc.Core; import arc.*;
import arc.Events; import arc.graphics.*;
import arc.graphics.Color; import arc.graphics.g2d.*;
import arc.graphics.g2d.Draw; import arc.math.*;
import arc.graphics.g2d.Fill; import arc.scene.ui.layout.*;
import arc.graphics.g2d.Lines; import arc.util.*;
import arc.math.Angles; import mindustry.*;
import arc.math.Mathf; import mindustry.content.*;
import arc.math.geom.Position;
import arc.scene.ui.layout.Scl;
import arc.util.Align;
import arc.util.Time;
import arc.util.Tmp;
import mindustry.Vars;
import mindustry.content.Fx;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.game.Team; import mindustry.game.*;
import mindustry.gen.Building; import mindustry.gen.*;
import mindustry.gen.Groups; import mindustry.graphics.*;
import mindustry.gen.Teamc; import mindustry.mod.*;
import mindustry.gen.Unit; import mindustry.ui.*;
import mindustry.graphics.Drawf; import mindustry.world.*;
import mindustry.graphics.Layer;
import mindustry.graphics.Pal;
import mindustry.mod.Mod;
import mindustry.type.UnitType;
import mindustry.ui.Fonts;
import mindustry.world.Block;
import mindustry.world.blocks.ConstructBlock;
import mindustry.world.blocks.defense.turrets.*; import mindustry.world.blocks.defense.turrets.*;
import static UnitInfo.SVars.*; import static UnitInfo.SVars.*;
@@ -37,7 +23,6 @@ import static arc.Core.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class Main extends Mod { public class Main extends Mod {
@Override @Override
public void init(){ public void init(){
Events.on(ClientLoadEvent.class, e -> { Events.on(ClientLoadEvent.class, e -> {
@@ -111,68 +96,40 @@ public class Main extends Mod {
Draw.reset(); Draw.reset();
}); });
// Turret Ranges
if(settings.getBool("rangeNearby") && player != null) { if(settings.getBool("rangeNearby") && player != null) {
Groups.all.each(entityc -> entityc instanceof Teamc && (entityc instanceof Building || (settings.getBool("unitRange") && entityc instanceof Unit)), entityc -> { //only turret and unit are allowed Team team = player.team();
boolean h = false; Unit unit = player.unit();
float range = 0; Groups.build.each(e -> {
if(entityc instanceof Turret.TurretBuild) { //if it's turret and can target player and if (e.team == team) return; // Don't draw own turrets
Turret turret = (Turret) ((Turret.TurretBuild) entityc).block; if (!(e instanceof BaseTurret.BaseTurretBuild )) return; // Not a turret
if((entityc instanceof PowerTurret.PowerTurretBuild)) { //can shoot to player or if ((e instanceof Turret.TurretBuild t && !t.hasAmmo()) || !e.cons.valid()) return; // No ammo
if(((PowerTurret.PowerTurretBuild) entityc).power().graph.getLastScaledPowerIn() > 0f) {
if(player.unit().isGrounded() && turret.targetGround) h = true;
if(player.unit().isFlying() && turret.targetAir) h = true;
}
}else if(((Turret.TurretBuild) entityc).hasAmmo()) {
if(player.unit().isGrounded() && turret.targetGround) h = true;
if(player.unit().isFlying() && turret.targetAir) h = true;
}
range = turret.range;
}
if(entityc instanceof TractorBeamTurret.TractorBeamBuild) { //if it's parallax and can target player or
TractorBeamTurret turret = (TractorBeamTurret) ((TractorBeamTurret.TractorBeamBuild) entityc).block;
if(((TractorBeamTurret.TractorBeamBuild) entityc).power().graph.getLastScaledPowerIn() > 0f) {
if(player.unit().isGrounded() && turret.targetGround) h = true;
if(player.unit().isFlying() && turret.targetAir) h = true;
}
range = turret.range;
}
if(entityc instanceof ConstructBlock.ConstructBuild) { //if it's not constructed yet but can target player later or
if (((ConstructBlock.ConstructBuild) entityc).current instanceof Turret) {
Turret turret = (Turret) ((ConstructBlock.ConstructBuild) entityc).current;
if (player.unit().isGrounded() && turret.targetGround) h = true;
if (player.unit().isFlying() && turret.targetAir) h = true;
range = turret.range;
} else if (((ConstructBlock.ConstructBuild) entityc).current instanceof TractorBeamTurret) {
TractorBeamTurret turret = (TractorBeamTurret) ((ConstructBlock.ConstructBuild) entityc).current;
if (player.unit().isGrounded() && turret.targetGround) h = true;
if (player.unit().isFlying() && turret.targetAir) h = true;
range = turret.range;
}
}
if(entityc instanceof Unit) { //if it's just unit and can target player,
UnitType type = ((Unit) entityc).type;
if (player.unit().isGrounded() && type.targetGround) h = true;
if (player.unit().isFlying() && type.targetAir) h = true;
range = ((Unit) entityc).range();
}
//draw range. boolean canHit = e.block instanceof Turret t ? unit.isFlying() ? t.targetAir : t.targetGround :
if(Vars.player.dst((Position) entityc) <= range + settings.getInt("rangeRadius") * tilesize && //out of range is not allowed e.block instanceof TractorBeamTurret tu && (unit.isFlying() ? tu.targetAir : tu.targetGround);
(settings.getBool("allTeamRange") || //derelict or player team are not allowed without setting float range = ((BaseTurret.BaseTurretBuild) e).range();
(((Teamc) entityc).team() != player.team() && ((Teamc) entityc).team() != Team.derelict))){
if (h) {
if(entityc instanceof ConstructBlock.ConstructBuild){ if(Vars.player.dst(e) <= range + settings.getInt("rangeRadius") * tilesize + e.block.offset) {
Lines.stroke(3f, Tmp.c1.set(Pal.gray).a(((ConstructBlock.ConstructBuild) entityc).progress)); if (canHit || settings.getBool("allTargetRange"))
Lines.dashCircle(((Teamc) entityc).x(), ((Teamc) entityc).y(), range); Drawf.dashCircle(e.x, e.y, range, canHit ? e.team.color : Team.derelict.color);
Lines.stroke(1f, Tmp.c1.set(((Teamc) entityc).team().color).a(((ConstructBlock.ConstructBuild) entityc).progress));
Lines.dashCircle(((Teamc) entityc).x(), ((Teamc) entityc).y(), range);
Draw.reset();
}
else Drawf.dashCircle(((Teamc) entityc).x(), ((Teamc) entityc).y(), range, ((Teamc) entityc).team().color);
}else if (settings.getBool("allTargetRange"))
Drawf.dashCircle(((Teamc) entityc).x(), ((Teamc) entityc).y(), range, Color.gray);
} }
}); });
// Unit Ranges (Only works when turret ranges are enabled)
if (!settings.getBool("unitRange")) {
Groups.unit.each(u -> {
if (u.team == team) return; // Don't draw own units
boolean canHit = unit.isFlying() ? u.type.targetAir : u.type.targetGround;
float range = u.range();
if(Vars.player.dst(u) <= range + settings.getInt("rangeRadius") * tilesize) { // TODO: Store value of rangeRadius as an int, should increase performance
if (canHit || settings.getBool("allTargetRange")) // Same as above
Drawf.dashCircle(u.x, u.y, range, canHit ? u.team.color : Team.derelict.color);
}
});
}
} }
}); });
} }