From 17e25c9cf76a0cab8452057539fe27c4b9575eee Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 22 May 2024 17:10:50 +0900 Subject: [PATCH] GameItem item image Pixmap --- .../gameitems/ItemHomeComputer.kt | 5 +- .../gameitems/ItemWearableWorldRadar.kt | 5 +- assets/mods/basegame/books/test.xml | 6 +- btexdoc.dtd | 1 + src/net/torvald/btex/BTeXParser.kt | 6 +- .../torvald/terrarum/gameitems/GameItem.kt | 21 +- .../terrarum/itemproperties/ItemCodex.kt | 32 +++ .../modulebasegame/gameitems/AxeCore.kt | 23 +- .../gameitems/FixtureItemBase.kt | 7 +- .../gameitems/ItemFurnaceAndAnvil.kt | 5 +- .../modulebasegame/gameitems/ItemJukebox.kt | 15 +- .../gameitems/ItemLogicSignalBlocker.kt | 20 +- .../gameitems/ItemLogicSignalBulb.kt | 5 +- .../gameitems/ItemLogicSignalEmitter.kt | 5 +- .../gameitems/ItemLogicSignalSevenSeg.kt | 5 +- .../gameitems/ItemLogicSignalSwitchManual.kt | 5 +- .../modulebasegame/gameitems/ItemMisc.kt | 25 +- .../modulebasegame/gameitems/ItemSeeds.kt | 20 +- .../gameitems/ItemSmelterBasic.kt | 10 +- .../gameitems/ItemStorageChest.kt | 20 +- .../gameitems/ItemSwingingDoorOak.kt | 20 +- .../modulebasegame/gameitems/ItemTable.kt | 20 +- .../modulebasegame/gameitems/ItemTapestry.kt | 5 +- .../gameitems/ItemTextSignCopper.kt | 5 +- .../modulebasegame/gameitems/ItemThrowable.kt | 5 +- .../modulebasegame/gameitems/ItemTikiTorch.kt | 5 +- .../gameitems/ItemTypewriter.kt | 5 +- .../gameitems/ItemWallCalendar.kt | 5 +- .../gameitems/ItemWireRollingMill.kt | 5 +- .../modulebasegame/gameitems/ItemWorkbench.kt | 15 +- .../gameitems/ItemWorldPortal.kt | 5 +- .../modulebasegame/gameitems/ItemWrench.kt | 5 +- .../modulebasegame/gameitems/MusicDisc.kt | 4 +- .../modulebasegame/gameitems/OreItemBase.kt | 230 +++++++++++------- .../gameitems/PickaxeGeneric.kt | 25 +- .../gameitems/SledgehammerCore.kt | 20 +- .../modulebasegame/gameitems/WireCutterAll.kt | 5 +- .../gameitems/WireGraphDebugger.kt | 5 +- .../gameitems/WirePieceSignalWire.kt | 5 +- 39 files changed, 401 insertions(+), 234 deletions(-) diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemHomeComputer.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemHomeComputer.kt index 1d42663fb..df0fc679c 100644 --- a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemHomeComputer.kt +++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemHomeComputer.kt @@ -21,8 +21,9 @@ class ItemHomeComputer(originalID: ItemID) : FixtureItemBase(originalID, "net.to override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE) + init { + itemImage = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_DESKTOP_COMPUTER" } \ No newline at end of file diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt index 729da8b82..b38972e43 100644 --- a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt +++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt @@ -34,8 +34,9 @@ class ItemWearableWorldRadar(originalID: String) {// : GameItem(originalID) { override val isUnique = false override val isDynamic = true override val materialId = "" - override val itemImage: TextureRegion - get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") + init { + itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") + } override var baseToolSize: Double? = baseMass diff --git a/assets/mods/basegame/books/test.xml b/assets/mods/basegame/books/test.xml index 7daa47d73..be1ec8dae 100644 --- a/assets/mods/basegame/books/test.xml +++ b/assets/mods/basegame/books/test.xml @@ -2,11 +2,7 @@ -

1972년 11월 21일, 김두한은 오랜 지병이었던 고혈압으로 쓰러졌다. 향년 55세였고, 박정희 정권의 독재가 또 한번의 정권 연장을 위해 유신헌법을 통과한지 한 달만이었다. 많은 인파가 몰린 그의 장례행렬에는 한 무리의 어린아이들도 그 뒤를 잇고 있었다. 백야 김좌진 장군의 국가유공자 연금 전액을 매달 삼애 고아원이라는 곳에 기탁한 이유였다. 김두한. 그는 일제 말 우리가 주권을 잃었던 식민지 시절부터 해방 이후 좌우익의 대립에 이어서 자유당 부패정치와 5.16 박정희 정권에 이르기까지 그의 전생에 온 몸을 다 던져 불의와 싸웠다.

- - 최동열: 난 오랫동안 자네를 지켜봐온 사람일세. 자네는 자네답게 살았어. 조선의 주먹 황제답게 말이야. 늘 야인이였지만 용감하고 멋있게 살았어. 나름대로 자네의 역사를 가지고 자네의 시대를 치열하고 열심히 살았다는 얘기야. 뭐랄까...? 야인시대라고나 할까? - -

야인시대! 그렇다. 그것은 바로 그가 몸바쳐 살아왔던 이 나라 격동기의 또 다른 역사의 한 장이었다.

+ diff --git a/btexdoc.dtd b/btexdoc.dtd index 21f946d33..7161fa35b 100644 --- a/btexdoc.dtd +++ b/btexdoc.dtd @@ -48,6 +48,7 @@ "src CDATA #IMPLIED fromgame CDATA #IMPLIED gameitem CDATA #IMPLIED + itemimg CDATA #IMPLIED caption %Text; #IMPLIED height %Number; #REQUIRED"> , 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 itemImageEmissive: TextureRegion? = null @@ -407,6 +425,7 @@ abstract class GameItem(val originalID: ItemID) : Comparable, Cloneabl return ret } } + } /** diff --git a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt index da5af9304..496dd49f7 100644 --- a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt @@ -1,5 +1,6 @@ package net.torvald.terrarum.itemproperties +import com.badlogic.gdx.graphics.Pixmap import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.App import net.torvald.terrarum.App.printdbg @@ -135,6 +136,37 @@ class ItemCodex { 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? { if (item == null) return null return getItemImageGlow(item.originalID) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt index b62e84e67..116cc20cd 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt @@ -272,10 +272,9 @@ class AxeCopper(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "CUPR" 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 { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,0) equipPosition = GameItem.EquipPosition.HAND_GRIP maxDurability = (TOOL_DURABILITY_BASE * material.enduranceMod).roundToInt() durability = maxDurability.toFloat() @@ -301,8 +300,9 @@ class AxeIron(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "IRON" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(4,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -330,8 +330,9 @@ class AxeSteel(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "STAL" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -359,8 +360,9 @@ class AxeWood(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "WOOD" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,4) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9,4) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -388,8 +390,9 @@ class AxeStone(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "ROCK" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12,4) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12,4) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt index d75512002..f35b1f903 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt @@ -52,8 +52,11 @@ open class FixtureItemBase(originalID: ItemID, val fixtureClassName: String) : G * * ```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 diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt index 38f1ec1bf..b4eb2c05d 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFurnaceAndAnvil.kt @@ -13,8 +13,9 @@ class ItemFurnaceAndAnvil(originalID: ItemID) : FixtureItemBase(originalID, "net override var baseMass = 100.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5,3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_FURNACE_AND_ANVIL" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt index 120040118..ce6baaf50 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt @@ -13,8 +13,9 @@ class ItemJukebox(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald override var baseMass = 200.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_JUKEBOX" @@ -30,8 +31,9 @@ class ItemMusicalTurntable(originalID: ItemID) : FixtureItemBase(originalID, "ne override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TURNTABLE" @@ -48,8 +50,9 @@ class ItemMechanicalTines(originalID: ItemID) : FixtureItemBase(originalID, "net override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/mechanical_tines.tga") + init { + itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/mechanical_tines.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_MECHANICAL_TINES" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBlocker.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBlocker.kt index b5cb973d2..80824ee7e 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBlocker.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBlocker.kt @@ -17,8 +17,9 @@ class ItemLogicSignalBlocker(originalID: ItemID) : FixtureItemBase(originalID, " override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10, 3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_LOGIC_SIGNAL_BLOCKER" @@ -44,8 +45,9 @@ class ItemLogicSignalLatch(originalID: ItemID) : FixtureItemBase(originalID, "ne override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11, 3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_LOGIC_SIGNAL_LATCH" @@ -71,8 +73,9 @@ class ItemLogicSignalRepeaterHorz(originalID: ItemID) : FixtureItemBase(original override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12, 3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_LOGIC_SIGNAL_REPEATER" @@ -98,8 +101,9 @@ class ItemLogicSignalAdder(originalID: ItemID) : FixtureItemBase(originalID, "ne override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_LOGIC_SIGNAL_ADDER" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBulb.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBulb.kt index 605dda43f..f08adfda3 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBulb.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalBulb.kt @@ -17,8 +17,9 @@ class ItemLogicSignalBulb(originalID: ItemID) : FixtureItemBase(originalID, "net override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9, 3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_COPPER_BULB" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt index e2169c5b6..6159c2ed9 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt @@ -17,8 +17,9 @@ class ItemLogicSignalEmitter(originalID: ItemID) : FixtureItemBase(originalID, " override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_LOGIC_SIGNAL_EMITTER" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSevenSeg.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSevenSeg.kt index 9b493ce70..f50272de6 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSevenSeg.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSevenSeg.kt @@ -17,8 +17,9 @@ class ItemLogicSignalSevenSeg(originalID: ItemID) : FixtureItemBase(originalID, override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 3) + } override val itemImageEmissive: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15, 4) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSwitchManual.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSwitchManual.kt index 432374406..8ae579bdc 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSwitchManual.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalSwitchManual.kt @@ -17,8 +17,9 @@ class ItemLogicSignalSwitchManual(originalID: ItemID) : FixtureItemBase(original override var baseMass = FixtureLogicSignalEmitter.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8, 3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_LOGIC_SIGNAL_SWITCH" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt index a3f45b8bf..4ff312da5 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt @@ -34,8 +34,9 @@ class OreStick(originalID: ItemID) : LightIngredientBase(originalID) { override val materialId = "WOOD" override var calories = 600.0 override var smokiness = 0.2f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6) + } } /** @@ -43,8 +44,9 @@ class OreStick(originalID: ItemID) : LightIngredientBase(originalID) { */ class ItemClayBall(originalID: ItemID) : LightIngredientBase(originalID) { override var originalName = "BLOCK_CLAY" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11,6) + } } /** @@ -52,8 +54,9 @@ class ItemClayBall(originalID: ItemID) : LightIngredientBase(originalID) { */ class ItemGunpowder(originalID: ItemID) : LightIngredientBase(originalID) { override var originalName = "ITEM_GUNPOWDER" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,12) + init { + 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 originalName = "BLOCK_TORCH" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,14) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,14) + } override val itemImageEmissive: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,14) @@ -95,6 +99,7 @@ class ItemTorch(originalID: ItemID) : LightIngredientBase(originalID) { */ class ItemSolderingWire(originalID: ItemID) : LightIngredientBase(originalID) { override var originalName = "ITEM_SOLDERING_WIRE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,2) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6,2) + } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSeeds.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSeeds.kt index 8a4c36ad9..93f0a0075 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSeeds.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSeeds.kt @@ -9,30 +9,34 @@ class ItemSeedOak(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald override var baseMass = 1.0 override val materialId = "OOZE" override var inventoryCategory = Category.GENERIC - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,11) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,11) + } } class ItemSeedEbony(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingEbony") { override var originalName = "ITEM_SEED_EBONY" override var baseMass = 1.0 override val materialId = "OOZE" override var inventoryCategory = Category.GENERIC - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,11) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,11) + } } class ItemSeedBirch(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingBirch") { override var originalName = "ITEM_SEED_BIRCH" override var baseMass = 1.0 override val materialId = "OOZE" override var inventoryCategory = Category.GENERIC - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,11) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,11) + } } class ItemSeedRosewood(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.SaplingRosewood") { override var originalName = "ITEM_SEED_ROSEWOOD" override var baseMass = 1.0 override val materialId = "OOZE" override var inventoryCategory = Category.GENERIC - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,11) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,11) + } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt index d3beec395..9d9a66522 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSmelterBasic.kt @@ -11,8 +11,9 @@ class ItemSmelterBasic(originalID: ItemID) : FixtureItemBase(originalID, "net.to override var baseMass = 100.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(4,3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_SMELTER_SMALL" @@ -25,8 +26,9 @@ class ItemAlloyingFurnace(originalID: ItemID) : FixtureItemBase(originalID, "net override var baseMass = 100.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(13,3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_ALLOYING_FURNACE" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt index b1b5374d4..fd708ae87 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt @@ -15,8 +15,9 @@ class ItemStorageChest(originalID: ItemID) : FixtureItemBase(originalID, "net.to override var baseMass = FixtureTikiTorch.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_STORAGE_CHEST" } @@ -29,8 +30,9 @@ class ItemStorageChestEbony(originalID: ItemID) : FixtureItemBase(originalID, "n override var baseMass = FixtureTikiTorch.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_2.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_2.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_STORAGE_CHEST" } @@ -43,8 +45,9 @@ class ItemStorageChestBirch(originalID: ItemID) : FixtureItemBase(originalID, "n override var baseMass = FixtureTikiTorch.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_3.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_3.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_STORAGE_CHEST" } @@ -57,8 +60,9 @@ class ItemStorageChestRosewood(originalID: ItemID) : FixtureItemBase(originalID, override var baseMass = FixtureTikiTorch.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_4.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest_4.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_STORAGE_CHEST" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt index 00605f9bb..e6371c866 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt @@ -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 val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10) + } override var baseToolSize: Double? = baseMass 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 val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10) + } override var baseToolSize: Double? = baseMass 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 val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10) + } override var baseToolSize: Double? = baseMass 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 val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_DOOR_ROSEWOOD" } diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTable.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTable.kt index 52545b3cd..6f719085f 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTable.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTable.kt @@ -11,8 +11,9 @@ class ItemTable(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.t override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "WOOD" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_1.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_1.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TABLE_OAK" } @@ -25,8 +26,9 @@ class ItemTableEbony(originalID: ItemID) : FixtureItemBase(originalID, "net.torv override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "WOOD" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_2.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_2.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TABLE_EBONY" } @@ -39,8 +41,9 @@ class ItemTableBirch(originalID: ItemID) : FixtureItemBase(originalID, "net.torv override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "WOOD" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_3.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_3.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TABLE_BIRCH" } @@ -53,8 +56,9 @@ class ItemTableRosewood(originalID: ItemID) : FixtureItemBase(originalID, "net.t override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "WOOD" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_4.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/table_4.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TABLE_ROSEWOOD" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTapestry.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTapestry.kt index 56944849f..08af571fc 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTapestry.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTapestry.kt @@ -20,8 +20,9 @@ class ItemTapestry(originalID: ItemID) : FixtureItemBase(originalID, "net.torval override var baseMass = 6.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") + init { + itemImage = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TAPESTRY" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt index 437bd1d1d..9d52ff698 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt @@ -22,8 +22,9 @@ class ItemTextSignCopper(originalID: ItemID) : FixtureItemBase(originalID, "net. override var baseMass = 10.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 4) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 4) + } override val itemImageEmissive: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13, 4) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemThrowable.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemThrowable.kt index 781ec0ef0..9d327bd52 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemThrowable.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemThrowable.kt @@ -70,6 +70,7 @@ fun getThrowPosAndVector(actor: ActorWithBody): Pair { */ class ItemCherryBomb(originalID: ItemID) : ItemThrowable(originalID, "net.torvald.terrarum.modulebasegame.gameactors.ActorCherryBomb") { override var originalName = "ITEM_CHERRY_BOMB" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,13) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,13) + } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTikiTorch.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTikiTorch.kt index 42ebfbf6b..bbbd076b9 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTikiTorch.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTikiTorch.kt @@ -14,8 +14,9 @@ class ItemTikiTorch(originalID: ItemID) : FixtureItemBase(originalID, "net.torva override var baseMass = FixtureTikiTorch.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32) + init { + itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TIKI_TORCH" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt index ce5fc05b7..f6ebe5593 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt @@ -14,8 +14,9 @@ class ItemTypewriter(originalID: ItemID) : FixtureItemBase(originalID, "net.torv override var baseMass = FixtureTikiTorch.MASS override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16) + init { + itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_TYPEWRITER" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt index 2f4f9b797..b66686497 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt @@ -13,8 +13,9 @@ class ItemWallCalendar(originalID: ItemID) : FixtureItemBase(originalID, "net.to override var baseMass = 1.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_CALENDAR" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWireRollingMill.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWireRollingMill.kt index 8731e189e..87d7e8362 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWireRollingMill.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWireRollingMill.kt @@ -12,8 +12,9 @@ class ItemWireRollingMill(originalID: ItemID) : FixtureItemBase(originalID, "net override var baseMass = 50.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/wire_rolling_mill.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/wire_rolling_mill.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_WIRE_ROLLING_MILL" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorkbench.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorkbench.kt index 39b457bec..8e198f15a 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorkbench.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorkbench.kt @@ -12,8 +12,9 @@ class ItemWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "net.torva override var baseMass = 20.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga") + init { + itemImage = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga") + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_WORKBENCH" @@ -29,8 +30,9 @@ class ItemElectricWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "n override var baseMass = 40.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSheet("basegame", "sprites/fixtures/electric_workbench.tga", 32, 32, 0, 0) + init { + itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/electric_workbench.tga", 32, 32, 0, 0) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_ELECTRIC_WORKBENCH" @@ -46,8 +48,9 @@ class ItemEngravingWorkbench(originalID: ItemID) : FixtureItemBase(originalID, " override var baseMass = 40.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = getItemImageFromSheet("basegame", "sprites/fixtures/engraving_workbench.tga", 32, 32, 0, 0) + init { + itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/engraving_workbench.tga", 32, 32, 0, 0) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_ENGRAVING_WORKBENCH" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt index 6187d6b0e..da160a518 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt @@ -14,8 +14,9 @@ class ItemWorldPortal(originalID: ItemID) : FixtureItemBase(originalID, "net.tor override var baseMass = 6000.0 override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3) + } override var baseToolSize: Double? = baseMass override var originalName = "ITEM_WORLD_PORTAL" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWrench.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWrench.kt index 61130be92..7697549c0 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWrench.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWrench.kt @@ -24,8 +24,9 @@ class ItemWrench(originalID: ItemID) : GameItem(originalID), FixtureInteractionB override var inventoryCategory = Category.TOOL override val canBeDynamic = false override val materialId = "STAL" // this is to just increase the reach - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5, 2) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5, 2) + } init { stackable = false diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt index 4e9a61ac8..f9232655c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt @@ -52,7 +52,9 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String) "${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 diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt index ce1610755..54bdd92bf 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt @@ -38,8 +38,9 @@ class ItemLogsOak(originalID: ItemID) : OreItemBase(originalID) { override val materialId = "WOOD" override var calories = 1920.0 override var smokiness = 0.2f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,10) + } init { tags.add("ACTINGBLOCK") } override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { @@ -51,8 +52,9 @@ class ItemLogsEbony(originalID: ItemID) : OreItemBase(originalID) { override val materialId = "WOOD" override var calories = 1920.0 override var smokiness = 0.2f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,10) + } init { tags.add("ACTINGBLOCK") } override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { @@ -64,8 +66,9 @@ class ItemLogsBirch(originalID: ItemID) : OreItemBase(originalID) { override val materialId = "WOOD" override var calories = 1920.0 override var smokiness = 0.2f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,10) + } init { tags.add("ACTINGBLOCK") } override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { @@ -77,8 +80,9 @@ class ItemLogsRosewood(originalID: ItemID) : OreItemBase(originalID) { override val materialId = "WOOD" override var calories = 1920.0 override var smokiness = 0.2f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,10) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,10) + } init { tags.add("ACTINGBLOCK") } 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) { override var originalName = "ITEM_ORE_MALACHITE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6) + } } class OreIron(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_HAEMATITE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,6) + } } class OreCoal(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_COAL" override var calories = 4800.0 override var smokiness = 0.3f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(3,6) + } } class OreZinc(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_SPHALERITE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6) + } } class OreTin(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_CASSITERITE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6) + } } class OreGold(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_NATURAL_GOLD" override val materialId: String = "AURM" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6, 6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6, 6) + } } class OreSilver(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_NATURAL_SILVER" override val materialId: String = "ARGN" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,6) + } } class OreLead(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ORE_GALENA" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6) + } } class GemQuartz(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_GEM_QUARTZ" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(13,6) + } } class GemAmethyst(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_GEM_AMETHYST" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(14,6) + } } class ItemRockSalt(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_ROCK_SALT" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10,6) + } } class ItemNitre(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_NITRE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(15,6) + init { + 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 calories = 4800.0 override var smokiness = 0.4f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6) + } } class ItemCharcoal(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_CHARCOAL" override var calories = 4800.0 override var smokiness = 0.3f - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(12,6) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12,6) + } } class IngotCopper(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_COPPER" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) + } } class IngotIron(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_IRON" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) + } } class IngotSteel(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_STEEL" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(18,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(18,0) + } } class IngotZinc(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_ZINC" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(19,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(19,0) + } } class IngotTin(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_TIN" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(20,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(20,0) + } } class IngotGold(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_GOLD" override val materialId: String = "AURM" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(21, 0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(21, 0) + } } class IngotSilver(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_SILVER" override val materialId: String = "ARGN" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(22,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(22,0) + } } class IngotLead(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_LEAD" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(23,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(23,0) + } } class IngotBronze(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_BRONZE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(24,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(24,0) + } } class IngotBrass(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_BRASS" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(25,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(25,0) + } } class IngotElectrum(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_ELECTRUM" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(26,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(26,0) + } } class IngotSilverBillon(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_SILVER_BILLON" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(27,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(27,0) + } } class IngotRosegold(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_ROSEGOLD" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(28,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(28,0) + } } class IngotSolder(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_INGOT_SOLDER" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(29,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(29,0) + } } class SheetCopper(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_COPPER" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) + } } class SheetIron(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_IRON" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) + } } class SheetSteel(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_STEEL" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(18,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(18,1) + } } class SheetZinc(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_ZINC" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(19,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(19,1) + } } class SheetTin(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_TIN" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(20,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(20,1) + } } class SheetGold(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_GOLD" override val materialId: String = "AURM" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(21,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(21,1) + } } class SheetSilver(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_SILVER" override val materialId: String = "ARGN" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(22,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(22,1) + } } class SheetLead(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_LEAD" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(23,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(23,1) + } } class SheetBronze(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_BRONZE" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(24,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(24,1) + } } class SheetBrass(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_BRASS" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(25,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(25,1) + } } class SheetElectrum(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_ELECTRUM" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(26,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(26,1) + } } class SheetSilverBillon(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_SILVER_BILLON" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(27,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(27,1) + } } class SheetRosegold(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_ROSEGOLD" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(28,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(28,1) + } } class SheetSolder(originalID: ItemID) : OreItemBase(originalID) { override var originalName = "ITEM_SHEET_SOLDER" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(29,1) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(29,1) + } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt index 182eae18a..ae8821161 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt @@ -283,8 +283,9 @@ class PickaxeCopper(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "CUPR" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -313,8 +314,9 @@ class PickaxeIron(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "IRON" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -343,8 +345,9 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "STAL" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -373,8 +376,9 @@ class PickaxeWood(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "WOOD" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,4) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,4) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -403,8 +407,9 @@ class PickaxeStone(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "ROCK" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,4) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(11,4) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt index ec830f41e..55352f95b 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt @@ -133,8 +133,9 @@ class SledgehammerCopper(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "CUPR" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(6,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -157,8 +158,9 @@ class SledgehammerIron(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "IRON" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -181,8 +183,9 @@ class SledgehammerSteel(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "STAL" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,0) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,0) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP @@ -208,8 +211,9 @@ class SledgehammerWood(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = true override val materialId = "WOOD" override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,4) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(10,4) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WireCutterAll.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WireCutterAll.kt index 928410a53..e574aac8a 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/WireCutterAll.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WireCutterAll.kt @@ -91,8 +91,9 @@ class WireCutterAll(originalID: ItemID) : GameItem(originalID), FixtureInteracti override var inventoryCategory = Category.TOOL override val canBeDynamic = false override val materialId = "STAL" // this is to just increase the reach - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1, 3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(1, 3) + } @Transient val selectorUI = UIWireCutterPie(originalID) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt index 81a5b7119..2d2de3808 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt @@ -21,8 +21,9 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) { override val canBeDynamic = false override val materialId = "CUPR" override var baseMass = 2.0 - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,3) + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(2,3) + } override var equipPosition = HAND_GRIP override var originalName = "ITEM_MULTIMETER" diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt index ce869d613..252077471 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt @@ -23,8 +23,9 @@ class WirePieceSignalWire(originalID: ItemID, private val atlasID: String, priva override var inventoryCategory = Category.WIRE override val canBeDynamic = false override val materialId = "" - override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY) + init { + itemImage = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY) + } init { equipPosition = GameItem.EquipPosition.HAND_GRIP