Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove WC's custom Pick Your Advancements mod #6807

Merged
merged 2 commits into from
Jun 29, 2022
Merged

Remove WC's custom Pick Your Advancements mod #6807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afb14df
Remove WC's custom Pick Your Advancements mod
CelticMinstrel Jun 28, 2022
c8acde0
Remove PYA from options screen
CelticMinstrel Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 0 additions & 20 deletions data/campaigns/World_Conquest/gui/help_dialog.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,26 +580,6 @@
vertical_alignment = "top"
grow_factor = 1
[grid]
[row]
[column]
horizontal_alignment = "left"
border = "all"
border_size = 5
[label]
definition = "gold_small"
label = "Use WC2 PYA mod"
[/label]
[/column]
[column]
horizontal_alignment = "center"
border = "all"
border_size = 5
[toggle_button]
definition = "no_label"
id="checkbox_use_pya"
[/toggle_button]
[/column]
[/row]
[row]
[column]
horizontal_alignment = "left"
Expand Down
2 changes: 0 additions & 2 deletions data/campaigns/World_Conquest/lua/game_mechanics/wocopedia/help.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,6 @@ function wesnoth.wml_actions.wc2_show_wocopedia(cfg)
page_type = "settings",
}

page.checkbox_use_pya.selected = not not wml.variables["wc2_config_enable_pya"]
page.checkbox_use_pya.enabled = false
page.checkbox_use_markers.selected = not not wml.variables["wc2_config_enable_unitmarker"]
page.checkbox_use_markers.enabled = false
page.checkbox_use_pickup.selected = not not wml.variables["wc2_config_experimental_pickup"]
Expand Down
6 changes: 0 additions & 6 deletions data/campaigns/World_Conquest/lua/map/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ function wc_ii_generate_scenario(nplayers, gen_args)
},
},
options = {
wml.tag.checkbox {
id="wc2_config_enable_pya",
default=true,
name="Enable advancement mod",
description="enables the buildin mod to preselect what unit will advance into, disable this to be compatible with other mods that do the same thing",
},
wml.tag.checkbox {
id="wc2_config_enable_unitmarker",
default=true,
Expand Down
96 changes: 0 additions & 96 deletions data/campaigns/World_Conquest/lua/optional_mechanics/pick_advance.lua
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions data/campaigns/World_Conquest/resources/resources.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@
[lua]
code = " wesnoth.dofile('campaigns/World_Conquest//lua/optional_mechanics/destruction.lua') "
[/lua]
[lua]
code = " wesnoth.dofile('campaigns/World_Conquest//lua/optional_mechanics/pick_advance.lua') "
[/lua]
[lua]
code = " wesnoth.dofile('campaigns/World_Conquest//lua/optional_mechanics/unitmarker.lua') "
[/lua]
Expand Down