From e4634045c2b5dca0d249dc09f4447ffe1d668397 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 25 Sep 2024 17:39:28 +0900 Subject: [PATCH] pitchblende spawning --- assets/mods/basegame/blocks/blocks.csv | 8 ++++---- assets/mods/basegame/crafting/masonry.json | 5 ++--- assets/mods/basegame/items/items.tga | 2 +- assets/mods/basegame/ores/ores.csv | 4 ++-- assets/mods/basegame/ores/worldgen.csv | 1 + .../terrarum/tests/WorldgenNoiseSandbox.kt | 16 ++++------------ work_files/graphics/items/basegame_items.kra | 4 ++-- 7 files changed, 16 insertions(+), 24 deletions(-) diff --git a/assets/mods/basegame/blocks/blocks.csv b/assets/mods/basegame/blocks/blocks.csv index ef16fcf9d..f3deb4101 100644 --- a/assets/mods/basegame/blocks/blocks.csv +++ b/assets/mods/basegame/blocks/blocks.csv @@ -3,18 +3,18 @@ "1";"N/A";"N/A";"BLOCK_UPDATE";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"AIIR";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"INTERNAL,NORANDTILE" # rocks -"16";"16";"16";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING,BRICKTILE¤19" +"16";"16";"16";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" "17";"16";"16";"BLOCK_STONE_QUARRIED";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" "18";"18";"18";"BLOCK_STONE_TILE_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.18";"STONE" "19";"19";"19";"BLOCK_STONE_BRICKS";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"STONE" -"20";"20";"20";"BLOCK_STONE_GABBRO";"0.1252";"0.1252";"0.1252";"0.1252";"80";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURA,OREBEARING,OLDNAME¤0.4.4¤STONE_DEEP" -"21";"21";"21";"BLOCK_STONE_MARBLE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.1";"ROCK,NATURAL,STONETILE¤18" +"20";"20";"20";"BLOCK_STONE_GABBRO";"0.1252";"0.1252";"0.1252";"0.1252";"80";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,DEEPROCK,OREBEARING,OLDNAME¤0.4.4¤STONE_DEEP" +"21";"21";"21";"BLOCK_STONE_MARBLE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.1";"ROCK,NATURAL,FLUXSTONE" "22";"22";"22";"BLOCK_STONE_ORTHOCLASE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" "23";"23";"23";"BLOCK_STONE_PLAGIOCLASE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" "24";"24";"24";"BLOCK_STONE_MICROCLINE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" "25";"25";"25";"BLOCK_STONE_BASALT";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" "26";"26";"26";"BLOCK_STONE_SLATE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" -"27";"27";"27";"BLOCK_STONE_LIMESTONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING" +"27";"27";"27";"BLOCK_STONE_LIMESTONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"ROCK,NATURAL,OREBEARING,FLUXSTONE" # dirts "32";"32";"32";"BLOCK_DIRT";"0.1252";"0.1252";"0.1252";"0.1252";"12";"1400";"DIRT";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"0.0";"DIRT,NATURAL,CULTIVABLE" diff --git a/assets/mods/basegame/crafting/masonry.json b/assets/mods/basegame/crafting/masonry.json index c7413b7d2..429e7531a 100644 --- a/assets/mods/basegame/crafting/masonry.json +++ b/assets/mods/basegame/crafting/masonry.json @@ -3,15 +3,14 @@ "basegame:19": { "workbench": "masonry", "ingredients": [ - [1, 1, "$BRICKROCK"] + [1, 1, "basegame:16"] ] }, /* white stone tile */ "basegame:18": { "workbench": "masonry", "ingredients": [ - [1, 1, "basegame:21"], - [1, 3, "$BRICKROCK"] + [1, 1, "basegame:21"] ] }, /* bricks */ diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index f8048c431..3e5d0a3c4 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:966156c40984686c52ec0adb39a2c41e3f48ef12d20cdd108813cca8db984599 +oid sha256:faabfd9b9af70cf352986289d3e487fb720601670d2172caba48bc46d0565256 size 2408466 diff --git a/assets/mods/basegame/ores/ores.csv b/assets/mods/basegame/ores/ores.csv index c7169fade..4f9dd1be2 100644 --- a/assets/mods/basegame/ores/ores.csv +++ b/assets/mods/basegame/ores/ores.csv @@ -21,5 +21,5 @@ #"263";"item@basegame:139";"GEM,TOPAZ";100663296 #"264";"item@basegame:140";"GEM,DIAMOND";100663296 -#"512";"macro@BASETILE";"GRASS";100663296 -#"513";"macro@BASETILE";"MOSS";100663296 \ No newline at end of file +#"512";"macro@DROP_BASETILE";"GRASS";100663296 +#"513";"macro@DROP_BASETILE";"MOSS";100663296 \ No newline at end of file diff --git a/assets/mods/basegame/ores/worldgen.csv b/assets/mods/basegame/ores/worldgen.csv index d2cf1207d..586fe21e1 100644 --- a/assets/mods/basegame/ores/worldgen.csv +++ b/assets/mods/basegame/ores/worldgen.csv @@ -7,6 +7,7 @@ "6";"0.009";"0.300";"0.474";"1.0";"a16x16";"natural gold";"" "7";"0.013";"0.300";"0.476";"1.0";"a16x16";"natural silver";"" "8";"0.017";"0.020";"0.511";"1.0";"a16x16";"lead (galena)";"" +"9";"0.008";"0.200";"0.480";"1.0";"a16x16";"uranium (pitchblende)";"FLUXSTONE" "256";"0.010";"-0.366";"0.528";"2.4";"a16x8";"rocksalt";"DEEPROCK" "257";"0.007";"0.100";"0.494";"1.0";"a16x8";"amethyst";"" diff --git a/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt b/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt index f5953243b..4620aa133 100644 --- a/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt +++ b/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt @@ -188,16 +188,6 @@ class WorldgenNoiseSandbox : ApplicationAdapter() { return 3200 } - private fun Int.addSY(): Int { - val offset = 90 * 8 - return this + offset - } - - private fun Int.subtractSY(): Int { - val offset = 90 * 8 - return this - offset - } - private fun getSY(y: Int): Double = y - (getClampedHeight() - YHEIGHT_MAGIC) * YHEIGHT_DIVISOR // Q&D offsetting to make ratio of sky:ground to be constant private fun renderNoise(noiseMaker: NoiseMaker, callback: () -> Unit = {}) { @@ -452,9 +442,10 @@ internal class TerragenTest(val seed: Long, val params: TerragenParams) : NoiseM private val LAVA = 0xff5900ff.toInt() private val WATER = 0x0059ffff.toInt() private val OIL = 0xd8e088ff.toInt() + private val PITCHBLENDE = 0x000000ff.toInt() private val oreCols = listOf( - COPPER_ORE, IRON_ORE, COAL_ORE, ZINC_ORE, TIN_ORE, GOLD_ORE, SILVER_ORE, LEAD_ORE, ROCKSALT, QUARTZ, AMETHYST, NITRE + COPPER_ORE, IRON_ORE, COAL_ORE, ZINC_ORE, TIN_ORE, GOLD_ORE, SILVER_ORE, LEAD_ORE, PITCHBLENDE, ROCKSALT, QUARTZ, AMETHYST, NITRE ) private val terragenYscaling = (NOISEBOX_HEIGHT / 2400.0).pow(0.75) @@ -470,7 +461,7 @@ internal class TerragenTest(val seed: Long, val params: TerragenParams) : NoiseM val terr = noiseValue[0].tiered(terragenTiers) val cave = if (noiseValue[1] < 0.5) 0 else 1 - val ore = (noiseValue.subList(2, noiseValue.size - 1)).zip(oreCols).firstNotNullOfOrNull { (n, colour) -> if (n > 0.5) colour else null } + val ore = (noiseValue.subList(2, noiseValue.size - 1 - 4)).zip(oreCols).firstNotNullOfOrNull { (n, colour) -> if (n > 0.5) colour else null } val isMarble = false // noiseValue[13] > 0.5 @@ -866,6 +857,7 @@ internal class TerragenTest(val seed: Long, val params: TerragenParams) : NoiseM Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:6", 0.009, 0.300, 0.474, 1.0)), Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:7", 0.013, 0.300, 0.476, 1.0)), Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:8", 0.017, 0.020, 0.511, 1.0)), + Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:9", 0.008, 0.200, 0.480, 1.0)), Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:256", 0.010, -0.366, 0.528, 2.4)), Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:257", 0.007, 0.100, 0.494, 1.0)), Joise(generateOreVeinModule(caveAttenuateBiasScaledCache, seed shake "ores@basegame:258", 0.019, 0.015, 0.509, 1.0)), diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 2896d2779..cf6a9b93c 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67fcf37014b8b851a4ea8162f59937ed510e447e1ea3ce3b97a0080a3a333a88 -size 1769717 +oid sha256:154af945243d2046a17a4ec63066c1d13cff5fcb2c99b448f710740002c077b3 +size 1769693