diff --git a/data/campaigns/World_Conquest/_main.cfg b/data/campaigns/World_Conquest/_main.cfg index b8ca2a13fdc..85a26821ddf 100644 --- a/data/campaigns/World_Conquest/_main.cfg +++ b/data/campaigns/World_Conquest/_main.cfg @@ -26,7 +26,8 @@ {./era/factions} {./era/campaign} -{./resources} +{./resources/data} +{./resources/strings} {./scenarios} #define WC_II_PAIR UNIT1 UNIT2 @@ -92,5 +93,58 @@ Includes an in-game help to know pairs status, with a right-click on an empty he [/world_conquest_data] [/resource] -{WORLD_CONQUEST_II_CAMPAIGN_RESOURCE} +# the campaign-specific resources +[resource] + id = "wc2_scenario_res" + [lua] + code = " wesnoth.dofile('campaigns/World_Conquest/lua/campaign_main.lua') " + [/lua] + [load_resource] + id = "wc2_trainer_data" + [/load_resource] + [load_resource] + id = "wc2_artifact_data" + [/load_resource] + [load_resource] + id = "wc2_trait_data" + [/load_resource] +[/resource] + +[resource] + id = "wc2_trait_data" + [world_conquest_data] + [trait_heroic] + {WORLD_CONQUEST_II_TRAIT_HEROIC} + [/trait_heroic] + [trait_expert] + {WORLD_CONQUEST_II_TRAIT_EXPERT} + [/trait_expert] + [/world_conquest_data] +[/resource] + +[resource] + id = "wc2_trainer_data" + [world_conquest_data] + {WORLD_CONQUEST_TEK_TRAINER_DEFINITIONS} + [/world_conquest_data] +[/resource] + +[resource] + id = "wc2_artifact_data" + [world_conquest_data] + {WORLD_CONQUEST_TEK_ARTIFACT_DEFINITIONS} + [/world_conquest_data] +[/resource] + +[resource] + id = "wc2_scenario_res_extra" + ## additional mods that work independent on the wc2 core. + ## but note that they use our utils.lua and assume it to be present in global namespace. + [lua] + code = " wesnoth.dofile('campaigns/World_Conquest/lua/optional_mechanics/destruction.lua') " + [/lua] + [lua] + code = " wesnoth.dofile('campaigns/World_Conquest/lua/optional_mechanics/unitmarker.lua') " + [/lua] +[/resource] #endif diff --git a/data/campaigns/World_Conquest/resources/resources.cfg b/data/campaigns/World_Conquest/resources/resources.cfg deleted file mode 100644 index eb14fa07fd0..00000000000 --- a/data/campaigns/World_Conquest/resources/resources.cfg +++ /dev/null @@ -1,61 +0,0 @@ -#textdomain wesnoth-wc -## add subfolders -{./data} -{./strings} - -#define WORLD_CONQUEST_II_CAMPAIGN_RESOURCE - [resource] - id = "wc2_scenario_res" - [lua] - code = " wesnoth.dofile('campaigns/World_Conquest//lua/campaign_main.lua') " - [/lua] - [load_resource] - id = "wc2_trainer_data" - [/load_resource] - [load_resource] - id = "wc2_artifact_data" - [/load_resource] - [load_resource] - id = "wc2_trait_data" - [/load_resource] - [/resource] - - [resource] - id = "wc2_trait_data" - [world_conquest_data] - [trait_heroic] - {WORLD_CONQUEST_II_TRAIT_HEROIC} - [/trait_heroic] - [trait_expert] - {WORLD_CONQUEST_II_TRAIT_EXPERT} - [/trait_expert] - [/world_conquest_data] - [/resource] - - [resource] - id = "wc2_trainer_data" - [world_conquest_data] - {WORLD_CONQUEST_TEK_TRAINER_DEFINITIONS} - [/world_conquest_data] - [/resource] - - [resource] - id = "wc2_artifact_data" - [world_conquest_data] - {WORLD_CONQUEST_TEK_ARTIFACT_DEFINITIONS} - [/world_conquest_data] - [/resource] - - [resource] - id = "wc2_scenario_res_extra" - ## additional mods that work independent on the wc2 core. - ## but note that they use our utils.lua and assume it to be present in global namespace. - [lua] - code = " wesnoth.dofile('campaigns/World_Conquest//lua/optional_mechanics/destruction.lua') " - [/lua] - [lua] - code = " wesnoth.dofile('campaigns/World_Conquest//lua/optional_mechanics/unitmarker.lua') " - [/lua] - [/resource] - -#enddef