curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 04:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Light fuck: At least I've figured out what the fuck was wrong with.

Browse Source
This commit is contained in:
minjaesong
2017-09-12 21:29:45 +09:00
parent e67b97257c
commit 82ddfeb6ee
15 changed files with 99 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/ui/UIBasicNotifier.kt
View File

@@ -47,7 +47,7 @@ class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas() {
private val temperature: Int
get() {
if (player != null) {
val playerTilePos = player.tilewiseHitbox
val playerTilePos = player.hIntTilewiseHitbox
val tempCelsius = -273f + (Terrarum.ingame?.world?.getTemperature(playerTilePos.centeredX.toInt(), playerTilePos.centeredY.toInt()) ?: 288f)
return if (Terrarum.getConfigBoolean("useamericanunit")) {
tempCelsius.times(1.8f).plus(32f).roundInt()
@@ -111,7 +111,7 @@ class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas() {
val lightLevel: Color
if (player != null) {
val playerPos = player.tilewiseHitbox
val playerPos = player.hIntTilewiseHitbox
lightLevel = (LightmapRenderer.getLight(playerPos.centeredX.toInt(), playerPos.centeredY.toInt()) ?:
Terrarum.ingame!!.world.globalLight
)

2
src/net/torvald/terrarum/ui/UITierOneWatch.kt
View File

@@ -66,7 +66,7 @@ class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() {
val lightLevel: Color
if (player != null) {
val playerPos = player.tilewiseHitbox
val playerPos = player.hIntTilewiseHitbox
lightLevel = (LightmapRenderer.getLight(playerPos.centeredX.toInt(), playerPos.centeredY.toInt()) ?:
Terrarum.ingame!!.world.globalLight
)