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

Crawl unit cells (#10298)

Browse Source 
* Crawl unit cells

* Normal cells don't draw on crawl units
This commit is contained in:
Andromeda-Galaxy29
2025-02-06 15:39:23 -05:00
committed by GitHub
parent 52b1ef52d0
commit 556b2aa114
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/type/UnitType.java
+11 -2
View File
@@ -443,7 +443,7 @@ public class UnitType extends UnlockableContent implements Senseable{
public TextureRegion baseRegion, legRegion, region, previewRegion, shadowRegion, cellRegion, itemCircleRegion, public TextureRegion baseRegion, legRegion, region, previewRegion, shadowRegion, cellRegion, itemCircleRegion,
softShadowRegion, jointRegion, footRegion, legBaseRegion, baseJointRegion, outlineRegion, treadRegion, softShadowRegion, jointRegion, footRegion, legBaseRegion, baseJointRegion, outlineRegion, treadRegion,
mineLaserRegion, mineLaserEndRegion; mineLaserRegion, mineLaserEndRegion;
public TextureRegion[] wreckRegions, segmentRegions, segmentOutlineRegions; public TextureRegion[] wreckRegions, segmentRegions, segmentCellRegions, segmentOutlineRegions;
public TextureRegion[][] treadRegions; public TextureRegion[][] treadRegions;
//INTERNAL REQUIREMENTS //INTERNAL REQUIREMENTS
@@ -963,9 +963,11 @@ public class UnitType extends UnlockableContent implements Senseable{
segmentRegions = new TextureRegion[segments]; segmentRegions = new TextureRegion[segments];
segmentOutlineRegions = new TextureRegion[segments]; segmentOutlineRegions = new TextureRegion[segments];
segmentCellRegions = new TextureRegion[segments];
for(int i = 0; i < segments; i++){ for(int i = 0; i < segments; i++){
segmentRegions[i] = Core.atlas.find(name + "-segment" + i); segmentRegions[i] = Core.atlas.find(name + "-segment" + i);
segmentOutlineRegions[i] = Core.atlas.find(name + "-segment-outline" + i); segmentOutlineRegions[i] = Core.atlas.find(name + "-segment-outline" + i);
segmentCellRegions[i] = Core.atlas.find(name + "-segment-cell" + i);
} }
clipSize = Math.max(region.width * 2f, clipSize); clipSize = Math.max(region.width * 2f, clipSize);
@@ -1286,7 +1288,7 @@ public class UnitType extends UnlockableContent implements Senseable{
if(engines.size > 0) drawEngines(unit); if(engines.size > 0) drawEngines(unit);
Draw.z(z); Draw.z(z);
if(drawBody) drawBody(unit); if(drawBody) drawBody(unit);
if(drawCell) drawCell(unit); if(drawCell && !(unit instanceof Crawlc)) drawCell(unit);
drawWeapons(unit); drawWeapons(unit);
if(drawItems) drawItems(unit); if(drawItems) drawItems(unit);
if(!isPayload){ if(!isPayload){
@@ -1652,6 +1654,13 @@ public class UnitType extends UnlockableContent implements Senseable{
//TODO merge outlines? //TODO merge outlines?
Draw.rect(regions[i], unit.x + tx, unit.y + ty, rot - 90); Draw.rect(regions[i], unit.x + tx, unit.y + ty, rot - 90);
// Draws the cells
if(drawCell && p != 0 && segmentCellRegions[i].found()){
Draw.color(cellColor(unit));
Draw.rect(segmentCellRegions[i], unit.x + tx, unit.y + ty, rot - 90);
Draw.reset();
}
} }
} }
} }