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

Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2

Browse Source
This commit is contained in:
Epowerj
2022-08-04 19:02:22 -04:00
parent 1fa34518d6 62d0d62d22
commit f728bd643a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,7 +454,6 @@ public class Blocks{
speedMultiplier = 0.3f; speedMultiplier = 0.3f;
variants = 0; variants = 0;
liquidDrop = Liquids.arkycite; liquidDrop = Liquids.arkycite;
liquidMultiplier = 1.5f;
isLiquid = true; isLiquid = true;
//TODO no status for now //TODO no status for now
//status = StatusEffects.slow; //status = StatusEffects.slow;
@@ -3163,6 +3162,7 @@ public class Blocks{
Liquids.water,new LiquidBulletType(Liquids.water){{ Liquids.water,new LiquidBulletType(Liquids.water){{
knockback = 0.7f; knockback = 0.7f;
drag = 0.01f; drag = 0.01f;
layer = Layer.bullet - 2f;
}}, }},
Liquids.slag, new LiquidBulletType(Liquids.slag){{ Liquids.slag, new LiquidBulletType(Liquids.slag){{
damage = 4; damage = 4;
@@ -3173,6 +3173,7 @@ public class Blocks{
}}, }},
Liquids.oil, new LiquidBulletType(Liquids.oil){{ Liquids.oil, new LiquidBulletType(Liquids.oil){{
drag = 0.01f; drag = 0.01f;
layer = Layer.bullet - 2f;
}} }}
); );
size = 2; size = 2;
@@ -3439,6 +3440,7 @@ public class Blocks{
ammoMultiplier = 0.4f; ammoMultiplier = 0.4f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
damage = 0.2f; damage = 0.2f;
layer = Layer.bullet - 2f;
}}, }},
Liquids.slag, new LiquidBulletType(Liquids.slag){{ Liquids.slag, new LiquidBulletType(Liquids.slag){{
lifetime = 49f; lifetime = 49f;
@@ -3472,6 +3474,7 @@ public class Blocks{
ammoMultiplier = 0.4f; ammoMultiplier = 0.4f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
damage = 0.2f; damage = 0.2f;
layer = Layer.bullet - 2f;
}} }}
); );
size = 3; size = 3;

5
core/src/mindustry/world/blocks/production/Pump.java
View File

@@ -58,10 +58,11 @@ public class Pump extends LiquidBlock{
if(liquidDrop != null){ if(liquidDrop != null){
float width = drawPlaceText(Core.bundle.formatFloat("bar.pumpspeed", amount * pumpAmount * 60f, 0), x, y, valid); float width = drawPlaceText(Core.bundle.formatFloat("bar.pumpspeed", amount * pumpAmount * 60f, 0), x, y, valid);
float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f; float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f;
float ratio = (float)liquidDrop.fullIcon.width / liquidDrop.fullIcon.height;
Draw.mixcol(Color.darkGray, 1f); Draw.mixcol(Color.darkGray, 1f);
Draw.rect(liquidDrop.fullIcon, dx, dy - 1, s, s); Draw.rect(liquidDrop.fullIcon, dx, dy - 1, s * ratio, s);
Draw.reset(); Draw.reset();
Draw.rect(liquidDrop.fullIcon, dx, dy, s, s); Draw.rect(liquidDrop.fullIcon, dx, dy, s * ratio, s);
} }
} }