From c0c98c3b809a921257f16d68cc578fad800ed76c Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 8 Aug 2023 17:44:23 +0900 Subject: [PATCH] some locale changes; remoCon changes on load menu --- assets/mods/basegame/locales/en/calendar.json | 3 +- assets/mods/basegame/locales/en/game.json | 31 ++++++++--------- assets/mods/basegame/locales/en/items.json | 24 +++++++------- .../mods/basegame/locales/koKR/calendar.json | 3 +- assets/mods/basegame/locales/koKR/game.json | 33 ++++++++++--------- assets/mods/basegame/locales/koKR/items.json | 10 +++--- .../gameactors/FixtureTypewriter.kt | 2 +- .../gameactors/FixtureWallCalendar.kt | 2 +- .../gameitems/ItemTypewriter.kt | 2 +- .../gameitems/ItemWallCalendar.kt | 2 +- .../terrarum/modulebasegame/ui/UILoadList.kt | 2 +- .../modulebasegame/ui/UILoadSavegame.kt | 20 +++++++++-- .../modulebasegame/ui/UITitleRemoConYaml.kt | 7 ++++ 13 files changed, 84 insertions(+), 57 deletions(-) diff --git a/assets/mods/basegame/locales/en/calendar.json b/assets/mods/basegame/locales/en/calendar.json index 15a254cfe..eaf0f4ef8 100644 --- a/assets/mods/basegame/locales/en/calendar.json +++ b/assets/mods/basegame/locales/en/calendar.json @@ -1,8 +1,7 @@ { - "GAME_ITEM_CALENDAR": "Calendar", "MENU_CALENDAR_CALENDAR": "Calendar", "MENU_CALENDAR_EVENTS": "Events", - "MENU_CALENDAR_ADD_NEW_EVENT": "Add New Event…", + "MENU_CALENDAR_ADD_NEW_EVENT": "Add New Event", "CONTEXT_CALENDAR_SEASON_SPRING": "Spring", "CONTEXT_CALENDAR_SEASON_SUMMER": "Summer", "CONTEXT_CALENDAR_SEASON_AUTUMN": "Autumn", diff --git a/assets/mods/basegame/locales/en/game.json b/assets/mods/basegame/locales/en/game.json index 2b89f9902..67cc21ca0 100644 --- a/assets/mods/basegame/locales/en/game.json +++ b/assets/mods/basegame/locales/en/game.json @@ -1,23 +1,24 @@ { + "CONTEXT_GENERATOR_SEED": "Seed", + "CONTEXT_ITEM_MAP": "Map", + "CONTEXT_ITEM_TOOL_PLURAL": "Tools", + "CONTEXT_PLACE_COORDINATE": "Coordinate", + "CONTEXT_WORLD_COUNT": "Worlds: ", "CONTEXT_WORLD_NEW": "New World", "MENU_LABEL_DELETE_WORLD": "Delete World", - "CONTEXT_WORLD_COUNT": "Worlds: ", - "GAME_INVENTORY_INGREDIENTS": "Ingredients", - "GAME_INVENTORY_POTIONS": "Potions", - "GAME_INVENTORY_BLOCKS": "Blocks", - "GAME_INVENTORY_WALLS": "Walls", - "CONTEXT_ITEM_TOOL_PLURAL": "Tools", - "GAME_INVENTORY_FAVORITES": "Favorites", - "GAME_INVENTORY_REGISTER": "Register", - "CONTEXT_ITEM_MAP": "Map", "MENU_LABEL_MENU": "Menu", - "CONTEXT_GENERATOR_SEED": "Seed", + "MENU_LABEL_PREV_SAVES": "Previous Saves", + "MENU_LABEL_RENAME": "Rename", + "GAME_ACTION_CRAFT": "Craft", "GAME_ACTION_GRAPPLE": "Grapple", "GAME_ACTION_QUICKSEL": "Quick Select", - "GAME_ACTION_CRAFT": "Craft", - "GAME_CRAFTING": "Crafting", - "GAME_CRAFTABLE_ITEMS": "Craftable Items", - "MENU_LABEL_RENAME": "Rename", "GAME_ACTION_TELEPORT": "Teleport", - "CONTEXT_PLACE_COORDINATE": "Coordinate" + "GAME_CRAFTABLE_ITEMS": "Craftable Items", + "GAME_CRAFTING": "Crafting", + "GAME_INVENTORY_BLOCKS": "Blocks", + "GAME_INVENTORY_FAVORITES": "Favorites", + "GAME_INVENTORY_INGREDIENTS": "Ingredients", + "GAME_INVENTORY_POTIONS": "Potions", + "GAME_INVENTORY_REGISTER": "Register", + "GAME_INVENTORY_WALLS": "Walls" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json index 4c5671a23..2a281c653 100644 --- a/assets/mods/basegame/locales/en/items.json +++ b/assets/mods/basegame/locales/en/items.json @@ -1,18 +1,20 @@ { + "BLOCK_STONE_DEEP": "Deepstone", + "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding", + "BLOCK_STONE_MARBLE": "Marble", + + "ITEM_CALENDAR": "Calendar", + "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter", + "ITEM_STORAGE_CHEST": "Storage Chest", + "ITEM_TIKI_TORCH": "Tiki Torch", + "ITEM_TYPEWRITER": "Typewriter", + "ITEM_WIRE": "Wire", + "ITEM_WIRE_CUTTER": "Wire Cutter", + "ACTORBLOCK_ALLOW_MOVE_DOWN": "Urist Arôlcustith", "ACTORBLOCK_FULL_COLLISION": "Urist Berdanrifot", "ACTORBLOCK_NO_COLLISION": "Urist Zafal", "ACTORBLOCK_NO_PASS_RIGHT": "Urist McPassLeft", "ACTORBLOCK_NO_PASS_LEFT": "Urist McPassRight", - "ACTORBLOCK_TILING_PLACEHOLDER": "Urist Berdanurdim", - - "BLOCK_STONE_DEEP": "Deepstone", - "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding", - "BLOCK_STONE_MARBLE": "Marble", - - "ITEM_STORAGE_CHEST": "Storage Chest", - "ITEM_WIRE": "Wire", - "ITEM_WIRE_CUTTER": "Wire Cutter", - "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter", - "ITEM_TIKI_TORCH": "Tiki Torch" + "ACTORBLOCK_TILING_PLACEHOLDER": "Urist Berdanurdim" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/koKR/calendar.json b/assets/mods/basegame/locales/koKR/calendar.json index a0694d855..d6fc30f0a 100644 --- a/assets/mods/basegame/locales/koKR/calendar.json +++ b/assets/mods/basegame/locales/koKR/calendar.json @@ -1,8 +1,7 @@ { - "GAME_ITEM_CALENDAR": "달력", "MENU_CALENDAR_CALENDAR": "달력", "MENU_CALENDAR_EVENTS": "일정", - "MENU_CALENDAR_ADD_NEW_EVENT": "새 일정 추가…", + "MENU_CALENDAR_ADD_NEW_EVENT": "새 일정 추가", "CONTEXT_CALENDAR_SEASON_SPRING": "봄", "CONTEXT_CALENDAR_SEASON_SUMMER": "여름", "CONTEXT_CALENDAR_SEASON_AUTUMN": "가을", diff --git a/assets/mods/basegame/locales/koKR/game.json b/assets/mods/basegame/locales/koKR/game.json index ca422ca70..5b404947b 100644 --- a/assets/mods/basegame/locales/koKR/game.json +++ b/assets/mods/basegame/locales/koKR/game.json @@ -1,24 +1,25 @@ { + "CONTEXT_GENERATOR_SEED": "시드", + "CONTEXT_ITEM_MAP": "지도", + "CONTEXT_ITEM_TOOL_PLURAL": "도구", + "CONTEXT_PLACE_COORDINATE": "좌표", + "CONTEXT_WORLD_COUNT": "새계: ", "CONTEXT_WORLD_NEW": "새 세계", "MENU_LABEL_DELETE_WORLD": "새계 삭제", - "CONTEXT_WORLD_COUNT": "새계: ", - "MENU_MONITOR_CALI_TITLE": "모니터 확인", - "GAME_INVENTORY_INGREDIENTS": "재료", - "GAME_INVENTORY_POTIONS": "물약", - "GAME_INVENTORY_BLOCKS": "블록", - "GAME_INVENTORY_WALLS": "벽지", - "CONTEXT_ITEM_TOOL_PLURAL": "도구", - "GAME_INVENTORY_FAVORITES": "즐겨찾기", - "GAME_INVENTORY_REGISTER": "등록하기", "MENU_LABEL_MENU": "메뉴", - "CONTEXT_ITEM_MAP": "지도", - "CONTEXT_GENERATOR_SEED": "시드", + "MENU_LABEL_PREV_SAVES": "이전 세이브", + "MENU_LABEL_RENAME": "이름 바꾸기", + "MENU_MONITOR_CALI_TITLE": "모니터 확인", + "GAME_ACTION_CRAFT": "제작하기", "GAME_ACTION_GRAPPLE": "매달리기", "GAME_ACTION_QUICKSEL": "빠른 선택", - "GAME_ACTION_CRAFT": "제작하기", - "GAME_CRAFTING": "제작", - "GAME_CRAFTABLE_ITEMS": "제작 가능한 아이템", - "MENU_LABEL_RENAME": "이름 바꾸기", "GAME_ACTION_TELEPORT": "텔레포트하기", - "CONTEXT_PLACE_COORDINATE": "좌표" + "GAME_CRAFTABLE_ITEMS": "제작 가능한 아이템", + "GAME_CRAFTING": "제작", + "GAME_INVENTORY_BLOCKS": "블록", + "GAME_INVENTORY_FAVORITES": "즐겨찾기", + "GAME_INVENTORY_INGREDIENTS": "재료", + "GAME_INVENTORY_POTIONS": "물약", + "GAME_INVENTORY_REGISTER": "등록하기", + "GAME_INVENTORY_WALLS": "벽지" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/koKR/items.json b/assets/mods/basegame/locales/koKR/items.json index d022b7aa4..1d1cf966b 100644 --- a/assets/mods/basegame/locales/koKR/items.json +++ b/assets/mods/basegame/locales/koKR/items.json @@ -3,9 +3,11 @@ "BLOCK_SCAFFOLDING_NORMAL": "발판", "BLOCK_STONE_MARBLE": "대리석", - "ITEM_STORAGE_CHEST": "보관상자", - "ITEM_WIRE": "전선", - "ITEM_WIRE_CUTTER": "전선 절단기", + "ITEM_CALENDAR": "달력", "ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기", - "ITEM_TIKI_TORCH": "티키 토치" + "ITEM_STORAGE_CHEST": "보관상자", + "ITEM_TIKI_TORCH": "티키 토치", + "ITEM_TYPEWRITER": "타자기", + "ITEM_WIRE": "전선", + "ITEM_WIRE_CUTTER": "전선 절단기" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTypewriter.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTypewriter.kt index c5392daca..4405e1ba6 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTypewriter.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTypewriter.kt @@ -24,7 +24,7 @@ class FixtureTypewriter : FixtureBase { // constructor used when the game loads from the savefile constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), - nameFun = { Lang["GAME_ITEM_TYPEWRITER"] } + nameFun = { Lang["ITEM_TYPEWRITER"] } ) { density = 2000.0 diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureWallCalendar.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureWallCalendar.kt index c916a2453..6311317f1 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureWallCalendar.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureWallCalendar.kt @@ -14,7 +14,7 @@ class FixtureWallCalendar : FixtureBase { constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), - nameFun = { Lang["GAME_ITEM_CALENDAR"] } + nameFun = { Lang["ITEM_CALENDAR"] } ) { val itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga") diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt index 9cc7584e9..1a0bc2b1d 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt @@ -11,7 +11,7 @@ import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch class ItemTypewriter(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureTypewriter") { override var dynamicID: ItemID = originalID - override val originalName = "GAME_ITEM_TYPEWRITER" + override val originalName = "ITEM_TYPEWRITER" override var baseMass = FixtureTikiTorch.MASS override var stackable = true override var inventoryCategory = Category.MISC diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt index 5a612c124..362648f1c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt @@ -10,7 +10,7 @@ import net.torvald.terrarum.gameitems.ItemID class ItemWallCalendar(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureWallCalendar") { override var dynamicID: ItemID = originalID - override val originalName = "GAME_ITEM_CALENDAR" + override val originalName = "ITEM_CALENDAR" override var baseMass = 1.0 override var stackable = true override var inventoryCategory = Category.MISC diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt index f4e4c54b2..9d9dd6be6 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt @@ -235,7 +235,7 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() { if (showSpinner) { val spin = spinner.get(spinnerFrame % 8, spinnerFrame / 8) val offX = UIRemoCon.menubarOffX - UIRemoCon.UIRemoConElement.paddingLeft + 72 + 1 - val offY = UIRemoCon.menubarOffY - UIRemoCon.UIRemoConElement.lineHeight * 3 + 16 + val offY = UIRemoCon.menubarOffY - UIRemoCon.UIRemoConElement.lineHeight * 4 + 16 batch.draw(spin, offX.toFloat(), offY.toFloat()) } } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadSavegame.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadSavegame.kt index fe9542c5e..6c247d555 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadSavegame.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadSavegame.kt @@ -90,8 +90,17 @@ class UILoadSavegame(val remoCon: UIRemoCon) : Advanceable() { listOf(NullUI/*, transitionalAutosave*/) ) - internal fun queueUpManageScr() { transitionPanel.setCentreUIto(0) } - internal fun queueUpNewCharScr() { transitionPanel.setCentreUIto(1) } + private val nodesForListing = Yaml(UITitleRemoConYaml.injectedMenuSingleCharSel).parse() + private val nodesForManage = Yaml(UITitleRemoConYaml.injectedMenuSingleSaveManage).parse() + + internal fun queueUpManageScr() { + transitionPanel.setCentreUIto(0) + remoCon.setNewRemoConContents(nodesForManage) + } + internal fun queueUpNewCharScr() { + transitionPanel.setCentreUIto(1) + remoCon.setNewRemoConContents(nodesForListing) + } // internal fun bringAutosaveSelectorUp() { transitionPanel.setRightUIto(1) } // internal fun takeAutosaveSelectorDown() { transitionPanel.setRightUIto(0) } @@ -102,6 +111,10 @@ class UILoadSavegame(val remoCon: UIRemoCon) : Advanceable() { internal fun changePanelTo(index: Int) { transitionPanel.requestTransition(index) + if (index == 1) + remoCon.setNewRemoConContents(nodesForManage) + else + remoCon.setNewRemoConContents(nodesForListing) } override fun advanceMode(button: UIItem) { @@ -118,6 +131,9 @@ class UILoadSavegame(val remoCon: UIRemoCon) : Advanceable() { // takeAutosaveSelectorDown() transitionPanel.show() + nodesForListing.parent = remoCon.treeRoot + nodesForManage.parent = remoCon.treeRoot + } override fun hide() { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt index 0ea233807..9880adabf 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt @@ -41,6 +41,7 @@ object UITitleRemoConYaml { // todo add MENU_IO_IMPORT val injectedMenuSingleCharSel = """ +- MENU_IO_IMPORT - CONTEXT_CHARACTER_NEW : net.torvald.terrarum.modulebasegame.ui.UINewCharacter - MENU_LABEL_RETURN """ @@ -48,6 +49,12 @@ object UITitleRemoConYaml { val injectedMenuSingleWorldSel = """ - CONTEXT_WORLD_NEW : net.torvald.terrarum.modulebasegame.ui.UINewWorld - MENU_LABEL_RETURN +""" + + val injectedMenuSingleSaveManage = """ +- MENU_MODULES +- MENU_LABEL_PREV_SAVES +- MENU_LABEL_RETURN """ operator fun invoke(hasSave: Boolean) =