From 180cf217f8560a257316b0e2555b91ebd5515d4f Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 15 Sep 2024 16:01:12 +0900 Subject: [PATCH] metals to their own sprite sheet --- assets/mods/basegame/items/buckets.tga | 2 +- assets/mods/basegame/items/items.tga | 4 +- assets/mods/basegame/items/metals.tga | 3 + .../terrarum/modulebasegame/EntryPoint.kt | 3 + .../gameitems/MetalworkItems.kt | 177 ++++++++++++++++++ .../modulebasegame/gameitems/OreItemBase.kt | 172 ----------------- .../graphics/items/basegame_buckets.kra | 4 +- work_files/graphics/items/basegame_items.kra | 4 +- work_files/graphics/items/basegame_metals.kra | 3 + 9 files changed, 193 insertions(+), 179 deletions(-) create mode 100644 assets/mods/basegame/items/metals.tga create mode 100644 src/net/torvald/terrarum/modulebasegame/gameitems/MetalworkItems.kt create mode 100644 work_files/graphics/items/basegame_metals.kra diff --git a/assets/mods/basegame/items/buckets.tga b/assets/mods/basegame/items/buckets.tga index e9cd6e48f..fd2ee6cef 100644 --- a/assets/mods/basegame/items/buckets.tga +++ b/assets/mods/basegame/items/buckets.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e707f52724c251bb38857b5204cb5a5f8c37ac886aa6b34ba4f2ab4f396dc79a +oid sha256:82fad341c1a135f42101e34475678271163b35020d3664dcc01e9ff1db3bf247 size 2408466 diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index a2b1683c3..f8048c431 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0245e0d4eab5db438dea06786dc94ac3532c682468e3bb56e07a2308b53a7be7 -size 4816914 +oid sha256:966156c40984686c52ec0adb39a2c41e3f48ef12d20cdd108813cca8db984599 +size 2408466 diff --git a/assets/mods/basegame/items/metals.tga b/assets/mods/basegame/items/metals.tga new file mode 100644 index 000000000..aa39a999d --- /dev/null +++ b/assets/mods/basegame/items/metals.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8801fb3e4e320ce4c28463d1a08eac409b57d373b05a14ea6a6e321dce519efa +size 2408466 diff --git a/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt b/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt index c00613dd2..3fba9ee1e 100644 --- a/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt +++ b/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt @@ -30,6 +30,9 @@ class EntryPoint : ModuleEntryPoint() { CommonResourcePool.addToLoadingList("$moduleName.buckets") { ItemSheet(ModMgr.getGdxFile(moduleName, "items/buckets.tga")) } + CommonResourcePool.addToLoadingList("$moduleName.metals") { + ItemSheet(ModMgr.getGdxFile(moduleName, "items/metals.tga")) + } CommonResourcePool.loadAll() diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/MetalworkItems.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/MetalworkItems.kt new file mode 100644 index 000000000..5e0324a9e --- /dev/null +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/MetalworkItems.kt @@ -0,0 +1,177 @@ +package net.torvald.terrarum.modulebasegame.gameitems + +import net.torvald.terrarum.CommonResourcePool +import net.torvald.terrarum.gameitems.ItemID + +class IngotCopper(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_COPPER" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(0,0) + } +} +class IngotIron(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_IRON" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(1,0) + } +} +class IngotSteel(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_STEEL" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(2,0) + } +} +class IngotZinc(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_ZINC" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(3,0) + } +} +class IngotTin(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_TIN" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(4,0) + } +} +class IngotGold(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_GOLD" + override val materialId: String = "AURM" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(5, 0) + } +} +class IngotSilver(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_SILVER" + override val materialId: String = "ARGN" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(6,0) + } +} +class IngotLead(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_LEAD" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(7,0) + } +} +class IngotBronze(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_BRONZE" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(8,0) + } +} +class IngotBrass(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_BRASS" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(9,0) + } +} +class IngotElectrum(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_ELECTRUM" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(10,0) + } +} +class IngotSilverBillon(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_SILVER_BILLON" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(11,0) + } +} +class IngotRosegold(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_ROSEGOLD" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(12,0) + } +} +class IngotSolder(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_INGOT_SOLDER" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(13,0) + } +} +class SheetCopper(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_COPPER" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(0,1) + } +} +class SheetIron(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_IRON" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(1,1) + } +} +class SheetSteel(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_STEEL" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(2,1) + } +} +class SheetZinc(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_ZINC" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(3,1) + } +} +class SheetTin(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_TIN" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(4,1) + } +} +class SheetGold(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_GOLD" + override val materialId: String = "AURM" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(5,1) + } +} +class SheetSilver(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_SILVER" + override val materialId: String = "ARGN" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(6,1) + } +} +class SheetLead(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_LEAD" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(7,1) + } +} +class SheetBronze(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_BRONZE" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(8,1) + } +} +class SheetBrass(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_BRASS" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(9,1) + } +} +class SheetElectrum(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_ELECTRUM" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(10,1) + } +} +class SheetSilverBillon(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_SILVER_BILLON" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(11,1) + } +} +class SheetRosegold(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_ROSEGOLD" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(12,1) + } +} +class SheetSolder(originalID: ItemID) : OreItemBase(originalID) { + override var originalName = "ITEM_SHEET_SOLDER" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.metals").get(13,1) + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt index f4928d8fd..7005c7bfa 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt @@ -193,175 +193,3 @@ class ItemCharcoal(originalID: ItemID) : OreItemBase(originalID) { itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(12,6) } } -class IngotCopper(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_COPPER" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) - } -} -class IngotIron(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_IRON" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,0) - } -} -class IngotSteel(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_STEEL" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(18,0) - } -} -class IngotZinc(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_ZINC" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(19,0) - } -} -class IngotTin(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_TIN" - 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" - 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" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(22,0) - } -} -class IngotLead(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_LEAD" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(23,0) - } -} -class IngotBronze(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_BRONZE" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(24,0) - } -} -class IngotBrass(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_BRASS" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(25,0) - } -} -class IngotElectrum(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_ELECTRUM" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(26,0) - } -} -class IngotSilverBillon(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_SILVER_BILLON" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(27,0) - } -} -class IngotRosegold(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_ROSEGOLD" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(28,0) - } -} -class IngotSolder(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_INGOT_SOLDER" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(29,0) - } -} -class SheetCopper(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_COPPER" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) - } -} -class SheetIron(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_IRON" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(16,1) - } -} -class SheetSteel(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_STEEL" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(18,1) - } -} -class SheetZinc(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_ZINC" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(19,1) - } -} -class SheetTin(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_TIN" - 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" - 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" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(22,1) - } -} -class SheetLead(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_LEAD" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(23,1) - } -} -class SheetBronze(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_BRONZE" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(24,1) - } -} -class SheetBrass(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_BRASS" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(25,1) - } -} -class SheetElectrum(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_ELECTRUM" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(26,1) - } -} -class SheetSilverBillon(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_SILVER_BILLON" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(27,1) - } -} -class SheetRosegold(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_ROSEGOLD" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(28,1) - } -} -class SheetSolder(originalID: ItemID) : OreItemBase(originalID) { - override var originalName = "ITEM_SHEET_SOLDER" - init { - itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(29,1) - } -} \ No newline at end of file diff --git a/work_files/graphics/items/basegame_buckets.kra b/work_files/graphics/items/basegame_buckets.kra index 250ba80cc..8856a7d97 100644 --- a/work_files/graphics/items/basegame_buckets.kra +++ b/work_files/graphics/items/basegame_buckets.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0a386c2fc6c27302eb6091efce9784b4044be41c4e584ea491f76ea21ff6bb3 -size 197616 +oid sha256:9bb09f0611eecaae1bd2794d57b5b24514f61b364818730c950606e2ecfae47a +size 299517 diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 18162f2c7..2896d2779 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d6288cbfad9eac944b23f67fac447b0d7ccdc435d0a8b10e70caf406c890444 -size 2139571 +oid sha256:67fcf37014b8b851a4ea8162f59937ed510e447e1ea3ce3b97a0080a3a333a88 +size 1769717 diff --git a/work_files/graphics/items/basegame_metals.kra b/work_files/graphics/items/basegame_metals.kra new file mode 100644 index 000000000..ffa1541cd --- /dev/null +++ b/work_files/graphics/items/basegame_metals.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1e172d18f24fcd5d08d35a1859e44a22cac1b1112430303a122575d5b41c377 +size 427871