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

Freezing armor multiplier

Browse Source
This commit is contained in:
Anuken
2018-12-06 09:30:41 -05:00
parent 6caf0fc1cc
commit da86dee981
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/content/StatusEffects.java
View File

@@ -47,7 +47,8 @@ public class StatusEffects implements ContentList{
freezing = new StatusEffect(5 * 60f){ freezing = new StatusEffect(5 * 60f){
{ {
oppositeScale = 0.4f; oppositeScale = 0.4f;
speedMultiplier = 0.5f; speedMultiplier = 0.6f;
armorMultiplier = 0.8f;
} }
@Override @Override

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

@@ -23,11 +23,13 @@ import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.type.Recipe;
import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.mindustry.world.Pos;
import io.anuke.ucore.core.*; import io.anuke.ucore.core.*;
import io.anuke.ucore.entities.EntityQuery; import io.anuke.ucore.entities.EntityQuery;
import io.anuke.ucore.modules.Module; import io.anuke.ucore.modules.Module;
import io.anuke.ucore.util.*; import io.anuke.ucore.util.Atlas;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Strings;
import io.anuke.ucore.util.Timer;
import java.io.IOException; import java.io.IOException;

26
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -337,10 +337,8 @@ public class Block extends BaseBlock {
public void setBars(){ public void setBars(){
if(hasPower) bars.add(new BlockBar(BarType.power, true, tile -> tile.entity.power.amount / powerCapacity)); if(hasPower) bars.add(new BlockBar(BarType.power, true, tile -> tile.entity.power.amount / powerCapacity));
if(hasLiquids) if(hasLiquids) bars.add(new BlockBar(BarType.liquid, true, tile -> tile.entity.liquids.total() / liquidCapacity));
bars.add(new BlockBar(BarType.liquid, true, tile -> tile.entity.liquids.total() / liquidCapacity)); if(hasItems) bars.add(new BlockBar(BarType.inventory, true, tile -> (float) tile.entity.items.total() / itemCapacity));
if(hasItems)
bars.add(new BlockBar(BarType.inventory, true, tile -> (float) tile.entity.items.total() / itemCapacity));
} }
public String name(){ public String name(){
@@ -543,16 +541,16 @@ public class Block extends BaseBlock {
public Array<Object> getDebugInfo(Tile tile){ public Array<Object> getDebugInfo(Tile tile){
return Array.with( return Array.with(
"block", tile.block().name, "block", tile.block().name,
"floor", tile.floor().name, "floor", tile.floor().name,
"x", tile.x, "x", tile.x,
"y", tile.y, "y", tile.y,
"entity.name", tile.entity.getClass(), "entity.name", tile.entity.getClass(),
"entity.x", tile.entity.x, "entity.x", tile.entity.x,
"entity.y", tile.entity.y, "entity.y", tile.entity.y,
"entity.id", tile.entity.id, "entity.id", tile.entity.id,
"entity.items.total", hasItems ? tile.entity.items.total() : null, "entity.items.total", hasItems ? tile.entity.items.total() : null,
"entity.graph", tile.entity.power != null && tile.entity.power.graph != null ? tile.entity.power.graph.getID() : null "entity.graph", tile.entity.power != null && tile.entity.power.graph != null ? tile.entity.power.graph.getID() : null
); );
} }
} }