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

GameItem item image Pixmap

Browse Source
This commit is contained in:
minjaesong
2024-05-22 17:10:50 +09:00
parent fc509de98f
commit 17e25c9cf7
39 changed files with 401 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemHomeComputer.kt
View File

@@ -21,8 +21,9 @@ class ItemHomeComputer(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE) itemImage = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_DESKTOP_COMPUTER" override var originalName = "ITEM_DESKTOP_COMPUTER"
} }

5
ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt
View File

@@ -34,8 +34,9 @@ class ItemWearableWorldRadar(originalID: String) {// : GameItem(originalID) {
override val isUnique = false override val isUnique = false
override val isDynamic = true override val isDynamic = true
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass

6
assets/mods/basegame/books/test.xml
View File

@@ -2,11 +2,7 @@
<btexdoc cover="hardcover" inner="standard" papersize="standard"> <btexdoc cover="hardcover" inner="standard" papersize="standard">
<manuscript> <manuscript>
<p>1972년 11월 21일, 김두한은 오랜 지병이었던 고혈압으로 쓰러졌다. 향년 55세였고, 박정희 정권의 독재가 또 한번의 정권 연장을 위해 유신헌법을 통과한지 한 달만이었다. 많은 인파가 몰린 그의 장례행렬에는 한 무리의 어린아이들도 그 뒤를 잇고 있었다. 백야 김좌진 장군의 국가유공자 연금 전액을 매달 삼애 고아원이라는 곳에 기탁한 이유였다. 김두한. 그는 일제 말 우리가 주권을 잃었던 식민지 시절부터 해방 이후 좌우익의 대립에 이어서 자유당 부패정치와 5.16 박정희 정권에 이르기까지 그의 전생에 온 몸을 다 던져 불의와 싸웠다.</p> <img itemimg="item@basegame:54" height="4" caption="It's a small world"/>
<callout>최동열: 난 오랫동안 자네를 지켜봐온 사람일세. 자네는 자네답게 살았어. 조선의 주먹 황제답게 말이야. 늘 야인이였지만 용감하고 멋있게 살았어. 나름대로 자네의 역사를 가지고 자네의 시대를 치열하고 열심히 살았다는 얘기야. 뭐랄까...? 야인시대라고나 할까?</callout>
<p>야인시대! 그렇다. 그것은 바로 그가 몸바쳐 살아왔던 이 나라 격동기의 또 다른 역사의 한 장이었다.</p>
</manuscript> </manuscript>
</btexdoc> </btexdoc>

1
btexdoc.dtd
View File

@@ -48,6 +48,7 @@
"src CDATA #IMPLIED "src CDATA #IMPLIED
fromgame CDATA #IMPLIED fromgame CDATA #IMPLIED
gameitem CDATA #IMPLIED gameitem CDATA #IMPLIED
itemimg CDATA #IMPLIED
caption %Text; #IMPLIED caption %Text; #IMPLIED
height %Number; #REQUIRED"> height %Number; #REQUIRED">
<!ENTITY % coreattrs <!ENTITY % coreattrs

6
src/net/torvald/btex/BTeXParser.kt
View File

@@ -973,9 +973,10 @@ object BTeXParser {
val btexObjName = "IMG@${makeRandomObjName()}" val btexObjName = "IMG@${makeRandomObjName()}"
val img = attribs["src"] val img = attribs["src"]
val fromgame = attribs["fromgame"] val fromgame = attribs["fromgame"]
val itemimg = attribs["itemimg"]
val caption = attribs["caption"] val caption = attribs["caption"]
if (listOf(img, fromgame).count { it != null } != 1) { if (listOf(img, fromgame, itemimg).count { it != null } != 1) {
throw IllegalArgumentException() throw IllegalArgumentException()
} }
@@ -1010,6 +1011,9 @@ object BTeXParser {
val modulePath = fromgame.substringAfter(':') val modulePath = fromgame.substringAfter(':')
Pixmap(ModMgr.getGdxFile(moduleName, modulePath)) Pixmap(ModMgr.getGdxFile(moduleName, modulePath))
} }
else if (itemimg != null) {
ItemCodex.getItemImagePixmap(itemimg)!!
}
else throw InternalError() else throw InternalError()
val imgWidth = (imgHeight.toFloat() / inputPixmap.height * inputPixmap.width).roundToInt() val imgWidth = (imgHeight.toFloat() / inputPixmap.height * inputPixmap.width).roundToInt()

21
src/net/torvald/terrarum/gameitems/GameItem.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.gameitems package net.torvald.terrarum.gameitems
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.gdx.graphics.Cvec import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.* import net.torvald.terrarum.*
@@ -159,7 +160,24 @@ abstract class GameItem(val originalID: ItemID) : Comparable<GameItem>, Cloneabl
* ``` * ```
* *
*/ */
@Transient open val itemImage: TextureRegion? = null @Transient var itemImage: TextureRegion? = null
set(tex) {
field = tex
tex?.let {
val texdata = tex.texture.textureData.also {
if (!it.isPrepared) it.prepare()
}
itemImagePixmap = Pixmap(tex.regionWidth, tex.regionHeight, texdata.format).also {
it.drawPixmap(
texdata.consumePixmap(),
0, 0, tex.regionX, tex.regionY, tex.regionWidth, tex.regionHeight
)
App.disposables.add(it)
}
}
}
@Transient open var itemImagePixmap: Pixmap? = null; internal set
@Transient open val itemImageGlow: TextureRegion? = null @Transient open val itemImageGlow: TextureRegion? = null
@Transient open val itemImageEmissive: TextureRegion? = null @Transient open val itemImageEmissive: TextureRegion? = null
@@ -407,6 +425,7 @@ abstract class GameItem(val originalID: ItemID) : Comparable<GameItem>, Cloneabl
return ret return ret
} }
} }
} }
/** /**

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

@@ -1,5 +1,6 @@
package net.torvald.terrarum.itemproperties package net.torvald.terrarum.itemproperties
import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.App.printdbg
@@ -135,6 +136,37 @@ class ItemCodex {
return getItemImage(item.originalID) return getItemImage(item.originalID)
} }
fun getItemImagePixmap(itemID: ItemID?): Pixmap? {
if (itemID == null) return null
if (itemID.isDynamic()) {
return getItemImagePixmap(dynamicToStaticID(itemID))
}
else if (itemID.isItem()) {
return itemCodex[itemID]?.itemImagePixmap
}
else if (itemID.isWire()) {
return itemCodex[itemID]?.itemImagePixmap
}
else if (itemID.isWall()) {
val itemSheetNumber = App.tileMaker.tileIDtoItemSheetNumber(itemID.substring(5))
return TODO()
/*return BlocksDrawer.tileItemWallPixmap.getPortion(
itemSheetNumber % App.tileMaker.TILES_IN_X,
itemSheetNumber / App.tileMaker.TILES_IN_X
)*/
}
// else: terrain
else {
val itemSheetNumber = App.tileMaker.tileIDtoItemSheetNumber(itemID)
return TODO()
/*return BlocksDrawer.tileItemTerrainPixmap.getPortion(
itemSheetNumber % App.tileMaker.TILES_IN_X,
itemSheetNumber / App.tileMaker.TILES_IN_X
)*/
}
}
fun getItemImageGlow(item: GameItem?): TextureRegion? { fun getItemImageGlow(item: GameItem?): TextureRegion? {
if (item == null) return null if (item == null) return null
return getItemImageGlow(item.originalID) return getItemImageGlow(item.originalID)

23
src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt
View File

@@ -272,10 +272,9 @@ class AxeCopper(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,0)
init { init {
itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,0)
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
maxDurability = (TOOL_DURABILITY_BASE * material.enduranceMod).roundToInt() maxDurability = (TOOL_DURABILITY_BASE * material.enduranceMod).roundToInt()
durability = maxDurability.toFloat() durability = maxDurability.toFloat()
@@ -301,8 +300,9 @@ class AxeIron(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "IRON" override val materialId = "IRON"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(4,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -330,8 +330,9 @@ class AxeSteel(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "STAL" override val materialId = "STAL"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -359,8 +360,9 @@ class AxeWood(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "WOOD" override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,4) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9,4)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -388,8 +390,9 @@ class AxeStone(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "ROCK" override val materialId = "ROCK"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12,4) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12,4)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP

7
src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt
View File

@@ -52,8 +52,11 @@ open class FixtureItemBase(originalID: ItemID, val fixtureClassName: String) : G
* *
* ```get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")``` * ```get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")```
*/ */
override val itemImage: TextureRegion
get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_32") init {
itemImage = CommonResourcePool.getAsTextureRegion("itemplaceholder_32")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt
View File

@@ -13,8 +13,9 @@ class ItemFurnaceAndAnvil(originalID: ItemID) : FixtureItemBase(originalID, "net
override var baseMass = 100.0 override var baseMass = 100.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5,3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_FURNACE_AND_ANVIL" override var originalName = "ITEM_FURNACE_AND_ANVIL"

15
src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt
View File

@@ -13,8 +13,9 @@ class ItemJukebox(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald
override var baseMass = 200.0 override var baseMass = 200.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_JUKEBOX" override var originalName = "ITEM_JUKEBOX"
@@ -30,8 +31,9 @@ class ItemMusicalTurntable(originalID: ItemID) : FixtureItemBase(originalID, "ne
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TURNTABLE" override var originalName = "ITEM_TURNTABLE"
@@ -48,8 +50,9 @@ class ItemMechanicalTines(originalID: ItemID) : FixtureItemBase(originalID, "net
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/mechanical_tines.tga") itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/mechanical_tines.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_MECHANICAL_TINES" override var originalName = "ITEM_MECHANICAL_TINES"

20
src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBlocker.kt
View File

@@ -17,8 +17,9 @@ class ItemLogicSignalBlocker(originalID: ItemID) : FixtureItemBase(originalID, "
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10, 3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_BLOCKER" override var originalName = "ITEM_LOGIC_SIGNAL_BLOCKER"
@@ -44,8 +45,9 @@ class ItemLogicSignalLatch(originalID: ItemID) : FixtureItemBase(originalID, "ne
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11, 3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_LATCH" override var originalName = "ITEM_LOGIC_SIGNAL_LATCH"
@@ -71,8 +73,9 @@ class ItemLogicSignalRepeaterHorz(originalID: ItemID) : FixtureItemBase(original
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12, 3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_REPEATER" override var originalName = "ITEM_LOGIC_SIGNAL_REPEATER"
@@ -98,8 +101,9 @@ class ItemLogicSignalAdder(originalID: ItemID) : FixtureItemBase(originalID, "ne
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_ADDER" override var originalName = "ITEM_LOGIC_SIGNAL_ADDER"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBulb.kt
View File

@@ -17,8 +17,9 @@ class ItemLogicSignalBulb(originalID: ItemID) : FixtureItemBase(originalID, "net
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9, 3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_COPPER_BULB" override var originalName = "ITEM_COPPER_BULB"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt
View File

@@ -17,8 +17,9 @@ class ItemLogicSignalEmitter(originalID: ItemID) : FixtureItemBase(originalID, "
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_EMITTER" override var originalName = "ITEM_LOGIC_SIGNAL_EMITTER"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSevenSeg.kt
View File

@@ -17,8 +17,9 @@ class ItemLogicSignalSevenSeg(originalID: ItemID) : FixtureItemBase(originalID,
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 3)
}
override val itemImageEmissive: TextureRegion override val itemImageEmissive: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 4) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 4)

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSwitchManual.kt
View File

@@ -17,8 +17,9 @@ class ItemLogicSignalSwitchManual(originalID: ItemID) : FixtureItemBase(original
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8, 3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_LOGIC_SIGNAL_SWITCH" override var originalName = "ITEM_LOGIC_SIGNAL_SWITCH"

25
src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt
View File

@@ -34,8 +34,9 @@ class OreStick(originalID: ItemID) : LightIngredientBase(originalID) {
override val materialId = "WOOD" override val materialId = "WOOD"
override var calories = 600.0 override var calories = 600.0
override var smokiness = 0.2f override var smokiness = 0.2f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6)
}
} }
/** /**
@@ -43,8 +44,9 @@ class OreStick(originalID: ItemID) : LightIngredientBase(originalID) {
*/ */
class ItemClayBall(originalID: ItemID) : LightIngredientBase(originalID) { class ItemClayBall(originalID: ItemID) : LightIngredientBase(originalID) {
override var originalName = "BLOCK_CLAY" override var originalName = "BLOCK_CLAY"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11,6)
}
} }
/** /**
@@ -52,8 +54,9 @@ class ItemClayBall(originalID: ItemID) : LightIngredientBase(originalID) {
*/ */
class ItemGunpowder(originalID: ItemID) : LightIngredientBase(originalID) { class ItemGunpowder(originalID: ItemID) : LightIngredientBase(originalID) {
override var originalName = "ITEM_GUNPOWDER" override var originalName = "ITEM_GUNPOWDER"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,12) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,12)
}
} }
/** /**
@@ -64,8 +67,9 @@ class ItemTorch(originalID: ItemID) : LightIngredientBase(originalID) {
override var inventoryCategory = Category.FIXTURE override var inventoryCategory = Category.FIXTURE
override var originalName = "BLOCK_TORCH" override var originalName = "BLOCK_TORCH"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,14) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,14)
}
override val itemImageEmissive: TextureRegion override val itemImageEmissive: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,14) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,14)
@@ -95,6 +99,7 @@ class ItemTorch(originalID: ItemID) : LightIngredientBase(originalID) {
*/ */
class ItemSolderingWire(originalID: ItemID) : LightIngredientBase(originalID) { class ItemSolderingWire(originalID: ItemID) : LightIngredientBase(originalID) {
override var originalName = "ITEM_SOLDERING_WIRE" override var originalName = "ITEM_SOLDERING_WIRE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,2) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6,2)
}
} }

20
src/net/torvald/terrarum/modulebasegame/gameitems/ItemSeeds.kt
View File

@@ -9,30 +9,34 @@ class ItemSeedOak(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald
override var baseMass = 1.0 override var baseMass = 1.0
override val materialId = "OOZE" override val materialId = "OOZE"
override var inventoryCategory = Category.GENERIC override var inventoryCategory = Category.GENERIC
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,11) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,11)
}
} }
class ItemSeedEbony(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingEbony") { class ItemSeedEbony(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingEbony") {
override var originalName = "ITEM_SEED_EBONY" override var originalName = "ITEM_SEED_EBONY"
override var baseMass = 1.0 override var baseMass = 1.0
override val materialId = "OOZE" override val materialId = "OOZE"
override var inventoryCategory = Category.GENERIC override var inventoryCategory = Category.GENERIC
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,11) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,11)
}
} }
class ItemSeedBirch(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingBirch") { class ItemSeedBirch(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingBirch") {
override var originalName = "ITEM_SEED_BIRCH" override var originalName = "ITEM_SEED_BIRCH"
override var baseMass = 1.0 override var baseMass = 1.0
override val materialId = "OOZE" override val materialId = "OOZE"
override var inventoryCategory = Category.GENERIC override var inventoryCategory = Category.GENERIC
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,11) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,11)
}
} }
class ItemSeedRosewood(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingRosewood") { class ItemSeedRosewood(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingRosewood") {
override var originalName = "ITEM_SEED_ROSEWOOD" override var originalName = "ITEM_SEED_ROSEWOOD"
override var baseMass = 1.0 override var baseMass = 1.0
override val materialId = "OOZE" override val materialId = "OOZE"
override var inventoryCategory = Category.GENERIC override var inventoryCategory = Category.GENERIC
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,11) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,11)
}
} }

10
src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt
View File

@@ -11,8 +11,9 @@ class ItemSmelterBasic(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var baseMass = 100.0 override var baseMass = 100.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(4,3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_SMELTER_SMALL" override var originalName = "ITEM_SMELTER_SMALL"
@@ -25,8 +26,9 @@ class ItemAlloyingFurnace(originalID: ItemID) : FixtureItemBase(originalID, "net
override var baseMass = 100.0 override var baseMass = 100.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(13,3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_ALLOYING_FURNACE" override var originalName = "ITEM_ALLOYING_FURNACE"

20
src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt
View File

@@ -15,8 +15,9 @@ class ItemStorageChest(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_STORAGE_CHEST" override var originalName = "ITEM_STORAGE_CHEST"
} }
@@ -29,8 +30,9 @@ class ItemStorageChestEbony(originalID: ItemID) : FixtureItemBase(originalID, "n
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_2.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_2.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_STORAGE_CHEST" override var originalName = "ITEM_STORAGE_CHEST"
} }
@@ -43,8 +45,9 @@ class ItemStorageChestBirch(originalID: ItemID) : FixtureItemBase(originalID, "n
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_3.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_3.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_STORAGE_CHEST" override var originalName = "ITEM_STORAGE_CHEST"
} }
@@ -57,8 +60,9 @@ class ItemStorageChestRosewood(originalID: ItemID) : FixtureItemBase(originalID,
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_4.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_4.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_STORAGE_CHEST" override var originalName = "ITEM_STORAGE_CHEST"
} }

20
src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt
View File

@@ -16,8 +16,9 @@ class ItemSwingingDoorOak(originalID: ItemID) :
override var baseMass = 20.0 // 360[L] * 0.1 * 0.56[SpecificGravity], rounded to the nearest integer override var baseMass = 20.0 // 360[L] * 0.1 * 0.56[SpecificGravity], rounded to the nearest integer
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_DOOR_OAK" override var originalName = "ITEM_DOOR_OAK"
} }
@@ -29,8 +30,9 @@ class ItemSwingingDoorEbony(originalID: ItemID) :
override var baseMass = 30.0 // 360[L] * 0.1 * 0.82[SpecificGravity], rounded to the nearest integer override var baseMass = 30.0 // 360[L] * 0.1 * 0.82[SpecificGravity], rounded to the nearest integer
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_DOOR_EBONY" override var originalName = "ITEM_DOOR_EBONY"
} }
@@ -42,8 +44,9 @@ class ItemSwingingDoorBirch(originalID: ItemID) :
override var baseMass = 17.0 // 360[L] * 0.1 * 0.48[SpecificGravity], rounded to the nearest integer override var baseMass = 17.0 // 360[L] * 0.1 * 0.48[SpecificGravity], rounded to the nearest integer
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_DOOR_BIRCH" override var originalName = "ITEM_DOOR_BIRCH"
} }
@@ -55,8 +58,9 @@ class ItemSwingingDoorRosewood(originalID: ItemID) :
override var baseMass = 24.0 // 360[L] * 0.1 * 0.68[SpecificGravity], rounded to the nearest integer override var baseMass = 24.0 // 360[L] * 0.1 * 0.68[SpecificGravity], rounded to the nearest integer
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_DOOR_ROSEWOOD" override var originalName = "ITEM_DOOR_ROSEWOOD"
} }

20
src/net/torvald/terrarum/modulebasegame/gameitems/ItemTable.kt
View File

@@ -11,8 +11,9 @@ class ItemTable(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.t
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "WOOD" override val materialId = "WOOD"
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_1.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_1.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TABLE_OAK" override var originalName = "ITEM_TABLE_OAK"
} }
@@ -25,8 +26,9 @@ class ItemTableEbony(originalID: ItemID) : FixtureItemBase(originalID, "net.torv
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "WOOD" override val materialId = "WOOD"
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_2.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_2.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TABLE_EBONY" override var originalName = "ITEM_TABLE_EBONY"
} }
@@ -39,8 +41,9 @@ class ItemTableBirch(originalID: ItemID) : FixtureItemBase(originalID, "net.torv
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "WOOD" override val materialId = "WOOD"
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_3.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_3.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TABLE_BIRCH" override var originalName = "ITEM_TABLE_BIRCH"
} }
@@ -53,8 +56,9 @@ class ItemTableRosewood(originalID: ItemID) : FixtureItemBase(originalID, "net.t
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "WOOD" override val materialId = "WOOD"
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_4.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_4.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TABLE_ROSEWOOD" override var originalName = "ITEM_TABLE_ROSEWOOD"
} }

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemTapestry.kt
View File

@@ -20,8 +20,9 @@ class ItemTapestry(originalID: ItemID) : FixtureItemBase(originalID, "net.torval
override var baseMass = 6.0 override var baseMass = 6.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") itemImage = CommonResourcePool.getAsTextureRegion("itemplaceholder_16")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TAPESTRY" override var originalName = "ITEM_TAPESTRY"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt
View File

@@ -22,8 +22,9 @@ class ItemTextSignCopper(originalID: ItemID) : FixtureItemBase(originalID, "net.
override var baseMass = 10.0 override var baseMass = 10.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 4) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 4)
}
override val itemImageEmissive: TextureRegion override val itemImageEmissive: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13, 4) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13, 4)

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemThrowable.kt
View File

@@ -70,6 +70,7 @@ fun getThrowPosAndVector(actor: ActorWithBody): Pair<Vector2, Vector2> {
*/ */
class ItemCherryBomb(originalID: ItemID) : ItemThrowable(originalID, "net.torvald.terrarum.modulebasegame.gameactors.ActorCherryBomb") { class ItemCherryBomb(originalID: ItemID) : ItemThrowable(originalID, "net.torvald.terrarum.modulebasegame.gameactors.ActorCherryBomb") {
override var originalName = "ITEM_CHERRY_BOMB" override var originalName = "ITEM_CHERRY_BOMB"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,13) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,13)
}
} }

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemTikiTorch.kt
View File

@@ -14,8 +14,9 @@ class ItemTikiTorch(originalID: ItemID) : FixtureItemBase(originalID, "net.torva
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32) itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TIKI_TORCH" override var originalName = "ITEM_TIKI_TORCH"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt
View File

@@ -14,8 +14,9 @@ class ItemTypewriter(originalID: ItemID) : FixtureItemBase(originalID, "net.torv
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16) itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_TYPEWRITER" override var originalName = "ITEM_TYPEWRITER"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt
View File

@@ -13,8 +13,9 @@ class ItemWallCalendar(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var baseMass = 1.0 override var baseMass = 1.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_CALENDAR" override var originalName = "ITEM_CALENDAR"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemWireRollingMill.kt
View File

@@ -12,8 +12,9 @@ class ItemWireRollingMill(originalID: ItemID) : FixtureItemBase(originalID, "net
override var baseMass = 50.0 override var baseMass = 50.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/wire_rolling_mill.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/wire_rolling_mill.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_WIRE_ROLLING_MILL" override var originalName = "ITEM_WIRE_ROLLING_MILL"

15
src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorkbench.kt
View File

@@ -12,8 +12,9 @@ class ItemWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "net.torva
override var baseMass = 20.0 override var baseMass = 20.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga") itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga")
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_WORKBENCH" override var originalName = "ITEM_WORKBENCH"
@@ -29,8 +30,9 @@ class ItemElectricWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "n
override var baseMass = 40.0 override var baseMass = 40.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSheet("basegame", "sprites/fixtures/electric_workbench.tga", 32, 32, 0, 0) itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/electric_workbench.tga", 32, 32, 0, 0)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_ELECTRIC_WORKBENCH" override var originalName = "ITEM_ELECTRIC_WORKBENCH"
@@ -46,8 +48,9 @@ class ItemEngravingWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "
override var baseMass = 40.0 override var baseMass = 40.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = getItemImageFromSheet("basegame", "sprites/fixtures/engraving_workbench.tga", 32, 32, 0, 0) itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/engraving_workbench.tga", 32, 32, 0, 0)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_ENGRAVING_WORKBENCH" override var originalName = "ITEM_ENGRAVING_WORKBENCH"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt
View File

@@ -14,8 +14,9 @@ class ItemWorldPortal(originalID: ItemID) : FixtureItemBase(originalID, "net.tor
override var baseMass = 6000.0 override var baseMass = 6000.0
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3)
}
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_WORLD_PORTAL" override var originalName = "ITEM_WORLD_PORTAL"

5
src/net/torvald/terrarum/modulebasegame/gameitems/ItemWrench.kt
View File

@@ -24,8 +24,9 @@ class ItemWrench(originalID: ItemID) : GameItem(originalID), FixtureInteractionB
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "STAL" // this is to just increase the reach override val materialId = "STAL" // this is to just increase the reach
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5, 2) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5, 2)
}
init { init {
stackable = false stackable = false

4
src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt
View File

@@ -52,7 +52,9 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
"${meta.author.trim()}${meta.album.trim()}" "${meta.author.trim()}${meta.album.trim()}"
} }
@Transient override val itemImage: TextureRegion = generateSprite() init {
itemImage = generateSprite()
}
/** /**
* Reads a channel-wise black and white image and tints it using HSLuv colour space * Reads a channel-wise black and white image and tints it using HSLuv colour space

230
src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt
View File

@@ -38,8 +38,9 @@ class ItemLogsOak(originalID: ItemID) : OreItemBase(originalID) {
override val materialId = "WOOD" override val materialId = "WOOD"
override var calories = 1920.0 override var calories = 1920.0
override var smokiness = 0.2f override var smokiness = 0.2f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,10)
}
init { tags.add("ACTINGBLOCK") } init { tags.add("ACTINGBLOCK") }
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
@@ -51,8 +52,9 @@ class ItemLogsEbony(originalID: ItemID) : OreItemBase(originalID) {
override val materialId = "WOOD" override val materialId = "WOOD"
override var calories = 1920.0 override var calories = 1920.0
override var smokiness = 0.2f override var smokiness = 0.2f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,10)
}
init { tags.add("ACTINGBLOCK") } init { tags.add("ACTINGBLOCK") }
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
@@ -64,8 +66,9 @@ class ItemLogsBirch(originalID: ItemID) : OreItemBase(originalID) {
override val materialId = "WOOD" override val materialId = "WOOD"
override var calories = 1920.0 override var calories = 1920.0
override var smokiness = 0.2f override var smokiness = 0.2f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,10)
}
init { tags.add("ACTINGBLOCK") } init { tags.add("ACTINGBLOCK") }
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
@@ -77,8 +80,9 @@ class ItemLogsRosewood(originalID: ItemID) : OreItemBase(originalID) {
override val materialId = "WOOD" override val materialId = "WOOD"
override var calories = 1920.0 override var calories = 1920.0
override var smokiness = 0.2f override var smokiness = 0.2f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,10) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,10)
}
init { tags.add("ACTINGBLOCK") } init { tags.add("ACTINGBLOCK") }
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
@@ -90,68 +94,80 @@ class ItemLogsRosewood(originalID: ItemID) : OreItemBase(originalID) {
class OreCopper(originalID: ItemID) : OreItemBase(originalID, true) { class OreCopper(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_MALACHITE" override var originalName = "ITEM_ORE_MALACHITE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6)
}
} }
class OreIron(originalID: ItemID) : OreItemBase(originalID, true) { class OreIron(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_HAEMATITE" override var originalName = "ITEM_ORE_HAEMATITE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,6)
}
} }
class OreCoal(originalID: ItemID) : OreItemBase(originalID, true) { class OreCoal(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_COAL" override var originalName = "ITEM_ORE_COAL"
override var calories = 4800.0 override var calories = 4800.0
override var smokiness = 0.3f override var smokiness = 0.3f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,6)
}
} }
class OreZinc(originalID: ItemID) : OreItemBase(originalID, true) { class OreZinc(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_SPHALERITE" override var originalName = "ITEM_ORE_SPHALERITE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6)
}
} }
class OreTin(originalID: ItemID) : OreItemBase(originalID, true) { class OreTin(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_CASSITERITE" override var originalName = "ITEM_ORE_CASSITERITE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6)
}
} }
class OreGold(originalID: ItemID) : OreItemBase(originalID, true) { class OreGold(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_NATURAL_GOLD" override var originalName = "ITEM_ORE_NATURAL_GOLD"
override val materialId: String = "AURM" override val materialId: String = "AURM"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6, 6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6, 6)
}
} }
class OreSilver(originalID: ItemID) : OreItemBase(originalID, true) { class OreSilver(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_NATURAL_SILVER" override var originalName = "ITEM_ORE_NATURAL_SILVER"
override val materialId: String = "ARGN" override val materialId: String = "ARGN"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,6)
}
} }
class OreLead(originalID: ItemID) : OreItemBase(originalID, true) { class OreLead(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_GALENA" override var originalName = "ITEM_ORE_GALENA"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6)
}
} }
class GemQuartz(originalID: ItemID) : OreItemBase(originalID, true) { class GemQuartz(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_GEM_QUARTZ" override var originalName = "ITEM_GEM_QUARTZ"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(13,6)
}
} }
class GemAmethyst(originalID: ItemID) : OreItemBase(originalID, true) { class GemAmethyst(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_GEM_AMETHYST" override var originalName = "ITEM_GEM_AMETHYST"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(14,6)
}
} }
class ItemRockSalt(originalID: ItemID) : OreItemBase(originalID, true) { class ItemRockSalt(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ROCK_SALT" override var originalName = "ITEM_ROCK_SALT"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10,6)
}
} }
class ItemNitre(originalID: ItemID) : OreItemBase(originalID, true) { class ItemNitre(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_NITRE" override var originalName = "ITEM_NITRE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(15,6)
}
} }
@@ -159,157 +175,187 @@ class ItemCoalCoke(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_COAL_COKE" override var originalName = "ITEM_COAL_COKE"
override var calories = 4800.0 override var calories = 4800.0
override var smokiness = 0.4f override var smokiness = 0.4f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6)
}
} }
class ItemCharcoal(originalID: ItemID) : OreItemBase(originalID) { class ItemCharcoal(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_CHARCOAL" override var originalName = "ITEM_CHARCOAL"
override var calories = 4800.0 override var calories = 4800.0
override var smokiness = 0.3f override var smokiness = 0.3f
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12,6) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12,6)
}
} }
class IngotCopper(originalID: ItemID) : OreItemBase(originalID) { class IngotCopper(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_COPPER" override var originalName = "ITEM_INGOT_COPPER"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0)
}
} }
class IngotIron(originalID: ItemID) : OreItemBase(originalID) { class IngotIron(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_IRON" override var originalName = "ITEM_INGOT_IRON"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0)
}
} }
class IngotSteel(originalID: ItemID) : OreItemBase(originalID) { class IngotSteel(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_STEEL" override var originalName = "ITEM_INGOT_STEEL"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(18,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(18,0)
}
} }
class IngotZinc(originalID: ItemID) : OreItemBase(originalID) { class IngotZinc(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_ZINC" override var originalName = "ITEM_INGOT_ZINC"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(19,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(19,0)
}
} }
class IngotTin(originalID: ItemID) : OreItemBase(originalID) { class IngotTin(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_TIN" override var originalName = "ITEM_INGOT_TIN"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(20,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(20,0)
}
} }
class IngotGold(originalID: ItemID) : OreItemBase(originalID) { class IngotGold(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_GOLD" override var originalName = "ITEM_INGOT_GOLD"
override val materialId: String = "AURM" override val materialId: String = "AURM"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(21, 0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(21, 0)
}
} }
class IngotSilver(originalID: ItemID) : OreItemBase(originalID) { class IngotSilver(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_SILVER" override var originalName = "ITEM_INGOT_SILVER"
override val materialId: String = "ARGN" override val materialId: String = "ARGN"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(22,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(22,0)
}
} }
class IngotLead(originalID: ItemID) : OreItemBase(originalID) { class IngotLead(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_LEAD" override var originalName = "ITEM_INGOT_LEAD"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(23,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(23,0)
}
} }
class IngotBronze(originalID: ItemID) : OreItemBase(originalID) { class IngotBronze(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_BRONZE" override var originalName = "ITEM_INGOT_BRONZE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(24,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(24,0)
}
} }
class IngotBrass(originalID: ItemID) : OreItemBase(originalID) { class IngotBrass(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_BRASS" override var originalName = "ITEM_INGOT_BRASS"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(25,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(25,0)
}
} }
class IngotElectrum(originalID: ItemID) : OreItemBase(originalID) { class IngotElectrum(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_ELECTRUM" override var originalName = "ITEM_INGOT_ELECTRUM"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(26,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(26,0)
}
} }
class IngotSilverBillon(originalID: ItemID) : OreItemBase(originalID) { class IngotSilverBillon(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_SILVER_BILLON" override var originalName = "ITEM_INGOT_SILVER_BILLON"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(27,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(27,0)
}
} }
class IngotRosegold(originalID: ItemID) : OreItemBase(originalID) { class IngotRosegold(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_ROSEGOLD" override var originalName = "ITEM_INGOT_ROSEGOLD"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(28,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(28,0)
}
} }
class IngotSolder(originalID: ItemID) : OreItemBase(originalID) { class IngotSolder(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_INGOT_SOLDER" override var originalName = "ITEM_INGOT_SOLDER"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(29,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(29,0)
}
} }
class SheetCopper(originalID: ItemID) : OreItemBase(originalID) { class SheetCopper(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_COPPER" override var originalName = "ITEM_SHEET_COPPER"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1)
}
} }
class SheetIron(originalID: ItemID) : OreItemBase(originalID) { class SheetIron(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_IRON" override var originalName = "ITEM_SHEET_IRON"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1)
}
} }
class SheetSteel(originalID: ItemID) : OreItemBase(originalID) { class SheetSteel(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_STEEL" override var originalName = "ITEM_SHEET_STEEL"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(18,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(18,1)
}
} }
class SheetZinc(originalID: ItemID) : OreItemBase(originalID) { class SheetZinc(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_ZINC" override var originalName = "ITEM_SHEET_ZINC"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(19,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(19,1)
}
} }
class SheetTin(originalID: ItemID) : OreItemBase(originalID) { class SheetTin(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_TIN" override var originalName = "ITEM_SHEET_TIN"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(20,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(20,1)
}
} }
class SheetGold(originalID: ItemID) : OreItemBase(originalID) { class SheetGold(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_GOLD" override var originalName = "ITEM_SHEET_GOLD"
override val materialId: String = "AURM" override val materialId: String = "AURM"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(21,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(21,1)
}
} }
class SheetSilver(originalID: ItemID) : OreItemBase(originalID) { class SheetSilver(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_SILVER" override var originalName = "ITEM_SHEET_SILVER"
override val materialId: String = "ARGN" override val materialId: String = "ARGN"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(22,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(22,1)
}
} }
class SheetLead(originalID: ItemID) : OreItemBase(originalID) { class SheetLead(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_LEAD" override var originalName = "ITEM_SHEET_LEAD"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(23,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(23,1)
}
} }
class SheetBronze(originalID: ItemID) : OreItemBase(originalID) { class SheetBronze(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_BRONZE" override var originalName = "ITEM_SHEET_BRONZE"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(24,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(24,1)
}
} }
class SheetBrass(originalID: ItemID) : OreItemBase(originalID) { class SheetBrass(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_BRASS" override var originalName = "ITEM_SHEET_BRASS"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(25,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(25,1)
}
} }
class SheetElectrum(originalID: ItemID) : OreItemBase(originalID) { class SheetElectrum(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_ELECTRUM" override var originalName = "ITEM_SHEET_ELECTRUM"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(26,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(26,1)
}
} }
class SheetSilverBillon(originalID: ItemID) : OreItemBase(originalID) { class SheetSilverBillon(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_SILVER_BILLON" override var originalName = "ITEM_SHEET_SILVER_BILLON"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(27,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(27,1)
}
} }
class SheetRosegold(originalID: ItemID) : OreItemBase(originalID) { class SheetRosegold(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_ROSEGOLD" override var originalName = "ITEM_SHEET_ROSEGOLD"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(28,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(28,1)
}
} }
class SheetSolder(originalID: ItemID) : OreItemBase(originalID) { class SheetSolder(originalID: ItemID) : OreItemBase(originalID) {
override var originalName = "ITEM_SHEET_SOLDER" override var originalName = "ITEM_SHEET_SOLDER"
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(29,1) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(29,1)
}
} }

25
src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
View File

@@ -283,8 +283,9 @@ class PickaxeCopper(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -313,8 +314,9 @@ class PickaxeIron(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "IRON" override val materialId = "IRON"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -343,8 +345,9 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "STAL" override val materialId = "STAL"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -373,8 +376,9 @@ class PickaxeWood(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "WOOD" override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,4) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,4)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -403,8 +407,9 @@ class PickaxeStone(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "ROCK" override val materialId = "ROCK"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,4) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11,4)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP

20
src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt
View File

@@ -133,8 +133,9 @@ class SledgehammerCopper(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -157,8 +158,9 @@ class SledgehammerIron(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "IRON" override val materialId = "IRON"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -181,8 +183,9 @@ class SledgehammerSteel(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "STAL" override val materialId = "STAL"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,0) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,0)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -208,8 +211,9 @@ class SledgehammerWood(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = true override val canBeDynamic = true
override val materialId = "WOOD" override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,4) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10,4)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP

5
src/net/torvald/terrarum/modulebasegame/gameitems/WireCutterAll.kt
View File

@@ -91,8 +91,9 @@ class WireCutterAll(originalID: ItemID) : GameItem(originalID), FixtureInteracti
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "STAL" // this is to just increase the reach override val materialId = "STAL" // this is to just increase the reach
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1, 3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1, 3)
}
@Transient val selectorUI = UIWireCutterPie(originalID) @Transient val selectorUI = UIWireCutterPie(originalID)

5
src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt
View File

@@ -21,8 +21,9 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) {
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = 2.0 override var baseMass = 2.0
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,3) itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,3)
}
override var equipPosition = HAND_GRIP override var equipPosition = HAND_GRIP
override var originalName = "ITEM_MULTIMETER" override var originalName = "ITEM_MULTIMETER"

5
src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt
View File

@@ -23,8 +23,9 @@ class WirePieceSignalWire(originalID: ItemID, private val atlasID: String, priva
override var inventoryCategory = Category.WIRE override var inventoryCategory = Category.WIRE
override val canBeDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion init {
get() = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY) itemImage = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY)
}
init { init {
equipPosition = GameItem.EquipPosition.HAND_GRIP equipPosition = GameItem.EquipPosition.HAND_GRIP