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

fix: held items now glow (or not glow) under UV as they should

Browse Source
This commit is contained in:
minjaesong
2022-12-27 04:19:13 +09:00
parent 801acd2f24
commit 856bd93329
8 changed files with 89 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,10 +124,14 @@ class ItemCodex {
fun getItemImage(item: GameItem?): TextureRegion? {
if (item == null) return null
return getItemImage(item.originalID)
}
fun getItemImageGlow(item: GameItem?): TextureRegion? {
if (item == null) return null
return getItemImageGlow(item.originalID)
}
fun getItemImage(itemID: ItemID?): TextureRegion? {
if (itemID == null) return null
@@ -155,7 +159,35 @@ class ItemCodex {
itemSheetNumber / App.tileMaker.TILES_IN_X
)
}
}
fun getItemImageGlow(itemID: ItemID?): TextureRegion? {
if (itemID == null) return null
if (itemID.isDynamic()) {
return getItemImageGlow(dynamicToStaticID(itemID))
}
else if (itemID.isItem()) {
return itemCodex[itemID]?.itemImageGlow
}
else if (itemID.isWire()) {
return itemCodex[itemID]?.itemImageGlow
}
else if (itemID.isWall()) {
val itemSheetNumber = App.tileMaker.tileIDtoItemSheetNumber(itemID.substring(5))
return BlocksDrawer.tileItemWallGlow.get(
itemSheetNumber % App.tileMaker.TILES_IN_X,
itemSheetNumber / App.tileMaker.TILES_IN_X
)
}
// else: terrain
else {
val itemSheetNumber = App.tileMaker.tileIDtoItemSheetNumber(itemID)
return BlocksDrawer.tileItemTerrainGlow.get(
itemSheetNumber % App.tileMaker.TILES_IN_X,
itemSheetNumber / App.tileMaker.TILES_IN_X
)
}
}
fun hasItem(itemID: ItemID): Boolean = dynamicItemInventory.containsKey(itemID)