From 29f6034fdc00044d0797b46389b7cdc9190012c5 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 28 Jul 2021 16:10:03 +0900 Subject: [PATCH] wires are now separated from blocks --- REFERENCING.md | 7 ++++--- assets/mods/basegame/items/items.tga | 4 ++-- assets/mods/basegame/{blocks => wires}/8192.tga | 0 assets/mods/basegame/{blocks => wires}/8193.tga | 0 assets/mods/basegame/{blocks => wires}/8194.tga | 0 assets/mods/basegame/{blocks => wires}/8195.tga | 0 assets/mods/basegame/{blocks => wires}/wire.tga | 0 assets/mods/basegame/{blocks => wires}/wire.tga.gz | 0 assets/mods/basegame/{blocks => wires}/wires.csv | 0 src/net/torvald/terrarum/ModMgr.kt | 6 ++---- src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt | 2 +- work_files/graphics/items/items.kra | 3 +++ work_files/graphics/{terrain => wires}/wire.psd | 0 .../graphics/{terrain => wires}/wire_single_items.psd | 0 .../{terrain => wires}/wires_collection_powerwires.kra | 0 .../{terrain => wires}/wires_collection_signalwires.kra | 0 .../{terrain => wires}/wires_collection_transistors.kra | 0 17 files changed, 12 insertions(+), 10 deletions(-) rename assets/mods/basegame/{blocks => wires}/8192.tga (100%) rename assets/mods/basegame/{blocks => wires}/8193.tga (100%) rename assets/mods/basegame/{blocks => wires}/8194.tga (100%) rename assets/mods/basegame/{blocks => wires}/8195.tga (100%) rename assets/mods/basegame/{blocks => wires}/wire.tga (100%) rename assets/mods/basegame/{blocks => wires}/wire.tga.gz (100%) rename assets/mods/basegame/{blocks => wires}/wires.csv (100%) create mode 100644 work_files/graphics/items/items.kra rename work_files/graphics/{terrain => wires}/wire.psd (100%) rename work_files/graphics/{terrain => wires}/wire_single_items.psd (100%) rename work_files/graphics/{terrain => wires}/wires_collection_powerwires.kra (100%) rename work_files/graphics/{terrain => wires}/wires_collection_signalwires.kra (100%) rename work_files/graphics/{terrain => wires}/wires_collection_transistors.kra (100%) diff --git a/REFERENCING.md b/REFERENCING.md index 3b5252d43..ce2ca5dd3 100644 --- a/REFERENCING.md +++ b/REFERENCING.md @@ -9,8 +9,9 @@ where Prefix is predefined (see below), Integer ID is arbitrarily chosen within ### Prefixes |Name|Description| |----|-----------| -|wall|Wall, only used by the Inventory to differentiate walls from blocks (therefore wall shares same "ID Space" with blocks/fluids/wires)| -|item|Item (Static), uses different "ID Space" with blocks/walls/fluids/wires| +|wall|Wall, only used by the Inventory to differentiate walls from blocks (therefore wall shares same "ID Space" with blocks)| +|item|Item (Static)| +|wire|Wires| Notes: - BlockCodex and ItemCodex will not store prefix part of the ID, as blocks and walls are identical in properties @@ -46,4 +47,4 @@ Actor range in-depth |0x6000_0000..0x6FFF_FFFF|Rendered front (e.g. fake tile)| |0x7000_0000..0x7FFF_FFFF|Rendered as screen overlay, not affected by light nor environment overlays| -Actor IDs are assigned in 256 groups, single actor can have 256 sub-actors \ No newline at end of file +Actor IDs are assigned in 256 groups, single actor can have 256 sub-actors diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 6c8587c80..2920aa2b9 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:9c2e1dcaf92714d8a42b4a481f1b867218f35ab0544f02a94116c18b4877adbb -size 262188 +oid sha256:1fb3720c16a864940fe29c123c4f05debbe90a529be45e783f5c4bbdb7ad3caa +size 262162 diff --git a/assets/mods/basegame/blocks/8192.tga b/assets/mods/basegame/wires/8192.tga similarity index 100% rename from assets/mods/basegame/blocks/8192.tga rename to assets/mods/basegame/wires/8192.tga diff --git a/assets/mods/basegame/blocks/8193.tga b/assets/mods/basegame/wires/8193.tga similarity index 100% rename from assets/mods/basegame/blocks/8193.tga rename to assets/mods/basegame/wires/8193.tga diff --git a/assets/mods/basegame/blocks/8194.tga b/assets/mods/basegame/wires/8194.tga similarity index 100% rename from assets/mods/basegame/blocks/8194.tga rename to assets/mods/basegame/wires/8194.tga diff --git a/assets/mods/basegame/blocks/8195.tga b/assets/mods/basegame/wires/8195.tga similarity index 100% rename from assets/mods/basegame/blocks/8195.tga rename to assets/mods/basegame/wires/8195.tga diff --git a/assets/mods/basegame/blocks/wire.tga b/assets/mods/basegame/wires/wire.tga similarity index 100% rename from assets/mods/basegame/blocks/wire.tga rename to assets/mods/basegame/wires/wire.tga diff --git a/assets/mods/basegame/blocks/wire.tga.gz b/assets/mods/basegame/wires/wire.tga.gz similarity index 100% rename from assets/mods/basegame/blocks/wire.tga.gz rename to assets/mods/basegame/wires/wire.tga.gz diff --git a/assets/mods/basegame/blocks/wires.csv b/assets/mods/basegame/wires/wires.csv similarity index 100% rename from assets/mods/basegame/blocks/wires.csv rename to assets/mods/basegame/wires/wires.csv diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt index de5673335..356c13842 100644 --- a/src/net/torvald/terrarum/ModMgr.kt +++ b/src/net/torvald/terrarum/ModMgr.kt @@ -223,11 +223,9 @@ object ModMgr { object GameBlockLoader { - val blockPath = "blocks/" - @JvmStatic operator fun invoke(module: String) { - BlockCodex(module, blockPath + "blocks.csv") - WireCodex(module, blockPath + "wires.csv") + BlockCodex(module, "blocks/blocks.csv") + WireCodex(module, "wires/wires.csv") } } diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt index 55b277bc5..64e1a376f 100644 --- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt @@ -103,7 +103,7 @@ internal object BlocksDrawer { ) //TODO make wire work with the TileAtlas system - tilesWire = TextureRegionPack(ModMgr.getGdxFile("basegame", "blocks/wire.tga"), TILE_SIZE, TILE_SIZE) + tilesWire = TextureRegionPack(ModMgr.getGdxFile("basegame", "wires/wire.tga"), TILE_SIZE, TILE_SIZE) tilesFluid = TextureRegionPack(Texture(AppLoader.tileMaker.atlasFluid), TILE_SIZE, TILE_SIZE) tilesGlow = TextureRegionPack(Texture(AppLoader.tileMaker.atlasGlow), TILE_SIZE, TILE_SIZE) diff --git a/work_files/graphics/items/items.kra b/work_files/graphics/items/items.kra new file mode 100644 index 000000000..3f7bce75d --- /dev/null +++ b/work_files/graphics/items/items.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2153025ac512bd55634ab63cb37c079409eb3aa893b766a912d33efe3fb1c14 +size 408890 diff --git a/work_files/graphics/terrain/wire.psd b/work_files/graphics/wires/wire.psd similarity index 100% rename from work_files/graphics/terrain/wire.psd rename to work_files/graphics/wires/wire.psd diff --git a/work_files/graphics/terrain/wire_single_items.psd b/work_files/graphics/wires/wire_single_items.psd similarity index 100% rename from work_files/graphics/terrain/wire_single_items.psd rename to work_files/graphics/wires/wire_single_items.psd diff --git a/work_files/graphics/terrain/wires_collection_powerwires.kra b/work_files/graphics/wires/wires_collection_powerwires.kra similarity index 100% rename from work_files/graphics/terrain/wires_collection_powerwires.kra rename to work_files/graphics/wires/wires_collection_powerwires.kra diff --git a/work_files/graphics/terrain/wires_collection_signalwires.kra b/work_files/graphics/wires/wires_collection_signalwires.kra similarity index 100% rename from work_files/graphics/terrain/wires_collection_signalwires.kra rename to work_files/graphics/wires/wires_collection_signalwires.kra diff --git a/work_files/graphics/terrain/wires_collection_transistors.kra b/work_files/graphics/wires/wires_collection_transistors.kra similarity index 100% rename from work_files/graphics/terrain/wires_collection_transistors.kra rename to work_files/graphics/wires/wires_collection_transistors.kra