diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json index da743e0b1..10926265d 100644 --- a/assets/mods/basegame/locales/en/items.json +++ b/assets/mods/basegame/locales/en/items.json @@ -50,6 +50,7 @@ "ITEM_LOGS_EBONY": "Ebony Logs", "ITEM_LOGS_OAK": "Oak Logs", "ITEM_LOGS_ROSEWOOD": "Rosewood Logs", + "ITEM_MULTIMETER": "Multimeter", "ITEM_NITRE": "Nitre", "ITEM_ORE_CASSITERITE": "Tin Ore", "ITEM_ORE_COAL": "Coal", diff --git a/assets/mods/basegame/locales/koKR/items.json b/assets/mods/basegame/locales/koKR/items.json index d5d9bc496..97eccdfbd 100644 --- a/assets/mods/basegame/locales/koKR/items.json +++ b/assets/mods/basegame/locales/koKR/items.json @@ -50,6 +50,7 @@ "ITEM_LOGS_EBONY": "흑단 통나무", "ITEM_LOGS_OAK": "통나무", "ITEM_LOGS_ROSEWOOD": "자단 통나무", + "ITEM_MULTIMETER": "멀티미터", "ITEM_NITRE": "초석", "ITEM_ORE_CASSITERITE": "주석석", "ITEM_ORE_COAL": "석탄", diff --git a/assets/mods/basegame/sprites/fixtures/text_sign_glass_copper.tga b/assets/mods/basegame/sprites/fixtures/text_sign_glass_copper.tga new file mode 100644 index 000000000..6cddf91de --- /dev/null +++ b/assets/mods/basegame/sprites/fixtures/text_sign_glass_copper.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2567daf0c9f2e1c4acbfe3a788964a72fcb9bb87bf345bb0f06036683cb58e4c +size 16402 diff --git a/assets/mods/basegame/sprites/fixtures/text_sign_glass_copper_emsv.tga b/assets/mods/basegame/sprites/fixtures/text_sign_glass_copper_emsv.tga new file mode 100644 index 000000000..1bdf5fb21 --- /dev/null +++ b/assets/mods/basegame/sprites/fixtures/text_sign_glass_copper_emsv.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f738699433045c1ad112589c317035cbe26834fe17954a9e3808a47fbeea49dd +size 16402 diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt index 66fc394b5..2c8cd0d08 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt @@ -7,6 +7,7 @@ import net.torvald.terrarum.* import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.BlockMarkerActor import net.torvald.terrarum.gameitems.GameItem +import net.torvald.terrarum.gameitems.GameItem.EquipPosition.HAND_GRIP import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes @@ -22,13 +23,12 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) { override var baseMass = 2.0 override val itemImage: TextureRegion get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,3) + override var equipPosition = HAND_GRIP + override var originalName = "ITEM_MULTIMETER" init { - equipPosition = GameItem.EquipPosition.HAND_GRIP - name = "Wire Debugger" stackable = false isUnique = true - originalName = "WIRE_DEBUGGER" } private val sb = StringBuilder() diff --git a/work_files/UI/edge_lit_text_sign.kra b/work_files/UI/edge_lit_text_sign.kra index d2d1221ba..7e908b706 100644 --- a/work_files/UI/edge_lit_text_sign.kra +++ b/work_files/UI/edge_lit_text_sign.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb46473853dc3ee17289651856681b456769993cd2e4cddfc0bd6afaf3b96885 -size 374460 +oid sha256:888e4eb13f79e712b565befacc3159e3785dae240b9550c729cde83d1c6d1b27 +size 275925