From afec6181c4cc2ba663330766477b6d4624247a2e Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 21 Jun 2021 20:52:49 -0400 Subject: [PATCH] More stone blocks --- .../blocks/environment/beryl-wall1.png | Bin 518 -> 0 bytes .../blocks/environment/beryl-wall2.png | Bin 518 -> 0 bytes .../blocks/environment/beryllic-stone1.png | Bin 0 -> 284 bytes .../blocks/environment/beryllic-stone2.png | Bin 0 -> 227 bytes .../blocks/environment/beryllic-stone3.png | Bin 0 -> 190 bytes core/assets/icons/icons.properties | 4 +++ core/src/mindustry/content/Blocks.java | 29 +++++++++++++----- .../maps/planet/AsteroidGenerator.java | 11 ++++--- 8 files changed, 31 insertions(+), 13 deletions(-) delete mode 100644 core/assets-raw/sprites/blocks/environment/beryl-wall1.png delete mode 100644 core/assets-raw/sprites/blocks/environment/beryl-wall2.png create mode 100644 core/assets-raw/sprites/blocks/environment/beryllic-stone1.png create mode 100644 core/assets-raw/sprites/blocks/environment/beryllic-stone2.png create mode 100644 core/assets-raw/sprites/blocks/environment/beryllic-stone3.png diff --git a/core/assets-raw/sprites/blocks/environment/beryl-wall1.png b/core/assets-raw/sprites/blocks/environment/beryl-wall1.png deleted file mode 100644 index 417efb30250cc778e3759b39ca523e81ea0163b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U_9XI z;usRqx_7!`-XQ}4S9`(O@*nL(Y;U3rJD-rRjq#_}X5mr^Wq5AzncYqu_N zx_#Z{{_!L0gD9t2&RU(pR~VCddJLV_CBzvXeEP@5aFK5okAou<2b&7JlkJ2Ji?7Kl zOmZ{YHqXg(ivZ(+hzV?mc0QQ$)$B}@f(UG44 zI*hVz$IOCG9q*W*U7~bpN-|f=D*m3c9l;7WDj(eI+WSboc2=gSbe=quKy!se1ItHt Zt4IMMuFE&l85kHCJYD@<);T3K0RRoK+d=>U diff --git a/core/assets-raw/sprites/blocks/environment/beryl-wall2.png b/core/assets-raw/sprites/blocks/environment/beryl-wall2.png deleted file mode 100644 index 417efb30250cc778e3759b39ca523e81ea0163b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U_9XI z;usRqx_7!`-XQ}4S9`(O@*nL(Y;U3rJD-rRjq#_}X5mr^Wq5AzncYqu_N zx_#Z{{_!L0gD9t2&RU(pR~VCddJLV_CBzvXeEP@5aFK5okAou<2b&7JlkJ2Ji?7Kl zOmZ{YHqXg(ivZ(+hzV?mc0QQ$)$B}@f(UG44 zI*hVz$IOCG9q*W*U7~bpN-|f=D*m3c9l;7WDj(eI+WSboc2=gSbe=quKy!se1ItHt Zt4IMMuFE&l85kHCJYD@<);T3K0RRoK+d=>U diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone1.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone1.png new file mode 100644 index 0000000000000000000000000000000000000000..1082571d282749707bc63d867d748e10fd7ef966 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7TV# z;usRqdUu*5-ys7Y7T#CP53WpKAot^cvc*CE7rcs_%VZ||a@cM43hAG7*O!0#>u*yU zOJ#1xxTI_pJNNqK*P8vd84LwX@6TSe7Cn%4tZBt12Iiz49QF)02Mv#Ks5eM$oRe^C zLgrophizG(7q8?9teZ0DGS7kRCygeI9nY9=eXq8huu|&y3(XyR7iN1aPVLMpW_ppl zlx^l4j@aWq9aGr$HD1Uz5qD9a$kxH(=d7UdqG`<{Wr1C1IKS-Ty{r6!G4Kk5bW-2$ ohM(PH|CEztkIJ}zxXxhREAR8EIFmhxfq{X+)78&qol`;+06SE1?*IS* literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/beryllic-stone2.png b/core/assets-raw/sprites/blocks/environment/beryllic-stone2.png new file mode 100644 index 0000000000000000000000000000000000000000..aa7fbb8f361f798a76a5a793b2cfae84ca9ea885 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V3_Oa z;usRqnryPw?EiU#hK5W9UHQ@j3kn#xcQq{7!7%6Vzo+cKtQc+(lntC3?)4pzV*OIWa?Zq|U#H_b;}NT-O92WqxHDvhTvDB#`WC2& zbm*~XJndjy-{VolpnK`?1+GTNhYT?n9rC_R5M_EXEpU>VL6plAtEL!(FP9FiV0M!= ec*T&#%nV5snP zaSVxQO*YwT_W!&=Lqn#5uDl3e!ot>tO^=ugzWtsq|6$eAEDnw??gbHj?<8hfG0b=U z@r2EWH{d8^OVi9}d<$4E9A*4b#1tyiaGq&bs&kH*;HEi^ji*=z4aF8UPn^i%E^F|r sA&|YtD&Y#_Vm^t|11p%>wlXsW%89+Q+Gci-fq{X+)78&qol`;+046j*j{pDw literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c2f12a72fb..809bcb2bd6 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -387,3 +387,7 @@ 63346=ferric-stone-wall|block-ferric-stone-wall-ui 63345=ferric-craters|block-ferric-craters-ui 63344=ferric-boulder|block-ferric-boulder-ui +63343=beryllic-stone|block-beryllic-stone-ui +63342=beryllic-stone-wall|block-beryllic-stone-wall-ui +63341=beryllic-boulder|block-beryllic-boulder-ui +63340=carbon-boulder|block-carbon-boulder-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 00d0b301c6..9412f730ae 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -40,10 +40,10 @@ public class Blocks implements ContentList{ redmat, bluemat, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, redweed, purbush, coralChunk, yellowCoral, - regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, - ferricStone, ferricCraters, graphiticStone, + regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, + ferricStone, ferricCraters, graphiticStone, beryllicStone, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt, - shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, ferricBoulder, + shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, pebbles, tendrils, @@ -53,7 +53,6 @@ public class Blocks implements ContentList{ //wall ores wallOreBeryl, graphiticWall, - berylWall, //TODO remove? //crafting siliconSmelter, siliconCrucible, siliconArcFurnace, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer, @@ -323,6 +322,10 @@ public class Blocks implements ContentList{ blendGroup = ferricStone; }}; + beryllicStone = new Floor("beryllic-stone"){{ + variants = 4; + }}; + redIce = new Floor("red-ice"){{ dragMultiplier = 0.4f; speedMultiplier = 0.9f; @@ -401,6 +404,10 @@ public class Blocks implements ContentList{ ferricStone.asFloor().wall = this; }}; + beryllicStoneWall = new StaticWall("beryllic-stone-wall"){{ + beryllicStone.asFloor().wall = this; + }}; + redIceWall = new StaticWall("red-ice-wall"){{ redIce.asFloor().wall = this; }}; @@ -478,11 +485,21 @@ public class Blocks implements ContentList{ variants = 2; }}; + carbonBoulder = new Prop("carbon-boulder"){{ + variants = 2; + graphiticStone.asFloor().decoration = this; + }}; + ferricBoulder = new Prop("ferric-boulder"){{ variants = 2; ferricStone.asFloor().decoration = this; }}; + beryllicBoulder = new Prop("beryllic-boulder"){{ + variants = 2; + beryllicStone.asFloor().decoration = this; + }}; + moss = new Floor("moss"){{ variants = 3; attributes.set(Attribute.spores, 0.15f); @@ -556,10 +573,6 @@ public class Blocks implements ContentList{ wallOreBeryl = new WallOreBlock(Items.beryllium); - berylWall = new StaticWall("beryl-wall"){{ - itemDrop = Items.beryllium; - }}; - graphiticWall = new StaticWall("graphitic-wall"){{ itemDrop = Items.graphite; variants = 3; diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java index e2377f784f..3c82d1e7b2 100644 --- a/core/src/mindustry/maps/planet/AsteroidGenerator.java +++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java @@ -15,8 +15,8 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ //TODO nonstatic public static int min = 20, max = 28, octaves = 2, foct = 3; public static float radMin = 12f, radMax = 60f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f; - public static float fmag = 0.59f, fscl = 50f, fper = 0.6f; - public static float iceChance = 0.05f, carbonChance = 0.1f; + public static float fmag = 0.5f, fscl = 50f, fper = 0.6f; + public static float iceChance = 0.05f, carbonChance = 0.1f, berylChance = 0.1f; Rand rand; int seed; @@ -25,6 +25,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ Floor floor = ( rand.chance(iceChance) ? Blocks.ice : rand.chance(carbonChance) ? Blocks.graphiticStone : + rand.chance(berylChance) ? Blocks.beryllicStone : Blocks.ferricStone ).asFloor(); @@ -76,7 +77,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ //walls at insides pass((x, y) -> { - if(floor == Blocks.space || Ridged.noise2d(seed + 1, x, y, 3, 0.5f, 1f / 60f) > 0.38f || Mathf.within(x, y, sx, sy, 20 + Ridged.noise2d(seed, x, y, 3, 0.5f, 1f / 30f) * 6f)) return; + if(floor == Blocks.space || Ridged.noise2d(seed + 1, x, y, 4, 0.7f, 1f / 60f) > 0.45f || Mathf.within(x, y, sx, sy, 20 + Ridged.noise2d(seed, x, y, 3, 0.5f, 1f / 30f) * 6f)) return; int radius = 6; for(int dx = x - radius; dx <= x + radius; dx++){ @@ -97,7 +98,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ if(floor == Blocks.stone && rand.chance(0.02)) floor = Blocks.craters; }); - decoration(0.013f); + decoration(0.015f); //lead generates around stone walls oreAround(Blocks.oreLead, Blocks.stoneWall, 3, 70f, 0.6f); @@ -108,7 +109,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ wallOre(Blocks.carbonWall, Blocks.graphiticWall, 35f, 0.57f); //TODO - //wallOre(Blocks.iceWall, Blocks.wallOreBeryl, 35f, 0.57f); + wallOre(Blocks.beryllicStoneWall, Blocks.wallOreBeryl, 50f, 0.62f); //TODO: //- thorium - cores?