Skip to content

Commit

Permalink
Merge pull request #266 from Rift-Walker/sp_advanced_settings
Browse files Browse the repository at this point in the history 
Eras and mods for sp. Configure, [option]s, and connect for sp. Fix saves for updated sp codepath.
  • Loading branch information
@Rift-Walker
Rift-Walker committed Aug 13, 2014
2 parents 8f49cba + e03369a commit 4b9ffe6
Show file tree
Hide file tree
Showing 32 changed files with 921 additions and 66 deletions.
5 changes: 5 additions & 0 deletions changelog
View file
Expand Up @@ -28,6 +28,9 @@ Version 1.13.0-dev:
* Fix bug in Return Guardian Micro AI when there is no path to the return hex
* Campaigns:
* Changed all occurrences of {FLAG_VARIANT ragged} to {FLAG_VARIANT6 ragged}
* Singleplayer campaign creation now utilizes the create, configure,
and connect engines from the multiplayer codepath.
* Eras, mods, and options are now available for sp campaigns.
* Descent into Darkness:
* Fixed various issues with player and enemy gold and income in
'Descent into Darkness'.
Expand Down Expand Up @@ -105,6 +108,8 @@ Version 1.13.0-dev:
* Fixed AI engine names in the MP game setup screen being translated to the
language selected when Wesnoth was started rather than the current
language (bug #22092).
* Added a new "Advanced Settings" button and dialog to campaign select.
* Added new wml attributes to listbox: has_minimum and has_maximum.
* WML engine:
* Added customizable recall costs for unit types and individual units,
using the new recall_cost attribute in [unit_type] and [unit].
Expand Down
14 changes: 14 additions & 0 deletions data/gui/default/window/campaign_dialog.cfg
View file
Expand Up @@ -411,6 +411,20 @@
[row]
grow_factor = 0

[column]
border = "all"
border_size = 5

horizontal_alignment = "left"

[button]
id = "advanced_settings"
definition = "default"
label = _ "Advanced Settings"
[/button]

[/column]

[column]
border = "all"
border_size = 5
Expand Down
337 changes: 337 additions & 0 deletions data/gui/default/window/campaign_settings.cfg
View file
@@ -0,0 +1,337 @@
#textdomain wesnoth-lib

[window]
id = "campaign_settings"
description = "Singleplayer advanced settings dialog."

[resolution]
definition = "default"

maximum_width = 800

automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"

[linked_group]
id = "era"
fixed_width = "true"
[/linked_group]

[linked_group]
id = "mod"
fixed_width = "true"
[/linked_group]

[tooltip]
id = "tooltip_large"
[/tooltip]

[helptip]
id = "tooltip_large"
[/helptip]

[grid]

[row]
grow_factor = 0

[column]
grow_factor = 1

border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "title"

label = _ "Advanced Settings"
[/label]

[/column]

[column]

horizontal_grow = "true"
vertical_grow = "true"

[spacer]
[/spacer]

[/column]

[/row]

[row]

[column]
grow_factor = 1

border = "all"
border_size = 5
horizontal_alignment = "left"

[label]
definition = "default"

label = _ "Additional Dialogs:"
[/label]

[/column]

[column]

[spacer]
[/spacer]

[/column]

[/row]

[row]

[column]
grow_factor = 1

border = "all"
border_size = 5
horizontal_alignment = "left"

[toggle_button]
definition = "default"
id = "mp_configure"

label = _ "Level Options"
[/toggle_button]

[/column]

[column]
grow_factor = 1

border = "all"
border_size = 5
horizontal_alignment = "left"

[toggle_button]
definition = "default"
id = "mp_connect"

label = _ "Configure Sides"
[/toggle_button]

[/column]

[/row]

[row]
[column]
[spacer]
height = 5
[/spacer]
[/column]
[column]
[spacer]
height = 5
[/spacer]
[/column]
[/row]

[row]

[column]

horizontal_grow = "true"
vertical_grow = "true"

[grid]

[row]
grow_factor = 0

[column]
border = "all"
border_size = 5
horizontal_grow = "true"

[label]
definition = "default"
id = "era_label"

label = _ "Era:"
[/label]

[/column]

[/row]

[row]
grow_factor = 1

[column]
border = "all"
border_size = 5

horizontal_grow = "true"
vertical_grow = "true"

[listbox]
id = "era_list"
definition = "default"

[list_definition]

[row]

[column]
horizontal_grow = "true"
vertical_grow = "true"

[toggle_panel]
definition = "default"

[grid]

[row]

[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5

[label]
id = "era"
linked_group = "era"
definition = "default"
[/label]

[/column]

[/row]

[/grid]

[/toggle_panel]

[/column]

[/row]

[/list_definition]

[/listbox]

[/column]

[/row]

[/grid]

[/column]

[column]
horizontal_grow = "true"
vertical_grow = "true"

[grid]

[row]

[column]
border = "all"
border_size = 5
horizontal_grow = "true"

[label]
definition = "default"
id = "mod_label"

label = _ "Modifications:"
[/label]

[/column]

[/row]

[row]

[column]
border = "all"
border_size = 5

horizontal_grow = "true"
vertical_grow = "true"

[listbox]
id = "modification_list"
definition = "default"
has_minimum = false
has_maximum = false

[list_definition]

[row]

[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5

[toggle_button]
id = "mod"
linked_group = "mod"
definition = "default"
[/toggle_button]

[/column]

[/row]

[/list_definition]

[/listbox]

[/column]

[/row]

[/grid]

[/column]

[/row]

[row]
grow_factor = 0

[column]

[spacer]
[/spacer]

[/column]

[column]
border = "all"
border_size = 5

horizontal_alignment = "right"

[button]
id = "ok"
definition = "default"

label = _ "OK"
[/button]

[/column]

[/row]

[/grid]

[/resolution]

[/window]
10 changes: 10 additions & 0 deletions data/gui/schema.cfg
View file
Expand Up @@ -1504,6 +1504,16 @@
type="scrollbar_mode"
default=initial_auto
[/key]
[key]
name="has_minimum"
type="bool"
default=true
[/key]
[key]
name="has_maximum"
type="bool"
default=true
[/key]
[/tag]
[tag]
name="matrix"
Expand Down

0 comments on commit 4b9ffe6

Please sign in to comment.