AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update "World screen" tutorial text and Home key improved (#4403)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-07-07 19:00:12 +02:00 committed by GitHub
parent 8eb97b2ea0
commit 373b42bfcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/assets/jsons/Tutorials.json
View File

@ -129,7 +129,7 @@
],
"Keyboard": [
"If you have a keyboard, some shortcut keys become available. Unit command or improvement picker keys, for example, are shown directly in their corresponding buttons.",
"On the world screen the hotkeys are as follows:", "Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital",
"On the world screen the hotkeys are as follows:", "Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital or open its city screen if already centered",
"F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload",
"Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game"
],
@ -144,23 +144,23 @@
"⑤: The Diplomacy Button - shows the diplomacy manager where you can talk to other civilizations.",
"⑥: Unit Action Buttons - while a unit is selected its possible actions appear here.",
"⑦: The unit/city info pane - shows information about a selected unit or city.",
"⑧: The name (and unit icon) of the selected unit or city, with current health if wounded.",
"⑧: The name (and unit icon) of the selected unit or city, with current health if wounded. Clicking a unit name or icon will open its civilopedia entry.",
"⑨: The arrow buttons allow jumping to the next/previous unit.",
"⑩: For a selected unit, its promotions appear here, and clicking leads to the promotions screen for that unit.",
"⑪: Remaining/per turn movement points, strength and experience / XP needed for promotion. For cities, you get its combat strength.",
"⑫: This button closes the selected unit/city info pane.",
"⑬: This pane appears when you order a uint to attack an enemy. On top are attacker and defender with their respective base strengths.",
"⑬: This pane appears when you order a unit to attack an enemy. On top are attacker and defender with their respective base strengths.",
"⑭: Below that are strength boni or mali and health bars projecting before / after the attack.",
"⑮: The Attack Button - let blood flow!",
"⑯: The minimap shows an overview over the world, with known cities, terrain and fog of war. Clicking will position the main map.",
"⑰: To the side of the minimap are display feature toggling buttons - tile yield, worked indicator, show/hide resources. These mirror setting on the options screen and are hidden if you deactivate the minimap.",
"⑱: Tile information for the selected hex - current or potential yield, terrain, effects, present units, city located there and such.",
"⑱: Tile information for the selected hex - current or potential yield, terrain, effects, present units, city located there and such. Where appropriate, clicking a line opens the corresponding civilopedia entry.",
"⑲: Notifications - what happened during the last 'next turn' phase. Some are clickable to show a relevant place on the map, some even show several when you click repeatedly.",
"⑳: The Next Turn Button - unless there are things to do, in which case the label changes to 'next unit', 'pick policy' and so on.",
"ⓐ: The overview button leads to the empire overview screen with various tabs (the last one viewed is remembered) holding vital information about the state of your civilization in world.",
"ⓑ: The culture icon shows accumulated culture and culture needed for the next policy - in this case, the exclamation mark tells us a next policy can be enacted. Clicking is another way to the policies manager.",
"ⓒ: Your known strategic resources are displayed here with the available (usage already deducted) number - click to go to the resources overview screen.",
"ⓓ: Happiness/unhappiness balance and either golden age with turns left or accumulated happines with amount needed for a golden age is shown next to the smiley. Clicking also leads to the resources overview screen as luxury resources are a way to improve happiness.",
"ⓓ: Happiness/unhappiness balance and either golden age with turns left or accumulated happiness with amount needed for a golden age is shown next to the smiley. Clicking also leads to the resources overview screen as luxury resources are a way to improve happiness.",
"ⓔ: The science icon shows the number of science points produced per turn. Clicking leads to the technology tree.",
"ⓕ: Number of turns played with translation into calendar years. Click to see the victory overview.",
"ⓖ: The number of gold coins in your treasury and income. Clicks lead to the Stats overview screen.",

2
android/assets/jsons/translations/German.properties
View File

@ -3958,7 +3958,7 @@ Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barri
Keyboard = Tastatur
If you have a keyboard, some shortcut keys become available. Unit command or improvement picker keys, for example, are shown directly in their corresponding buttons. = Wenn du eine Tastatur verwendest, werden einige Tastenkombinationen verfügbar. Die Tasten, z.B. für den Einheitenbefehl oder zur Auswahl einer Verbesserung, werden direkt in den entsprechenden Schaltflächen angezeigt.
On the world screen the hotkeys are as follows: = In der Weltansicht sind die Tastenkombinationen wie folgt:
Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital = Leertaste oder 'N' - Nächste Einheit oder nächste Runde\n'E' - Reichsübersicht (zuletzt angesehene Seite)\n'+', '-' - Vergrößern / Verkleinern\nHome - Zentrieren auf Hauptstadt
Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital or open its city screen if already centered = Leertaste oder 'N' - Nächste Einheit oder nächste Runde\n'E' - Reichsübersicht (zuletzt angesehene Seite)\n'+', '-' - Vergrößern / Verkleinern\nHome - Zentrieren auf Hauptstadt bzw. Stadt öffnen wenn dies bereits erfogt ist
F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 - Civilopedia öffnen\nF2 - Reichsübersicht Handel\nF3 - Reichsübersicht Einheiten\nF4 - Reichsübersicht Diplomatie\nF5 - Sozialpolitik\nF6 - Technologien\nF7 - Reichsübersicht Städte\nF8 - Siegesfortschritt\nF9 - Reichsübersicht Statistiken\nF10 - Reichsübersicht Ressourcen\nF11 - Schnellspeichern\nF12 - Schnellladen
Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game = Strg-R - Ressourcenanzeige umschalten\nStrg-Y - Felderträge umschalten\nStrg-O - Spieloptionen\nStrg-S - Spiel speichern\nStrg-L - Spiel laden

6
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -245,7 +245,11 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Cam
keyPressDispatcher[Input.Keys.F10] = { game.setScreen(EmpireOverviewScreen(selectedCiv, "Resources")) } // originally Strategic View
keyPressDispatcher[Input.Keys.F11] = quickSave // Quick Save
keyPressDispatcher[Input.Keys.F12] = quickLoad // Quick Load
keyPressDispatcher[Input.Keys.HOME] = { mapHolder.setCenterPosition(gameInfo.currentPlayerCiv.getCapital().location) } // Capital City View
keyPressDispatcher[Input.Keys.HOME] = { // Capital City View
val capital = gameInfo.currentPlayerCiv.getCapital()
if (!mapHolder.setCenterPosition(capital.location))
game.setScreen(CityScreen(capital))
}
keyPressDispatcher['\u000F'] = { this.openOptionsPopup() } // Ctrl-O: Game Options
keyPressDispatcher['\u0013'] = { game.setScreen(SaveGameScreen(gameInfo)) } // Ctrl-S: Save
keyPressDispatcher['\u000C'] = { game.setScreen(LoadGameScreen(this)) } // Ctrl-L: Load