upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 19:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove config.cfg and era-related single use macros.

Browse Source
This commit is contained in:
Pentarctagon 2022-06-29 21:08:04 -05:00 committed by Pentarctagon
parent 4252fad434
commit 0b6eb2a6e0
3 changed files with 69 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
data/campaigns/World_Conquest/_main.cfg
View File

@ -4,7 +4,19 @@
name="wesnoth-wc"
[/textdomain]
{./config.cfg}
#ifdef EDITOR
#ifndef LOAD_WC2
#define LOAD_WC2
#enddef
#endif
#endif
#ifdef MULTIPLAYER
#ifndef LOAD_WC2
#define LOAD_WC2
#enddef
#endif
#endif
#ifdef LOAD_WC2
@ -12,12 +24,65 @@
path=data/campaigns/World_Conquest
[/binary_path]
{./era}
{./era/factions}
{./era/campaign}
{./resources}
{./scenarios}
{WORLD_CONQUEST_II_ERA}
{WORLD_CONQUEST_II_ERA_RESOURCE}
#define WC_II_PAIR UNIT1 UNIT2
[pair]
types = {UNIT1} + "," + {UNIT2}
[/pair]
#enddef
[era]
id= "{WC_STR_ERA_ID_WC_II}"
name= {WC_STR_ERA_NAME_WC_II}
description= {WC_STR_ERA_DESCRIPTION_WC_II}
hide_help=yes
require_era=no
{MULTIPLAYER_SIDE_RANDOM_WC_II}
{MULTIPLAYER_SIDE_THE_TRUST}
{MULTIPLAYER_SIDE_THE_GUILD}
{MULTIPLAYER_SIDE_THE_HAND}
{MULTIPLAYER_SIDE_THE_MILITIA}
{MULTIPLAYER_SIDE_THE_MARAUDERS}
{MULTIPLAYER_SIDE_THE_HORDE}
{MULTIPLAYER_SIDE_THE_CULT}
{MULTIPLAYER_SIDE_THE_GANG}
{MULTIPLAYER_SIDE_THE_SCOURGE}
{MULTIPLAYER_SIDE_THE_ALLIANCE}
{MULTIPLAYER_SIDE_THE_DEFIANCE}
{MULTIPLAYER_SIDE_THE_ARTISANS}
{MULTIPLAYER_SIDE_THE_EMPIRE}
[load_resource]
id = "wc2_era_res"
[/load_resource]
[/era]
## this is needed in both the era and the campaign, in particular in the campaign this data is used to generate the deserters and the ai sides.
[resource]
id = "wc2_era_res"
[lua]
code = " wesnoth.dofile('campaigns/World_Conquest//lua/era_main.lua') "
[/lua]
[load_resource]
id = "wc2_mainline_heroes"
[/load_resource]
[/resource]
[resource]
id = "wc2_mainline_heroes"
[world_conquest_data]
[hero_types]
{WORLD_CONQUEST_II_ERA_HEROES_TYPES}
[/hero_types]
## array of [trait_extra]
{WORLD_CONQUEST_II_ERA_HEROES_TRAITS}
[/world_conquest_data]
[/resource]
{WORLD_CONQUEST_II_CAMPAIGN_RESOURCE}
#endif

15
data/campaigns/World_Conquest/config.cfg
View File

@ -1,15 +0,0 @@
#textdomain wesnoth-wc
#ifdef EDITOR
#ifndef LOAD_WC2
#define LOAD_WC2
#enddef
#endif
#endif
#ifdef MULTIPLAYER
#ifndef LOAD_WC2
#define LOAD_WC2
#enddef
#endif
#endif

65
data/campaigns/World_Conquest/era/era.cfg
View File

@ -1,65 +0,0 @@
#textdomain wesnoth-wc
## add subfolders
{./factions}
{./campaign}
#define WORLD_CONQUEST_II_ERA
[era]
id= "{WC_STR_ERA_ID_WC_II}"
name= {WC_STR_ERA_NAME_WC_II}
description= {WC_STR_ERA_DESCRIPTION_WC_II}
hide_help=yes
require_era=no
# addon_min_version="8.2"
{MULTIPLAYER_SIDE_RANDOM_WC_II}
{MULTIPLAYER_SIDE_THE_TRUST}
{MULTIPLAYER_SIDE_THE_GUILD}
{MULTIPLAYER_SIDE_THE_HAND}
{MULTIPLAYER_SIDE_THE_MILITIA}
{MULTIPLAYER_SIDE_THE_MARAUDERS}
{MULTIPLAYER_SIDE_THE_HORDE}
{MULTIPLAYER_SIDE_THE_CULT}
{MULTIPLAYER_SIDE_THE_GANG}
{MULTIPLAYER_SIDE_THE_SCOURGE}
{MULTIPLAYER_SIDE_THE_ALLIANCE}
{MULTIPLAYER_SIDE_THE_DEFIANCE}
{MULTIPLAYER_SIDE_THE_ARTISANS}
{MULTIPLAYER_SIDE_THE_EMPIRE}
[load_resource]
id = "wc2_era_res"
[/load_resource]
[/era]
#enddef
#define WORLD_CONQUEST_II_ERA_RESOURCE
## this is needed in both the era and the campaign, in particular in the campaign this data is used to generate the deserters and the ai sides.
[resource]
id = "wc2_era_res"
[lua]
code = " wesnoth.dofile('campaigns/World_Conquest//lua/era_main.lua') "
[/lua]
[load_resource]
id = "wc2_mainline_heroes"
[/load_resource]
[/resource]
[resource]
id = "wc2_mainline_heroes"
[world_conquest_data]
[hero_types]
{WORLD_CONQUEST_II_ERA_HEROES_TYPES}
[/hero_types]
## array of [trait_extra]
{WORLD_CONQUEST_II_ERA_HEROES_TRAITS}
[/world_conquest_data]
[/resource]
#enddef
#define WC_II_PAIR UNIT1 UNIT2
[pair]
types = {UNIT1} + "," + {UNIT2}
[/pair]
#enddef