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

itemised the torch

Browse Source
This commit is contained in:
minjaesong
2024-02-16 00:26:13 +09:00
parent 76586baba5
commit 26bdd2253a
14 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.gameactors.*
import net.torvald.terrarum.gameitems.*
import net.torvald.terrarum.weather.WeatherMixer.max
import org.dyn4j.geometry.Vector2
/**
@@ -130,12 +131,14 @@ open class DroppedItem : ActorWithBody {
else if (itemID.isWall())
BlockCodex[itemID.substringAfter('@')].getLumCol(randKey1, randKey2)
else {
Cvec(
ItemCodex[itemID]?.itemProperties?.getAsFloat(AVKey.LUMR) ?: 0f,
ItemCodex[itemID]?.itemProperties?.getAsFloat(AVKey.LUMG) ?: 0f,
ItemCodex[itemID]?.itemProperties?.getAsFloat(AVKey.LUMB) ?: 0f,
ItemCodex[itemID]?.itemProperties?.getAsFloat(AVKey.LUMA) ?: 0f,
)
val itemprop = ItemCodex[itemID]
(itemprop?.getLumCol() ?: Cvec(0)).max(
Cvec(
itemprop?.itemProperties?.getAsFloat(AVKey.LUMR) ?: 0f,
itemprop?.itemProperties?.getAsFloat(AVKey.LUMG) ?: 0f,
itemprop?.itemProperties?.getAsFloat(AVKey.LUMB) ?: 0f,
itemprop?.itemProperties?.getAsFloat(AVKey.LUMA) ?: 0f,
))
}
}