From fff492d89d376c69c67b78944c81d3201cbc6c2c Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Dec 2021 13:25:43 -0500 Subject: [PATCH] Erekir generation improvements --- .../blocks/props/yellow-stone-boulder1.png | Bin 0 -> 636 bytes .../blocks/props/yellow-stone-boulder2.png | Bin 0 -> 720 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 40 +++++++++++-- core/src/mindustry/ctype/ContentType.java | 3 +- .../maps/generators/BasicGenerator.java | 45 ++++++++++++++ .../maps/planet/ErekirPlanetGenerator.java | 55 ++++++++---------- core/src/mindustry/type/TeamEntry.java | 20 +++++++ .../world/blocks/environment/Floor.java | 5 ++ 9 files changed, 132 insertions(+), 37 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/props/yellow-stone-boulder1.png create mode 100644 core/assets-raw/sprites/blocks/props/yellow-stone-boulder2.png create mode 100644 core/src/mindustry/type/TeamEntry.java diff --git a/core/assets-raw/sprites/blocks/props/yellow-stone-boulder1.png b/core/assets-raw/sprites/blocks/props/yellow-stone-boulder1.png new file mode 100644 index 0000000000000000000000000000000000000000..3f7bc8955e38eef5c3c358a59c27c66030d4522d GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FU^4S` zaSX|5d^>Z$-(drRWBPvtjk%c^y;W7jPF)aP89g(?O8FkcR%dx-?hjmZHya#mJ94XW zQ^=|*yrD^n>$F7J3a0Mbc0PUn3tiNmbv< z{I5e|OXJ*v>cVXyix(d>@iFNLsdHpprKjAG^|jTlIWu$S3GeKr&<|GfBB@zZJEuw- ztgX4arAqF?+I=f~Z&f+|XuE8kBYB`{QvdFT6}MhAX~u-bPs_=et+3KJ!6Mu3(a(dg z{Cp;QS9WCQIR4xANzh?k%c={NF%QDmbN@BpSnaU9&?@p*Z*qHgT0^o>=!a$ZHMRD( zq;Ra77|3ux^if3WCY}9j)4no@vm9kFZs_0p zS)u-K;-!Nx6`r)uI<#woR)CJN*~}TUEj)i+$cuMxpPzs5n~UO~4HFtwURLvG80}i$ zwps0;&z}#!&OKt~;<)yZ;mSc~kqzR9tR~mQ?0f!#Nn9&e`(crP;NGKwOa)UXuD^75 z*Ztp(M)NP3NlzDKIB@afzK?$;y&~9HmNKpJ(-CTl+83s_u1h^ciB-%>SdaVZ-c2$A uc9LnDywM#3OHY_B;9GR+-^!LchWu;>l@p;#4;UC27(8A5T-G@yGywp&-WntT literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/props/yellow-stone-boulder2.png b/core/assets-raw/sprites/blocks/props/yellow-stone-boulder2.png new file mode 100644 index 0000000000000000000000000000000000000000..c0758368e3c8d47979e55bf6f8bcba6266eac953 GIT binary patch literal 720 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FVCwR8 zaSX|5d>du$&*Uf|SJQH;DZ%GLUrURdPKIv=&s<*9ddG!3<~t_;VLvwOn3t7sG}lH& z#f8QyVwY|x7)H$4dq%gqdh_PPvW9h{-)H^aSNZla!w>guCvp$Hc<`(!)$0Bmn~wed zcM@bOc{~;4+N$=({n)+j{}c}y=gt7LCWVB;1kM2cQq|l;889yN!p<`q9Gy7P6-8T*A177OmlbstWy*1W~G*`PIQ?KX44o-AAcPiyiG z-LoD%`FnKb^W#ee)KZl-E_Oz^#%NCWc#`{ki2&Dviu-Od2hQFOT698i!Yd1z8)_vg zj3S>heP5Mq$Z~L(dh&RYf>HzXIgK14MWqHOw=Bjb-3pu^=Kjtp`l>d~No~^Ohe?mU z{XbPD7|m5JQx4xG^t#D_Dc?Q4^Y!DCC2D3)y)6ZjH0bRz1jV?Kf`{-6QsO+o5ZotCL^N@e= { for(int i = 0; i < 4; i++){ @@ -358,6 +379,30 @@ public abstract class BasicGenerator implements WorldGenerator{ }); } + public void blend(Block floor, Block around, float radius){ + float r2 = radius*radius; + int cap = Mathf.ceil(radius); + int max = tiles.width * tiles.height; + Floor dest = around.asFloor(); + + for(int i = 0; i < max; i++){ + Tile tile = tiles.geti(i); + if(tile.floor() == floor){ + for(int cx = -cap; cx <= cap; cx++){ + for(int cy = -cap; cy <= cap; cy++){ + if(cx*cx + cy*cy <= r2){ + Tile other = tiles.get(tile.x + cx, tile.y + cy); + + if(other != null && other.floor() != floor){ + other.setFloor(dest); + } + } + } + } + } + } + } + public void brush(Seq path, int rad){ path.each(tile -> erase(tile.x, tile.y, rad)); } diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 3c586b2134..edd1daf54e 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -92,11 +92,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ tile.block = tile.floor.asFloor().wall; - if(Ridged.noise3d(1, position.x, position.y, position.z, 2, 25) > 0.2){ + if(Ridged.noise3d(1, position.x, position.y, position.z, 2, 25) > 0.19){ tile.block = Blocks.air; } - if(Ridged.noise3d(2, position.x, position.y + 4f, position.z, 3, 7f) > 0.7){ + if(Ridged.noise3d(2, position.x, position.y + 4f, position.z, 3, 6f) > 0.65){ tile.floor = Blocks.carbonStone; } } @@ -136,25 +136,29 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //arkycite pass((x, y) -> { + if(nearWall(x, y)) return; - float noise = noise(x + 300, y - x*1.6f + 100, 4, 0.81f, 96f, 1f); + float noise = noise(x + 300, y - x*1.6f + 100, 4, 0.8f, 120f, 1f); if(noise > 0.71f){ floor = Blocks.arkyciteFloor; - }else if(noise > 0.65){ - floor = Blocks.arkyicStone; } }); + median(2, 0.6, Blocks.arkyciteFloor); + + //TODO arkycite walls + blend(Blocks.arkyciteFloor, Blocks.arkyicStone, 4); + distort(10f, 12f); distort(5f, 7f); + //does arkycite need smoothing? + median(2, 0.6, Blocks.arkyciteFloor); + //smooth out slag to prevent random 1-tile patches median(3, 0.6, Blocks.slag); - //does arkycite need smoothing? - //median(3, 0.6, Blocks.arkyciteFloor); - pass((x, y) -> { float max = 0; for(Point2 p : Geometry.d8){ @@ -171,42 +175,29 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ tiles.getn(endX, endY).setOverlay(Blocks.spawn); + //TODO tech is lazy and boring tech(Blocks.darkPanel3, Blocks.darkPanel5, Blocks.darkMetal); //ores pass((x, y) -> { if(block != Blocks.air){ - boolean empty = false; - for(Point2 p : Geometry.d8){ - Tile other = tiles.get(x + p.x, y + p.y); - if(other != null && other.block() == Blocks.air){ - empty = true; - break; + //TODO use d4 instead of d8 for no out-of-reach ores? + if(nearAir(x, y)){ + if(noise(x + 78, y, 4, 0.7f, 35f, 1f) > 0.67f && block == Blocks.carbonWall){ + block = Blocks.graphiticWall; + }else if(noise(x + 782, y, 4, 0.8f, 40f, 1f) > 0.7f && block != Blocks.carbonWall){ + ore = Blocks.wallOreBeryl; } } + }else if(!nearWall(x, y)){ - if(empty && noise(x + 78, y, 4, 0.7f, 35f, 1f) > 0.67f && block == Blocks.carbonWall){ - block = Blocks.graphiticWall; - }else if(empty && noise(x + 782, y, 4, 0.8f, 40f, 1f) > 0.7f && block != Blocks.carbonWall){ - ore = Blocks.wallOreBeryl; - } - }else{ - boolean empty = true; - for(Point2 p : Geometry.d8){ - Tile other = tiles.get(x + p.x, y + p.y); - if(other != null && other.block() != Blocks.air){ - empty = false; - break; - } - } - - if(empty && noise(x + 150, y + x*2 + 100, 4, 0.8f, 40f, 1f) > 0.71f/* && floor == Blocks.yellowStone*/){ + if(noise(x + 150, y + x*2 + 100, 4, 0.8f, 40f, 1f) > 0.71f/* && floor == Blocks.yellowStone*/){ ore = Blocks.oreTungsten; } //TODO design ore generation so it doesn't overlap - if(empty && noise(x + 999, y + 600, 4, 0.63f, 37f, 1f) < 0.25f/* && floor == Blocks.yellowStone*/){ + if(noise(x + 999, y + 600, 4, 0.63f, 37f, 1f) < 0.25f/* && floor == Blocks.yellowStone*/){ ore = Blocks.oreThorium; } } @@ -239,6 +230,8 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ } } + decoration(0.015f); + //not allowed state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead, Items.blastCompound, Items.pyratite, Items.sporePod, Items.metaglass, Items.plastanium); diff --git a/core/src/mindustry/type/TeamEntry.java b/core/src/mindustry/type/TeamEntry.java new file mode 100644 index 0000000000..b288637447 --- /dev/null +++ b/core/src/mindustry/type/TeamEntry.java @@ -0,0 +1,20 @@ +package mindustry.type; + +import mindustry.ctype.*; +import mindustry.game.*; + +/** This class is only for displaying team lore in the content database. */ +//TODO +public class TeamEntry extends UnlockableContent{ + public final Team team; + + public TeamEntry(Team team){ + super(team.name); + this.team = team; + } + + @Override + public ContentType getContentType(){ + return ContentType.team; + } +} diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index 22f72762e4..ec07d11326 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -115,6 +115,11 @@ public class Floor extends Block{ //keep default value if not found... if(wall == null) wall = Blocks.air; + //try to load the default boulder + if(decoration == null){ + decoration = content.block(name + "-boulder"); + } + if(isLiquid && walkEffect == Fx.none){ walkEffect = Fx.ripple; }