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

new world and worldgen load scr update

Browse Source
This commit is contained in:
minjaesong
2024-09-10 18:38:39 +09:00
parent 29c1a69222
commit 180d36eb10
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/mods/basegame/fluid/fluids.csv
View File

@@ -1,4 +1,4 @@
"id";"name";"shdr";"shdg";"shdb";"shduv";"str";"dsty";"mate";"lumr";"lumg";"lumb";"lumuv";"colour";"vscs";"refl";"tags"
"1";"BLOCK_WATER";"0.1016";"0.0744";"0.0508";"0.0826";"100";"1000";"WATR";"0.0000";"0.0000";"0.0000";"0.0000";"005599A6";"5";"0.0";"NATURAL"
"2";"BLOCK_LAVA";"0.9696";"0.9696";"0.9696";"0.9696";"100";"2600";"ROCK"; "0.7664";"0.2032";"0.0000";"0.0000";"FF4600E6";"16";"0.0";"NATURAL,MOLTEN"
"3";"BLOCK_CRUDE_OIL";"0.9696";"0.9696";"0.9696";"0.9696";"100";"750";"COIL"; "0.0000";"0.0000";"0.0000";"0.0000";"1D0A06F8";"10";"0.0";"NATURAL"
"2";"BLOCK_LAVA";"0.1252";"0.1252";"0.1252";"0.1252";"100";"2600";"ROCK"; "0.7664";"0.2032";"0.0000";"0.0000";"FF4600E6";"16";"0.0";"NATURAL,MOLTEN"
"3";"BLOCK_CRUDE_OIL";"0.1252";"0.1252";"0.1252";"0.1252";"100";"750";"COIL"; "0.0000";"0.0000";"0.0000";"0.0000";"1D0A06F8";"10";"0.0";"NATURAL"
1 id name shdr shdg shdb shduv str dsty mate lumr lumg lumb lumuv colour vscs refl tags
2 1 BLOCK_WATER 0.1016 0.0744 0.0508 0.0826 100 1000 WATR 0.0000 0.0000 0.0000 0.0000 005599A6 5 0.0 NATURAL
3 2 BLOCK_LAVA 0.9696 0.1252 0.9696 0.1252 0.9696 0.1252 0.9696 0.1252 100 2600 ROCK 0.7664 0.2032 0.0000 0.0000 FF4600E6 16 0.0 NATURAL,MOLTEN
4 3 BLOCK_CRUDE_OIL 0.9696 0.1252 0.9696 0.1252 0.9696 0.1252 0.9696 0.1252 100 750 COIL 0.0000 0.0000 0.0000 0.0000 1D0A06F8 10 0.0 NATURAL

BIN
assets/mods/basegame/gui/large.png LFS
View File

Binary file not shown.

BIN
assets/mods/basegame/gui/normal.png LFS
View File

Binary file not shown.

BIN
assets/mods/basegame/gui/small.png LFS
View File

Binary file not shown.

3
src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt
View File

@@ -52,8 +52,9 @@ open class FancyWorldReadLoadScreen(screenToBeLoaded: IngameInstance, private va
val baseTileTex = arrayOf(
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer01"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer02"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer03"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer03"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer02"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer04"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer05"),

2
src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt
View File

@@ -538,7 +538,7 @@ object LightmapRenderer {
}*/
if (_thisFluid.type != Fluid.NULL) {
val fluidAmount = _thisFluid.amount.coerceIn(0f, 1f)
val fluidAmount = _thisFluid.amount.coerceIn(0f, 1f).pow(0.5f)
_thisTileLuminosity.set(_thisTerrainProp.getLumCol(worldX, worldY))
_thisTileLuminosity.maxAndAssign(_thisFluidProp.lumCol.cpy().mul(fluidAmount))