1.0.2

Fixed battle summary for knights so NVDA doesn't treat their names as a second column. Taught NVDA how to say options. Removed forced event pause for sighted mode and multiplayer.
Agamidae · Dec 27, 2023 · 5465982 · 5465982
1 parent 7bce506
commit 5465982
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 44 deletions.
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -0,0 +1,21 @@
+name: Release with commit
+
+on:
+  push:
+    branches:
+      - main
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ChanTsune/release-with-commit@v3.0.0
+        with:
+          regexp: "((\\d+([.]\\d+)*)\\d*)((\\s|\\S)*)"
+          regexp_options: "us"
+          release_name: "OCR-Support $1"
+          tag_name: "v$1"
+          body: "$4"
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/OCR-Support/gui/_OCR_WIDGET.gui b/OCR-Support/gui/_OCR_WIDGET.gui
@@ -34,7 +34,7 @@ window = {
 	state = {
 		name = stay_paused
 		# trigger_when = "[And(And(Not(IsGamePaused), Is('pause_event')), Not(Or(GameHasMultiplePlayers, Is('ocr')))]"
-		trigger_when = "[And(And(Not(IsGamePaused), Is('pause_event')), Not(Show('pause_event')))]"
+		trigger_when = "[And(And(And(And(Not(IsGamePaused), Is('pause_event')), Not(Show('pause_event'))), Isnt('ocr')), Not(GameIsMultiplayer))]"
 		on_finish = "[OnPause]"
 		on_finish = "[Clear('pause_event')]"
 	}
@@ -46,9 +46,9 @@ window = {
 
 	# text_single = {
 	# 	background = { using = Background_Area_Border_Solid }
-	# 	position = { 0 120 }
-	# 	visible = "[Is('toasted')]"
-	# 	raw_text = "TOAST"
+	# 	position = { 50 120 }
+	# 	visible = "[GameIsMultiplayer]"
+	# 	raw_text = "Multiplayer!"
 	# }
 
 

diff --git a/OCR-Support/gui/event_windows/character_event.gui b/OCR-Support/gui/event_windows/character_event.gui
@@ -195,6 +195,7 @@ types OCR {
 							text_single = {
 								layoutpolicy_horizontal = expanding
 								raw_text = "[GetDataModelSize(EventWindowData.GetOptions)] options:"
+								margin_bottom = 5
 							}
 
 							item = {

diff --git a/OCR-Support/gui/hud.gui b/OCR-Support/gui/hud.gui
@@ -1372,7 +1372,7 @@ widget = {
 
 							text_single = {
 								resizeparent = yes
-								margin_left = -60
+								margin_left = -56
 								name = "gained_value"
 								raw_text = "[ValueBreakdown.GetValue]."
 							}
@@ -1480,7 +1480,7 @@ widget = {
 			}
 
 			hbox = {
-			    layoutpolicy_horizontal = expanding
+		    layoutpolicy_horizontal = expanding
 				spacing = 3
 
 				datacontext = "[GetPlayer]"
@@ -5631,20 +5631,8 @@ types HUD
 	type container_resource_balance = container {
 		text_single = {
 			name = "balance_pos"
-			visible = "[GreaterThanOrEqualTo_CFixedPoint(PlayerValueItem.GetBalance, '(CFixedPoint)0')]"
-			text = "[PlayerValueItem.GetBalance|1=]"
+			text = "[PlayerValueItem.GetBalance|1=]."
 			max_width = 110
-
-			default_format = "#low"
-		}
-
-		text_single = {
-			name = "balance_neg"
-			visible = "[LessThan_CFixedPoint(PlayerValueItem.GetBalance, '(CFixedPoint)0')]"
-			text = "[PlayerValueItem.GetBalance|1=]"
-			max_width = 110
-
-			default_format = "#N"
 		}
 	}
 

diff --git a/OCR-Support/gui/shared/00_lists.gui b/OCR-Support/gui/shared/00_lists.gui
@@ -1244,7 +1244,8 @@ types Lists
 				block "filters_visible" { }
 
 				blockoverride "text" {
-					raw_text = "Filters[AddTextIf(CharacterSelectionList.FiltersShown, ', opened')][AddTextIf(Not(CharacterSelectionList.IsAllDefault), ', applied')], hotkey F."
+					raw_text = "Filters[AddTextIf(CharacterSelectionList.FiltersShown, ', opened')][AddTextIf(Not(CharacterSelectionList.IsAllDefault), ', applied')] F:"
+					# using : becuse it gives a better pause than a dot. Dunno why
 				}
 
 			}

diff --git a/OCR-Support/gui/window_battle_summary.gui b/OCR-Support/gui/window_battle_summary.gui
@@ -362,22 +362,20 @@ window = {
 
 						hbox = {
 							layoutpolicy_horizontal = expanding
-							spacing = 3
 
 							button_text = {
 								blockoverride "text" {
 									text = "BATTLE_SUMMARY_SOLDIERS"
-									align = left
 								}
 								blockoverride "extra" {
+									comma = {}
 									text_single = {
-										raw_text = ", tab 1"
+										raw_text = "tab 1,"
 									}
 									text_single = {
-										raw_text = ", Selected"
+										raw_text = "Selected."
 										visible = "[BattleSummaryWindow.IsSoldiersShown]"
 									}
-									dot = { }
 								}
 								onclick = "[BattleSummaryWindow.OnShowSoldiers]"
 								onclick = "[BattleSummaryWindow.RestoreSort]"
@@ -388,17 +386,16 @@ window = {
 							button_text = {
 								blockoverride "text" {
 									text = "BATTLE_SUMMARY_KNIGHTS"
-									align = left
 								}
 								blockoverride "extra" {
+									comma = {}
 									text_single = {
-										raw_text = ", tab 2"
+										raw_text = "tab 2,"
 									}
 									text_single = {
-										raw_text = ", Selected"
+										raw_text = "Selected."
 										visible = "[BattleSummaryWindow.IsKnightsShown]"
 									}
-									dot = { }
 								}
 								onclick = "[BattleSummaryWindow.OnShowKnights]"
 								onclick = "[BattleSummaryWindow.RestoreSort]"
@@ -858,14 +855,17 @@ types BattleSummary
 			}
 
 			char_name = {
+				blockoverride "margins" {
+					spacing = 3
+				}
 				# blockoverride "extra" {
 				# 	text_single = {
 				# 		raw_text = "[Character.GetAge]."
 				# 	}
 				# }
 			}
 
-		    expand = { }
+	    expand = { }
 		}
 
 		hbox = {

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.1"
- mod_changes: "Fixed sorting for special buildings.\nAdded advantage at the top of the battle window.\nAdded hotkey 2 to assign or change commander.\nFixed a typo in battle results and rounding of control in the county list."
+ 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."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/french/ocr_l_french.yml b/OCR-Support/localization/french/ocr_l_french.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0"
- mod_changes: "Fixed events increasing speed.\nAdded a togle to auto-unpause events.\nFixed sorting for character counties not refreshing the list.\nTweaked updates to not be read first in some windows."
+ 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."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/german/ocr_l_german.yml b/OCR-Support/localization/german/ocr_l_german.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0"
- mod_changes: "Fixed events increasing speed.\nAdded a togle to auto-unpause events.\nFixed sorting for character counties not refreshing the list.\nTweaked updates to not be read first in some windows."
+ 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."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/korean/ocr_l_korean.yml b/OCR-Support/localization/korean/ocr_l_korean.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0"
- mod_changes: "Fixed events increasing speed.\nAdded a togle to auto-unpause events.\nFixed sorting for character counties not refreshing the list.\nTweaked updates to not be read first in some windows."
+ 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."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/russian/ocr_l_russian.yml b/OCR-Support/localization/russian/ocr_l_russian.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0"
- mod_changes: "Fixed events increasing speed.\nAdded a togle to auto-unpause events.\nFixed sorting for character counties not refreshing the list.\nTweaked updates to not be read first in some windows."
+ 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."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/simp_chinese/ocr_l_simp_chinese.yml b/OCR-Support/localization/simp_chinese/ocr_l_simp_chinese.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0"
- mod_changes: "Fixed events increasing speed.\nAdded a togle to auto-unpause events.\nFixed sorting for character counties not refreshing the list.\nTweaked updates to not be read first in some windows."
+ 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."
  prev_changes: ""
 
 

diff --git a/OCR-Support/localization/spanish/ocr_l_spanish.yml b/OCR-Support/localization/spanish/ocr_l_spanish.yml
@@ -13,8 +13,8 @@
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.0"
- mod_changes: "Fixed events increasing speed.\nAdded a togle to auto-unpause events.\nFixed sorting for character counties not refreshing the list.\nTweaked updates to not be read first in some windows."
+ 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."
  prev_changes: ""