curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 02:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

tiling placeholder actorblock (for future use)

Browse Source
This commit is contained in:
minjaesong
2021-10-05 20:21:15 +09:00
parent e2e0d21e27
commit 59aa595a0e
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/mods/basegame/blocks/4090.tga LFS Normal file
View File

Binary file not shown.

1
assets/mods/basegame/blocks/blocks.csv
View File

@@ -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" "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" "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" "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" "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" "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" "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"
1 id drop name shdr shdg shdb shduv str dsty mate solid plat wall grav dlfn fv fr lumr lumg lumb lumuv colour vscs refl
103 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
104 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
105 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
106 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
107 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
108 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
109 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

1
src/net/torvald/terrarum/blockproperties/Block.kt
View File

@@ -118,6 +118,7 @@ object Block {
const val DAYLIGHT_CAPACITOR = "basegame:258" const val DAYLIGHT_CAPACITOR = "basegame:258"
const val ACTORBLOCK_TILING_PLACEHOLDER = "basegame:4090"
const val ACTORBLOCK_NO_COLLISION = "basegame:4091" const val ACTORBLOCK_NO_COLLISION = "basegame:4091"
const val ACTORBLOCK_FULL_COLLISION = "basegame:4092" const val ACTORBLOCK_FULL_COLLISION = "basegame:4092"
const val ACTORBLOCK_ALLOW_MOVE_DOWN = "basegame:4093" const val ACTORBLOCK_ALLOW_MOVE_DOWN = "basegame:4093"

4
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -10,7 +10,6 @@ import net.torvald.terrarum.*
import net.torvald.terrarum.App.* import net.torvald.terrarum.App.*
import net.torvald.terrarum.blockstats.MinimapComposer import net.torvald.terrarum.blockstats.MinimapComposer
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItemHorizontalFadeSlide import net.torvald.terrarum.ui.UIItemHorizontalFadeSlide
@@ -199,6 +198,7 @@ class UIInventoryFull(
this.handler.toggleKeyExtra.add { App.getConfigInt("control_key_gamemenu") } this.handler.toggleKeyExtra.add { App.getConfigInt("control_key_gamemenu") }
this.handler.toggleKeyExtraAction.add { this.handler.toggleKeyExtraAction.add {
if (it.isClosed) { if (it.isClosed) {
INGAME.setTooltipMessage(null)
transitionPanel.forcePosition(2) transitionPanel.forcePosition(2)
catBar.setSelectedPanel(2) catBar.setSelectedPanel(2)
it.setAsOpen() it.setAsOpen()
@@ -246,6 +246,8 @@ class UIInventoryFull(
// UI items // UI items
catBar.render(batch, camera) catBar.render(batch, camera)
transitionPanel.render(batch, camera) transitionPanel.render(batch, camera)
// if (transitionPanel.currentPosition != 1f) INGAME.setTooltipMessage(null)
} }
fun rebuildList() { fun rebuildList() {

7
src/net/torvald/terrarum/worlddrawer/CreateTileAtlas.kt
View File

@@ -123,7 +123,12 @@ class CreateTileAtlas {
System.err.println("Couldn't load file $filehandle from $modname, skipping...") 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 // test print
//PixmapIO2.writeTGA(Gdx.files.absolute("${AppLoader.defaultDir}/atlas.tga"), atlas, false) //PixmapIO2.writeTGA(Gdx.files.absolute("${AppLoader.defaultDir}/atlas.tga"), atlas, false)