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

Minor bugfixes

Browse Source
This commit is contained in:
Anuken
2018-11-08 14:53:18 -05:00
parent b53821976e
commit b7506229f8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/blocks/Blocks.java
View File

@@ -139,7 +139,7 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
ice = new Floor("ice"){{ ice = new Floor("ice"){{
dragMultiplier = 0.3f; dragMultiplier = 0.2f;
speedMultiplier = 0.4f; speedMultiplier = 0.4f;
minimapColor = Color.valueOf("b8eef8"); minimapColor = Color.valueOf("b8eef8");
hasOres = true; hasOres = true;

2
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -271,7 +271,7 @@ public class Control extends Module{
outer: outer:
for(int i = 0; i < content.recipes().size; i ++){ for(int i = 0; i < content.recipes().size; i ++){
Recipe recipe = content.recipes().get(i); Recipe recipe = content.recipes().get(i);
if(!recipe.hidden && recipe.requirements != null){ if(!recipe.isHidden() && recipe.requirements != null){
for(ItemStack stack : recipe.requirements){ for(ItemStack stack : recipe.requirements){
if(!entity.items.has(stack.item, Math.min((int) (stack.amount * unlockResourceScaling), 2000))) continue outer; if(!entity.items.has(stack.item, Math.min((int) (stack.amount * unlockResourceScaling), 2000))) continue outer;
} }

2
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -323,7 +323,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
} }
if(floor.isLiquid){ 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{ }else{
Draw.tint(Color.WHITE); Draw.tint(Color.WHITE);
} }