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

get operator on Tile/ItemPropCodex

Browse Source 
Former-commit-id: f6c4ecbad8c0ce2486524be70e68292d6aae799e
Former-commit-id: 9738a693eb55861d1292e59d8df2bec7f5603c40
This commit is contained in:
Song Minjae
2016-12-16 23:07:14 +09:00
parent 4552d7b7db
commit a5ca82f2c7
12 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/gameitem/DynamicItem.kt
View File

@@ -13,7 +13,7 @@ import org.newdawn.slick.GameContainer
* Created by minjaesong on 16-09-08.
*/
open class DynamicItem(val baseItemID: Int?, newMass: Double? = null, newScale: Double? = null)
: InventoryItemAdapter() {
: InventoryItem() {
/**
* Internal ID of an Item, Long
@@ -22,11 +22,11 @@ open class DynamicItem(val baseItemID: Int?, newMass: Double? = null, newScale:
* 32768-16777215: Dynamic items
* >= 16777216: Actor RefID
*/
override val itemID: Int = generateUniqueDynamicItemID()
override val id: Int = generateUniqueDynamicItemID()
override val equipPosition: Int = // default to HAND_GRIP if no baseItemID given
if (baseItemID != null)
ItemPropCodex.getProp(baseItemID).equipPosition
ItemPropCodex[baseItemID].equipPosition
else
EquipPosition.HAND_GRIP
@@ -67,14 +67,14 @@ open class DynamicItem(val baseItemID: Int?, newMass: Double? = null, newScale:
mass = newMass!!
}
else {
mass = newMass ?: ItemPropCodex.getProp(baseItemID).mass
mass = newMass ?: ItemPropCodex[baseItemID].mass
}
if (baseItemID == null) {
scale = newScale!!
}
else {
scale = newScale ?: ItemPropCodex.getProp(baseItemID).scale
scale = newScale ?: ItemPropCodex[baseItemID].scale
}
}
}