mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-04 22:50:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

Implemented more armor blocks and liquid router

Browse Source
This commit is contained in:
Anuken 2017-09-21 22:56:53 -04:00
parent 41c6f90ca3
commit 465c4b39f3
12 changed files with 215 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/compositewall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 269 B

BIN
core/assets-raw/sprites/blocks/duriumwall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 B

BIN
core/assets-raw/sprites/blocks/liquidrouter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

149
core/assets/sprites/sprites.atlas
View File

@ -53,104 +53,111 @@ blocks/coalpurifier
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduit
blocks/compositewall
rotate: false
xy: 341, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitbottom
blocks/conduit
rotate: false
xy: 351, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitliquid
blocks/conduitbottom
rotate: false
xy: 361, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduittop
blocks/conduitliquid
rotate: false
xy: 371, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyor
blocks/conduittop
rotate: false
xy: 381, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyormove
blocks/conveyor
rotate: false
xy: 391, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/core
blocks/conveyormove
rotate: false
xy: 401, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/cross
blocks/core
rotate: false
xy: 411, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/crucible
blocks/cross
rotate: false
xy: 421, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/deepwater
blocks/crucible
rotate: false
xy: 431, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt1
blocks/deepwater
rotate: false
xy: 441, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt2
blocks/dirt1
rotate: false
xy: 451, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt3
blocks/dirt2
rotate: false
xy: 461, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirtblock
blocks/dirt3
rotate: false
xy: 471, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirtblock
rotate: false
xy: 481, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirtedge
rotate: false
xy: 85, 19
@ -167,7 +174,14 @@ blocks/doubleturret
index: -1
blocks/drill
rotate: false
xy: 481, 23
xy: 491, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/duriumwall
rotate: false
xy: 501, 23
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -181,35 +195,35 @@ blocks/flameturret
index: -1
blocks/grass1
rotate: false
xy: 501, 23
xy: 128, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass2
rotate: false
xy: 128, 11
xy: 138, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass3
rotate: false
xy: 128, 1
xy: 138, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock
rotate: false
xy: 138, 11
xy: 148, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock2
rotate: false
xy: 138, 1
xy: 148, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -223,42 +237,42 @@ blocks/grassedge
index: -1
blocks/iron1
rotate: false
xy: 178, 11
xy: 188, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron2
rotate: false
xy: 178, 1
xy: 188, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron3
rotate: false
xy: 188, 11
xy: 198, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/irondrill
rotate: false
xy: 188, 1
xy: 198, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ironwall
rotate: false
xy: 198, 11
xy: 208, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/junction
rotate: false
xy: 198, 1
xy: 208, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -270,6 +284,13 @@ blocks/laserturret
orig: 10, 10
offset: 0, 0
index: -1
blocks/liquidrouter
rotate: false
xy: 218, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/machineturret
rotate: false
xy: 151, 21
@ -293,21 +314,21 @@ blocks/mortarturret
index: -1
blocks/mossblock
rotate: false
xy: 208, 1
xy: 228, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/mossstone
rotate: false
xy: 208, 1
xy: 228, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/omnidrill
rotate: false
xy: 218, 11
xy: 228, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -321,7 +342,7 @@ blocks/plasmaturret
index: -1
blocks/pump
rotate: false
xy: 228, 11
xy: 238, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -335,35 +356,35 @@ blocks/repairturret
index: -1
blocks/rock
rotate: false
xy: 228, 1
xy: 248, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2
rotate: false
xy: 238, 11
xy: 248, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2shadow
rotate: false
xy: 238, 1
xy: 258, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow
rotate: false
xy: 248, 11
xy: 258, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/router
rotate: false
xy: 248, 1
xy: 268, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -384,21 +405,21 @@ blocks/shotgunturret
index: -1
blocks/shrub
rotate: false
xy: 258, 11
xy: 268, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shrubshadow
rotate: false
xy: 258, 1
xy: 278, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter
rotate: false
xy: 268, 11
xy: 278, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -412,21 +433,21 @@ blocks/sniperturret
index: -1
blocks/steelconveyor
rotate: false
xy: 268, 1
xy: 288, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyormove
rotate: false
xy: 278, 13
xy: 288, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelwall
rotate: false
xy: 278, 3
xy: 298, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -440,49 +461,49 @@ blocks/stone
index: -1
blocks/stone1
rotate: false
xy: 288, 13
xy: 298, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone2
rotate: false
xy: 288, 3
xy: 308, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone3
rotate: false
xy: 298, 13
xy: 308, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock
rotate: false
xy: 298, 3
xy: 318, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock2
rotate: false
xy: 308, 13
xy: 318, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock3
rotate: false
xy: 308, 3
xy: 328, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonedrill
rotate: false
xy: 318, 13
xy: 328, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -496,42 +517,42 @@ blocks/stoneedge
index: -1
blocks/stonewall
rotate: false
xy: 318, 3
xy: 338, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium1
rotate: false
xy: 328, 13
xy: 338, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium2
rotate: false
xy: 328, 3
xy: 348, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium3
rotate: false
xy: 338, 13
xy: 348, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumdrill
rotate: false
xy: 338, 3
xy: 358, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumwall
rotate: false
xy: 348, 13
xy: 358, 3
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -545,7 +566,7 @@ blocks/turret
index: -1
blocks/water
rotate: false
xy: 348, 3
xy: 368, 13
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -587,7 +608,7 @@ enemies/bossmech
index: -1
enemies/fastmech
rotate: false
xy: 491, 23
xy: 128, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -601,49 +622,49 @@ enemies/firemech
index: -1
enemies/mech1
rotate: false
xy: 208, 11
xy: 218, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-coal
rotate: false
xy: 148, 11
xy: 158, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-dirium
rotate: false
xy: 148, 1
xy: 158, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-iron
rotate: false
xy: 158, 11
xy: 168, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-steel
rotate: false
xy: 158, 1
xy: 168, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-stone
rotate: false
xy: 168, 11
xy: 178, 11
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-titanium
rotate: false
xy: 168, 1
xy: 178, 1
size: 8, 8
orig: 8, 8
offset: 0, 0
@ -664,7 +685,7 @@ laserend
index: -1
player
rotate: false
xy: 218, 1
xy: 238, 11
size: 8, 8
orig: 8, 8
offset: 0, 0

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

5
core/src/io/anuke/mindustry/resource/Recipe.java
View File

@ -14,6 +14,8 @@ public enum Recipe{
ironwall(distribution, Blocks.ironwall, stack(Item.iron, 5)),
steelwall(distribution, Blocks.steelwall, stack(Item.steel, 5)),
titaniumwall(distribution, Blocks.titaniumwall, stack(Item.titanium, 5)),
duriumwall(distribution, Blocks.diriumwall, stack(Item.dirium, 5)),
compositewall(distribution, Blocks.compositewall, stack(Item.dirium, 5), stack(Item.titanium, 5), stack(Item.steel, 5), stack(Item.iron, 5)),
conveyor(distribution, ProductionBlocks.conveyor, stack(Item.stone, 1)),
fastconveyor(distribution, ProductionBlocks.steelconveyor, stack(Item.steel, 1)),
router(distribution, ProductionBlocks.router, stack(Item.stone, 3)),
@ -43,8 +45,11 @@ public enum Recipe{
coalpurifier(production, ProductionBlocks.coalpurifier, stack(Item.steel, 20), stack(Item.iron, 20)),
conduit(distribution, ProductionBlocks.conduit, stack(Item.steel, 1)),
liquidrouter(distribution, ProductionBlocks.liquidrouter, stack(Item.steel, 5)),
pump(production, ProductionBlocks.pump, stack(Item.steel, 20));
public Block result;
public ItemStack[] requirements;
public Section section;

10
core/src/io/anuke/mindustry/world/blocks/Blocks.java
View File

@ -108,7 +108,15 @@ public class Blocks{
}},
titaniumwall = new Wall("titaniumwall"){{
health = 140;
health = 150;
formalName = "titanium wall";
}},
diriumwall = new Wall("duriumwall"){{
health = 190;
formalName = "dirium wall";
}},
compositewall = new Wall("compositewall"){{
health = 270;
formalName = "composite wall";
}};
}

52
core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
View File

@ -1,10 +1,6 @@
package io.anuke.mindustry.world.blocks;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.Inventory;
import io.anuke.mindustry.Renderer;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.resource.Liquid;
@ -43,6 +39,10 @@ public class ProductionBlocks{
}},
liquidrouter = new LiquidRouter("liquidrouter"){{
}},
conveyor = new Conveyor("conveyor"){{
}},
@ -53,49 +53,7 @@ public class ProductionBlocks{
formalName = "steel conveyor";
}},
router = new Block("router"){
private ObjectMap<Tile, Byte> lastmap = new ObjectMap<>();
int maxitems = 20;
{
update = true;
solid = true;
}
@Override
public void update(Tile tile){
if(Timers.get(tile, 2) && tile.entity.totalItems() > 0){
if(lastmap.get(tile, (byte)-1) != tile.rotation)
tryDump(tile, tile.rotation, null);
tile.rotation ++;
tile.rotation %= 4;
}
}
@Override
public void handleItem(Tile tile, Item item, Tile source){
super.handleItem(tile, item, source);
lastmap.put(tile, (byte)tile.relativeTo(source.x, source.y));
}
@Override
public boolean accept(Item item, Tile dest, Tile source){
int items = dest.entity.totalItems();
return items < maxitems;
}
@Override
public void drawPixelOverlay(Tile tile){
float fract = (float)tile.entity.totalItems()/maxitems;
Renderer.drawBar(Color.GREEN, tile.worldx(), tile.worldy() + 13, fract);
}
@Override
public String description(){
return "Split input materials into 3 directions.";
}
router = new Router("router"){
},
junction = new Block("junction"){

4
core/src/io/anuke/mindustry/world/blocks/types/Conduit.java
View File

@ -75,7 +75,7 @@ public class Conduit extends Block{
if(flow <= 0f || entity.liquidAmount < flow) return;
if(other.acceptLiquid(next, tile, liquid, flow)){
other.addLiquid(next, tile, liquid, flow);
other.handleLiquid(next, tile, liquid, flow);
entity.liquidAmount -= flow;
}
}
@ -87,7 +87,7 @@ public class Conduit extends Block{
return entity.liquidAmount + amount < liquidCapacity && (entity.liquid == liquid || entity.liquidAmount <= 0.01f);
}
public void addLiquid(Tile tile, Tile source, Liquid liquid, float amount){
public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){
ConduitEntity entity = tile.entity();
entity.liquid = liquid;
entity.liquidAmount += amount;

51
core/src/io/anuke/mindustry/world/blocks/types/LiquidRouter.java Normal file
View File

@ -0,0 +1,51 @@
package io.anuke.mindustry.world.blocks.types;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.resource.Liquid;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Timers;
public class LiquidRouter extends Conduit{
private ObjectMap<Tile, Byte> lastmap = new ObjectMap<>();
public LiquidRouter(String name) {
super(name);
rotate = false;
solid = true;
}
@Override
public void update(Tile tile){
ConduitEntity entity = tile.entity();
if(Timers.get(tile, 2) && entity.liquidAmount > 0){
if(lastmap.get(tile, (byte)-1) != tile.rotation){
tryMoveLiquid(tile, tile.getNearby()[tile.rotation]);
}
tile.rotation ++;
tile.rotation %= 4;
}
}
@Override
public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){
super.handleLiquid(tile, source, liquid, amount);
lastmap.put(tile, (byte)tile.relativeTo(source.x, source.y));
}
@Override
public void draw(Tile tile){
ConduitEntity entity = tile.entity();
Draw.rect(name(), tile.worldx(), tile.worldy());
Draw.color(Color.ROYAL);
Draw.alpha(entity.liquidAmount / liquidCapacity);
Draw.rect("blank", tile.worldx(), tile.worldy(), 2, 2);
Draw.color();
}
}

58
core/src/io/anuke/mindustry/world/blocks/types/Router.java Normal file
View File

@ -0,0 +1,58 @@
package io.anuke.mindustry.world.blocks.types;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.Renderer;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Timers;
public class Router extends Block{
private ObjectMap<Tile, Byte> lastmap = new ObjectMap<>();
int maxitems = 20;
public Router(String name) {
super(name);
update = true;
solid = true;
}
@Override
public void update(Tile tile){
if(Timers.get(tile, 2) && tile.entity.totalItems() > 0){
if(lastmap.get(tile, (byte)-1) != tile.rotation)
tryDump(tile, tile.rotation, null);
tile.rotation ++;
tile.rotation %= 4;
}
}
@Override
public void handleItem(Tile tile, Item item, Tile source){
super.handleItem(tile, item, source);
lastmap.put(tile, (byte)tile.relativeTo(source.x, source.y));
}
@Override
public boolean accept(Item item, Tile dest, Tile source){
int items = dest.entity.totalItems();
return items < maxitems;
}
@Override
public void drawPixelOverlay(Tile tile){
float fract = (float)tile.entity.totalItems()/maxitems;
Renderer.drawBar(Color.GREEN, tile.worldx(), tile.worldy() + 13, fract);
}
@Override
public String description(){
return "Split input materials into 3 directions.";
}
}

BIN
desktop/gifexport/recording1506048867.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB