diff --git a/assets/mods/basegame/blocks/4090.tga b/assets/mods/basegame/blocks/4090.tga new file mode 100644 index 000000000..c5033e14a --- /dev/null +++ b/assets/mods/basegame/blocks/4090.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fffb3b9a233fbd27a58c411e8eb2cb6828f21b0041cd514dd97ed2a9cdaff122 +size 1068 diff --git a/assets/mods/basegame/blocks/blocks.csv b/assets/mods/basegame/blocks/blocks.csv index f070635ef..a54d58639 100644 --- a/assets/mods/basegame/blocks/blocks.csv +++ b/assets/mods/basegame/blocks/blocks.csv @@ -103,6 +103,7 @@ "273";"273";"BLOCK_SCAFFOLDING_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1400";"WOOD";"0";"1";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0" "274";"274";"BLOCK_SCAFFOLDING_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"1";"670";"WOOD";"0";"1";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0" "275";"275";"BLOCK_SCAFFOLDING_BLOODROSE";"0.0312";"0.0312";"0.0312";"0.0312";"1";"900";"WOOD";"0";"1";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0" +"4090";"0";"ACTORBLOCK_TILING_PLACEHOLDER";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"0";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0" "4091";"0";"ACTORBLOCK_NO_COLLISION";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"0";"0";"N/A";"0";"0";"4";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0" "4092";"0";"ACTORBLOCK_FULL_COLLISION";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"0";"0";"N/A";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0" "4093";"0";"ACTORBLOCK_ALLOW_MOVE_DOWN";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"1";"0";"N/A";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0" diff --git a/src/net/torvald/terrarum/blockproperties/Block.kt b/src/net/torvald/terrarum/blockproperties/Block.kt index 5aa63c693..faa4d6e93 100644 --- a/src/net/torvald/terrarum/blockproperties/Block.kt +++ b/src/net/torvald/terrarum/blockproperties/Block.kt @@ -118,6 +118,7 @@ object Block { const val DAYLIGHT_CAPACITOR = "basegame:258" + const val ACTORBLOCK_TILING_PLACEHOLDER = "basegame:4090" const val ACTORBLOCK_NO_COLLISION = "basegame:4091" const val ACTORBLOCK_FULL_COLLISION = "basegame:4092" const val ACTORBLOCK_ALLOW_MOVE_DOWN = "basegame:4093" diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index 9f9b2f01a..b8842ae6c 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -10,7 +10,6 @@ import net.torvald.terrarum.* import net.torvald.terrarum.App.* import net.torvald.terrarum.blockstats.MinimapComposer import net.torvald.terrarum.langpack.Lang -import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarum.ui.UIItemHorizontalFadeSlide @@ -199,6 +198,7 @@ class UIInventoryFull( this.handler.toggleKeyExtra.add { App.getConfigInt("control_key_gamemenu") } this.handler.toggleKeyExtraAction.add { if (it.isClosed) { + INGAME.setTooltipMessage(null) transitionPanel.forcePosition(2) catBar.setSelectedPanel(2) it.setAsOpen() @@ -246,6 +246,8 @@ class UIInventoryFull( // UI items catBar.render(batch, camera) transitionPanel.render(batch, camera) + +// if (transitionPanel.currentPosition != 1f) INGAME.setTooltipMessage(null) } fun rebuildList() { diff --git a/src/net/torvald/terrarum/worlddrawer/CreateTileAtlas.kt b/src/net/torvald/terrarum/worlddrawer/CreateTileAtlas.kt index 8e9d36711..d2a8e1d02 100644 --- a/src/net/torvald/terrarum/worlddrawer/CreateTileAtlas.kt +++ b/src/net/torvald/terrarum/worlddrawer/CreateTileAtlas.kt @@ -123,7 +123,12 @@ class CreateTileAtlas { System.err.println("Couldn't load file $filehandle from $modname, skipping...") } } - + // hard-coding shits + tags["basegame:4090"] = RenderTag( + tags["basegame:4090"]!!.tileNumber, + RenderTag.CONNECT_MUTUAL, + RenderTag.MASK_NA + ) // test print //PixmapIO2.writeTGA(Gdx.files.absolute("${AppLoader.defaultDir}/atlas.tga"), atlas, false)