diff --git a/Config/common/scripted_guis.cwt b/Config/common/scripted_guis.cwt index a3c32238..ccbd95f8 100644 --- a/Config/common/scripted_guis.cwt +++ b/Config/common/scripted_guis.cwt @@ -78,7 +78,7 @@ scripted_gui = { ## cardinality = 0..1 properties = { ## cardinality = ~1..inf - scalar = { + value[gui_element_name] = { ## cardinality = 0..1 ### Should return name of the texture in gfx file. image = localisation_inline @@ -94,7 +94,7 @@ scripted_gui = { ## cardinality = 0..1 dynamic_lists = { ## cardinality = ~1..inf - scalar = { + value[gridBoxType_element_name] = { ### The array that will be used for populating the grid. array = variable_field ## cardinality = 0..1 @@ -628,4 +628,72 @@ enums = { test_contesded_states #(states that shares provinces between enemy countries) test_if_only_coastal } + + enum[click_modifiers] = { + _click + _right_click + _alt_click + _control_click + _shift_click + _right_alt_click + _right_control_click + _right_shift_click + _alt_right_click + _alt_control_click + _alt_shift_click + _control_right_click + _control_alt_click + _control_shift_click + _shift_right_click + _shift_alt_click + _shift_control_click + _right_alt_control_click + _right_alt_shift_click + _right_control_alt_click + _right_control_shift_click + _right_shift_alt_click + _right_shift_control_click + _alt_right_shift_click + _alt_right_control_click + _alt_control_shift_click + _alt_control_right_click + _alt_shift_control_click + _alt_shift_right_click + _control_right_alt_click + _control_right_shift_click + _control_alt_right_click + _control_alt_shift_click + _control_shift_right_click + _control_shift_alt_click + _shift_right_control_click + _shift_right_alt_click + _shift_alt_control_click + _shift_alt_right_click + _shift_control_alt_click + _shift_control_right_click + _right_alt_control_shift_click + _right_alt_shift_control_click + _right_control_alt_shift_click + _right_control_shift_alt_click + _right_shift_alt_control_click + _right_shift_control_alt_click + _alt_right_control_shift_click + _alt_right_shift_control_click + _alt_control_right_shift_click + _alt_control_shift_right_click + _alt_shift_right_control_click + _alt_shift_control_right_click + _control_right_shift_alt_click + _control_right_alt_shift_click + _control_alt_shift_right_click + _control_alt_right_shift_click + _control_shift_alt_right_click + _control_shift_right_alt_click + _shift_right_alt_control_click + _shift_right_control_alt_click + _shift_alt_right_control_click + _shift_alt_control_right_click + _shift_control_right_alt_click + _shift_control_alt_right_click + } } diff --git a/Config/effects.cwt b/Config/effects.cwt index 65f02f01..05dda4c9 100644 --- a/Config/effects.cwt +++ b/Config/effects.cwt @@ -177,8 +177,8 @@ alias[effect:remove_building] = { ### Removes specified building in specified state or province. ## scope = state alias[effect:remove_building] = { - tag = value[building_tag] - tag = { + tags = value[building_tag] + tags = { ##cardinality = 1..inf value[building_tag] } @@ -641,6 +641,8 @@ alias[effect:division_template] = { ## cardinality = 0..1 division_names_group = ## cardinality = 0..1 + role = value[ai_template_roles] + ## cardinality = 0..1 override_model = ## cardinality = 0..1 is_locked = bool diff --git a/Config/effects_gtd.cwt b/Config/effects_gtd.cwt index afcdc902..53c1ce73 100644 --- a/Config/effects_gtd.cwt +++ b/Config/effects_gtd.cwt @@ -50,6 +50,8 @@ alias[effect:create_colonial_division_template] = { ## cardinality = 0..1 division_names_group = ## cardinality = 0..1 + role = value[ai_template_roles] + ## cardinality = 0..1 override_model = ## cardinality = 0..1 template_counter = int diff --git a/Config/interface/gui.cwt b/Config/interface/gui.cwt index d99954ff..71a407f4 100644 --- a/Config/interface/gui.cwt +++ b/Config/interface/gui.cwt @@ -25,7 +25,7 @@ containerWindowType = { ### Background texture background = { ## cardinality = 0..1 - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] alias_name[gui_image] = alias_match_left[gui_image] ## cardinality = 0..1 @@ -75,7 +75,7 @@ alias[gui:containerWindowType] = { ### Background texture background = { ## cardinality = 0..1 - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] alias_name[gui_image] = alias_match_left[gui_image] ## cardinality = 0..1 @@ -108,7 +108,7 @@ alias[gui:containerWindowType] = { } ###Drop Down Box, seems to be hardcoded alias[gui:dropDownBoxType] = { - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 ### Mouse Draggable moveable = bool @@ -128,7 +128,7 @@ alias[gui:dropDownBoxType] = { ### Background texture background = { ## cardinality = 0..1 - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] alias_name[gui_image] = alias_match_left[gui_image] ## cardinality = 0..1 @@ -160,7 +160,7 @@ alias[gui:dropDownBoxType] = { scroll_wheel_factor = float ##cardinality = 0..1 expandButton = { - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 ### Special size version for buttons size = { @@ -193,7 +193,7 @@ alias[gui:dropDownBoxType] = { } ## cardinality = 0..1 expandedWindow = { - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 ### Mouse Draggable moveable = bool @@ -209,7 +209,7 @@ alias[gui:dropDownBoxType] = { ### Background texture background = { ## cardinality = 0..1 - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] alias_name[gui_image] = alias_match_left[gui_image] ## cardinality = 0..1 @@ -243,7 +243,7 @@ alias[gui:dropDownBoxType] = { } ###Button Element alias[gui:buttonType] = { - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 ### Special size version for buttons size = { @@ -280,7 +280,7 @@ alias[gui:buttonType] = { ### Hardcoded alias[gui:OverlappingElementsBoxType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] ## cardinality = 0..1 spacing = float @@ -292,7 +292,8 @@ alias[gui:OverlappingElementsBoxType] = { ### Dynamic List alias[gui:gridBoxType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] + name = value_set[gridBoxType_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] ## cardinality = 0..1 @@ -332,7 +333,7 @@ alias[gui:gridBoxType] = { ## cardinality = 0..1 background = { ## cardinality = 0..1 - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] alias_name[gui_image] = alias_match_left[gui_image] ## cardinality = 0..1 @@ -345,7 +346,7 @@ alias[gui:gridBoxType] = { ### Dynamic List alias[gui:listBoxType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] ## cardinality = 0..1 @@ -367,7 +368,7 @@ alias[gui:listBoxType] = { ### Dynamic List alias[gui:smoothListBoxType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] ## cardinality = 0..1 @@ -393,6 +394,7 @@ alias[gui:smoothListBoxType] = { alias[gui:iconType] = { ### Name referenced by scripted gui name = value_set[iconType_name] + name = value_set[gui_element_name] ##cardinality = ~1..1 alias_name[any_image_type] = alias_match_left[any_image_type] alias_name[gui_image] = alias_match_left[gui_image] @@ -402,7 +404,7 @@ alias[gui:iconType] = { ###Unknown, seems to be only used with hardcoded things alias[gui:positionType] = { ## cardinality = ~1..1 - name = scalar + name = value_set[gui_element_name] position = { x = int[-3840..3840] x = float[-3840..3840] @@ -415,7 +417,7 @@ alias[gui:positionType] = { ###Browser, hardcoded alias[gui:browserType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] ##cardinality = ~1..1 alias_name[any_image_type] = alias_match_left[any_image_type] alias_name[gui_image] = alias_match_left[gui_image] @@ -425,7 +427,7 @@ alias[gui:browserType] = { ###Text box alias[gui:instantTextBoxType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 ## cardinality = 0..1 font = scalar @@ -471,7 +473,7 @@ alias[gui:instantTextBoxType] = { ###Editable text box - only works with hardcoded HoI4 elements alias[gui:editBoxType] = { ### Name referenced by scripted gui - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 text = localisation ## cardinality = 0..1 @@ -527,7 +529,7 @@ alias[gui:editBoxType] = { } ### Checkbox alias[gui:checkboxType] = { - name = scalar + name = value_set[gui_element_name] ## cardinality = 0..1 buttonText = localisation ## cardinality = 0..1 @@ -540,7 +542,7 @@ alias[gui:checkboxType] = { alias_name[gui_localization] = alias_match_left[gui_localization] } alias[gui:scrollbarType] = { - name = scalar + name = value_set[gui_element_name] slider = scalar track = scalar leftbutton = scalar @@ -556,7 +558,7 @@ alias[gui:scrollbarType] = { horizontal = int ## cardinality = 4..4 guiButtonType = { - name = scalar + name = value_set[gui_element_name] quadTextureSprite = position = {x=int y=int} ## cardinality = 0..1 @@ -564,13 +566,13 @@ alias[gui:scrollbarType] = { } } alias[gui:extendedScrollbarType] = { - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] ## cardinality = 0..1 background = { ## cardinality = 0..1 - name = scalar + name = value_set[gui_element_name] alias_name[gui_standard] = alias_match_left[gui_standard] alias_name[gui_image] = alias_match_left[gui_image] ## cardinality = 0..1 @@ -609,7 +611,7 @@ alias[gui:extendedScrollbarType] = { ##cardinality = 1..1 ###Slider for scroll bar slider = { - name = scalar + name = value_set[gui_element_name] alias_name[gui_image] = alias_match_left[gui_image] position = { x = int[-3840..3840] @@ -622,7 +624,7 @@ alias[gui:extendedScrollbarType] = { ##cardinality = 1..1 ###Slider for scroll bar track = { - name = scalar + name = value_set[gui_element_name] alias_name[gui_image] = alias_match_left[gui_image] position = { x = int[-3840..3840] @@ -635,7 +637,7 @@ alias[gui:extendedScrollbarType] = { ##cardinality = 0..1 ###Increase button increaseButton = { - name = scalar + name = value_set[gui_element_name] alias_name[gui_image] = alias_match_left[gui_image] alias_name[gui_sound] = alias_match_left[gui_sound] position = { @@ -649,7 +651,7 @@ alias[gui:extendedScrollbarType] = { ##cardinality = 0..1 ###Decrease button decreaseButton = { - name = scalar + name = value_set[gui_element_name] alias_name[gui_image] = alias_match_left[gui_image] alias_name[gui_sound] = alias_match_left[gui_sound] position = { @@ -663,7 +665,7 @@ alias[gui:extendedScrollbarType] = { ##cardinality = 0..1 ###Decrease button slider = { - name = scalar + name = value_set[gui_element_name] alias_name[gui_image] = alias_match_left[gui_image] position = { x = int[-3840..3840] diff --git a/Config/triggers_gtd.cwt b/Config/triggers_gtd.cwt index b34ef710..eb1f5e4a 100644 --- a/Config/triggers_gtd.cwt +++ b/Config/triggers_gtd.cwt @@ -120,6 +120,7 @@ alias[trigger:has_naval_invasion_against_state] = { ### check if any state in the given category meets the trigger. ## scope = any +## push_scope = state alias[trigger:any_state_in] = { ## cardinality = 0..1 tooltip = localisation @@ -129,6 +130,7 @@ alias[trigger:any_state_in] = { } ### check if any state in the given category meets the trigger. ## scope = any +## push_scope = state alias[trigger:any_state_in] = { ## cardinality = 0..1 tooltip = localisation @@ -138,6 +140,7 @@ alias[trigger:any_state_in] = { } ### check if any state in the given category meets the trigger. ## scope = any +## push_scope = state alias[trigger:any_state_in] = { ## cardinality = 0..1 tooltip = localisation @@ -147,6 +150,7 @@ alias[trigger:any_state_in] = { } ### check if any state in the given category meets the trigger. ## scope = any +## push_scope = state alias[trigger:any_state_in] = { ## cardinality = 0..1 tooltip = localisation