1.12.01

Fixed game rules being limited to 200.
Added numbers to wars, when calling an ally to war. Should fix an issue 
with clicks.
Added how many of adjacent rulers are at war.

OCR-Support/common/script_values/sval_OCR.txt

@@ -663,6 +663,49 @@ neighbours_sval = {
 	}
 }
 
+adjacent_rulers_at_war = {
+	every_in_list = {
+		limit = { is_at_war = yes }
+		variable = adjacent_rulers
+		add = 1
+	}
+}
+
+adjacent_vassals_at_war = {
+	every_in_list = {
+		limit = { is_at_war = yes }
+		variable = adjacent_vassals
+		add = 1
+	}
+}
+
+adjacent_rulers_across_water_at_war = {
+	every_in_list = {
+		limit = { is_at_war = yes }
+		variable = adjacent_rulers_across_water
+		add = 1
+	}
+}
+
+neighbours_at_war_sval = {
+	every_in_list = {
+		limit = { is_at_war = yes }
+		variable = adjacent_rulers
+		add = 1
+	}
+	every_in_list = {
+		limit = { is_at_war = yes }
+		variable = adjacent_vassals
+		add = 1
+	}
+	every_in_list = {
+		limit = { is_at_war = yes }
+		variable = adjacent_rulers_across_water
+		add = 1
+	}
+}
+
+
 unmarried_children = {
 	every_child = {
 		limit = {

OCR-Support/gui/game_rules.gui

@@ -25,9 +25,10 @@ window = {
 		size = { 100% 100% }
 		using = ocr
 
+
 		vbox = {
 			# visible = "[Is('rules_page')]"
-			datamodel = "[GetNullCharacterDataModel('(int32)5')]"
+			datamodel = "[DataModelFirst(JominiGameRules.GetSettings, '(int32)5')]"
 
 			item = {
 				button = {
@@ -87,7 +88,7 @@ window = {
 				# spacing = 5
 
 				hbox = {
-				    layoutpolicy_horizontal = expanding
+		    layoutpolicy_horizontal = expanding
 
 					button_text = {
 						onclick = "[Toggle('game_rules_list')]"
@@ -199,7 +200,7 @@ window = {
 							vbox = {
 								visible = "[GreaterThan_int32(GetDataModelSize(JominiGameRules.GetVisibleSettings), '(int32)40')]"
 								layoutpolicy_horizontal = expanding
-								datamodel = "[GetNullCharacterDataModel( FixedPointToInt(Add_CFixedPoint(Divide_CFixedPoint(IntToFixedPoint(GetDataModelSize(JominiGameRules.GetVisibleSettings)), '(CFixedPoint)40'), '(CFixedPoint)0.99')) )]"
+								datamodel = "[DataModelFirst(JominiGameRules.GetVisibleSettings, FixedPointToInt(Add_CFixedPoint(Divide_CFixedPoint(IntToFixedPoint(GetDataModelSize(JominiGameRules.GetVisibleSettings)), '(CFixedPoint)40'), '(CFixedPoint)0.99')))]"
 
 								text_single = {
 									layoutpolicy_horizontal = expanding

OCR-Support/gui/interaction_call_ally.gui

@@ -28,6 +28,7 @@ window = {
 		using = ocr_margins
 		layoutpolicy_horizontal = expanding
 		layoutpolicy_vertical = expanding
+		alwaystransparent = no
 		# set_parent_size_to_minimum = yes
 
 		button = {
@@ -114,6 +115,12 @@ window = {
 						button_text = {
 							layoutpolicy_horizontal = expanding
 							datacontext = "[CallAllyWarItem.GetWar]"
+							blockoverride "num" {}
+							shortcuts_list = {
+								blockoverride "click" {
+									onclick = "[CallAllyWarItem.OnClick]"
+								}
+							}
 							blockoverride "pre" {
 								spacing = 3
 								text_single = {
@@ -125,9 +132,10 @@ window = {
 									raw_text = "Selected,"
 								}
 							}
-						    blockoverride "text" {
+					    blockoverride "text" {
 								raw_text = "[War.GetName]."
-						    }
+								alwaystransparent = yes
+					    }
 							onclick = "[CallAllyWarItem.OnClick]"
 							down = "[CallAllyWarItem.IsSelected]"
 							enabled = "[CallAllyWarItem.IsEnabled]"

OCR-Support/gui/window_character.gui

@@ -443,6 +443,10 @@ types CharOCRTypes {
 			text_single = {
 				raw_text = "[Character.GetPrimaryTitle.GetNameNoTierNoTooltip],"
 			}
+			text_single = {
+				visible = "[Character.IsAtWar]"
+				raw_text = "at war,"
+			}
 			# text_single = {
 			# 	raw_text = "[Character.GetPrimaryTitle.GetRankConcept],"
 			# }
@@ -458,10 +462,6 @@ types CharOCRTypes {
 			text_single = {
 				raw_text = "[Character.GetMaxMilitaryStrength|0] men,"
 			}
-			text_single = {
-				visible = "[Character.IsAtWar]"
-				raw_text = "at war."
-			}
 			# text_single = {
 			# 	raw_text = "[Character.GetPrimaryTitle.GetTierAsNameNoTooltip]"
 			# }

OCR-Support/gui/window_character_ocr.gui

@@ -986,7 +986,15 @@ types OCR {
 						button_text = {
 							layoutpolicy_horizontal = expanding
 							blockoverride "text" {
-								raw_text = "[Character.MakeScope.ScriptValue('neighbours_sval')] adjacent rulers, Control A."
+								raw_text = "[Character.MakeScope.ScriptValue('neighbours_sval')] adjacent rulers,"
+							}
+							blockoverride "extra" {
+								text_single = {
+									raw_text = "[Character.MakeScope.ScriptValue('neighbours_at_war_sval')] at war,"
+								}
+								text_single = {
+									raw_text = "Control A."
+								}
 							}
 							visible = "[And( And(GreaterThan_int32(Character.RealmSize, '(int32)0'), Not(IsLandlessAdventurer(Character))), Character.IsAlive)]"
 							onclick = "[GetVariableSystem.Set('expand_view', 'neighbours')]"
@@ -2323,7 +2331,7 @@ types OCR {
 						shortcut = map_mode_1
 						onclick = "[Toggle('collapse_neighbours')]"
 						blockoverride "text" {
-							raw_text = "[Character.MakeScope.ScriptValue('neighbours_sval')] Rulers, [Collapse('collapse_neighbours')] E"
+							raw_text = "[Character.MakeScope.ScriptValue('neighbours_sval')] Rulers, [Character.MakeScope.ScriptValue('neighbours_at_war_sval')] at war, [Collapse('collapse_neighbours')] E"
 						}
 					}
 
@@ -2340,7 +2348,7 @@ types OCR {
 							layoutpolicy_horizontal = expanding
 
 							text_single = {
-								raw_text = "[GetDataModelSize(Character.MakeScope.GetList('adjacent_rulers'))] Independent."
+								raw_text = "[GetDataModelSize(Character.MakeScope.GetList('adjacent_rulers'))] Independent, [Character.MakeScope.ScriptValue('adjacent_rulers_at_war')] at war."
 							}
 							item = {
 								adjacent_ruler_button = { }
@@ -2354,7 +2362,7 @@ types OCR {
 							layoutpolicy_horizontal = expanding
 
 							text_single = {
-								raw_text = "[GetDataModelSize(Character.MakeScope.GetList('adjacent_vassals'))] fellow vassals."
+								raw_text = "[GetDataModelSize(Character.MakeScope.GetList('adjacent_vassals'))] fellow vassals, [Character.MakeScope.ScriptValue('adjacent_vassals_at_war')] at war."
 							}
 							item = {
 								adjacent_ruler_button = { }
@@ -2368,7 +2376,7 @@ types OCR {
 							layoutpolicy_horizontal = expanding
 
 							text_single = {
-								raw_text = "[GetDataModelSize(Character.MakeScope.GetList('adjacent_rulers_across_water'))] Across water."
+								raw_text = "[GetDataModelSize(Character.MakeScope.GetList('adjacent_rulers_across_water'))] Across water, [Character.MakeScope.ScriptValue('adjacent_rulers_across_water_at_war')] at war."
 							}
 							item = {
 								adjacent_ruler_button = { }

OCR-Support/localization/english/ocr_l_english.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""

OCR-Support/localization/french/ocr_l_french.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""

OCR-Support/localization/german/ocr_l_german.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""

OCR-Support/localization/korean/ocr_l_korean.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""

OCR-Support/localization/russian/ocr_l_russian.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""

OCR-Support/localization/simp_chinese/ocr_l_simp_chinese.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""

OCR-Support/localization/spanish/ocr_l_spanish.yml

@@ -18,8 +18,8 @@ LOADING_TIP: "Loading tip:"
 
  test1: "speed_1"
 
- mod_version: "Mod version 1.2 for CK3 1.14"
- mod_changes: "Updated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
+ mod_version: "Mod version 1.2.01 for CK3 1.14"
+ mod_changes: ".01 changes:\nFixed game rules being limited to 200.\nAdded numbers to wars, when calling an ally to war. Should fix an issue with clicks.\nAdded how many of adjacent rulers are at war.\n1.2 Changes:\nUpdated to game version 1.14.\nYou can now play as landless adventurers. With Roads to Power DLC.\nTo do next: admin governments, message settings, music player, update sighted view.\nOther changes: Removed traits from the list of mercenaries because it caused massive lag.\nUpdated the list of holy orders, they apparently weren't converted to text.\nDid some clean up on the bookmark screen.\nMain menu now shows a character of the week."
  prev_changes: ""
  agot_ocr_version: ""
  agot_ocr_mod_changes: ""