Skip to content

Commit

Permalink
1.12.03
Browse files Browse the repository at this point in the history
Added refill buttons for adventurers in the military window.
Added missing provisions label to tooltips.
Changed camp hotkey to Control q.
Added Enter for construct and upgrade buttons in the camp.
  • Loading branch information
Agamidae committed Nov 18, 2024
1 parent cee8648 commit 37bdd1b
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 25 deletions.
Binary file added OCR-Support/gfx/texticons/provisions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions OCR-Support/gui/hud.gui
Original file line number Diff line number Diff line change
Expand Up @@ -2158,6 +2158,7 @@ widget = {
button_text = {
using = NoWindowsOpen
datacontext = "[GetPlayer.GetDomicile]"
shortcut = map_mode_5
onclick = "[ToggleGameViewData( 'domicile', Domicile.Self )]"
blockoverride "text" {
raw_text = "Your [Domicile.GetType.GetNameNoTooltip] is in [Domicile.GetLocation.GetTerrain.GetNameNoTooltip] of [Domicile.GetLocation.GetNameNoTooltip],"
Expand All @@ -2179,9 +2180,13 @@ widget = {
}

text_single = {
raw_text = "[Domicile.GetProvisionsMax]."
raw_text = "[Domicile.GetProvisionsMax],"
}
}

text_single = {
raw_text = "Control Q."
}
}
# blockoverride "extra" {
# text_single = {
Expand Down Expand Up @@ -2930,14 +2935,14 @@ widget = {
button_text = {
name = "hud_camp_button"
widgetid = "hud_camp_button"
shortcut = "council_window"
shortcut = "map_mode_5"
datacontext = "[Character.GetDomicile]"
visible = "[Character.HasDomicile]"

onclick = "[ToggleGameViewData( 'domicile', Domicile.Self )]"
# tooltip = "[Domicile.GetMapPinTooltip( Character.Self )]"
blockoverride "text" {
raw_text = "Your [SelectLocalization(IsLandlessAdventurer( GetPlayer ), 'camp', 'estate')], F4."
raw_text = "Your [SelectLocalization(IsLandlessAdventurer( GetPlayer ), 'camp', 'estate')], Control Q."
}
}

Expand Down
10 changes: 4 additions & 6 deletions OCR-Support/gui/texticons.gui
Original file line number Diff line number Diff line change
Expand Up @@ -2595,12 +2595,10 @@ texticon = {
texticon = {
icon = provisions_icon
iconsize = {
texture = "gfx/interface/icons/icon_camp_supply.dds"
size = { 0 0 }
framesize = { 0 0 }
frame = 1
offset = { 0 6 }
fontsize = 16
texture = "gfx/texticons/provisions.png"
size = { 68 17 }
offset = { 0 4 }
fontsize = 15
}
}

Expand Down
6 changes: 4 additions & 2 deletions OCR-Support/gui/window_domicile.gui
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,7 @@ types OCR {
name = "construct_button"
visible = "[And( DomicileWindow.IsEditMode, Or( DomicileWindow.IsInspectLineTreeBuilding, DomicileBuildingSlot.HasSelectedFreeInternalSlot ) )]"
shortcut = character_finder
shortcut = confirm

onclick = "[DomicileWindow.SetShowConstructionStartedNotification( DomicileWindow.GetSelectedSlotIndex )]"
onclick = "[PostCommand( Domicile.BuildBuilding( DomicileBuilding.Self, DomicileWindow.Self ) )]"
Expand All @@ -928,6 +929,7 @@ types OCR {
button_text = {
name = "upgrade_button"
shortcut = mapmode_duchies_secondary
shortcut = confirm
visible = "[And(And( And( DomicileWindow.IsEditMode, Not( DomicileWindow.IsInspectLineTreeBuilding ) ), Not( DomicileBuildingSlot.HasSelectedFreeInternalSlot ) ), Not(ObjectsEqual(DomicileBuildingSlot.GetBuilding, DomicileWindow.GetSelectedTreeUpgrade)))]"
onclick = "[PostCommand( Domicile.BuildBuilding( DomicileBuilding.Self, DomicileWindow.Self ) )]"
onclick = "[GetVariableSystem.Clear( 'camp_build_view' )]"
Expand Down Expand Up @@ -955,12 +957,12 @@ types OCR {

text_single = {
visible = "[And(And( DomicileWindow.IsEditMode, Or( DomicileWindow.IsInspectLineTreeBuilding, DomicileBuildingSlot.HasSelectedFreeInternalSlot ) ), IsValidCommand( Domicile.BuildBuilding( DomicileBuilding.Self, DomicileWindow.Self ) ))]"
raw_text = "hotkey C,"
raw_text = "Enter or C,"
}

text_single = {
visible = "[And(And( And( DomicileWindow.IsEditMode, Not( DomicileWindow.IsInspectLineTreeBuilding ) ), Not( DomicileBuildingSlot.HasSelectedFreeInternalSlot ) ), IsValidCommand( Domicile.BuildBuilding( DomicileBuilding.Self, DomicileWindow.Self ) ))]"
raw_text = "hotkey U,"
raw_text = "Enter or U,"
}
}

Expand Down
43 changes: 43 additions & 0 deletions OCR-Support/gui/window_military.gui
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,49 @@ window = {
using = tooltip_se
clicksound = "event:/SFX/UI/Unit/Army/sfx_ui_raise_army"
}

button_text = {
layoutpolicy_horizontal = expanding
datacontext = "[MilitaryView.GetMilitaryItem]"
visible = "[And( GetPlayer.GetGovernment.IsType( 'landless_adventurer_government' ), Character.IsPlayerInteractionShown('refill_maa_interaction') )]"
shortcut = map_mode_18

name = "adventurer_refill_shortcut"
datacontext = "[GetPlayer]"
enabled = "[Character.IsPlayerInteractionValid('refill_maa_interaction')]"
onclick = "[Character.OpenPlayerInteraction('refill_maa_interaction')]"
blockoverride "disabled" {
visible = "[Not(Character.IsPlayerInteractionValid('refill_maa_interaction'))]"
}
blockoverride "text" {
raw_text = "[Character.GetPlayerInteractionName('refill_maa_interaction')], Control R."
}
tooltip = "[Character.GetPlayerInteractionTooltip('refill_maa_interaction')]"
using = tooltip_se
clicksound = "event:/SFX/UI/Unit/Army/sfx_ui_raise_army"
}

button_text = {
layoutpolicy_horizontal = expanding
datacontext = "[MilitaryView.GetMilitaryItem]"
visible = "[And( GetPlayer.GetGovernment.IsType( 'landless_adventurer_government' ), Character.IsPlayerInteractionShown('reinforce_soldiers_interaction') )]"
shortcut = map_mode_17

name = "adventurer_reinforce_shortcut"
datacontext = "[GetPlayer]"
enabled = "[Character.IsPlayerInteractionValid('reinforce_soldiers_interaction')]"
blockoverride "disabled" {
visible = "[Not(Character.IsPlayerInteractionValid('reinforce_soldiers_interaction'))]"
}
onclick = "[Character.OpenPlayerInteraction('reinforce_soldiers_interaction')]"
blockoverride "text" {
raw_text = "[Character.GetPlayerInteractionName('reinforce_soldiers_interaction')], Control L."
}
tooltip = "[Character.GetPlayerInteractionTooltip('reinforce_soldiers_interaction')]"
using = tooltip_se
clicksound = "event:/SFX/UI/Unit/Army/sfx_ui_raise_army"
}

}

button_text = {
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/english/ocr_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/french/ocr_l_french.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/german/ocr_l_german.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/korean/ocr_l_korean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/russian/ocr_l_russian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/simp_chinese/ocr_l_simp_chinese.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down
4 changes: 2 additions & 2 deletions OCR-Support/localization/spanish/ocr_l_spanish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOADING_TIP: "Loading tip:"
# 3. push
# 4. upload

mod_version: "Mod version 1.2.02 for CK3 1.14"
mod_changes: ".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:\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."
mod_version: "Mod version 1.2.03 for CK3 1.14"
mod_changes: ".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."
prev_changes: ""
agot_ocr_version: ""
agot_ocr_mod_changes: ""
Expand Down

0 comments on commit 37bdd1b

Please sign in to comment.