From 180d36eb10f6eb3d73bc4c097385dac76e227f20 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 10 Sep 2024 18:38:39 +0900 Subject: [PATCH] new world and worldgen load scr update --- assets/mods/basegame/fluid/fluids.csv | 4 ++-- assets/mods/basegame/gui/large.png | 4 ++-- assets/mods/basegame/gui/normal.png | 4 ++-- assets/mods/basegame/gui/small.png | 4 ++-- .../terrarum/modulebasegame/FancyWorldReadLoadScreen.kt | 3 ++- src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/assets/mods/basegame/fluid/fluids.csv b/assets/mods/basegame/fluid/fluids.csv index a24e4d109..74e978137 100644 --- a/assets/mods/basegame/fluid/fluids.csv +++ b/assets/mods/basegame/fluid/fluids.csv @@ -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" diff --git a/assets/mods/basegame/gui/large.png b/assets/mods/basegame/gui/large.png index 4563e6bde..9951619e3 100644 --- a/assets/mods/basegame/gui/large.png +++ b/assets/mods/basegame/gui/large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:172d1098fcdf749fbaa6e0d91bb5cf047fcd080364b4b462f8e367fc7b30503d -size 2639 +oid sha256:3a78a6e2ee970b49da00daf81cfd7416a8cef9cfc56849fd96706bba6340be42 +size 6865 diff --git a/assets/mods/basegame/gui/normal.png b/assets/mods/basegame/gui/normal.png index 4f1c06dd2..232c969b7 100644 --- a/assets/mods/basegame/gui/normal.png +++ b/assets/mods/basegame/gui/normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67ca75d254bbf680b9a11edcb00352f7f54cd8a130b4abf61c2864573d42edf3 -size 1242 +oid sha256:f62926f669b2ecae463b7aa71e9a78adfc55269bce5c5076fe1fdb9512d62445 +size 4776 diff --git a/assets/mods/basegame/gui/small.png b/assets/mods/basegame/gui/small.png index 85da6c012..ca6a28374 100644 --- a/assets/mods/basegame/gui/small.png +++ b/assets/mods/basegame/gui/small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:877d79cd28c45ce7f3291e8dc8b31dc437e3129c5a9cf5079041ddf86389a759 -size 890 +oid sha256:cfd211f41ce36f1f9d97a984d7c777debb96d859339c289a628057955d647402 +size 3438 diff --git a/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt b/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt index 89ee65c8d..c356bcd1d 100644 --- a/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt +++ b/src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt @@ -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"), diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt b/src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt index 1fcc13094..ae3263236 100644 --- a/src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt +++ b/src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt @@ -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))