More decoration blocks
BIN
core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png
Normal file
|
After Width: | Height: | Size: 247 B |
BIN
core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png
Normal file
|
After Width: | Height: | Size: 223 B |
BIN
core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png
Normal file
|
After Width: | Height: | Size: 221 B |
BIN
core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png
Normal file
|
After Width: | Height: | Size: 267 B |
BIN
core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png
Normal file
|
After Width: | Height: | Size: 605 B |
BIN
core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png
Normal file
|
After Width: | Height: | Size: 565 B |
BIN
core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png
Normal file
|
After Width: | Height: | Size: 554 B |
@@ -509,3 +509,5 @@
|
|||||||
63195=red-ice-boulder|block-red-ice-boulder-ui
|
63195=red-ice-boulder|block-red-ice-boulder-ui
|
||||||
63194=crystal-blocks|block-crystal-blocks-ui
|
63194=crystal-blocks|block-crystal-blocks-ui
|
||||||
63193=yellow-stone-plates|block-yellow-stone-plates-ui
|
63193=yellow-stone-plates|block-yellow-stone-plates-ui
|
||||||
|
63192=rough-rhyolite|block-rough-rhyolite-ui
|
||||||
|
63191=rhyolite-boulder|block-rhyolite-boulder-ui
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class Blocks{
|
|||||||
|
|
||||||
//environment
|
//environment
|
||||||
air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
|
air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
|
||||||
dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce,
|
dacite, rhyolite, rhyoliteCrater, roughRhyolite, regolith, yellowStone, redIce,
|
||||||
arkyciteFloor, arkyicStone,
|
arkyciteFloor, arkyicStone,
|
||||||
redmat, bluemat,
|
redmat, bluemat,
|
||||||
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
|
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
|
||||||
@@ -50,7 +50,7 @@ public class Blocks{
|
|||||||
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
|
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
|
||||||
//boulders
|
//boulders
|
||||||
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
|
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
|
||||||
arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder,
|
arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder, rhyoliteBoulder,
|
||||||
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
|
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
|
||||||
darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
|
darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
|
||||||
pebbles, tendrils,
|
pebbles, tendrils,
|
||||||
@@ -367,6 +367,11 @@ public class Blocks{
|
|||||||
blendGroup = rhyolite;
|
blendGroup = rhyolite;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
roughRhyolite = new Floor("rough-rhyolite"){{
|
||||||
|
attributes.set(Attribute.water, -1f);
|
||||||
|
variants = 3;
|
||||||
|
}};
|
||||||
|
|
||||||
steamVent = new SteamVent("steam-vent"){{
|
steamVent = new SteamVent("steam-vent"){{
|
||||||
parent = blendGroup = rhyolite;
|
parent = blendGroup = rhyolite;
|
||||||
attributes.set(Attribute.vent, 1f);
|
attributes.set(Attribute.vent, 1f);
|
||||||
@@ -519,7 +524,7 @@ public class Blocks{
|
|||||||
}};
|
}};
|
||||||
|
|
||||||
rhyoliteWall = new StaticWall("rhyolite-wall"){{
|
rhyoliteWall = new StaticWall("rhyolite-wall"){{
|
||||||
rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = this;
|
rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = roughRhyolite.asFloor().wall = this;
|
||||||
attributes.set(Attribute.silicate, 1f);
|
attributes.set(Attribute.silicate, 1f);
|
||||||
}};
|
}};
|
||||||
|
|
||||||
@@ -688,6 +693,11 @@ public class Blocks{
|
|||||||
redIce.asFloor().decoration = this;
|
redIce.asFloor().decoration = this;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
rhyoliteBoulder = new Prop("rhyolite-boulder"){{
|
||||||
|
variants = 3;
|
||||||
|
rhyolite.asFloor().decoration = roughRhyolite.asFloor().decoration = this;
|
||||||
|
}};
|
||||||
|
|
||||||
metalFloor = new Floor("metal-floor", 0);
|
metalFloor = new Floor("metal-floor", 0);
|
||||||
metalFloorDamaged = new Floor("metal-floor-damaged", 3);
|
metalFloorDamaged = new Floor("metal-floor-damaged", 3);
|
||||||
|
|
||||||
|
|||||||
@@ -2538,7 +2538,7 @@ public class UnitTypes{
|
|||||||
drownTimeMultiplier = 2f;
|
drownTimeMultiplier = 2f;
|
||||||
|
|
||||||
hovering = true;
|
hovering = true;
|
||||||
visualElevation = 0.65f;
|
visualElevation = 0.4f;
|
||||||
groundLayer = Layer.legUnit;
|
groundLayer = Layer.legUnit;
|
||||||
|
|
||||||
weapons.add(new Weapon("bulwark-weapon"){{
|
weapons.add(new Weapon("bulwark-weapon"){{
|
||||||
|
|||||||
@@ -169,6 +169,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
|
|||||||
median(3, 0.6, Blocks.slag);
|
median(3, 0.6, Blocks.slag);
|
||||||
|
|
||||||
pass((x, y) -> {
|
pass((x, y) -> {
|
||||||
|
//rough rhyolite
|
||||||
|
if(noise(x, y + 600 + x, 5, 0.86f, 60f, 1f) < 0.41f && floor == Blocks.rhyolite){
|
||||||
|
floor = Blocks.roughRhyolite;
|
||||||
|
}
|
||||||
|
|
||||||
if((floor == Blocks.arkyciteFloor || floor == Blocks.arkyicStone) && block.isStatic()){
|
if((floor == Blocks.arkyciteFloor || floor == Blocks.arkyicStone) && block.isStatic()){
|
||||||
block = Blocks.arkyicWall;
|
block = Blocks.arkyicWall;
|
||||||
}
|
}
|
||||||
@@ -244,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
|
|||||||
//vents
|
//vents
|
||||||
outer:
|
outer:
|
||||||
for(Tile tile : tiles){
|
for(Tile tile : tiles){
|
||||||
if(floor == Blocks.rhyolite && rand.chance(0.0011)){
|
if(floor == Blocks.rhyolite && rand.chance(0.0015)){
|
||||||
int radius = 2;
|
int radius = 2;
|
||||||
for(int x = -radius; x <= radius; x++){
|
for(int x = -radius; x <= radius; x++){
|
||||||
for(int y = -radius; y <= radius; y++){
|
for(int y = -radius; y <= radius; y++){
|
||||||
|
|||||||