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

TODO cleanup / Test fixes

Browse Source
This commit is contained in:
Anuken
2019-02-08 16:29:10 -05:00
parent 66c27fab13
commit adf5189541
18 changed files with 43 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -51,7 +51,7 @@ public class Blocks implements ContentList{
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine,
//transpor
//transport
conveyor, titaniumConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver,
//liquids
@@ -992,7 +992,7 @@ public class Blocks implements ContentList{
alwaysUnlocked = true;
health = 1100;
itemCapacity = 5000;
itemCapacity = 3000;
size = 3;
}};
@@ -1000,7 +1000,7 @@ public class Blocks implements ContentList{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000));
health = 2000;
itemCapacity = 8000;
itemCapacity = 6000;
size = 4;
}};
@@ -1008,7 +1008,7 @@ public class Blocks implements ContentList{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 8000, Items.silicon, 4000, Items.surgealloy, 2000));
health = 4000;
itemCapacity = 12000;
itemCapacity = 10000;
size = 5;
}};

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

@@ -266,7 +266,7 @@ public class TechTree implements ContentList{
private TechNode node(Block block, Runnable children){
ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
for(int i = 0; i < requirements.length; i++){
requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 50);
requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 40);
}
return new TechNode(block, requirements, children);
@@ -288,7 +288,6 @@ public class TechTree implements ContentList{
context.children.add(this);
}
//TODO remove requirements... for now
this.block = block;
this.requirements = requirements;

16
core/src/io/anuke/mindustry/content/Zones.java
View File

@@ -29,7 +29,7 @@ public class Zones implements ContentList{
waveSpacing = 60 * 60 * 2; //2 mins
spawns = Array.with(
new SpawnGroup(UnitTypes.dagger){{
unitScaling = 2;
unitScaling = 1.5f;
}},
new SpawnGroup(UnitTypes.dagger){{
@@ -73,7 +73,7 @@ public class Zones implements ContentList{
waveSpacing = 60 * 60 * 1.5f;
spawns = Array.with(
new SpawnGroup(UnitTypes.dagger){{
unitScaling = 2;
unitScaling = 1.5f;
}},
new SpawnGroup(UnitTypes.crawler){{
@@ -109,7 +109,8 @@ public class Zones implements ContentList{
}};
frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 2)
.decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{
.decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))
.core(Blocks.coreFoundation)){{
deployCost = ItemStack.with(Items.copper, 500);
startingItems = ItemStack.with(Items.copper, 400);
conditionWave = 10;
@@ -168,7 +169,8 @@ public class Zones implements ContentList{
}};
}};
ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores", 1)){{
ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores", 1)
.core(Blocks.coreFoundation)){{
deployCost = ItemStack.with(Items.copper, 600, Items.graphite, 50);
startingItems = ItemStack.with(Items.copper, 400);
conditionWave = 20;
@@ -242,7 +244,8 @@ public class Zones implements ContentList{
stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2)
.dist(2.5f, true)
.decor(new Decoration(Blocks.stainedStone, Blocks.stainedBoulder, 0.01))){{
.decor(new Decoration(Blocks.stainedStone, Blocks.stainedBoulder, 0.01))
.core(Blocks.coreFoundation)){{
deployCost = ItemStack.with(Items.copper, 500, Items.lead, 300, Items.silicon, 100);
startingItems = ItemStack.with(Items.copper, 400, Items.lead, 100);
conditionWave = 10;
@@ -386,7 +389,8 @@ public class Zones implements ContentList{
}};
}};
desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift").dist(2f)){{
desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift")
.core(Blocks.coreFoundation).dist(2f)){{
deployCost = ItemStack.with(Items.copper, 2000);
startingItems = ItemStack.with(Items.copper, 1500);
itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000);