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

reelase

Browse Source
This commit is contained in:
sharlotte
2021-09-05 22:46:07 +09:00
parent a214edb822
commit d78f846dbb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/mod.json
View File

@@ -3,7 +3,7 @@
"displayName": "Unit Information", "displayName": "Unit Information",
"author": "Sharlotte", "author": "Sharlotte",
"description": "The mod displays more information in-game, such as unit/building, wave, core, tile, item/unit total info etc", "description": "The mod displays more information in-game, such as unit/building, wave, core, tile, item/unit total info etc",
"version": "1.3.6", "version": "1.3.7",
"main": "UnitInfo.core.Main", "main": "UnitInfo.core.Main",
"minGameVersion": "130.1", "minGameVersion": "130.1",
"dependencies": [], "dependencies": [],

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

@@ -16,6 +16,7 @@ import mindustry.ai.types.*;
import mindustry.content.Fx; import mindustry.content.Fx;
import mindustry.core.Renderer; import mindustry.core.Renderer;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.entities.bullet.BulletType;
import mindustry.entities.units.AIController; import mindustry.entities.units.AIController;
import mindustry.entities.units.UnitCommand; import mindustry.entities.units.UnitCommand;
import mindustry.entities.units.UnitController; import mindustry.entities.units.UnitController;
@@ -28,9 +29,7 @@ import mindustry.ui.Fonts;
import mindustry.world.Block; import mindustry.world.Block;
import mindustry.world.Tile; import mindustry.world.Tile;
import mindustry.world.blocks.ControlBlock; import mindustry.world.blocks.ControlBlock;
import mindustry.world.blocks.defense.turrets.BaseTurret; import mindustry.world.blocks.defense.turrets.*;
import mindustry.world.blocks.defense.turrets.TractorBeamTurret;
import mindustry.world.blocks.defense.turrets.Turret;
import mindustry.world.blocks.distribution.MassDriver; import mindustry.world.blocks.distribution.MassDriver;
import mindustry.world.blocks.payloads.PayloadMassDriver; import mindustry.world.blocks.payloads.PayloadMassDriver;
import mindustry.world.blocks.power.PowerNode; import mindustry.world.blocks.power.PowerNode;
@@ -157,7 +156,7 @@ public class OverDrawer {
}); });
// Turret Ranges // Turret Ranges
if(settings.getBool("rangeNearby") && player != null) { if(settings.getBool("rangeNearby") && player != null && player.unit() != null && !player.unit().dead) {
Team team = player.team(); Team team = player.team();
Unit unit = player.unit(); Unit unit = player.unit();
Groups.build.each(e -> { Groups.build.each(e -> {
@@ -174,13 +173,17 @@ public class OverDrawer {
if(control.input.block != null && dst <= max) canHit = e.block instanceof Turret t && t.targetGround; if(control.input.block != null && dst <= max) canHit = e.block instanceof Turret t && t.targetGround;
if(player.dst(e) <= max || (control.input.block != null && dst <= max)) { if(player.dst(e) <= max || (control.input.block != null && dst <= max)) {
if(canHit || settings.getBool("allTargetRange")){ if(canHit || settings.getBool("allTargetRange")){
if(settings.getBool("softRangeDrawing")){ if(e instanceof Turret.TurretBuild t){
Lines.stroke(Scl.scl(), Tmp.c1.set(canHit ? e.team.color : Team.derelict.color).a(0.5f)); Lines.stroke(1.5f, Tmp.c1.set(canHit ? e.team.color : Team.derelict.color).a(0.75f));
Tmp.v1.set(e.x, e.y).trns(((BaseTurret.BaseTurretBuild)e).rotation+((Turret)t.block).shootCone, range);
Lines.line(e.x, e.y, e.x + Tmp.v1.x, e.y + Tmp.v1.y);
Tmp.v1.set(e.x, e.y).trns(((BaseTurret.BaseTurretBuild)e).rotation-((Turret)t.block).shootCone, range);
Lines.line(e.x, e.y, e.x + Tmp.v1.x, e.y + Tmp.v1.y);
}
Lines.stroke(1, Tmp.c1.set(canHit ? e.team.color : Team.derelict.color).a(0.5f));
Lines.poly(e.x, e.y, Lines.circleVertices(range), range); Lines.poly(e.x, e.y, Lines.circleVertices(range), range);
Fill.light(e.x, e.y, Lines.circleVertices(range), range, Color.clear, Tmp.c1.a(Mathf.clamp(1-((control.input.block != null && dst <= max ? dst : player.dst(e))/max), 0, settings.getInt("softRangeOpacity")/100f))); Fill.light(e.x, e.y, Lines.circleVertices(range), range, Color.clear, Tmp.c1.a(Mathf.clamp(1-((control.input.block != null && dst <= max ? dst : player.dst(e))/max), 0, settings.getInt("softRangeOpacity")/100f)));
} }
else Drawf.dashCircle(e.x, e.y, range, canHit ? e.team.color : Team.derelict.color);
}
} }
}); });
@@ -196,13 +199,10 @@ public class OverDrawer {
if(Vars.player.dst(u) <= max) { if(Vars.player.dst(u) <= max) {
if (canHit || settings.getBool("allTargetRange")) // Same as above if (canHit || settings.getBool("allTargetRange")) // Same as above
if(settings.getBool("softRangeDrawing")){ Lines.stroke(1, Tmp.c1.set(canHit ? u.team.color : Team.derelict.color).a(0.5f));
Lines.stroke(Scl.scl(), Tmp.c1.set(canHit ? u.team.color : Team.derelict.color).a(0.5f));
Lines.poly(u.x, u.y, Lines.circleVertices(range), range); Lines.poly(u.x, u.y, Lines.circleVertices(range), range);
Fill.light(u.x, u.y, Lines.circleVertices(range), range, Color.clear, Tmp.c1.a(Math.min(settings.getInt("softRangeOpacity")/100f, 1-Vars.player.dst(u)/max))); Fill.light(u.x, u.y, Lines.circleVertices(range), range, Color.clear, Tmp.c1.a(Math.min(settings.getInt("softRangeOpacity")/100f, 1-Vars.player.dst(u)/max)));
} }
else Drawf.dashCircle(u.x, u.y, range, canHit ? u.team.color : Team.derelict.color);
}
}); });
} }
} }