some locale changes; remoCon changes on load menu

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",

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"
 }

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",
+  "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"
 }

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": "가을",

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": "지도",
+  "MENU_LABEL_PREV_SAVES": "이전 세이브",
-  "CONTEXT_GENERATOR_SEED": "시드",
+  "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": "벽지"
 }

assets/mods/basegame/locales/koKR/items.json

@@ -3,9 +3,11 @@
   "BLOCK_SCAFFOLDING_NORMAL": "발판",
   "BLOCK_STONE_MARBLE": "대리석",
 
-  "ITEM_STORAGE_CHEST": "보관상자",
+  "ITEM_CALENDAR": "달력",
-  "ITEM_WIRE": "전선",
-  "ITEM_WIRE_CUTTER": "전선 절단기",
   "ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기",
-  "ITEM_TIKI_TORCH": "티키 토치"
+  "ITEM_STORAGE_CHEST": "보관상자",
+  "ITEM_TIKI_TORCH": "티키 토치",
+  "ITEM_TYPEWRITER": "타자기",
+  "ITEM_WIRE": "전선",
+  "ITEM_WIRE_CUTTER": "전선 절단기"
 }

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

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")
 

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

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

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())
         }
     }

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) }
+    private val nodesForListing = Yaml(UITitleRemoConYaml.injectedMenuSingleCharSel).parse()
-    internal fun queueUpNewCharScr() { transitionPanel.setCentreUIto(1) }
+    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() {

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) =