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

Switched to unit UI icons for minimap/players

Browse Source
This commit is contained in:
Anuken
2024-04-18 10:05:21 -04:00
parent 243cc1e527
commit 604e732edb
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/BlockUnitComp.java
View File

@@ -43,6 +43,12 @@ abstract class BlockUnitComp implements Unitc{
return tile.block.fullIcon; return tile.block.fullIcon;
} }
@Replace
@Override
public TextureRegion uiIcon(){
return tile.block.uiIcon;
}
@Override @Override
public void killed(){ public void killed(){
tile.kill(); tile.kill();

4
core/src/mindustry/entities/comp/PlayerComp.java
View File

@@ -72,9 +72,9 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
public TextureRegion icon(){ public TextureRegion icon(){
//display default icon for dead players //display default icon for dead players
if(dead()) return core() == null ? UnitTypes.alpha.fullIcon : ((CoreBlock)bestCore().block).unitType.fullIcon; if(dead()) return core() == null ? UnitTypes.alpha.uiIcon : ((CoreBlock)bestCore().block).unitType.uiIcon;
return unit.icon(); return unit.uiIcon();
} }
public boolean displayAmmo(){ public boolean displayAmmo(){

5
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -671,6 +671,11 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
return type.fullIcon; return type.fullIcon;
} }
/** @return a preview UI icon for this unit. */
public TextureRegion uiIcon(){
return type.uiIcon;
}
/** Actually destroys the unit, removing it and creating explosions. **/ /** Actually destroys the unit, removing it and creating explosions. **/
public void destroy(){ public void destroy(){
if(!isAdded() || !type.killable) return; if(!isAdded() || !type.killable) return;

2
core/src/mindustry/graphics/MinimapRenderer.java
View File

@@ -166,7 +166,7 @@ public class MinimapRenderer{
if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue; if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue;
float scale = Scl.scl(1f) * tilesize * 3; float scale = Scl.scl(1f) * tilesize * 3;
var region = unit.icon(); var region = unit.uiIcon();
Draw.mixcol(unit.team.color, 1f); Draw.mixcol(unit.team.color, 1f);
Draw.rect(region, unit.x, unit.y, scale, scale * (float)region.height / region.width, unit.rotation() - 90); Draw.rect(region, unit.x, unit.y, scale, scale * (float)region.height / region.width, unit.rotation() - 90);

2
core/src/mindustry/graphics/OverlayRenderer.java
View File

@@ -129,7 +129,7 @@ public class OverlayRenderer{
Draw.mixcol(Pal.accent, 1f); Draw.mixcol(Pal.accent, 1f);
Draw.alpha(unitFade); Draw.alpha(unitFade);
Building build = (select instanceof BlockUnitc b ? b.tile() : select instanceof Building b ? b : null); Building build = (select instanceof BlockUnitc b ? b.tile() : select instanceof Building b ? b : null);
TextureRegion region = build != null ? build.block.fullIcon : select instanceof Unit u ? u.icon() : Core.atlas.white(); TextureRegion region = build != null ? build.block.fullIcon : Core.atlas.white();
if(!(select instanceof Unitc)){ if(!(select instanceof Unitc)){
Draw.rect(region, select.getX(), select.getY()); Draw.rect(region, select.getX(), select.getY());