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

Unit drown color fixes

Browse Source
This commit is contained in:
Anuken
2021-08-25 09:35:07 -04:00
parent 26dd7e00eb
commit 55269846f1
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/mindustry/type/UnitType.java
View File

@@ -795,20 +795,11 @@ public class UnitType extends UnlockableContent{
Draw.reset(); Draw.reset();
} }
public void applyOutlineColor(Unit unit){
if(unit.isBoss()){
Draw.mixcol(unit.team.color, Mathf.absin(7f, 1f));
}
if(unit.drownTime > 0 && unit.lastDrownFloor != null){
Draw.color(Color.white, unit.lastDrownFloor.mapColor, unit.drownTime * 0.4f);
}
}
public void drawOutline(Unit unit){ public void drawOutline(Unit unit){
Draw.reset(); Draw.reset();
if(Core.atlas.isFound(outlineRegion)){ if(Core.atlas.isFound(outlineRegion)){
applyColor(unit);
applyOutlineColor(unit); applyOutlineColor(unit);
Draw.rect(outlineRegion, unit.x, unit.y, unit.rotation - 90); Draw.rect(outlineRegion, unit.x, unit.y, unit.rotation - 90);
Draw.reset(); Draw.reset();
@@ -962,7 +953,7 @@ public class UnitType extends UnlockableContent{
Draw.mixcol(Color.white, unit.hitTime); Draw.mixcol(Color.white, unit.hitTime);
if(unit.lastDrownFloor != null){ if(unit.lastDrownFloor != null){
Draw.color(Color.white, unit.lastDrownFloor.mapColor, unit.drownTime * 0.4f); Draw.color(Color.white, Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.83f), unit.drownTime * 0.9f);
}else{ }else{
Draw.color(Color.white); Draw.color(Color.white);
} }
@@ -972,13 +963,23 @@ public class UnitType extends UnlockableContent{
Draw.mixcol(); Draw.mixcol();
} }
public void applyOutlineColor(Unit unit){
if(unit.isBoss()){
Draw.mixcol(unit.team.color, Mathf.absin(7f, 1f));
}
if(unit.drownTime > 0 && unit.lastDrownFloor != null){
Draw.color(Color.white, Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.8f), unit.drownTime * 0.9f);
}
}
public void applyColor(Unit unit){ public void applyColor(Unit unit){
Draw.color(); Draw.color();
Tmp.c1.set(Color.white).lerp(Pal.heal, Mathf.clamp(unit.healTime - unit.hitTime)); Tmp.c1.set(Color.white).lerp(Pal.heal, Mathf.clamp(unit.healTime - unit.hitTime));
Draw.mixcol(Tmp.c1, Math.max(unit.hitTime, Mathf.clamp(unit.healTime))); Draw.mixcol(Tmp.c1, Math.max(unit.hitTime, Mathf.clamp(unit.healTime)));
if(unit.drownTime > 0 && unit.lastDrownFloor != null){ if(unit.drownTime > 0 && unit.lastDrownFloor != null){
Draw.mixcol(unit.lastDrownFloor.mapColor, unit.drownTime * 0.85f); Draw.mixcol(Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.83f), unit.drownTime * 0.9f);
} }
} }