From 80d688e6f5af68004894dc63174e30f87d23cae6 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Sun, 25 Apr 2021 20:56:41 +1200
Subject: [PATCH 1/3] wiki-keyboardShortcuts-cleanUp
---
.gitignore | 1 +
src/002-config/mousetrapConfig.js | 6 +++---
src/gui/Encyclopedia/encyclopedia.tw | 26 +++++++++++++++++---------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 443b678cc40..52ad941110d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ build/
*.tmp
# misc
+FCHost/*
fc-pregmod
bin/*
*.outline
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index 8c051bec677..f2a106d1eec 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -270,14 +270,14 @@ App.UI.Hotkeys = (function() {
a.target = "_blank";
a.append("US-QWERTY layout");
li.append(a,
- "there may be keys or combinations of keys where the recorded key is different from the key used to listen to key events. You will have to find these keys yourself through trial and error.");
+ " there may be keys or combinations of keys where the recorded key is different from the key used to listen to key events. You will have to find these keys yourself through trial and error.");
ul.append(li);
App.UI.DOM.appendNewElement("li", ul, "Custom hotkeys are browser specific and are not part of your save.");
li = document.createElement("li");
- li.append("While we try not to overwrite browser or OS level key combinations it is possible to do so with custom hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are available. There are however keys that cannot be overwritten, the ",
- App.UI.DOM.makeElement("code", "Win key"), " on Windows is an example for this.");
+ li.append("While we try not to overwrite browser or OS level key combinations it is possible to do so with custom hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are available. There are however keys that cannot be overwritten, such as the ",
+ App.UI.DOM.makeElement("code", "Win key"), " on Windows.");
ul.append(li);
p.append(ul);
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 58e8e16c1a1..f6f9b5128f4 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -129,15 +129,23 @@ PLAYING FREE CITIES
<<case "Keyboard Shortcuts">>
- The game supports a few keyboard shortcuts.
-
- <br><br>''Enter'' or ''space'' will activate the uppermost button in the left-side UI bar. This button is context sensitive; in events and reports it continues the game, while in menus it functions as a back button. ''Enter'' is used to end the week from the main menu, and ''space'' is used to continue in all other situations.
-
- <br><br>''Right arrow'', ''left arrow'' and ''q'', ''e'' will move between slaves in slaves' individual menus.
-
- <br><br>On the main menus, ''C'' will open arcology management, ''S'' will open the slave markets, ''A'' will open personal attention options, ''H'' will open Head Girl management, ''B'' will open Bodyguard management, ''R'' will open Recruiter management, ''X'' will review your personal affairs, and ''F'' will initiate the short sex scene at the bottom of the main menu.
-
-
+ The uppermost button (in events and reports it continues the game, while in menus it functions as a back button) in the left-side UI bar can be activated via context sensitive keybinds; ''<<print App.UI.Hotkeys.hotkeys("endWeek")>>'' is used to end the week from the main menu, and ''<<print App.UI.Hotkeys.hotkeys("nextLink")>>'' is used to continue in all other situations.
+
+ <br><br>Within slaves' individual menus ''<<print App.UI.Hotkeys.hotkeys("prev-slave")>>'' will move to the last slave and ''<<print App.UI.Hotkeys.hotkeys("next-slave")>>'' to the next.
+
+ <br>Review your personal affairs with ''<<print App.UI.Hotkeys.hotkeys("Manage Personal Affairs")>>'' and weekly actions with ''<<print App.UI.Hotkeys.hotkeys("Personal Attention Select")>>''.
+ <br>''<<print App.UI.Hotkeys.hotkeys("Rules Assistant")>>'' will open RA Rules.
+ <br>''<<print App.UI.Hotkeys.hotkeys("Manage Arcology")>>'' will open arcology management.
+ <br>''<<print App.UI.Hotkeys.hotkeys("Options")>>'' will opens the options menu.
+ <br>''<<print App.UI.Hotkeys.hotkeys("Buy Slaves")>>'' will open the slave markets.
+ <br>''<<print App.UI.Hotkeys.hotkeys("BG Select")>>'' will open Bodyguard management.
+ <br>''<<print App.UI.Hotkeys.hotkeys("Future Society")>>'' will open Future Societies.
+ <br>''<<print App.UI.Hotkeys.hotkeys("Manage Penthouse")>>'' will open Manage Penthouse.
+
+ <br>''<<print App.UI.Hotkeys.hotkeys("Manage Penthouse")>>'' will ''only open'' Head Girl management on the main page.
+
+ <br><br>Nearly every key can be rebound in Hotkey Settings which can be accessed in game via SideBar -> Options -> Hotkey Settings.
+ <<includeDOM App.UI.DOM.linkReplace(" Modify/review them now", App.UI.Hotkeys.settings())>>
<<case "The Arcology Interface">>
The Arcology Interface is the large table-based display at the top of the main menu. It's designed as an abstract representation of the arcology.
--
GitLab
From ac91963f3dbf18b06684b4fee22e111accb90733 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Sun, 25 Apr 2021 22:40:11 +1200
Subject: [PATCH 2/3] Remove .gitignore change
---
.gitignore | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index bfc7a1e081e..52ad941110d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,6 @@ build/
# misc
FCHost/*
fc-pregmod
-FCHost/*
bin/*
*.outline
*.todo
--
GitLab
From e9ccf3c3f8dcc9e371d77ce7aeb55ac2235540d5 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Sun, 25 Apr 2021 22:41:36 +1200
Subject: [PATCH 3/3] Remove .gitignore change - pass II
---
.gitignore | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 52ad941110d..443b678cc40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,6 @@ build/
*.tmp
# misc
-FCHost/*
fc-pregmod
bin/*
*.outline
--
GitLab