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

wippie

Browse Source
This commit is contained in:
minjaesong
2021-02-15 16:25:47 +09:00
parent 0292115f89
commit 295dd8b8d6
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/blockproperties/BlockCodex.kt
View File

@@ -62,9 +62,8 @@ object BlockCodex {
setProp(blockProps[intVal(it, "id")], it) setProp(blockProps[intVal(it, "id")], it)
}*/ }*/
val numericID = intVal(it, "id") setProp(module, it)
setProp(module, numericID, it) val tileId = "$module:${intVal(it, "id")}"
val tileId = "$module:$numericID"
// register tiles with dynamic light // register tiles with dynamic light
if ((blockProps[tileId]?.dynamicLuminosityFunction ?: 0) != 0) { if ((blockProps[tileId]?.dynamicLuminosityFunction ?: 0) != 0) {
@@ -78,7 +77,7 @@ object BlockCodex {
virtualToTile[virtualID] = tileId virtualToTile[virtualID] = tileId
virtualChunk.add(virtualID) virtualChunk.add(virtualID)
setProp("virt", virtualTileCursor, it) setProp("virt", it, virtualTileCursor)
printdbg(this, "Block ID $tileId -> Virtual ID $virtualID, baseLum: ${blockProps[virtualID]?.baseLumCol}") printdbg(this, "Block ID $tileId -> Virtual ID $virtualID, baseLum: ${blockProps[virtualID]?.baseLumCol}")
virtualTileCursor += 1 virtualTileCursor += 1
@@ -151,11 +150,11 @@ object BlockCodex {
return blockProps[blockID] return blockProps[blockID]
} }
private fun setProp(modname: String, key: Int, record: CSVRecord) { private fun setProp(modname: String, record: CSVRecord, newKey: Int? = null) {
val prop = BlockProp() val prop = BlockProp()
prop.nameKey = record.get("name") prop.nameKey = record.get("name")
prop.id = "$modname:${(if (key == -1) 0 else intVal(record, "id"))}" prop.id = if (newKey != null) "$modname:$newKey" else "$modname:${intVal(record, "id")}"
prop.drop = "$modname:${intVal(record, "drop")}" prop.drop = "$modname:${intVal(record, "drop")}"
prop.shadeColR = floatVal(record, "shdr") prop.shadeColR = floatVal(record, "shdr")
@@ -187,9 +186,9 @@ object BlockCodex {
prop.dynamicLuminosityFunction = intVal(record, "dlfn") prop.dynamicLuminosityFunction = intVal(record, "dlfn")
blockProps["$modname:$key"] = prop blockProps["$modname:${prop.id}"] = prop
printmsg(this, "$modname:${intVal(record, "id")}\t" + prop.nameKey) printmsg(this, "Setting prop $modname:${prop.id}\t" + prop.nameKey)
} }
} }

5
src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
View File

@@ -55,7 +55,9 @@ class EntryPoint : ModuleEntryPoint() {
// block items (blocks and walls are the same thing basically) // block items (blocks and walls are the same thing basically)
for (tile in BlockCodex.getAll()) { for (tile in BlockCodex.getAll()) {
ItemCodex[tile.id] = makeNewItemObj(tile, false) ItemCodex[tile.id] = makeNewItemObj(tile, false)
if (IS_DEVELOPMENT_BUILD) print(tile.id+" ")
ItemCodex["wall@"+tile.id] = makeNewItemObj(tile, true) ItemCodex["wall@"+tile.id] = makeNewItemObj(tile, true)
if (IS_DEVELOPMENT_BUILD) print("wall@"+tile.id+" ")
} }
@@ -75,9 +77,6 @@ class EntryPoint : ModuleEntryPoint() {
init { init {
equipPosition = EquipPosition.HAND_GRIP equipPosition = EquipPosition.HAND_GRIP
if (IS_DEVELOPMENT_BUILD)
print("$originalID ")
} }
override fun startPrimaryUse(delta: Float): Boolean { override fun startPrimaryUse(delta: Float): Boolean {