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

clean up, bugfix

Browse Source
This commit is contained in:
sharlottes
2022-04-14 18:32:56 +09:00
parent b004db604e
commit 7f6f106890
2 changed files with 68 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
src/UnitInfo/core/OverDrawer.java
View File

@@ -2,21 +2,17 @@ package UnitInfo.core;
import UnitInfo.ui.*; import UnitInfo.ui.*;
import arc.*; import arc.*;
import arc.audio.Sound;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.scene.Element;
import arc.scene.Group;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.ai.*; import mindustry.ai.*;
import mindustry.ai.types.*; import mindustry.ai.types.*;
import mindustry.content.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.entities.units.*; import mindustry.entities.units.*;
import mindustry.game.*; import mindustry.game.*;
@@ -25,7 +21,6 @@ import mindustry.graphics.*;
import mindustry.logic.*; import mindustry.logic.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.defense.*;
import mindustry.world.blocks.defense.turrets.*; import mindustry.world.blocks.defense.turrets.*;
import mindustry.world.blocks.distribution.*; import mindustry.world.blocks.distribution.*;
import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.payloads.*;
@@ -56,35 +51,36 @@ public class OverDrawer {
public static void setEvent(){ public static void setEvent(){
Events.run(EventType.Trigger.draw, () -> { Events.run(EventType.Trigger.draw, () -> {
effectBuffer.resize(graphics.getWidth(), graphics.getHeight()); effectBuffer.resize(graphics.getWidth(), graphics.getHeight());
Draw.z(Layer.max);
//local drawing, drawn on player/camera position //local drawing, drawn on player/camera position
if(settings.getBool("spawnerarrow")) { if(settings.getBool("spawnerarrow")) {
spawner.getSpawns().each(t -> {
float leng = (player.unit() != null && player.unit().hitSize > 4 * 8f ? player.unit().hitSize * 1.5f : 4 * 8f) + sin; float leng = (player.unit() != null && player.unit().hitSize > 4 * 8f ? player.unit().hitSize * 1.5f : 4 * 8f) + sin;
Tmp.v1.set(camera.position); Tmp.v1.set(camera.position);
Lines.stroke(1f + sin / 2, Pal.accent); Lines.stroke(1f + sin / 2, Pal.accent);
Lines.circle(Tmp.v1.x, Tmp.v1.y, leng - 4f); Lines.circle(Tmp.v1.x, Tmp.v1.y, leng - 4f);
spawner.getSpawns().each(t -> {
Drawf.arrow(Tmp.v1.x, Tmp.v1.y, t.worldx(), t.worldy(), leng, (Math.min(200 * 8f, Mathf.dst(Tmp.v1.x, Tmp.v1.y, t.worldx(), t.worldy())) / (200 * 8f)) * (5f + sin)); Drawf.arrow(Tmp.v1.x, Tmp.v1.y, t.worldx(), t.worldy(), leng, (Math.min(200 * 8f, Mathf.dst(Tmp.v1.x, Tmp.v1.y, t.worldx(), t.worldy())) / (200 * 8f)) * (5f + sin));
}); });
} }
if(settings.getBool("select") && target != null) { if(settings.getBool("select")) {
Draw.color(Tmp.c1.set(locked ? Color.orange : Color.darkGray).lerp(locked ? Color.scarlet : Color.gray, Mathf.absin(Time.time, 3f, 1f)).a(settings.getInt("selectopacity") / 100f));
float length = (target instanceof Unit u ? u.hitSize : target instanceof Building b ? b.block.size * tilesize : 0) * 1.5f + 2.5f;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
float rot = i * 90f + 45f + (-Time.time) % 360f; float rot = i * 90f + 45f + (-Time.time) % 360f;
float length = (target instanceof Unit u ? u.hitSize : target instanceof Building b ? b.block.size * tilesize : 0) * 1.5f + 2.5f;
Draw.color(Tmp.c1.set(locked ? Color.orange : Color.darkGray).lerp(locked ? Color.scarlet : Color.gray, Mathf.absin(Time.time, 3f, 1f)).a(settings.getInt("selectopacity") / 100f));
Draw.rect("select-arrow", target.x() + Angles.trnsx(rot, length), target.y() + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f); Draw.rect("select-arrow", target.x() + Angles.trnsx(rot, length), target.y() + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f);
} }
if(settings.getBool("distanceLine") && player.unit() != null && !player.unit().dead && target != null) { //need selected other unit with living player }
Teamc from = player.unit();
Position to = target;
if(to == from) to = input.mouseWorld();
if(player.unit() instanceof BlockUnitUnit bu) Tmp.v1.set(bu.x() + bu.tile().block.offset, bu.y() + bu.tile().block.offset).sub(to.getX(), to.getY()).limit(bu.tile().block.size * tilesize + sin + 0.5f);
else Tmp.v1.set(from.x(), from.y()).sub(to.getX(), to.getY()).limit(player.unit().hitSize + sin + 0.5f);
float x2 = from.x() - Tmp.v1.x, y2 = from.y() - Tmp.v1.y, if(settings.getBool("distanceLine")) {
x1 = to.getX() + Tmp.v1.x, y1 = to.getY() + Tmp.v1.y; Posc from = player;
Position to = target;
if(to == from || to == null) to = input.mouseWorld();
if(player.unit() instanceof BlockUnitUnit bu) Tmp.v1.set(bu.x() + bu.tile().block.offset, bu.y() + bu.tile().block.offset).sub(to.getX(), to.getY()).limit(bu.tile().block.size * tilesize + sin + 0.5f);
else Tmp.v1.set(from.x(), from.y()).sub(to.getX(), to.getY()).limit((player.unit()==null?0:player.unit().hitSize) + sin + 0.5f);
float x2 = from.x() - Tmp.v1.x, y2 = from.y() - Tmp.v1.y, x1 = to.getX() + Tmp.v1.x, y1 = to.getY() + Tmp.v1.y;
int segs = (int) (to.dst(from.x(), from.y()) / tilesize); int segs = (int) (to.dst(from.x(), from.y()) / tilesize);
if(segs > 0){ if(segs > 0){
Lines.stroke(2.5f, Pal.gray); Lines.stroke(2.5f, Pal.gray);
@@ -98,42 +94,43 @@ public class OverDrawer {
Pal.accent, 0.25f, false, Align.center); Pal.accent, 0.25f, false, Align.center);
} }
} }
}
//global drawing, which needs camera-clipping //global drawing, which needs camera-clipping
Core.camera.bounds(Tmp.r1); Core.camera.bounds(Tmp.r1);
Groups.unit.each(u -> { Groups.unit.each(u-> isInCamera(u.x, u.y, u.hitSize), u -> {
UnitController c = u.controller(); UnitController c = u.controller();
UnitCommand com = u.team.data().command; UnitCommand com = u.team.data().command;
if(logicLine && c instanceof LogicAI ai && (ai.control == LUnitControl.approach || ai.control == LUnitControl.move) && isInCamera(Tmp.r1, u.x, u.y, u.hitSize)) { if(logicLine && c instanceof LogicAI ai && (ai.control == LUnitControl.approach || ai.control == LUnitControl.move)) {
Lines.stroke(1, u.team.color); Lines.stroke(1, u.team.color);
Lines.line(u.x(), u.y(), ai.moveX, ai.moveY); Lines.line(u.x(), u.y(), ai.moveX, ai.moveY);
Lines.stroke(0.5f + Mathf.absin(6f, 0.5f), Tmp.c1.set(Pal.logicOperations).lerp(Pal.sap, Mathf.absin(6f, 0.5f))); Lines.stroke(0.5f + Mathf.absin(6f, 0.5f), Tmp.c1.set(Pal.logicOperations).lerp(Pal.sap, Mathf.absin(6f, 0.5f)));
Lines.line(u.x(), u.y(), ai.controller.x, ai.controller.y); Lines.line(u.x(), u.y(), ai.controller.x, ai.controller.y);
} }
if(!unitLine || u.type.flying || com == UnitCommand.idle || if(unitLine && !u.type.flying && com != UnitCommand.idle && !(c instanceof MinerAI || c instanceof BuilderAI || c instanceof RepairAI || c instanceof DefenderAI || c instanceof FormationAI || c instanceof FlyingAI)) {
c instanceof MinerAI ||
c instanceof BuilderAI ||
c instanceof RepairAI ||
c instanceof DefenderAI ||
c instanceof FormationAI ||
c instanceof FlyingAI) return;
Lines.stroke(1, u.team.color); Lines.stroke(1, u.team.color);
otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != u.team); otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != u.team);
getNextTile(u.tileOn(), u.controller() instanceof SuicideAI ? 0 : u.pathType(), u.team, com.ordinal()); getNextTile(u.tileOn(), u.controller() instanceof SuicideAI ? 0 : u.pathType(), u.team, com.ordinal());
pathTiles.filter(Objects::nonNull); pathTiles.filter(Objects::nonNull);
for(int i = 0; i < pathTiles.size; i++) { for(int i = 0; i < pathTiles.size; i++) {
Tile from = pathTiles.get(i); Tile from = pathTiles.get(i);
Tile to = pathTiles.get(i + 1); Tile to = pathTiles.get(i + 1);
if(!isInCamera(Tmp.r1, from.x, from.y)) continue; if(!isInCamera(from.x, from.y)) continue;
Lines.line(from.worldx(), from.worldy(), to.worldx(), to.worldy()); Lines.line(from.worldx(), from.worldy(), to.worldx(), to.worldy());
} }
pathTiles.clear(); pathTiles.clear();
}
if(Core.settings.getBool("unithealthui"))
FreeBar.draw(u);
if(!renderer.pixelator.enabled() && u.item() != null && u.itemTime > 0.01f)
Fonts.outline.draw(u.stack.amount + "",
u.x + Angles.trnsx(u.rotation + 180f, u.type.itemOffsetY),
u.y + Angles.trnsy(u.rotation + 180f, u.type.itemOffsetY) - 3,
Pal.accent, 0.25f * u.itemTime / Scl.scl(1f), false, Align.center);
}); });
if(pathLine) spawner.getSpawns().each(t -> { if(pathLine) spawner.getSpawns().each(t -> {
@@ -147,61 +144,20 @@ public class OverDrawer {
for(int i = 0; i < pathTiles.size; i++) { for(int i = 0; i < pathTiles.size; i++) {
Tile from = pathTiles.get(i); Tile from = pathTiles.get(i);
Tile to = pathTiles.get(i + 1); Tile to = pathTiles.get(i + 1);
if(!isInCamera(Tmp.r1, from.x, from.y)) continue; if(!isInCamera(from.x, from.y)) continue;
Lines.line(from.worldx(), from.worldy(), to.worldx(), to.worldy()); Lines.line(from.worldx(), from.worldy(), to.worldx(), to.worldy());
} }
pathTiles.clear(); pathTiles.clear();
} }
}); });
Draw.z(Layer.overlayUI);
if(Core.settings.getBool("blockfont")) {
indexer.eachBlock(null, camera.position.x, camera.position.y, 400, b -> isInCamera(Tmp.r1, b.x, b.y, b.block.size/2f), b -> {
if(b instanceof ForceProjector.ForceBuild force) {
ForceProjector forceBlock = (ForceProjector) force.block;
float max = forceBlock.shieldHealth + forceBlock.phaseShieldBoost * force.phaseHeat;
Fonts.outline.draw((int)b.health + " / " + (int)b.maxHealth,
b.x, b.y - b.block.size * 8 * 0.25f - 2,
Tmp.c1.set(Pal.items).lerp(Pal.health, 1-b.healthf()), (b.block.size == 1 ? 0.3f : 0.25f) * 0.25f * b.block.size, false, Align.center);
Fonts.outline.draw((int)(max-force.buildup) + " / " + (int)max,
b.x, b.y - b.block.size * 8 * 0.25f + 2,
Tmp.c1.set(Pal.shield).lerp(Pal.gray, 1-((max-force.buildup) / max)), (b.block.size == 1 ? 0.3f : 0.25f) * 0.25f * b.block.size, false, Align.center);
}
else if(b instanceof ReloadTurret.ReloadTurretBuild || b instanceof UnitFactory.UnitFactoryBuild || b instanceof Reconstructor.ReconstructorBuild) {
float progress = 0f;
if(b instanceof ReloadTurret.ReloadTurretBuild turret) progress = turret.reload / ((ReloadTurret)turret.block).reloadTime * 100;
if(b instanceof UnitFactory.UnitFactoryBuild factory) progress = factory.fraction() * 100;
if(b instanceof Reconstructor.ReconstructorBuild reconstructor) progress = reconstructor.fraction() * 100;
Fonts.outline.draw((int)b.health + " / " + (int)b.maxHealth,
b.x, b.y - b.block.size * 8 * 0.25f - 2,
Tmp.c1.set(Pal.items).lerp(Pal.health, 1-b.healthf()), (b.block.size == 1 ? 0.3f : 0.25f) * 0.25f * b.block.size, false, Align.center);
Fonts.outline.draw((int)progress + "%",
b.x, b.y - b.block.size * 8 * 0.25f + 2,
Tmp.c1.set(Color.lightGray).lerp(Pal.accent, progress/100), (b.block.size == 1 ? 0.3f : 0.25f) * 0.25f * b.block.size, false, Align.center);
}
else Fonts.outline.draw((int)b.health + " / " + (int)b.maxHealth,
b.x, b.y - b.block.size * 8 * 0.25f,
Tmp.c1.set(Pal.items).lerp(Pal.health, 1-b.healthf()), (b.block.size == 1 ? 0.3f : 0.25f) * 0.25f * b.block.size, false, Align.center);
});
}
if(Core.settings.getBool("unithealthui")) //display unit health bar
Groups.unit.each(u->isInCamera(Tmp.r1, u.x, u.y, u.hitSize/2f), FreeBar::draw);
if(settings.getBool("blockstatus")) //display enemy block status if(settings.getBool("blockstatus")) //display enemy block status
Groups.build.each(b->isInCamera(Tmp.r1, b.x, b.y, b.block.size/2f) && Vars.player.team() == b.team, Building::drawStatus); Groups.build.each(b->isInCamera(b.x, b.y, b.block.size/2f) && Vars.player.team() == b.team, Building::drawStatus);
if(!renderer.pixelator.enabled()) if(settings.getBool("linkedNode") && target instanceof Building node){
Groups.unit.each(unit -> isInCamera(Tmp.r1, unit.x, unit.y, unit.hitSize/2f) && unit.item() != null && unit.itemTime > 0.01f, unit -> linkedNodes.clear();
Fonts.outline.draw(unit.stack.amount + "", drawNodeLink(node);
unit.x + Angles.trnsx(unit.rotation + 180f, unit.type.itemOffsetY), }
unit.y + Angles.trnsy(unit.rotation + 180f, unit.type.itemOffsetY) - 3,
Pal.accent, 0.25f * unit.itemTime / Scl.scl(1f), false, Align.center)
);
if(settings.getBool("linkedMass")){ if(settings.getBool("linkedMass")){
if(target instanceof MassDriver.MassDriverBuild mass) { if(target instanceof MassDriver.MassDriverBuild mass) {
@@ -214,17 +170,10 @@ public class OverDrawer {
} }
} }
if(settings.getBool("linkedNode") && target instanceof Building node){
linkedNodes.clear();
drawNodeLink(node);
}
if(settings.getBool("rangeNearby")) { if(settings.getBool("rangeNearby")) {
Unit unit = player.unit(); Unit unit = player.unit();
tmpbuildobj.clear(); tmpbuildobj.clear();
for(Team team : Team.baseTeams) { for(Team team : Team.baseTeams) {
Draw.drawRange(166 + (Team.baseTeams.length-team.id) * 3, 1, () -> effectBuffer.begin(Color.clear), () -> { Draw.drawRange(166 + (Team.baseTeams.length-team.id) * 3, 1, () -> effectBuffer.begin(Color.clear), () -> {
effectBuffer.end(); effectBuffer.end();
effectBuffer.blit(turretRange); effectBuffer.blit(turretRange);
@@ -235,7 +184,8 @@ public class OverDrawer {
Groups.build.each(b-> settings.getBool("aliceRange") || player.team() != b.team, b -> { Groups.build.each(b-> settings.getBool("aliceRange") || player.team() != b.team, b -> {
if(b instanceof BaseTurret.BaseTurretBuild turret) { if(b instanceof BaseTurret.BaseTurretBuild turret) {
float range = turret.range(); float range = turret.range();
if (isInCamera(Tmp.r1, b.x, b.y, range)) { if (isInCamera(b.x, b.y, range)) {
int index = b.team.id;
Draw.color(b.team.color); Draw.color(b.team.color);
boolean valid = false; boolean valid = false;
@@ -243,19 +193,20 @@ public class OverDrawer {
else if (b instanceof Turret.TurretBuild build) { else if (b instanceof Turret.TurretBuild build) {
Turret t = (Turret) build.block; Turret t = (Turret) build.block;
if((unit.isFlying() ? t.targetAir : t.targetGround)) valid = true; if((unit.isFlying() ? t.targetAir : t.targetGround)) valid = true;
if(!build.hasAmmo() || !build.cons.valid()) Draw.color(Pal.gray); if(!build.hasAmmo() || !build.cons.valid()) index = 0;
} else if (b instanceof TractorBeamTurret.TractorBeamBuild build) { } else if (b instanceof TractorBeamTurret.TractorBeamBuild build) {
TractorBeamTurret t = (TractorBeamTurret) build.block; TractorBeamTurret t = (TractorBeamTurret) build.block;
if((unit.isFlying() ? t.targetAir : t.targetGround)) valid = true; if((unit.isFlying() ? t.targetAir : t.targetGround)) valid = true;
if(!build.cons.valid()) Draw.color(Pal.gray); if(!build.cons.valid()) index = 0;
} }
if(!valid) return; if(!valid) return;
if(b.team==player.team()) Draw.color(player.team().color); if(b.team==player.team()) index = b.team.id;
Draw.color(Team.baseTeams[index].color);
if (settings.getBool("RangeShader")) { if (settings.getBool("RangeShader")) {
Draw.z(166+(Team.baseTeams.length-b.team.id)*3); Draw.z(166+(Team.baseTeams.length-index)*3);
Fill.poly(b.x, b.y, Lines.circleVertices(range), range); Fill.poly(b.x, b.y, Lines.circleVertices(range), range);
} else Drawf.dashCircle(b.x, b.y, range, b.team.color); } else Drawf.dashCircle(b.x, b.y, range, b.team.color);
} }
@@ -265,13 +216,13 @@ public class OverDrawer {
}); });
} }
static boolean isInCamera(Rect rect, float x, float y) { static boolean isInCamera(float x, float y) {
return isInCamera(rect, x, y, 0); return isInCamera(x, y, 0);
} }
static boolean isInCamera(Rect rect, float x, float y, float size) { static boolean isInCamera(float x, float y, float size) {
Tmp.r2.setCentered(x, y, size); Tmp.r2.setCentered(x, y, size);
return rect.overlaps(Tmp.r2); return Tmp.r1.overlaps(Tmp.r2);
} }
public static Tile getNextTile(Tile tile, int cost, Team team, int finder) { public static Tile getNextTile(Tile tile, int cost, Team team, int finder) {

2
src/UnitInfo/ui/windows/CommandDisplay.java
View File

@@ -53,7 +53,7 @@ public class CommandDisplay extends WindowTable {
}).minWidth(400f).left(); }).minWidth(400f).left();
cmdtable.button(Icon.play, ()->{ cmdtable.button(Icon.play, ()->{
final String[] params = {""}; final String[] params = {""};
fields.forEach(f-> params[0] +=" "+f.getText()); fields.each(f-> params[0] +=" "+f.getText());
Vars.netServer.clientCommands.handleMessage(Vars.netServer.clientCommands.getPrefix()+cmd.text+params[0], Vars.player); Vars.netServer.clientCommands.handleMessage(Vars.netServer.clientCommands.getPrefix()+cmd.text+params[0], Vars.player);
}); });
}).row(); }).row();