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

now dropped items can produce light (e.g. dropped torch)

Browse Source
This commit is contained in:
minjaesong
2022-09-11 17:10:01 +09:00
parent 430ad4e703
commit bec47e81e2
15 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/torvald/terrarum/itemproperties/ItemCodex.kt
View File

@@ -8,8 +8,7 @@ import net.torvald.terrarum.ReferencingRanges
import net.torvald.terrarum.ReferencingRanges.PREFIX_ACTORITEM
import net.torvald.terrarum.ReferencingRanges.PREFIX_DYNAMICITEM
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameitems.*
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.CanBeAnItem
import net.torvald.terrarum.modulebasegame.gameactors.FixtureBase
@@ -132,27 +131,23 @@ class ItemCodex {
fun getItemImage(itemID: ItemID?): TextureRegion? {
if (itemID == null) return null
// dynamic item
if (itemID.startsWith("$PREFIX_DYNAMICITEM:")) {
if (itemID.isDynamic()) {
return getItemImage(dynamicToStaticID(itemID))
}
// item
else if (itemID.startsWith("item@")) {
else if (itemID.isItem()) {
return itemCodex[itemID]?.itemImage
}
// wires
else if (itemID.startsWith("wire@")) {
else if (itemID.isWire()) {
return itemCodex[itemID]?.itemImage
}
// wall
else if (itemID.startsWith("wall@")) {
else if (itemID.isWall()) {
val itemSheetNumber = App.tileMaker.tileIDtoItemSheetNumber(itemID.substring(5))
return BlocksDrawer.tileItemWall.get(
itemSheetNumber % App.tileMaker.TILES_IN_X,
itemSheetNumber / App.tileMaker.TILES_IN_X
)
}
// terrain
// else: terrain
else {
val itemSheetNumber = App.tileMaker.tileIDtoItemSheetNumber(itemID)
return BlocksDrawer.tileItemTerrain.get(