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

Fixed some squished liquids

Browse Source
This commit is contained in:
Anuken
2022-07-05 10:44:36 -04:00
parent a4e482f55a
commit 8fa6a98027
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -4436,7 +4436,7 @@ public class Blocks{
frontColor = Color.white; frontColor = Color.white;
trailWidth = 2.8f; trailWidth = 2.8f;
trailLength = 9; trailLength = 9;
hitEffect = despawnEffect = Fx.hitBulletBig; hitEffect = despawnEffect = Fx.hitBulletColor;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
//TODO //TODO

3
core/src/mindustry/ui/ItemImage.java
View File

@@ -3,6 +3,7 @@ package mindustry.ui;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.type.*; import mindustry.type.*;
@@ -12,7 +13,7 @@ public class ItemImage extends Stack{
add(new Table(o -> { add(new Table(o -> {
o.left(); o.left();
o.add(new Image(region)).size(32f); o.add(new Image(region)).size(32f).scaling(Scaling.fit);
})); }));
if(amount != 0){ if(amount != 0){

4
core/src/mindustry/world/meta/StatValues.java
View File

@@ -234,7 +234,7 @@ public class StatValues{
for(Liquid liquid : content.liquids()){ for(Liquid liquid : content.liquids()){
if(!filter.get(liquid)) continue; if(!filter.get(liquid)) continue;
c.image(liquid.uiIcon).size(3 * 8).padRight(4).right().top(); c.image(liquid.uiIcon).size(3 * 8).scaling(Scaling.fit).padRight(4).right().top();
c.add(liquid.localizedName).padRight(10).left().top(); c.add(liquid.localizedName).padRight(10).left().top();
c.table(Tex.underline, bt -> { c.table(Tex.underline, bt -> {
bt.left().defaults().padRight(3).left(); bt.left().defaults().padRight(3).left();
@@ -258,7 +258,7 @@ public class StatValues{
for(Liquid liquid : content.liquids()){ for(Liquid liquid : content.liquids()){
if(!filter.get(liquid)) continue; if(!filter.get(liquid)) continue;
c.image(liquid.uiIcon).size(3 * 8).padRight(4).right().top(); c.image(liquid.uiIcon).size(3 * 8).scaling(Scaling.fit).padRight(4).right().top();
c.add(liquid.localizedName).padRight(10).left().top(); c.add(liquid.localizedName).padRight(10).left().top();
c.table(Tex.underline, bt -> { c.table(Tex.underline, bt -> {
bt.left().defaults().padRight(3).left(); bt.left().defaults().padRight(3).left();