mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-15 02:07:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0' into crater

Browse Source 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-16 22:38:51 +02:00
parent 1acc6461e6 280f3dd428
commit 32e32ecae2
19 changed files with 373 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/mindustry/content/Blocks.java
View File

@ -18,6 +18,7 @@ import mindustry.world.blocks.defense.*;
import mindustry.world.blocks.defense.turrets.*;
import mindustry.world.blocks.distribution.*;
import mindustry.world.blocks.environment.*;
import mindustry.world.blocks.experimental.*;
import mindustry.world.blocks.legacy.*;
import mindustry.world.blocks.liquid.*;
import mindustry.world.blocks.logic.*;
@ -76,7 +77,11 @@ public class Blocks implements ContentList{
duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown,
//units
groundFactory, repairPoint
groundFactory, repairPoint,
//misc experimental
blockForge, blockLauncher;
;
@ -1733,6 +1738,23 @@ public class Blocks implements ContentList{
new LegacyUnitFactory("legacy-unit-factory");
new LegacyCommandCenter("legacy-command-center");
//endregion
//region experimental
blockForge = new BlockForge("block-forge"){{
requirements(Category.production, ItemStack.with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
blockLauncher = new BlockLauncher("block-launcher"){{
requirements(Category.production, ItemStack.with(Items.thorium, 100));
size = 3;
hasPower = true;
consumes.power(2f);
}};
//endregion
}
}