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

wrap-up commits for "not a true Alpha 2.0 release I was hoping for"

Browse Source
This commit is contained in:
minjaesong
2024-11-15 23:41:25 +09:00
parent 2d7ef6e9ff
commit 63fe28eee2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/mods/basegame/locales/en/items.json
View File

@@ -1,5 +1,6 @@
{ {
"ITEM_ALLOYING_FURNACE": "Alloying Furnace", "ITEM_ALLOYING_FURNACE": "Alloying Furnace",
"ITEM_AXLE": "Axle",
"ITEM_BRICK_SINGULAR": "Brick", /* always singular */ "ITEM_BRICK_SINGULAR": "Brick", /* always singular */
"ITEM_BUCKET_IRON": "Iron Bucket %1$s", "ITEM_BUCKET_IRON": "Iron Bucket %1$s",
"ITEM_BUCKET_WOODEN": "Wooden Bucket %1$s", "ITEM_BUCKET_WOODEN": "Wooden Bucket %1$s",
@@ -17,6 +18,7 @@
"ITEM_ELECTRIC_WORKBENCH": "Electric Workbench", "ITEM_ELECTRIC_WORKBENCH": "Electric Workbench",
"ITEM_ENGRAVING_WORKBENCH": "Engraving Workbench", "ITEM_ENGRAVING_WORKBENCH": "Engraving Workbench",
"ITEM_FURNACE_AND_ANVIL": "Furnace and Anvil", "ITEM_FURNACE_AND_ANVIL": "Furnace and Anvil",
"ITEM_GEARBOX": "Gearbox",
"ITEM_GEM_RUBY": "Raw Ruby", "ITEM_GEM_RUBY": "Raw Ruby",
"ITEM_GEM_EMERALD": "Raw Emerald", "ITEM_GEM_EMERALD": "Raw Emerald",
"ITEM_GEM_SAPPHIRE": "Raw Sapphire", "ITEM_GEM_SAPPHIRE": "Raw Sapphire",
@@ -30,6 +32,7 @@
"ITEM_HATCHET_STEEL": "Steel Axe", "ITEM_HATCHET_STEEL": "Steel Axe",
"ITEM_HATCHET_STONE": "Stone Axe", "ITEM_HATCHET_STONE": "Stone Axe",
"ITEM_HATCHET_WOODEN": "Wooden Axe", "ITEM_HATCHET_WOODEN": "Wooden Axe",
"ITEM_INDUCTION_MOTOR": "Induction Motor",
"ITEM_INGOT_BRASS": "Brass Ingot", "ITEM_INGOT_BRASS": "Brass Ingot",
"ITEM_INGOT_BRONZE": "Bronze Ingot", "ITEM_INGOT_BRONZE": "Bronze Ingot",
"ITEM_INGOT_COPPER": "Copper Ingot", "ITEM_INGOT_COPPER": "Copper Ingot",

8
src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt
View File

@@ -175,7 +175,7 @@ open class Electric : FixtureBase {
val wx = x + worldBlockPos!!.x val wx = x + worldBlockPos!!.x
val wy = y + worldBlockPos!!.y val wy = y + worldBlockPos!!.y
println("Wxy($wx,$wy) getWireState($type)=$new, oldState($type)=$old") // println("Wxy($wx,$wy) getWireState($type)=$new, oldState($type)=$old")
if (new.x - old.x >= ELECTRIC_THRESHOLD_EDGE_DELTA && new.x >= ELECTRIC_THRESHOLD_HIGH) if (new.x - old.x >= ELECTRIC_THRESHOLD_EDGE_DELTA && new.x >= ELECTRIC_THRESHOLD_HIGH)
risingEdgeIndices.add(index) risingEdgeIndices.add(index)
@@ -188,9 +188,9 @@ open class Electric : FixtureBase {
} }
} }
if (risingEdgeIndices.isNotEmpty()) { // if (risingEdgeIndices.isNotEmpty()) {
println("risingEdgeIndices=$risingEdgeIndices") // println("risingEdgeIndices=$risingEdgeIndices")
} // }
risingEdgeIndices.forEach { onRisingEdge(it) } risingEdgeIndices.forEach { onRisingEdge(it) }
fallingEdgeIndices.forEach { onFallingEdge(it) } fallingEdgeIndices.forEach { onFallingEdge(it) }