WC: Missed some cases of id_suffix

This commit is contained in:
Celtic Minstrel 2021-06-27 00:38:27 -04:00
parent 0cadfb3286
commit 874af80fb4
3 changed files with 7 additions and 10 deletions

View file

@ -35,7 +35,6 @@ end
function wc_ii_generate_scenario(nplayers, gen_args)
nplayers = settings.nplayers or nplayers
local id_suffix = gen_args.id_suffix or ""
local scenario_extra = wml.get_child(gen_args, "scenario")
local scenario_num = settings.scenario_num or wml.variables.wc2_scenario or 1
--todo: does this work properly in the first scenario?
@ -51,13 +50,13 @@ function wc_ii_generate_scenario(nplayers, gen_args)
lua = {},
load_resource = {
{
id = "wc2_era_res" .. id_suffix
id = "wc2_era_res"
},
{
id = "wc2_scenario_res" .. id_suffix
id = "wc2_scenario_res"
},
{
id = "wc2_scenario_res_extra" .. id_suffix
id = "wc2_scenario_res_extra"
},
},
options = {
@ -80,8 +79,8 @@ function wc_ii_generate_scenario(nplayers, gen_args)
wc2_host_version = "0.8.2"
},
side = {},
id = "WC_II_" .. nplayers .. "p" .. id_suffix,
next_scenario = "WC_II_" .. nplayers .. "p" .. id_suffix,
id = "WC_II_" .. nplayers .. "p"
next_scenario = "WC_II_" .. nplayers .. "p"
description = "WC_II_" .. nplayers .. "p_desc",
modify_placing = false,
-- does this work

View file

@ -30,14 +30,14 @@ _ "World Conquest 3p" #enddef
## code inside ./lua/map does map/scenario generation.
[multiplayer]
id = "WC_II_{PLAYERS}p"
name= {WC_II_CAMPAIGN_NAME_{PLAYERS}P} + ""
name= {WC_II_CAMPAIGN_NAME_{PLAYERS}P}
description = {WC_II_CAMPAIGN_DESC_{PLAYERS}P}
allow_new_game=yes
require_scenario=no
scenario_generation=lua
[generator]
id="WC_II_{PLAYERS}p"
config_name={WC_II_CAMPAIGN_NAME_{PLAYERS}P} + ""
config_name={WC_II_CAMPAIGN_NAME_{PLAYERS}P}
nplayers={PLAYERS}
create_scenario = <<
local a = ...
@ -71,7 +71,6 @@ _ "World Conquest 3p" #enddef
end
>>
#endif
id_suffix=
[scenario]
{DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}

View file

@ -86,7 +86,6 @@
name="scenario"
super="scenario"
[/tag]
{SIMPLE_KEY id_suffix string}
[/then]
[/if]
[/tag]