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

Fixed #2774

Browse Source
This commit is contained in:
Anuken
2020-09-30 12:45:01 -04:00
parent f5e5f82d47
commit d2728c2bf0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1668,7 +1668,7 @@ public class Blocks implements ContentList{
foreshadow = new ItemTurret("foreshadow"){{ foreshadow = new ItemTurret("foreshadow"){{
float brange = range = 500f; float brange = range = 500f;
requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 175, Items.thorium, 350)); requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 200, Items.silicon, 600));
ammo( ammo(
Items.surgealloy, new PointBulletType(){{ Items.surgealloy, new PointBulletType(){{
shootEffect = Fx.instShoot; shootEffect = Fx.instShoot;

5
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -103,7 +103,10 @@ public class Conduit extends LiquidBlock implements Autotiler{
Draw.color(botColor); Draw.color(botColor);
Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation); Draw.color(liquids.current().color);
Draw.alpha(smoothLiquid);
Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
Draw.color();
Draw.rect(sliced(topRegions[bits], slice), x, y, rotation); Draw.rect(sliced(topRegions[bits], slice), x, y, rotation);
} }