Removed awt use / Sand recolor / Bugfixes / Link fix

This commit is contained in:
Anuken
2019-03-09 16:47:08 -05:00
parent 563e015c92
commit f86a07daee
22 changed files with 1265 additions and 1232 deletions

View File

@@ -36,7 +36,7 @@ public class Blocks implements ContentList{
//environment
air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow,
holostone, rocks, icerocks, cliffs, pine, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, duneRocks, stainedRocks, stainedStone, stainedRocksRed, stainedStoneRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder,
iceSnow, sandWater, duneRocks, sandRocks, stainedRocks, stainedStone, stainedRocksRed, stainedStoneRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks,
//crafting
@@ -213,6 +213,10 @@ public class Blocks implements ContentList{
variants = 2;
}};
sandRocks = new StaticWall("sandrocks"){{
variants = 2;
}};
pine = new StaticWall("pine"){{
//fillsTile = false;
variants = 0;
@@ -283,18 +287,18 @@ public class Blocks implements ContentList{
}};
ignarock = new Floor("ignarock"){{
blendGroup = sand;
}};
hotrock = new Floor("hotrock"){{
heat = 0.5f;
blendGroup = sand;
blendGroup = ignarock;
}};
magmarock = new Floor("magmarock"){{
heat = 0.75f;
updateEffect = Fx.magmasmoke;
blendGroup = sand;
blendGroup = ignarock;
}};
//endregion
@@ -717,7 +721,8 @@ public class Blocks implements ContentList{
massDriver = new MassDriver("mass-driver"){{
requirements(Category.distribution, ItemStack.with(Items.titanium, 250, Items.silicon, 150, Items.lead, 250, Items.thorium, 100));
size = 3;
itemCapacity = 60;
itemCapacity = 120;
reloadTime = 200f;
range = 440f;
}};

View File

@@ -89,7 +89,7 @@ public class Items implements ContentList{
flammability = 1.05f;
}};
sand = new Item("sand", Color.valueOf("e3d39e")){{
sand = new Item("sand", Color.valueOf("f7cba4")){{
}};

View File

@@ -186,7 +186,7 @@ public class Zones implements ContentList{
}};
}};
ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores", 1)){{
ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores", 1).dist(3f, true)){{
loadout = Loadouts.basicFoundation;
baseLaunchCost = ItemStack.with(Items.copper, 200, Items.graphite, 50);
startingItems = ItemStack.list(Items.copper, 400);