1.0.3

Fixed some typos in Autohotkey shortcuts and vassal contract window. Added Shift F one and Shift F2 as replacements for Page Up and Page down, if you don't have them. Mentioned the new hotkeys in the tutorial. In the title window, made the whole line with the de jure parent clickable. Restored the default fonts for German, French and Spanish to get the accents back.
Agamidae · Jan 1, 2024 · d8cdb26 · d8cdb26
1 parent bc6eb66
commit d8cdb26
Show file tree

Hide file tree

Showing 30 changed files with 240 additions and 1,309 deletions.
diff --git a/AHK Script Spanish.ahk b/AHK Script Spanish.ahk
@@ -16,6 +16,14 @@ ScaleY(y)
 ; the code below will only run for CK3
 #ifWinActive, ahk_exe ck3.exe
 
++F1::
+SendInput, {Shift up}
+SendInput, {PgUp}
+return
++F2::
+SendInput, {Shift up}
+SendInput, {PgDn}
+return
 
 ^CapsLock::
 global OCR := "CAPS"

diff --git a/AHK script.ahk b/AHK script.ahk
@@ -16,6 +16,14 @@ ScaleY(y)
 ; the code below will only run for CK3
 #ifWinActive, ahk_exe ck3.exe
 
++F1::
+SendInput, {Shift up}
+SendInput, {PgUp}
+return
++F2::
+SendInput, {Shift up}
+SendInput, {PgDn}
+return
 
 ^CapsLock::
 global OCR := "CAPS"

diff --git a/AutoHotkey Spanish.exe b/AutoHotkey Spanish.exe
diff --git a/AutoHotkey.exe b/AutoHotkey.exe
diff --git a/OCR-Support/fonts/Inconsolata-Regular.ttf b/OCR-Support/fonts/Inconsolata-Regular.ttf
diff --git a/OCR-Support/fonts/OCRAStd.otf b/OCR-Support/fonts/OCRAStd.otf
diff --git a/OCR-Support/fonts/fonts.font b/OCR-Support/fonts/fonts.font
@@ -59,14 +59,20 @@ fontfiles = {
 	}
 }
 
+### this is the new tweaked font we're using
+
 fontfiles = {
 	name = "Gitan_0"
 	always_load = yes
 
 	group = {
-		languages = { "l_english" "l_french" "l_german" "l_spanish" }
+		languages = { "l_english"}
 		files = { "fonts/Gitan_0.otf" }
 	}
+	group = {
+		languages = {"l_french" "l_german" "l_spanish" }
+		files = { "fonts/Gitan/GitanLatin-Regular.otf" "fonts/Open_Sans/OpenSans-SemiBold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Medium.otf" "fonts/Korean_fontset/IropkeBatangM.ttf" }
+	}
 	group = {
 		languages = { "l_russian" }
 		files = { "fonts/Open_Sans/OpenSans-SemiBold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Medium.otf" "fonts/Korean_fontset/IropkeBatangM.ttf" }
@@ -83,22 +89,92 @@ fontfiles = {
 }
 
 fontfiles = {
-	name = "OCR"
+	name = "Gitan-Bold_0"
 	always_load = yes
 
 	group = {
-		languages = { "l_english" "l_french" "l_german" "l_spanish" }
-		files = { "fonts/OCRAStd.otf" }
+		languages = { "l_english"}
+		files = { "fonts/Gitan_0.otf" }
+	}
+
+	group = {
+		languages = { "l_french" "l_german" "l_spanish" }
+		files = { "fonts/Gitan/GitanLatin-Bold.otf" "fonts/Open_Sans/OpenSans-Bold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IropkeBatangB.ttf" }
+	}
+
+	group = {
+		languages = { "l_russian" }
+		files = { "fonts/Open_Sans/OpenSans-Bold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IropkeBatangB.ttf" }
+	}
+
+	group = {
+		languages = { "l_simp_chinese" }
+		files = { "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Open_Sans/OpenSans-Bold.ttf" "fonts/Korean_fontset/IropkeBatangB.ttf" }
+	}
+
+	group = {
+		languages = { "l_korean" }
+		files = { "fonts/Korean_fontset/IropkeBatangB.ttf" "fonts/Open_Sans/OpenSans-Bold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" }
 	}
 }
 
 fontfiles = {
-	name = "Inconsolata"
+	name = "Gitan-Italic_0"
 	always_load = yes
 
 	group = {
-		languages = { "l_english" "l_french" "l_german" "l_spanish" }
-		files = { "fonts/Inconsolata-Regular.ttf" }
+		languages = { "l_english" }
+		files = { "fonts/Gitan_0.otf" }
+	}
+
+	group = {
+		languages = { "l_french" "l_german" "l_spanish" }
+		files = { "fonts/Gitan/GitanLatin-Italic.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Light.otf" "fonts/Korean_fontset/IBMPlexSansKR-Medium.otf" }
+	}
+
+	group = {
+		languages = { "l_russian" }
+		files = { "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Light.otf" "fonts/Korean_fontset/IBMPlexSansKR-Medium.otf" }
+	}
+
+	group = {
+		languages = { "l_simp_chinese" }
+		files = { "fonts/Noto_Sans_SC/NotoSansSC-Light.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Korean_fontset/IBMPlexSansKR-Medium.otf" }
+	}
+
+	group = {
+		languages = { "l_korean" }
+		files = { "fonts/Korean_fontset/IBMPlexSansKR-Medium.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Light.otf" }
+	}
+}
+
+fontfiles = {
+	name = "Gitan-Bold-Italic_0"
+	always_load = yes
+
+	group = {
+		languages = { "l_english" }
+		files = { "fonts/Gitan_0.otf" }
+	}
+
+	group = {
+		languages = { "l_french" "l_german" "l_spanish" }
+		files = { "fonts/Gitan/GitanLatin-Bold-Italic.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IBMPlexSansKR-SemiBold.otf" }
+	}
+
+	group = {
+		languages = { "l_russian" }
+		files = { "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IBMPlexSansKR-SemiBold.otf" }
+	}
+
+	group = {
+		languages = { "l_simp_chinese" }
+		files = { "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Korean_fontset/IBMPlexSansKR-SemiBold.otf" }
+	}
+
+	group = {
+		languages = { "l_korean" }
+		files = { "fonts/Korean_fontset/IBMPlexSansKR-SemiBold.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" }
 	}
 }
 
@@ -314,17 +390,17 @@ font = {
 
 	fontstyle = {
 		style = bold
-		fontfiles = "Gitan_0"
+		fontfiles = "Gitan-Bold_0"
 	}
 
 	fontstyle = {
 		style = italic
-		fontfiles = "Gitan_0"
+		fontfiles = "Gitan-Italic_0"
 	}
 
 	fontstyle = {
 		style = bold|italic
-		fontfiles = "Gitan_0"
+		fontfiles = "Gitan-Bold-Italic_0"
 	}
 
 	underlineformats = {

diff --git a/OCR-Support/gui/00_interaction_templates.gui b/OCR-Support/gui/00_interaction_templates.gui
@@ -1447,10 +1447,16 @@ types CharacterInteraction
 				layoutpolicy_horizontal = expanding
 				margin = { 0 10 }
 
-				text_label_center = {
-					text = "SCHEME_PREDICTION_NAME"
-					using = Font_Size_Medium
-					default_format = "#high"
+				hbox = {
+					layoutpolicy_horizontal = expanding
+
+					text_single = {
+						text = "SCHEME_PREDICTION_NAME"
+					}
+
+					dot = {}
+
+					expand = {}
 				}
 			}
 		}

diff --git a/OCR-Support/gui/interaction_modify_vassal_window.gui b/OCR-Support/gui/interaction_modify_vassal_window.gui
@@ -122,11 +122,11 @@ window = {
 										}
 
 										text_single = {
-											raw_text = "Opinion will change to [VassalContract.GetVassalOpinionModification|+=]"
+											raw_text = "Opinion will change by [VassalContract.GetVassalOpinionModification|+=]"
 										}
 
 										text_single = {
-											raw_text = ". Current [VassalContract.GetVassal.GetOpinionOf( GetPlayer )]."
+											raw_text = ". Current is [VassalContract.GetVassal.GetOpinionOf( GetPlayer )|+=]."
 										}
 
 										expand = { }

diff --git a/OCR-Support/gui/preload/00_types_OCR.gui b/OCR-Support/gui/preload/00_types_OCR.gui
@@ -546,7 +546,7 @@ types OcrSharedTypes {
 			raw_text = "Ctrl D, dismiss tooltips, requires Autohotkey."
 		}
 		text_single = {
-			raw_text = "O, outliner. Shows your holdins and armies during war."
+			raw_text = "O, outliner. Shows your holdings and armies during war."
 		}
 		text_single = {
 			raw_text = "Space, pause or unpause."
@@ -565,7 +565,7 @@ types OcrSharedTypes {
 		}
 
 		text_single = {
-			raw_text = "Autothotkey shortcuts:"
+			raw_text = "Autohotkey shortcuts:"
 		}
 		text_single = {
 			raw_text = "Shift one, click in the center of the screen. Use for council tasks."
@@ -609,6 +609,12 @@ types OcrSharedTypes {
 		text_single = {
 			raw_text = "Shift F eleven, toggle OCR mode. Also zooms out the camera, if you want to show the map to sighted friends."
 		}
+		text_single = {
+			raw_text = "Shift up and shift down: scroll up or down. Make sure to move the cursor to the list first."
+		}
+		text_single = {
+			raw_text = "Shift F one and Shift F2: Page Up and Page Down."
+		}
 	}
 
 	type error_button = button_text {

diff --git a/OCR-Support/gui/window_army.gui b/OCR-Support/gui/window_army.gui
@@ -106,10 +106,14 @@ window = {
 	}
 
 	widget = {
-		size = { 200 100% }
+		size = { 400 100% }
+
+		# background = { using = Background_Area_Border_Solid }
+
+		# keeping the center of the screen click-through in case the window appears when you're trying to send the army
 
 		widget = {
-			size = { 750 100% }
+			size = { 800 100% }
 
 			vbox = {
 				layoutpolicy_horizontal = expanding

diff --git a/OCR-Support/gui/window_combat.gui b/OCR-Support/gui/window_combat.gui
@@ -187,7 +187,7 @@ window = {
 							datacontext = "[CombatWindow.GetLeftSideMainParticipant]"
 							blockoverride "text" {
 								raw_text = "[Character.GetPrimaryTitle.GetNameNoTierNoTooltip]"
-								align = left
+								margin_left = -3
 							}
 						}
 
@@ -200,7 +200,7 @@ window = {
 							datacontext = "[CombatWindow.GetRightSideMainParticipant]"
 							blockoverride "text" {
 								raw_text = "[Character.GetPrimaryTitle.GetNameNoTierNoTooltip]."
-								align = left
+								margin_left = -3
 							}
 						}
 

diff --git a/OCR-Support/gui/window_title.gui b/OCR-Support/gui/window_title.gui
@@ -124,27 +124,27 @@ window = {
 					hbox = {
 						layoutpolicy_horizontal = expanding
 
-						hbox = {
-							spacing = 3
-
-							text_single = {
-								raw_text = "[TitleViewWindow.GetTitle.GetNameNoTooltip|U]."
-								max_width = 350
-								autoresize = yes
-								fontsize_min = 14
-							}
+						button_text = {
+							blockoverride "pre" {
+								text_single = {
+									raw_text = "[TitleViewWindow.GetTitle.GetNameNoTooltip|U]."
+									max_width = 350
+									autoresize = yes
+									fontsize_min = 14
+								}
 
-							text_single = {
-								visible = "[Not(Title.CanHaveClaim)]"
-								raw_text = "[Title.GetSpecialDescription]."
+								text_single = {
+									visible = "[Not(Title.CanHaveClaim)]"
+									raw_text = "[Title.GetSpecialDescription]."
+								}
 							}
-						}
-
-						button_text = {
-							visible = "[DataModelHasItems(TitleViewWindow.GetLiegeItems)]"
-								blockoverride "text" {
-										raw_text = "De jure in [Title.GetDeJureLiege.GetNameNoTooltip], Page Up."
+							blockoverride "extra" {
+								text_single = {
+									visible = "[DataModelHasItems(TitleViewWindow.GetLiegeItems)]"
+									raw_text = "De jure in [Title.GetDeJureLiege.GetNameNoTooltip], Page Up."
 								}
+							}
+							enabled = "[DataModelHasItems(TitleViewWindow.GetLiegeItems)]"
 							onclick = "[DefaultOnCoatOfArmsClick(Title.GetDeJureLiege.GetID)]"
 							onclick = "[DefaultOnCoatOfArmsRightClick(Title.GetDeJureLiege.GetID)]"
 							onclick = "[GetScriptedGui('adjacent_titles').Execute( GuiScope.SetRoot( Title.GetDeJureLiege.MakeScope ).End )]"

diff --git a/OCR-Support/localization/english/ocr_l_english.yml b/OCR-Support/localization/english/ocr_l_english.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0.2"
- mod_changes: "Fixed battle summary for knights so NVDA doesn't treat their names as a second column.\nTaught NVDA how to say options.\nRemoved forced event pause for sighted mode and multiplayer."
+ mod_version: "Mod version 1.0.3"
+ mod_changes: "Fixed some typos in Autohotkey shortcuts and vassal contract window.\nAdded Shift F one and Shift F2 as replacements for Page Up and Page down, if you don't have them.\nMentioned the new hotkeys in the tutorial.\nIn the title window, made the whole line with the de jure parent clickable.\nRestored the default fonts for German, French and Spanish to get the accents back."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/english/replace/replace_tutorial_l_english.yml b/OCR-Support/localization/english/replace/replace_tutorial_l_english.yml
@@ -53,11 +53,11 @@ lesson_basics_lifestyle_open_window_tt:2 "Press Control F to open lifestyles."
 lesson_basics_interacting_1_desc:1 "Now, having selected a [focus|E], we can move on to other people!\nInteracting with other [characters|E] is key in Crusader Kings 3, and you have many options for how to do so.\n\nYou may have noticed the prompt in the character window, you can click a character's name to interact with them, including your own.\nThis will open a list of potential [interactions|E], such as arranging a [marriage|E] or starting a [scheme|E]. This is also where you start [wars|E], but let's save that for later.\nYou can also right-click character names wherever they appear in other windows to open this menu.\n\nIf the list is large, some interactions may be hidden, so you'll need to press More Actions to show them."
 
 lesson_basics_open_character_view_tt:0 "1. Open your Character view with F one."
-lesson_basics_open_interactions_tt:2 "2. Select your [player_heir|E], with Page Down (they are at the bottom of the page).\n3. Click their name to see available Interactions."
+lesson_basics_open_interactions_tt:2 "2. Select your [player_heir|E], with Page Down or Shift F2 (they are at the bottom of the page).\n3. Click their name to see available Interactions."
 lesson_basics_send_gift_tt:2 "Confirm a  Send Gift Interaction with your $game_concept_heir$"
 lesson_basics_interacting_3_desc:1 "Well done! You have successfully increased somebody's [opinion|E] of you. Note that you don't have to keep your heir's opinion quite so high, we're just using it as an example.\n\nOpinion ranges from -100 to +100. Certain Opinion modifiers last forever, like family bonds. Others will wane over time, like the fading memory of receiving a monetary gift...\n\nIf you open your heir's window and place your cursor over his opinion of you, it will show where exactly the various numbers are coming from. Is it due to a marriage alliance, a gift of gold, or simply that they appreciate your honest nature?\n\nIf you close the tutorial, you'll find an update on the screen. Backspace will open the update feed — this is where  mildly interesting but non-critical information appears, and goes away after a little while when unpaused."
 
-lesson_basics_interacting_2_desc:2 "Let's start with the basics — everybody likes gold! Try sending a bribe to your [player_heir|E].\n\nOpen your character with F one.\nFind your Heir, Brian, and open interactions with him. You can do it in two ways:\nright-click his name, you may use backslash for it.\nor select him, you may use Page Down, and click his name in his view.\nFind Send Gift interaction and confirm.\n\nMost [interactions|E] will bring up a second window with details when selected. You can confirm or cancel an action in this window."
+lesson_basics_interacting_2_desc:2 "Let's start with the basics — everybody likes gold! Try sending a bribe to your [player_heir|E].\n\nOpen your character with F one.\nFind your Heir, Brian, and open interactions with him. You can do it in two ways:\nright-click his name, you may use backslash for it.\nor select him, you may use Page Down or Shift F2, and click his name in his view.\nFind Send Gift interaction and confirm.\n\nMost [interactions|E] will bring up a second window with details when selected. You can confirm or cancel an action in this window."
 
  lesson_basics_many_lives_1_desc:2 "Next, let's talk about your [dynasty|E]. As the game goes on, unless your [character|E] meets with an untimely "accident" or terrible disease, they will grow old and, eventually, die.\n\nThe story doesn't end there — it's only [game_over|E] if you do not have an heir of your own Dynasty!\n$lesson_basics_many_lives_2_desc$"
 lesson_basics_many_lives_2_desc:5 "As long as your [titles|E] have [heirs|E] of your [dynasty|E], your legacy will live on. When your current [character|E] dies, you simply start playing a new one: the [player_heir|E].\nIn some cases, when you take over your new Character, you may even find that they are responsible for the untimely demise of your previous Ruler...\n\nDepending on the type of [succession|E] your [realm|E] has, your heir will likely be one of your children — perhaps one that you have groomed to [Concept( 'ruler', 'Rule' )|E]?\n\nYou only have one heir right now, but let's look anyway.\nPress F2 to open your realm and three to switch to succession."
@@ -89,7 +89,7 @@ lesson_basics_dynasty_and_house_desc:0 "In the future, you might end up inheriti
 
 lesson_basics_de_jure_titles_desc:4 "Open your character with F one and press T or click on the line Duke of Munster. This will open the title window for your duchy, or petty kingdom. Many titles have such dynamic names, like Emirate or Earldom.\n\nThis window says how many counties in the title you control and shows other claimants. In the future you can invite claimants on other titles and declare wars for their claims, so they will become your vassals (as long as your title is a higher rank).\n\nSecond tab shows the de jure hierarchy of the title. Earldom of Desmond is supposed to belong to it, which lets you vassalize the Earl of Desmond, either through war or diplomacy. We will do this a few lessons later, for now let's explore the de jure structure around Ireland."
 
-lesson_basics_de_jure_cbs_desc: "Press page up to go to the de jure parent of your duchy, Kingdom of Ireland.\nDe jure tab shows duchies inside it, while counties tab lists all individual counties.\nOn the general tab you'll see the requirements to form it. You only need the majority of de jure counties in a title to create it, 8 out of 14 in this case, plus another duchy. Consider this your goal for the tutorial.\n\nSimilar to adjacent rulers, you can open adjacent titles, with Control A. Feel free to browse around de jure kingdoms or check out de jure empires, by going one level higher with Page Up.\nIn the next lesson, we will return down to earth and interact with counties."
+lesson_basics_de_jure_cbs_desc: "Select the de jure parent of your duchy, Kingdom of Ireland.\nYou can press Page Up or Shift F one to do it quickly.\nDe jure tab shows duchies inside it, while counties tab lists all individual counties.\nOn the general tab you'll see the requirements to form it. You only need the majority of de jure counties in a title to create it, 8 out of 14 in this case, plus another duchy. Consider this your goal for the tutorial.\n\nSimilar to adjacent rulers, you can open adjacent titles, with Control A. Feel free to browse around de jure kingdoms or check out de jure empires, by going one level higher with Page Up or Shift F one.\nIn the next lesson, we will return down to earth and interact with counties."
 
 lesson_basics_change_map_mode_1_tt:1 "Select your capital with Shift+S."
 lesson_basics_change_map_mode_2_tt:0 "Select Petty Kingdom of Munster."