From 74b6bc5dd305496f32f8da6f564ea16b95fe8679 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 23 Mar 2020 14:08:37 -0400 Subject: [PATCH] Added distributed ore gen --- .../revisions/BuilderUnitEntity/1.json | 1 + .../resources/revisions/LegsUnitEntity/1.json | 1 + .../revisions/MinerUnitEntity/1.json | 1 + .../resources/revisions/UnitEntity/1.json | 1 + .../revisions/UnitWaterMoveEntity/1.json | 1 + core/assets/planets/TODO.dat | Bin 21011 -> 23105 bytes .../maps/planet/TODOPlanetGenerator.java | 39 +++++++++++++++++- 7 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 annotations/src/main/resources/revisions/BuilderUnitEntity/1.json create mode 100644 annotations/src/main/resources/revisions/LegsUnitEntity/1.json create mode 100644 annotations/src/main/resources/revisions/MinerUnitEntity/1.json create mode 100644 annotations/src/main/resources/revisions/UnitEntity/1.json create mode 100644 annotations/src/main/resources/revisions/UnitWaterMoveEntity/1.json diff --git a/annotations/src/main/resources/revisions/BuilderUnitEntity/1.json b/annotations/src/main/resources/revisions/BuilderUnitEntity/1.json new file mode 100644 index 0000000000..23551d87ee --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderUnitEntity/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:range,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/LegsUnitEntity/1.json b/annotations/src/main/resources/revisions/LegsUnitEntity/1.json new file mode 100644 index 0000000000..8f4169f9d3 --- /dev/null +++ b/annotations/src/main/resources/revisions/LegsUnitEntity/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:baseRotation,type:float,size:4},{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:range,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/MinerUnitEntity/1.json b/annotations/src/main/resources/revisions/MinerUnitEntity/1.json new file mode 100644 index 0000000000..0321e5b69d --- /dev/null +++ b/annotations/src/main/resources/revisions/MinerUnitEntity/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:range,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/UnitEntity/1.json b/annotations/src/main/resources/revisions/UnitEntity/1.json new file mode 100644 index 0000000000..23551d87ee --- /dev/null +++ b/annotations/src/main/resources/revisions/UnitEntity/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:range,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/UnitWaterMoveEntity/1.json b/annotations/src/main/resources/revisions/UnitWaterMoveEntity/1.json new file mode 100644 index 0000000000..23551d87ee --- /dev/null +++ b/annotations/src/main/resources/revisions/UnitWaterMoveEntity/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:range,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index bc38622ff597b4b6c2c309af959a9414c772a6d8..0c6f13e2106cfc52838aa638a8bae5af8b0dca71 100644 GIT binary patch literal 23105 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 ores = Array.with(Blocks.oreCopper, Blocks.oreLead, Blocks.oreCoal, Blocks.oreCopper); ObjectMap dec = ObjectMap.of( Blocks.sporeMoss, Blocks.sporeCluster, Blocks.moss, Blocks.sporeCluster @@ -195,7 +194,43 @@ public class TODOPlanetGenerator extends PlanetGenerator{ inverseFloodFill(tiles.getn(spawn.x, spawn.y)); - ores(ores); + Array ores = Array.with(Blocks.oreCopper, Blocks.oreLead); + float poles = Math.abs(sector.tile.v.y); + float nmag = 0.5f; + float scl = 1f; + float addscl = 1.3f; + + if(noise.octaveNoise3D(2, 0.5, scl, sector.tile.v.x, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.25f*addscl){ + ores.add(Blocks.oreCoal); + } + + if(noise.octaveNoise3D(2, 0.5, scl, sector.tile.v.x + 1, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.5f*addscl){ + ores.add(Blocks.oreTitanium); + } + + if(noise.octaveNoise3D(2, 0.5, scl, sector.tile.v.x + 2, sector.tile.v.y, sector.tile.v.z)*nmag + poles > 0.7f*addscl){ + ores.add(Blocks.oreThorium); + } + + FloatArray frequencies = new FloatArray(); + for(int i = 0; i < ores.size; i++){ + frequencies.add(rand.random(-0.05f, 0.05f)); + } + + pass((x, y) -> { + if(floor.asFloor().isLiquid) return; + + int offsetX = x - 4, offsetY = y + 23; + for(int i = ores.size - 1; i >= 0; i--){ + Block entry = ores.get(i); + float freq = frequencies.get(i); + if(Math.abs(0.5f - noise(offsetX, offsetY + i*999, 2, 0.7, (40 + i * 2))) > 0.26f && + Math.abs(0.5f - noise(offsetX, offsetY - i*999, 1, 1, (30 + i * 4))) > 0.37f + freq){ + ore = entry; + break; + } + } + }); for(Room espawn : enemies){ tiles.getn(espawn.x, espawn.y).setOverlay(Blocks.spawn);