diff --git a/core/src/io/anuke/mindustry/content/blocks/Blocks.java b/core/src/io/anuke/mindustry/content/blocks/Blocks.java index da606c6851..67e031d4a6 100644 --- a/core/src/io/anuke/mindustry/content/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/Blocks.java @@ -139,7 +139,7 @@ public class Blocks extends BlockList implements ContentList{ }}; ice = new Floor("ice"){{ - dragMultiplier = 0.3f; + dragMultiplier = 0.2f; speedMultiplier = 0.4f; minimapColor = Color.valueOf("b8eef8"); hasOres = true; diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 7fec236a56..450773f1d3 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -271,7 +271,7 @@ public class Control extends Module{ outer: for(int i = 0; i < content.recipes().size; i ++){ Recipe recipe = content.recipes().get(i); - if(!recipe.hidden && recipe.requirements != null){ + if(!recipe.isHidden() && recipe.requirements != null){ for(ItemStack stack : recipe.requirements){ if(!entity.items.has(stack.item, Math.min((int) (stack.amount * unlockResourceScaling), 2000))) continue outer; } diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index a454e2078c..587b3a0125 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -323,7 +323,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } if(floor.isLiquid){ - Draw.tint(Color.WHITE, floor.liquidColor, Mathf.clamp(drownTime)); + Draw.tint(Color.WHITE, floor.liquidColor, Mathf.clamp(drownTime, 0, 0.99f)); }else{ Draw.tint(Color.WHITE); }