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

Duplicate ID check, hasItems cleanup, web host message, projector start

Browse Source
This commit is contained in:
Anuken
2018-06-17 23:19:58 -04:00
parent 4d9fab6cf2
commit 84d80525fa
43 changed files with 122 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,13 +78,11 @@ public class PowerBlocks extends BlockList implements ContentList {
battery = new PowerGenerator("battery") {{
powerCapacity = 320f;
hasItems = false;
}};
batteryLarge = new PowerGenerator("batterylarge") {{
size = 3;
powerCapacity = 2000f;
hasItems = false;
}};
powernode = new PowerDistributor("powernode") {{

10
core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
View File

@@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.units.*;
public class UnitBlocks extends BlockList implements ContentList {
public static Block resupplyPoint, repairPoint, droneFactory, dropPoint, reconstructor;
public static Block resupplyPoint, repairPoint, droneFactory, dropPoint, reconstructor, overdriveProjector, shieldProjector;
@Override
public void load() {
@@ -39,5 +39,13 @@ public class UnitBlocks extends BlockList implements ContentList {
reconstructor = new Reconstructor("reconstructor") {{
size = 2;
}};
overdriveProjector = new OverdriveProjector("overdriveprojector") {{
size = 2;
}};
shieldProjector = new ShieldProjector("shieldprojector") {{
size = 2;
}};
}
}