Skip to content

Commit

Permalink
1.2.09
Browse files Browse the repository at this point in the history
Added support for Polish language.
Aadjacent counties now show the title of the holder, to avoid confusion 
when people have the same name.
Cleaned up vassal directives in the realm window and added them to the 
character view.
  • Loading branch information
Agamidae committed Dec 1, 2024
1 parent d19f966 commit d8c4d0f
Show file tree
Hide file tree
Showing 18 changed files with 1,249 additions and 35 deletions.
20 changes: 10 additions & 10 deletions OCR-Support/fonts/fonts.font
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_russian" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_russian" "l_spanish" "l_polish" }
files = { "fonts/Open_Sans/OpenSans-SemiBold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IropkeBatangM.ttf" }
}

Expand All @@ -24,7 +24,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_russian" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_russian" "l_spanish" "l_polish"}
files = { "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IBMPlexSansKR-Medium.otf" }
}

Expand All @@ -44,7 +44,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_russian" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_russian" "l_spanish" "l_polish"}
files = { "fonts/Open_Sans_Condensed/OpenSansCondensed-Bold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IropkeBatangB.ttf" }
}

Expand All @@ -70,7 +70,7 @@ fontfiles = {
files = { "fonts/Gitan_0.otf" }
}
group = {
languages = {"l_french" "l_german" "l_spanish" }
languages = {"l_french" "l_german" "l_spanish" "l_polish"}
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 = {
Expand Down Expand Up @@ -184,7 +184,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_spanish" "l_polish" }
files = { "fonts/Gitan/GitanLatin-Regular.otf" "fonts/Open_Sans/OpenSans-SemiBold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Medium.otf" "fonts/Korean_fontset/IropkeBatangM.ttf" }
}

Expand All @@ -209,7 +209,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_spanish" "l_polish"}
files = { "fonts/Gitan/GitanLatin-Bold.otf" "fonts/Open_Sans/OpenSans-Bold.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/IropkeBatangB.ttf" }
}

Expand All @@ -234,7 +234,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_spanish" "l_polish"}
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" }
}

Expand All @@ -259,7 +259,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_spanish" "l_polish"}
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" }
}

Expand All @@ -285,7 +285,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_spanish" "l_polish"}
files = { "fonts/Fondamento/Fondamento-Regular.ttf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/Noto_Sans_SC/NotoSansSC-Bold.otf" "fonts/Korean_fontset/ON_YeossiB.ttf" }
}

Expand All @@ -311,7 +311,7 @@ fontfiles = {
always_load = yes

group = {
languages = { "l_english" "l_french" "l_german" "l_spanish" }
languages = { "l_english" "l_french" "l_german" "l_spanish" "l_polish"}
files = { "fonts/mapfont/Paradox_King_Script.otf" "fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf" "fonts/MonomakhUnicode/MonomakhUnicode.otf" "fonts/Noto_Sans_SC/NotoSansSC-Medium.otf" "fonts/Korean_fontset/GunglipbakmulgwanClassicB.ttf" }
}

Expand Down
2 changes: 1 addition & 1 deletion OCR-Support/gui/interaction_modify_vassal_window.gui
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ window = {
layoutpolicy_horizontal = expanding
datacontext = "[ModifyVassalContractInteractionWindow.GetCharacterInteractionConfirmationWindow]"
datacontext = "[ModifyVassalContractInteractionWindow.GetContractPreview]"
datacontext = "[VassalContract.GetVassal]"
datacontext = "[CharacterInteractionConfirmationWindow.GetRecipient]"


vbox = {
Expand Down
11 changes: 7 additions & 4 deletions OCR-Support/gui/shared/01_lists.gui
Original file line number Diff line number Diff line change
Expand Up @@ -299,18 +299,21 @@ types OCR {
button_text = {
block "give_directive_button_round" {}
blockoverride "text" {
raw_text = "[Character.Custom('vassal_directive_text')] directive"
raw_text = "[Character.Custom('vassal_directive_text')],"
alwaystransparent = yes
}
visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]"
enabled = "[Character.IsPlayerInteractionValid('give_vassal_directive_interaction')]"
onclick = "[Character.OpenPlayerInteraction('give_vassal_directive_interaction')]"
tooltip = "[Character.GetPlayerInteractionTooltip('give_vassal_directive_interaction')]"
blockoverride "disabled" {
visible = "[Not(Character.IsPlayerInteractionValid('give_vassal_directive_interaction'))]"
blockoverride "extra" {
text_single = {
visible = "[Not(Character.IsPlayerInteractionValid('give_vassal_directive_interaction'))]"
raw_text = "Can't change."
}
}
}


flowcontainer = {
ignoreinvisible = yes
visible = "[Not( VassalContract.IsRightfulLiege )]"
Expand Down
29 changes: 29 additions & 0 deletions OCR-Support/gui/window_character.gui
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,35 @@ types CharOCRTypes {
tooltip = "[Character.GetRelationToStringExtended( GetPlayer )]"
}

hbox = {
layoutpolicy_horizontal = expanding

button_text = {
block "give_directive_button_round" {}
blockoverride "text" {
raw_text = "[Character.Custom('vassal_directive_text')],"
alwaystransparent = yes
}
visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]"
enabled = "[Character.IsPlayerInteractionValid('give_vassal_directive_interaction')]"
onclick = "[Character.OpenPlayerInteraction('give_vassal_directive_interaction')]"
tooltip = "[Character.GetPlayerInteractionTooltip('give_vassal_directive_interaction')]"
blockoverride "extra" {
text_single = {
visible = "[Not(Character.IsPlayerInteractionValid('give_vassal_directive_interaction'))]"
raw_text = "Can't change."
}
}
}

vassal_stance_text = {
margin_left = 3
}

expand = {}
}


flowcontainer = {
ignoreinvisible = yes
layoutpolicy_horizontal = expanding
Expand Down
5 changes: 0 additions & 5 deletions OCR-Support/gui/window_character_ocr.gui
Original file line number Diff line number Diff line change
Expand Up @@ -971,11 +971,6 @@ types OCR {

expand = { }
}

vassal_stance_text = {
margin_left = 5
layoutpolicy_horizontal = expanding
}
}

# geography
Expand Down
2 changes: 1 addition & 1 deletion OCR-Support/gui/window_county_view.gui
Original file line number Diff line number Diff line change
Expand Up @@ -4420,7 +4420,7 @@ types OCR {

text_single = {
visible = "[Not(ObjectsEqual(Title.GetHolder, GetPlayer))]"
raw_text = "held by [Title.GetHolder.GetFirstNameNoTooltip]."
raw_text = "held by [Title.GetHolder.GetFirstNameNoTooltip] of [Title.GetHolder.GetPrimaryTitle.GetNameNoTierNoTooltip]."
}

text_single = {
Expand Down
6 changes: 4 additions & 2 deletions OCR-Support/localization/english/ocr_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ LOADING_TIP: "Loading tip:"
# 4. Disconnect
# 5. upload

mod_version: "Mod version 1.2.08 for CK3 1.14"
mod_changes: ".08 changes: fixed replacing buildings in holdings.\n.07 changes: Added missing descriptions for camp buildings.\n.06 changes: Fixed succession laws missing from the realm window.\n.05 changes: fixed unclickable traits in the ruler designer. Hopefully.\n.04 changes: Fixed a character missing in the event window.\nAlso added the number of characters, ages and their skills.\nFixed advice Finding Contracts.\nClicking an alert will now automatically restore the advice window if it was minimized.\n.03 changes: Added refill buttons for adventurers in the military window.\nAdded missing provisions label to tooltips.\nChanged camp hotkey to Control q.\nAdded Enter for construct and upgrade buttons in the camp.\n.02 changes: Fixed the list of dangers not appearing.\nFixed some dangers listed as both medium and low.\n.01 changes: Fixed 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: 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.09 for CK3 1.14"
mod_changes: ".09 changes: Added support for Polish language.\nAadjacent counties now show the title of the holder, to avoid confusion when people have the same name.\nCleaned up vassal directives in the realm window and added them to the character view.\n1.2 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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
ocr_tc_submod_version: ""
ocr_tc_submod_changes: ""

refusing_directive_text: "Refusing your [directive|E]!"
no_directive_text: "No [directive|E]"


foreign_affairs_text: "$no_affairs$$affairs_wars$"
Expand Down
6 changes: 4 additions & 2 deletions OCR-Support/localization/french/ocr_l_french.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ LOADING_TIP: "Loading tip:"
# 4. Disconnect
# 5. upload

mod_version: "Mod version 1.2.08 for CK3 1.14"
mod_changes: ".08 changes: fixed replacing buildings in holdings.\n.07 changes: Added missing descriptions for camp buildings.\n.06 changes: Fixed succession laws missing from the realm window.\n.05 changes: fixed unclickable traits in the ruler designer. Hopefully.\n.04 changes: Fixed a character missing in the event window.\nAlso added the number of characters, ages and their skills.\nFixed advice Finding Contracts.\nClicking an alert will now automatically restore the advice window if it was minimized.\n.03 changes: Added refill buttons for adventurers in the military window.\nAdded missing provisions label to tooltips.\nChanged camp hotkey to Control q.\nAdded Enter for construct and upgrade buttons in the camp.\n.02 changes: Fixed the list of dangers not appearing.\nFixed some dangers listed as both medium and low.\n.01 changes: Fixed 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: 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.09 for CK3 1.14"
mod_changes: ".09 changes: Added support for Polish language.\nAadjacent counties now show the title of the holder, to avoid confusion when people have the same name.\nCleaned up vassal directives in the realm window and added them to the character view.\n1.2 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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
ocr_tc_submod_version: ""
ocr_tc_submod_changes: ""

refusing_directive_text: "Refusing your [directive|E]!"
no_directive_text: "No [directive|E]"


foreign_affairs_text: "$no_affairs$$affairs_wars$"
Expand Down
6 changes: 4 additions & 2 deletions OCR-Support/localization/german/ocr_l_german.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ LOADING_TIP: "Loading tip:"
# 4. Disconnect
# 5. upload

mod_version: "Mod version 1.2.08 for CK3 1.14"
mod_changes: ".08 changes: fixed replacing buildings in holdings.\n.07 changes: Added missing descriptions for camp buildings.\n.06 changes: Fixed succession laws missing from the realm window.\n.05 changes: fixed unclickable traits in the ruler designer. Hopefully.\n.04 changes: Fixed a character missing in the event window.\nAlso added the number of characters, ages and their skills.\nFixed advice Finding Contracts.\nClicking an alert will now automatically restore the advice window if it was minimized.\n.03 changes: Added refill buttons for adventurers in the military window.\nAdded missing provisions label to tooltips.\nChanged camp hotkey to Control q.\nAdded Enter for construct and upgrade buttons in the camp.\n.02 changes: Fixed the list of dangers not appearing.\nFixed some dangers listed as both medium and low.\n.01 changes: Fixed 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: 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.09 for CK3 1.14"
mod_changes: ".09 changes: Added support for Polish language.\nAadjacent counties now show the title of the holder, to avoid confusion when people have the same name.\nCleaned up vassal directives in the realm window and added them to the character view.\n1.2 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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
ocr_tc_submod_version: ""
ocr_tc_submod_changes: ""

refusing_directive_text: "Refusing your [directive|E]!"
no_directive_text: "No [directive|E]"


foreign_affairs_text: "$no_affairs$$affairs_wars$"
Expand Down
6 changes: 4 additions & 2 deletions OCR-Support/localization/korean/ocr_l_korean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ LOADING_TIP: "Loading tip:"
# 4. Disconnect
# 5. upload

mod_version: "Mod version 1.2.08 for CK3 1.14"
mod_changes: ".08 changes: fixed replacing buildings in holdings.\n.07 changes: Added missing descriptions for camp buildings.\n.06 changes: Fixed succession laws missing from the realm window.\n.05 changes: fixed unclickable traits in the ruler designer. Hopefully.\n.04 changes: Fixed a character missing in the event window.\nAlso added the number of characters, ages and their skills.\nFixed advice Finding Contracts.\nClicking an alert will now automatically restore the advice window if it was minimized.\n.03 changes: Added refill buttons for adventurers in the military window.\nAdded missing provisions label to tooltips.\nChanged camp hotkey to Control q.\nAdded Enter for construct and upgrade buttons in the camp.\n.02 changes: Fixed the list of dangers not appearing.\nFixed some dangers listed as both medium and low.\n.01 changes: Fixed 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: 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.09 for CK3 1.14"
mod_changes: ".09 changes: Added support for Polish language.\nAadjacent counties now show the title of the holder, to avoid confusion when people have the same name.\nCleaned up vassal directives in the realm window and added them to the character view.\n1.2 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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
ocr_tc_submod_version: ""
ocr_tc_submod_changes: ""

refusing_directive_text: "Refusing your [directive|E]!"
no_directive_text: "No [directive|E]"


foreign_affairs_text: "$no_affairs$$affairs_wars$"
Expand Down
8 changes: 8 additions & 0 deletions OCR-Support/localization/polish/common_ocr_l_polish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
l_polish:
ctrl_y: "Control Y"
y: "Y"
disabled: "Disabled"
cant: "Can't"
cant_pick: "Can't pick"
pick: "pick"
tooltip: "tooltip"
25 changes: 25 additions & 0 deletions OCR-Support/localization/polish/km_localisation_l_polish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
l_polish:
km_knight_manager: "Knight Manager"
km_knight_manager_usage_tt: "Uncheck the checkboxes to disallow certain character groups from serving as knight. When unchecked, all characters of that group will no longer be knights and also will not show up in the list anymore. If you want to manually allow a specific character of that group to serve as knight, uncheck his K.M checkbox before disallowing his groups from serving as knight."
km_toggle_kin_cannot_be_knight: "My Dynasty"
km_toggle_kin_cannot_be_knight_tt: "If checked, characters of my dynasty can serve as knight."
km_toggle_children_cannot_be_knight: "My Offspring"
km_toggle_children_cannot_be_knight_tt: "If checked, my children can serve as knights."
km_toggle_family_spouses_cannot_be_knight: "Family Spouses"
km_toggle_family_spouses_cannot_be_knight_tt: "If checked, my spouse and the spouses of my offspring can serve as knights."
km_toggle_councillors_cannot_be_knight: "My Council"
km_toggle_councillors_cannot_be_knight_tt: "If checked, my [councillors] and my [court_positions] can serve as [knights]. Does not affect the Bodyguard and Garuda position, as they will support you in battle."
km_toggle_my_lovers_cannot_be_knight: "My Lovers"
km_toggle_my_lovers_cannot_be_knight_tt: "If checked, my lovers can serve as knight."
km_toggle_bad_fighters_cannot_be_knight: "Bad Fighters"
km_toggle_bad_fighters_cannot_be_knight_tt: "If checked, bad fighters (prowess below 6) can serve as knights."
km_toggle_average_fighters_cannot_be_knight: "Average Fighters"
km_toggle_average_fighters_cannot_be_knight_tt: "If checked, not that great fighters (prowess from 6 to 12) can serve as knights."
km_toggle_court_positions_cannot_be_knight: "Court Positions"
km_toggle_court_positions_cannot_be_knight_tt: "If checked, any character holding any court position (except Champions and Bodyguards) cannot be a knight."
km_toggle_my_heir_cannot_be_knight: "My Heir"
km_toggle_my_heir_cannot_be_knight_tt: "If checked, my heir can serve as knight."
km_toggle_exclude_label: "K.M."
km_toggle_exclude_label_tt: "If unchecked, the character is excluded from the Knight Manager Settings and can be a knight."
knight_manager_mod_vassals_label: "My Vassals"
knight_manager_mod_vassals_tooltip: "If checked, my #E [vassals]#! can serve as #E [knights]#!."
Loading

0 comments on commit d8c4d0f

Please sign in to comment.