curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

pitchblende spawning

Browse Source
This commit is contained in:
minjaesong
2024-09-25 17:39:28 +09:00
parent 468949a22c
commit e4634045c2
7 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/mods/basegame/blocks/blocks.csv
View File

@@ -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"
1 id drop spawn name shdr shdg shdb shduv str dsty mate solid wall grav dlfn fv fr lumr lumg lumb lumuv refl tags
3 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
4 # rocks
5 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 ROCK,NATURAL,OREBEARING
6 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
7 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
8 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
9 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 ROCK,NATURAL,DEEPROCK,OREBEARING,OLDNAME¤0.4.4¤STONE_DEEP
10 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 ROCK,NATURAL,FLUXSTONE
11 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
12 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
13 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
14 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
15 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
16 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 ROCK,NATURAL,OREBEARING,FLUXSTONE
17 # dirts
18 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
19 33 32 32 BLOCK_GRASS 0.1252 0.1252 0.1252 0.1252 12 1400 GRSS 1 0 N/A 0 0 16 0.0000 0.0000 0.0000 0.0000 0.0 GRASS,NATURAL,CULTIVABLE
20 34 34 34 BLOCK_GRASSWALL 0.1252 0.1252 0.1252 0.1252 12 1400 GRSS 1 1 N/A 0 0 16 0.0000 0.0000 0.0000 0.0000 0.0 GRASS,NATURAL

5
assets/mods/basegame/crafting/masonry.json
View File

@@ -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 */

BIN
assets/mods/basegame/items/items.tga LFS
View File

Binary file not shown.

4
assets/mods/basegame/ores/ores.csv
View File

@@ -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
#"512";"macro@DROP_BASETILE";"GRASS";100663296
#"513";"macro@DROP_BASETILE";"MOSS";100663296
Can't render this file because it contains an unexpected character in line 11 and column 2.

1
assets/mods/basegame/ores/worldgen.csv
View File

@@ -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";""
1 id freq power scale ratio tiling comment blocktagnongrata
7 6 0.009 0.300 0.474 1.0 a16x16 natural gold
8 7 0.013 0.300 0.476 1.0 a16x16 natural silver
9 8 0.017 0.020 0.511 1.0 a16x16 lead (galena)
10 9 0.008 0.200 0.480 1.0 a16x16 uranium (pitchblende) FLUXSTONE
11 256 0.010 -0.366 0.528 2.4 a16x8 rocksalt DEEPROCK
12 257 0.007 0.100 0.494 1.0 a16x8 amethyst
13 258 0.019 0.015 0.509 1.0 a16x8 quartz

16
src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt
View File

@@ -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)),

BIN
work_files/graphics/items/basegame_items.kra LFS
View File

Binary file not shown.