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

Variable name refactorings / Untested entity sleeping

Browse Source
This commit is contained in:
Anuken
2018-04-17 09:31:41 -04:00
parent 47d61c4a0e
commit b020bf6816
56 changed files with 269 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -166,7 +166,7 @@ public class CraftingBlocks {
craftEffect = BlockFx.pulverize;
craftTime = 60f;
updateEffect = BlockFx.pulverizeSmall;
hasInventory = hasPower = true;
hasItems = hasPower = true;
}},
oilRefinery = new GenericCrafter("oilrefinery") {{
@@ -177,7 +177,7 @@ public class CraftingBlocks {
output = Items.coal;
health = 80;
craftEffect = BlockFx.purifyoil;
hasInventory = hasLiquids = hasPower = true;
hasItems = hasLiquids = hasPower = true;
}},
stoneFormer = new GenericCrafter("stoneformer") {{
@@ -188,7 +188,7 @@ public class CraftingBlocks {
output = Items.stone;
health = 80;
craftEffect = BlockFx.purifystone;
hasLiquids = hasInventory = true;
hasLiquids = hasItems = true;
}},
weaponFactory = new WeaponFactory("weaponfactory") {{

6
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
View File

@@ -45,7 +45,7 @@ public class DebugBlocks {
@Override
public void update(Tile tile) {
SorterEntity entity = tile.entity();
entity.inventory.items[entity.sortItem.id] = 1;
entity.items.items[entity.sortItem.id] = 1;
tryDump(tile, entity.sortItem);
}
@@ -72,8 +72,8 @@ public class DebugBlocks {
public void update(Tile tile) {
LiquidSourceEntity entity = tile.entity();
tile.entity.liquid.amount = liquidCapacity;
tile.entity.liquid.liquid = entity.source;
tile.entity.liquids.amount = liquidCapacity;
tile.entity.liquids.liquid = entity.source;
tryDumpLiquid(tile);
}

4
core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
View File

@@ -76,13 +76,13 @@ public class PowerBlocks {
battery = new PowerGenerator("battery") {{
powerCapacity = 320f;
hasInventory = false;
hasItems = false;
}},
batteryLarge = new PowerGenerator("batterylarge") {{
size = 3;
powerCapacity = 2000f;
hasInventory = false;
hasItems = false;
}},
powernode = new PowerDistributor("powernode"),

4
core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java
View File

@@ -134,8 +134,8 @@ public class WeaponBlocks{
drawer = (tile, entity) -> {
Draw.rect(name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90);
Draw.color(entity.liquid.liquid.color);
Draw.alpha(entity.liquid.amount/liquidCapacity);
Draw.color(entity.liquids.liquid.color);
Draw.alpha(entity.liquids.amount/liquidCapacity);
Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90);
Draw.color();
};