curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-13 23:26:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

locale update

Browse Source
This commit is contained in:
minjaesong
2023-09-29 01:55:26 +09:00
parent e5adc7c908
commit 045165e388
11 changed files with 182 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,12 +21,12 @@ object Block {
const val PLANK_NORMAL = "basegame:48"
const val PLANK_EBONY = "basegame:49"
const val PLANK_BIRCH = "basegame:50"
const val PLANK_BLOODROSE = "basegame:51"
const val PLANK_ROSEWOOD = "basegame:51"
const val TRUNK_NORMAL = "basegame:64"
const val TRUNK_EBONY = "basegame:65"
const val TRUNK_BIRCH = "basegame:66"
const val TRUNK_BLOODROSE = "basegame:67"
const val TRUNK_ROSEWOOD = "basegame:67"
const val SAND = "basegame:80"
const val SAND_WHITE = "basegame:81"
@@ -64,7 +64,7 @@ object Block {
const val PLATFORM_WOODEN = "basegame:161"
const val PLATFORM_EBONY = "basegame:162"
const val PLATFORM_BIRCH = "basegame:163"
const val PLATFORM_BLOODROSE = "basegame:164"
const val PLATFORM_ROSEWOOD = "basegame:164"
const val TORCH = "basegame:176"
const val TORCH_FROST = "basegame:177"

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

@@ -94,7 +94,6 @@ class EntryPoint : ModuleEntryPoint() {
override val isUnique: Boolean = false
override var baseMass: Double = tile.density / 1000.0
override var baseToolSize: Double? = null
override val originalName = if (isWall) "${tile.nameKey}>>=BLOCK_WALL_NAME_TEMPLATE" else tile.nameKey
override var stackable = true
override var inventoryCategory = if (isWall) Category.WALL else Category.BLOCK
override var isDynamic = false
@@ -114,6 +113,12 @@ class EntryPoint : ModuleEntryPoint() {
tags.addAll(tile.tags)
}
override val originalName: String =
if (isWall && tags.contains("UNLIT")) "${tile.nameKey}>>=BLOCK_UNLIT_TEMPLATE>>=BLOCK_WALL_NAME_TEMPLATE"
else if (isWall) "${tile.nameKey}>>=BLOCK_WALL_NAME_TEMPLATE"
else if (tags.contains("UNLIT")) "${tile.nameKey}>>=BLOCK_UNLIT_TEMPLATE"
else tile.nameKey
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
return BlockBase.blockStartPrimaryUse(actor, this, dynamicID, delta)
}

3
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
View File

@@ -74,7 +74,8 @@ object PlayerBuilderSigrid {
fun fillTestInventory(inventory: ActorInventory) {
App.tileMaker.tags.forEach { (t, _) ->
if (!BlockCodex[t].isActorBlock) {
val prop = BlockCodex[t]
if (!prop.isActorBlock && !prop.hasTag("AIR")) {
inventory.add(t, 9995)
try {