Overlay testing

This commit is contained in:
Anuken
2019-04-12 23:03:34 -04:00
parent c0e425cf46
commit 816ae84005
25 changed files with 3527 additions and 3274 deletions

View File

@@ -33,9 +33,10 @@ public class Blocks implements ContentList{
air, part, spawn, deepwater, water, taintedWater, tar, stone, craters, charr, sand, darksand, ice, snow, darksandTaintedWater,
holostone, rocks, sporerocks, icerocks, cliffs, sporePine, pine, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, darksandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, grass, salt,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock, snowrock,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock, snowrock, saltRocks,
creeptree,
darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
pebbles,
//ores
oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium,
@@ -300,6 +301,9 @@ public class Blocks implements ContentList{
variants = 2;
}};
saltRocks = new StaticWall("saltrocks"){{
}};
sporePine = new StaticWall("spore-pine"){{
variants = 0;
}};
@@ -376,6 +380,8 @@ public class Blocks implements ContentList{
darkMetal = new StaticWall("dark-metal"){{
}};
pebbles = new OverlayFloor("pebbles");
//endregion
//region ore

View File

@@ -13,7 +13,7 @@ public class Zones implements ContentList{
public static Zone
groundZero, desertWastes,
craters, frozenForest, ruinousShores, stainedMountains,
overgrowth, infestedIslands,
saltFlats, overgrowth, infestedIslands,
desolateRift, nuclearComplex;
@Override
@@ -46,6 +46,19 @@ public class Zones implements ContentList{
}};
}};
saltFlats = new Zone("saltFlats", new DesertWastesGenerator(260, 260)){{
startingItems = ItemStack.list(Items.copper, 200);
conditionWave = 10;
zoneRequirements = ZoneRequirement.with(groundZero, 10);
blockRequirements = new Block[]{Blocks.router};
resources = new Item[]{Items.copper, Items.lead, Items.coal, Items.sand};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
waveSpacing = 60 * 60 * 1.5f;
}};
}};
overgrowth = new Zone("overgrowth", new OvergrowthGenerator(320, 320)){{
startingItems = ItemStack.list(Items.copper, 200);
conditionWave = 10;