0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[world conquest] replace deprecated ^Uf and Uft with ^Tf and Tt part-2

Browse source
This commit is contained in:
Tahsin Jahin Khalid 2021-08-11 19:23:22 +06:00 • committed by Pentarctagon
parent 391829dbeb
commit 1b267691f5
32 changed files with 108 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/campaigns/World_Conquest/lua/map/generator/clayey.lua
View file

@ -90,38 +90,38 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Hh",
convert_to="Hh^Vhh",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=5
},
dr_village {
terrain="Hh^Fp",
convert_to="Hh^Vhh",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=4
},
dr_village {
terrain="Hh^Tf",
convert_to="Hh^Vhh",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=3
},
dr_village {
terrain="Mm",
convert_to="Mm^Vhh",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Ww, Ww, Ww, Re, Rd, Rb, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=3
},
-- cave villages
dr_village {
terrain="Uu",
convert_to="Uu^Vu",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm,Ww",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm,Ww",
rating=4
},
dr_village {
terrain="Uh",
convert_to="Uu^Vu",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm,Ww",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm,Ww",
rating=4
},
-- water villages

12
data/campaigns/World_Conquest/lua/map/generator/coral.lua
View file

@ -103,38 +103,38 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Hh",
convert_to="Hh^Vd",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=5
},
dr_village {
terrain="Hh^Fp",
convert_to="Hh^Vd",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=4
},
dr_village {
terrain="Hh^Tf",
convert_to="Hh^Vd",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=3
},
dr_village {
terrain="Mm",
convert_to="Mm^Vd",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Uf, Mm",
adjacent_liked="Gg, Gs, Wwt, Wwrt, Re, Gg, Gs, Re, Rd, Rb, Gg, Gs, Hh, Hh^Fp, Hh^Tf, Mm",
rating=3
},
-- cave villages
dr_village {
terrain="Uu",
convert_to="Uu^Vu",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm",
rating=4
},
dr_village {
terrain="Uh",
convert_to="Uu^Vu",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm",
adjacent_liked="Hh,Hh^Fp,Mm,Uu,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm",
rating=4
},
-- water villages

8
data/campaigns/World_Conquest/lua/map/generator/industrial.lua
View file

@ -142,19 +142,19 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Uu",
convert_to="Uu^Vo",
adjacent_liked="Urb,Hh,Mm,Uu,Uh,Xu,Mm^Xm,Uu^Uf,Uu,Uh,Ww,Ww",
adjacent_liked="Urb,Hh,Mm,Uu,Uh,Xu,Mm^Xm,Uu^Tf,Uu,Uh,Ww,Ww",
rating=5
},
dr_village {
terrain="Uu^Tf",
convert_to="Uh^Vo",
adjacent_liked="Urb,Hh,Mm,Uu,Uh,Xu,Mm^Xm,Uu^Uf,Uu,Uh,Ww,Ww",
adjacent_liked="Urb,Hh,Mm,Uu,Uh,Xu,Mm^Xm,Uu^Tf,Uu,Uh,Ww,Ww",
rating=5
},
dr_village {
terrain="Uh",
convert_to="Uu^Vo",
adjacent_liked="Urb,Hh,Mm,Uu,Uh,Xu,Mm^Xm,Uu^Uf,Uu,Uh,Ww,Ww",
adjacent_liked="Urb,Hh,Mm,Uu,Uh,Xu,Mm^Xm,Uu^Tf,Uu,Uh,Ww,Ww",
rating=5
},
-- villages in forest
@ -217,7 +217,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
},
}
res.castle = {
valid_terrain="Gs, Gg, Hh, Ha, Hh^Uf, Gs^Uf, Ss, Dd, Aa",
valid_terrain="Gs, Gg, Hh, Ha, Hh^Tf, Gs^Tf, Ss, Dd, Aa",
min_distance=16,
}

10
data/campaigns/World_Conquest/lua/map/generator/podzol.lua
View file

@ -53,7 +53,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_convert(410, 750, 10, 465, "Gll,Gll^Tf", "Gd"),
dr_convert(650, 750, 10, 540, "Hh,Hhd", "Ha"),
dr_convert(650, 750, 10, 510, "Hh^Fp", "Ha^Fpa"),
dr_convert(650, 750, 10, 415, "Hh^Uf,Hhd^Tf", "Ha^Tf"),
dr_convert(650, 750, 10, 415, "Hh^Tf,Hhd^Tf", "Ha^Tf"),
dr_convert(375, 750, 10, 390, "Ss", "Ai"),
dr_convert(450, 750, 650, 675, "Gll", "Gll^Fet"),
dr_convert(100, 300, 800, 850, "Gll", "Gll^Em"),
@ -70,7 +70,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_temperature("Uu", 100, 300, "Ai"),
dr_temperature("Uu", 650, 700, "Uu^Tf"),
dr_temperature("Uh", 675, 725, "Uh^Tf"),
dr_temperature("(Uu,Uh,Uu^Uf)", 850, 999, "Ql"),
dr_temperature("(Uu,Uh,Uu^Tf)", 850, 999, "Ql"),
dr_temperature("Qxu", 800, 999, "Ql"),
}
res.road_cost = {
@ -135,13 +135,13 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Uu",
convert_to="Uu^Vo",
adjacent_liked="Ai,Hh,Mm,Uu,Uh,Uu^Uf,Xu,Rb",
adjacent_liked="Ai,Hh,Mm,Uu,Uh,Uu^Tf,Xu,Rb",
rating=4
},
dr_village {
terrain="Uh",
convert_to="Uh^Vud",
adjacent_liked="Ai,Hh,Mm,Uu,Uh,Uu^Uf,Xu,Rb",
adjacent_liked="Ai,Hh,Mm,Uu,Uh,Uu^Tf,Xu,Rb",
rating=3
},
dr_village {
@ -201,7 +201,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
},
}
res.castle = {
valid_terrain="Gll, Gd, Hh, Gll^Ft, Gll^Efm, Gll^Fet, Gll^Ftr, Ss, Ai, Gll^Uf, Hh^Uf, Hh^Fp, Aa, Ha, Ha^Fpa, Mm, Ms",
valid_terrain="Gll, Gd, Hh, Gll^Ft, Gll^Efm, Gll^Fet, Gll^Ftr, Ss, Ai, Gll^Tf, Hh^Tf, Hh^Fp, Aa, Ha, Ha^Fpa, Mm, Ms",
min_distance=13,
}

4
data/campaigns/World_Conquest/lua/map/generator/provinces.lua
View file

@ -163,13 +163,13 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Uu^Tf",
convert_to="Uu^Vud",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uu^Uf,Uh^Tf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uu^Tf,Uh^Tf",
rating=3
},
dr_village {
terrain="Uh^Tf",
convert_to="Uh^Vud",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uh^Uf,Uh^Tf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uh^Tf,Uh^Tf",
rating=2
},
}

2
data/campaigns/World_Conquest/lua/map/generator/sulfurous.lua
View file

@ -114,7 +114,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain = "Gs^Tf",
convert_to="Gs^Vh",
adjacent_liked="Gg, Gs, Gs^Uf, Gs^Uf, Gs^Uf, Gd, Re, Re, Gs^Ftr, Gs^Ftp, Gs^Fet, Gg^Ft, Gd^Fdf, Gd^Fetd, Hh, Mm, Hh^Ft, Hh^Ftp, Hhd^Fmf, Hhd",
adjacent_liked="Gg, Gs, Gs^Tf, Gs^Tf, Gs^Tf, Gd, Re, Re, Gs^Ftr, Gs^Ftp, Gs^Fet, Gg^Ft, Gd^Fdf, Gd^Fetd, Hh, Mm, Hh^Ft, Hh^Ftp, Hhd^Fmf, Hhd",
rating=8
},
dr_village {

16
data/campaigns/World_Conquest/lua/map/generator/wetland.lua
View file

@ -69,7 +69,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain = "Gs",
convert_to="Gs^Ve",
adjacent_liked="Gg, Gs, Ww, Rb, Rb, Rb, Gd, Rb, Rb, Gs, Hh, Hh^Fds, Hh^Uf, Gg, Gs",
adjacent_liked="Gg, Gs, Ww, Rb, Rb, Rb, Gd, Rb, Rb, Gs, Hh, Hh^Fds, Hh^Tf, Gg, Gs",
rating=9
},
dr_village {
@ -88,44 +88,44 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Hh",
convert_to="Hh^Vo",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Uf, Mm",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Tf, Mm",
rating=6
},
dr_village {
terrain="Hh^Fds",
convert_to="Hh^Vo",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Uf, Mm",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Tf, Mm",
rating=6
},
dr_village {
terrain="Hh^Tf",
convert_to="Hh^Vo",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Uf, Mm",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Tf, Mm",
rating=6
},
dr_village {
terrain="Mm",
convert_to="Mm^Vo",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Uf, Mm",
adjacent_liked="Gs, Gs, Ww, Rb, Rb, Gd, Gd, Rb, Rb, Gd, Hh, Hh^Fds, Hh^Tf, Mm",
rating=5
},
-- cave villages
dr_village {
terrain="Uu",
convert_to="Uu^Vud",
adjacent_liked="Hh,Uu,Mm,Uu,Uh,Uh,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm",
adjacent_liked="Hh,Uu,Mm,Uu,Uh,Uh,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm",
rating=6
},
dr_village {
terrain="Uh",
convert_to="Uu^Vud",
adjacent_liked="Hh,Uu,Mm,Uu,Uh,Uh,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm",
adjacent_liked="Hh,Uu,Mm,Uu,Uh,Uh,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm",
rating=6
},
dr_village {
terrain="Uu^Tf",
convert_to="Uu^Vud",
adjacent_liked="Hh,Uu,Mm,Uu,Uh,Uh,Uh,Hh^Uf,Xu,Uu^Uf,Mm^Xm",
adjacent_liked="Hh,Uu,Mm,Uu,Uh,Uh,Uh,Hh^Tf,Xu,Uu^Tf,Mm^Xm",
rating=6
},
-- water villages

4
data/campaigns/World_Conquest/lua/map/generator/wicked.lua
View file

@ -117,13 +117,13 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_village {
terrain="Uu^Tf",
convert_to="Uu^Vu",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uu^Uf,Uh^Tf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uu^Tf,Uh^Tf",
rating=5
},
dr_village {
terrain="Uh^Tf",
convert_to="Uh^Vu",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uh^Uf,Uh^Tf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uh^Tf,Uh^Tf",
rating=5
},
dr_village {

2
data/campaigns/World_Conquest/lua/map/postgeneration/1A_Start.lua
View file

@ -1,6 +1,6 @@
function world_conquest_tek_map_repaint_1()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Ai,Uh,Ql,Qxu,Xu", 3)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Ai,Uh,Ql,Qxu,Xu", 3)
world_conquest_tek_map_decoration_1()
world_conquest_tek_map_dirt("Gg^Tf")
end

6
data/campaigns/World_Conquest/lua/map/postgeneration/2A_Springs.lua
View file

@ -1,8 +1,8 @@
-- Springs
function world_conquest_tek_map_repaint_2a()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uh,Ql,Qxu,Xu,Ww,Ww", 3)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uh,Ql,Qxu,Xu,Ww,Ww", 3)
world_conquest_tek_map_decoration_2a()
world_conquest_tek_map_dirt("Gg^Uf,Gg^Uf,Gg^Uf,Gs^Tf")
world_conquest_tek_map_dirt("Gg^Tf,Gg^Tf,Gg^Tf,Gs^Tf")
end
function world_conquest_tek_map_decoration_2a()
@ -106,7 +106,7 @@ function world_conquest_tek_map_decoration_2a()
f.all(
f.terrain("Hh^Fp"),
f.radius(3, f.all(
f.terrain("Ql,Uu,Hu,Uu^Uf,Qxu,Mv"),
f.terrain("Ql,Uu,Hu,Uu^Tf,Qxu,Mv"),
f.none(
f.radius(3, f.terrain("Ds,Dd,Hd"))
)

2
data/campaigns/World_Conquest/lua/map/postgeneration/2C_Glaciers.lua
View file

@ -1,6 +1,6 @@
-- Glaciers
function world_conquest_tek_map_repaint_2c()
wct_reduce_wall_clusters("Uu,Uu^Uf,Uh,Uh^Uf,Uu,Uh,Ai,Ai,Xu,Ai,Ai")
wct_reduce_wall_clusters("Uu,Uu^Tf,Uh,Uh^Tf,Uu,Uh,Ai,Ai,Xu,Ai,Ai")
world_conquest_tek_map_decoration_2c()
wct_randomize_snowed_forest()
end

4
data/campaigns/World_Conquest/lua/map/postgeneration/2D_Provinces.lua
View file

@ -2,7 +2,7 @@
function world_conquest_tek_map_repaint_2d()
world_conquest_tek_map_decoration_2d()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uu^Dr,Ql,Qxu,Cud", 2)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uu^Dr,Ql,Qxu,Cud", 2)
set_terrain { "Uh",
f.all(
f.adjacent(f.terrain("Ch*,Kh*,Cd,Cv^Fds,Ce,Co*")),
@ -10,7 +10,7 @@ function world_conquest_tek_map_repaint_2d()
),
}
world_conquest_tek_map_dirt("Gg^Uf,Gg^Uf,Gg^Uf,Gs^Tf")
world_conquest_tek_map_dirt("Gg^Tf,Gg^Tf,Gg^Tf,Gs^Tf")
end
function wct_provinces_castle(terrain_to_change, terrain)

2
data/campaigns/World_Conquest/lua/map/postgeneration/2F_Clayey.lua
View file

@ -1,6 +1,6 @@
-- Clayey
function world_conquest_tek_map_repaint_2f()
wct_reduce_wall_clusters("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uh,Ql,Uu,Xu,Uu,Ww")
wct_reduce_wall_clusters("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uh,Ql,Uu,Xu,Uu,Ww")
set_terrain { "Xu",
f.all(
f.adjacent(f.terrain("Uu^*")),

4
data/campaigns/World_Conquest/lua/map/postgeneration/3A_Savannah.lua
View file

@ -1,7 +1,7 @@
-- Savannah
function world_conquest_tek_map_repaint_3a()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uu^Uf,Uh,Ql,Qxu,Xu", 2)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uu^Tf,Uh,Ql,Qxu,Xu", 2)
world_conquest_tek_castle_swamp_bridges()
world_conquest_tek_map_decoration_3a()
world_conquest_tek_map_dirt("Gs^Tf")
@ -95,7 +95,7 @@ function world_conquest_tek_map_decoration_3a()
f.all(
f.terrain("Hh^Vhh"),
f.none(
f.radius(2, f.terrain("M*^*,Xu,Uu,Uh,Uu^Uf,Ds,Dd,Hd,Ql,Qxu"))
f.radius(2, f.terrain("M*^*,Xu,Uu,Uh,Uu^Tf,Ds,Dd,Hd,Ql,Qxu"))
)
),
}

2
data/campaigns/World_Conquest/lua/map/postgeneration/3B_Wreck.lua
View file

@ -1,6 +1,6 @@
-- Wreck
function world_conquest_tek_map_repaint_3b()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uu^Uf,Uh,Ql,Qxu,Xu", 3)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uu^Tf,Uh,Ql,Qxu,Xu", 3)
world_conquest_tek_map_decoration_3b()
world_conquest_tek_map_dirt("Gs^Tf")
end

10
data/campaigns/World_Conquest/lua/map/postgeneration/3C_Delta.lua
View file

@ -72,7 +72,7 @@ function wct_noise_delta()
f.terrain("Dd"),
fraction = 5,
}
set_terrain { "Ur,Uue^Uf,Uue^Dr,Uue",
set_terrain { "Ur,Uue^Tf,Uue^Dr,Uue",
f.terrain("U*,U*^Tf"),
fraction = 3,
}
@ -111,7 +111,7 @@ function world_conquest_tek_map_decoration_3c()
)
),
}
set_terrain { "Gs,Gg,Hh^Ft,Ss,Ss,Hh,Ss,Mm,Ss,Hh^Uf,Ww,Gg,Ss,Ww,Ss",
set_terrain { "Gs,Gg,Hh^Ft,Ss,Ss,Hh,Ss,Mm,Ss,Hh^Tf,Ww,Gg,Ss,Ww,Ss",
f.terrain("Wwf"),
fraction = 2,
}
@ -119,7 +119,7 @@ function world_conquest_tek_map_decoration_3c()
f.terrain("Wwf"),
fraction = 9,
}
set_terrain { "Ss,Ss,Ss,Ds^Ftd,Ss,Mm,Ss,Ww,Ss,Hd,Ss,Gs^Uf,Ww,Gg,Ss",
set_terrain { "Ss,Ss,Ss,Ds^Ftd,Ss,Mm,Ss,Ww,Ss,Hd,Ss,Gs^Tf,Ww,Gg,Ss",
f.terrain("Wwf"),
fraction = 2,
}
@ -152,7 +152,7 @@ function world_conquest_tek_map_decoration_3c()
f.terrain("Dd,Ds,Xuce")
),
}
set_terrain { "Hh^Uf,Mm,Gg,Gs,Ss,Ds^Ftd,Hh,Hh^Ftp",
set_terrain { "Hh^Tf,Mm,Gg,Gs,Ss,Ds^Ftd,Hh,Hh^Ftp",
f.all(
f.terrain("Xuce"),
f.radius(3, f.terrain("K*^*"))
@ -261,7 +261,7 @@ function world_conquest_tek_map_decoration_3c()
set_terrain { "Ds",
f.all(
f.adjacent(f.terrain("Wo")),
f.terrain("Hh^Uf,G*^Uf,Mm")
f.terrain("Hh^Tf,G*^Tf,Mm")
),
}
set_terrain { "Hh",

4
data/campaigns/World_Conquest/lua/map/postgeneration/3E_Coral.lua
View file

@ -1,11 +1,11 @@
-- Coral
function world_conquest_tek_map_repaint_3e()
set_terrain { "Ur",
f.terrain("U*^Uf,U*"),
f.terrain("U*^Tf,U*"),
fraction = 8,
}
wct_reduce_wall_clusters("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uh,Ur,Uu,Ur,Uu,Ur")
wct_reduce_wall_clusters("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uh,Ur,Uu,Ur,Uu,Ur")
set_terrain { "Xu",
f.all(
f.adjacent(f.terrain("U*^*")),

4
data/campaigns/World_Conquest/lua/map/postgeneration/3F_Wetland.lua
View file

@ -1,11 +1,11 @@
-- Wetland
function world_conquest_tek_map_repaint_3f()
set_terrain { "Ur",
f.terrain("U*^Uf,U*"),
f.terrain("U*^Tf,U*"),
fraction = 10,
}
wct_reduce_wall_clusters("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uh,Uu,Uu,Qxu,Uu,Wwf")
wct_reduce_wall_clusters("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uh,Uu,Uu,Qxu,Uu,Wwf")
-- soft rough terrain generated
local terrain_to_change = wct_store_cave_passages_candidates()

4
data/campaigns/World_Conquest/lua/map/postgeneration/4A_Thermal.lua
View file

@ -1,9 +1,9 @@
-- Thermal
function world_conquest_tek_map_repaint_4a()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uu^Uf,Uh,Ql,Ql,Ql", 3)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uu^Tf,Uh,Ql,Ql,Ql", 3)
world_conquest_tek_map_decoration_4a()
world_conquest_tek_map_dirt("Gg^Uf,Gg^Uf,Gs^Tf")
world_conquest_tek_map_dirt("Gg^Tf,Gg^Tf,Gs^Tf")
end
function world_conquest_tek_map_decoration_4a()

10
data/campaigns/World_Conquest/lua/map/postgeneration/4B_Volcanic.lua
View file

@ -6,24 +6,24 @@ function world_conquest_tek_map_repaint_4b()
exact = false,
percentage = 10,
}
set_terrain { "Ql,Uu,Uh,Uh,Uu^Uf,Qxu,Uh^Tf",
set_terrain { "Ql,Uu,Uh,Uh,Uu^Tf,Qxu,Uh^Tf",
f.terrain("Xu"),
}
set_terrain { "Ql,Uu^Uf,Qxu,Uh^Uf,Uh,Uh,Uu,Ql,Md",
set_terrain { "Ql,Uu^Tf,Qxu,Uh^Tf,Uh,Uh,Uu,Ql,Md",
f.terrain("Mm^Xm"),
fraction = 2,
}
set_terrain { "Ql,Uu^Uf,Qxu,Uh^Tf",
set_terrain { "Ql,Uu^Tf,Qxu,Uh^Tf",
f.all(
f.terrain("Hh^F*"),
f.adjacent(f.terrain("Ql,Uu,Uh,Uu^Uf,Qxu,Uh^Tf"))
f.adjacent(f.terrain("Ql,Uu,Uh,Uu^Tf,Qxu,Uh^Tf"))
),
fraction = 3,
}
set_terrain { "Uh",
f.all(
f.terrain("Hh"),
f.adjacent(f.terrain("Ql,Uu,Uh,Uu^Uf,Qxu,Uh^Uf,Ur"))
f.adjacent(f.terrain("Ql,Uu,Uh,Uu^Tf,Qxu,Uh^Tf,Ur"))
),
fraction = 3,
}

2
data/campaigns/World_Conquest/lua/map/postgeneration/4C_Mines.lua
View file

@ -252,7 +252,7 @@ function world_conquest_tek_map_repaint_4c()
wct_reduce_wall_clusters("Uu^Br/,Uu^Br\\,Uu^Br|,Uu^Dr,Qxu")
world_conquest_tek_map_decoration_4c()
wct_fill_lava_chasms()
world_conquest_tek_map_dirt("Gg^Uf,Gg^Uf,Gs^Tf")
world_conquest_tek_map_dirt("Gg^Tf,Gg^Tf,Gs^Tf")
end
function wct_map_4c_post_bunus_decoration()
-- dwarvish forges and keeps

4
data/campaigns/World_Conquest/lua/map/postgeneration/4D_Podzol.lua
View file

@ -18,7 +18,7 @@ local function world_conquest_tek_map_repaint_4d()
percentage = 8,
}
set_terrain { "Mm,Gll,Gll",
f.terrain("Hh^Uf,Ss,Hh,Gll^Tf"),
f.terrain("Hh^Tf,Ss,Hh,Gll^Tf"),
exact = false,
percentage = 9,
}
@ -51,7 +51,7 @@ local function world_conquest_tek_map_repaint_4d()
exact = false,
percentage = 10,
}
set_terrain { "Hh,Mm,Gll^Fp,Gll^Fp,Gll^Fp,Gll^Fp,Hh^Fp,Gll^Uf,Hh^Tf",
set_terrain { "Hh,Mm,Gll^Fp,Gll^Fp,Gll^Fp,Gll^Fp,Hh^Fp,Gll^Tf,Hh^Tf",
f.all(
f.terrain("Gll"),
f.adjacent(f.terrain("G*,R*,Ww,A*,Gll^Efm"), nil, 6)

4
data/campaigns/World_Conquest/lua/map/postgeneration/4E_Wicked.lua
View file

@ -1,6 +1,6 @@
-- Wicked
function world_conquest_tek_map_repaint_4e()
wct_reduce_wall_clusters("Uu,Uu,Uu,Uu,Uu,Uu,Uu,Uu,Uh,Uh,Uh,Uh,Uu^Uf,Wwf,Ur,Qxu,Ql,Wwg")
wct_reduce_wall_clusters("Uu,Uu,Uu,Uu,Uu,Uu,Uu,Uu,Uh,Uh,Uh,Uh,Uu^Tf,Wwf,Ur,Qxu,Ql,Wwg")
wct_fill_lava_chasms()
-- soft rough terrain around caves
set_terrain { "Aa,Aa,Gs",
@ -12,7 +12,7 @@ function world_conquest_tek_map_repaint_4e()
fraction = 4,
}
set_terrain { "Gs,Gg,Gg",
f.terrain("H*^Uf,Hh,Hhd"),
f.terrain("H*^Tf,Hh,Hhd"),
fraction = 3,
}
set_terrain { "Aa,Aa,Aa,Gs",

2
data/campaigns/World_Conquest/lua/map/postgeneration/4F_Wild.lua
View file

@ -117,7 +117,7 @@ function repaint(map_data)
}
set_terrain { "Xu",
f.all(
f.terrain("Uu,Uh,Uu^Uf,Uh^Tf"),
f.terrain("Uu,Uh,Uu^Tf,Uh^Tf"),
f.adjacent(f.terrain("G*^*,H*^*")),
f.adjacent(f.terrain("*^Xm"), nil, 0)
),

4
data/campaigns/World_Conquest/lua/map/postgeneration/6A_Rural.lua
View file

@ -393,9 +393,9 @@ local function world_conquest_tek_map_decoration_6a()
end
local function world_conquest_tek_map_repaint_6a()
world_conquest_tek_map_rebuild("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uu^Uf,Uh,Ql,Qxu,Xu", 3)
world_conquest_tek_map_rebuild("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uu^Tf,Uh,Ql,Qxu,Xu", 3)
world_conquest_tek_map_decoration_6a()
world_conquest_tek_map_dirt("Gg^Uf,Gs^Tf")
world_conquest_tek_map_dirt("Gg^Tf,Gs^Tf")
end
local _ = wesnoth.textdomain 'wesnoth-wc'

4
data/campaigns/World_Conquest/lua/map/postgeneration/6B_Maritime.lua
View file

@ -336,7 +336,7 @@ function world_conquest_tek_map_decoration_6b()
),
fraction = 8,
}
set_terrain { "Gs^Fp,Hh^Fp,Hh,Mm,Gs^Fp,Ss^Uf,Ss^Uf,Ss^Tf",
set_terrain { "Gs^Fp,Hh^Fp,Hh,Mm,Gs^Fp,Ss^Tf,Ss^Tf,Ss^Tf",
f.all(
f.terrain("Ss"),
f.none(
@ -408,7 +408,7 @@ function world_conquest_tek_map_decoration_6b()
end
function world_conquest_tek_map_repaint_6b()
wct_reduce_wall_clusters("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uu^Uf,Uh,Ql,Qxu,Xu,Uu,Ur")
wct_reduce_wall_clusters("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uu^Tf,Uh,Ql,Qxu,Xu,Uu,Ur")
wct_fill_lava_chasms()
wct_volcanos()
world_conquest_tek_map_decoration_6b()

6
data/campaigns/World_Conquest/lua/map/postgeneration/6C_Industrial.lua
View file

@ -104,7 +104,7 @@ local function wct_dirty_deltas()
local terrain_to_change = wct_store_possible_dirty_delta()
while #terrain_to_change > 0 do
local loc = 1 -- todo: maybe use terrain_to_change[mathx.random(#terrain_to_change)]
local ter = mathx.random_choice("Gs,Hh^Uf,Cud,Gs^Uf,Gs,Hh,Ds^Edt,Ds,Hh^Fmf,Gs,Gs^Fmf")
local ter = mathx.random_choice("Gs,Hh^Tf,Cud,Gs^Tf,Gs,Hh,Ds^Edt,Ds,Hh^Fmf,Gs,Gs^Fmf")
map[loc] = ter
terrain_to_change = wct_store_possible_dirty_delta()
end
@ -472,7 +472,7 @@ local function world_conquest_tek_map_decoration_6c()
fraction = 6,
layer = "base",
}
set_terrain { "*^Fp,*^Fp,*^Fp,*^Fms,*^Fms,*^Fmf,*^Fmf,*^Uf,*^Fds,*^Fms,*^Fms,*^Fet,*^Efm,*",
set_terrain { "*^Fp,*^Fp,*^Fp,*^Fms,*^Fms,*^Fmf,*^Fmf,*^Tf,*^Fds,*^Fms,*^Fms,*^Fet,*^Efm,*",
f.all(
f.terrain("Hh,G*"),
f.radius(3, f.any(
@ -653,7 +653,7 @@ local function world_conquest_tek_map_repaint_6c()
world_conquest_tek_map_decoration_6c()
wct_reduce_wall_clusters("Uu,Uu^Uf,Uh,Uu^Uf,Uu,Uu^Uf,Uh,Ql,Qxu,Xu,Uu,Rb")
wct_reduce_wall_clusters("Uu,Uu^Tf,Uh,Uu^Tf,Uu,Uu^Tf,Uh,Ql,Qxu,Xu,Uu,Rb")
wct_fill_lava_chasms()
wct_volcanos()
wct_volcanos_dirt()

14
data/campaigns/World_Conquest/lua/map/postgeneration/6D_Feudal.lua
View file

@ -162,11 +162,11 @@ local function world_conquest_tek_map_repaint_6d()
roads_to_feudal_castle(5)
-- rebuild cave
wct_reduce_wall_clusters("Uu")
set_terrain { "Uh,Uh,Uu^Uf,Uh,Uh,Uu^Uf,Uh,Uh,Uu^Uf,Uh,Uh,Uu^Uf,Uh,Uh,Uu^Uf,Uh,Uu^Uf,Uu,Qxu,Qxu,Ql",
set_terrain { "Uh,Uh,Uu^Tf,Uh,Uh,Uu^Tf,Uh,Uh,Uu^Tf,Uh,Uh,Uu^Tf,Uh,Uh,Uu^Tf,Uh,Uu^Tf,Uu,Qxu,Qxu,Ql",
f.terrain("Uu"),
fraction = 4,
}
set_terrain { "Qxu,Uh^Uf,Ql,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Uh,Uh,Uu^Tf",
set_terrain { "Qxu,Uh^Tf,Ql,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Urb,Uh,Uh,Uu^Tf",
f.terrain("Uu"),
fraction = 5,
}
@ -174,8 +174,8 @@ local function world_conquest_tek_map_repaint_6d()
wct_fill_lava_chasms()
wct_volcanos()
wct_volcanos_dirt()
wct_break_walls("M*^Xm", "Mm,Mm,Hh,Hh,Hh^Fp,Hh^Fp,Hh^Uf,Hh^Uf,Gs^Fp,Rb,Rb,Rb")
wct_break_walls("X*", "Uh,Uh,Uh,Uh,Uh^Uf,Uu^Uf,Uu,Rd,Rd,Rd")
wct_break_walls("M*^Xm", "Mm,Mm,Hh,Hh,Hh^Fp,Hh^Fp,Hh^Tf,Hh^Tf,Gs^Fp,Rb,Rb,Rb")
wct_break_walls("X*", "Uh,Uh,Uh,Uh,Uh^Tf,Uu^Tf,Uu,Rd,Rd,Rd")
set_terrain { "Mm^Xm",
f.all(
f.terrain("X*"),
@ -221,17 +221,17 @@ local function world_conquest_tek_map_repaint_6d()
f.terrain("Hhd"),
fraction = 5,
}
set_terrain { "Hhd^Fp,Hhd^Fp,Hh^Uf,Gg^Tf",
set_terrain { "Hhd^Fp,Hhd^Fp,Hh^Tf,Gg^Tf",
f.terrain("Hhd"),
fraction = 10,
}
-- extra rough terrain
set_terrain { "Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hhd^Fp,Hhd^Fp,Mm,Mm,Mm,Gg^Uf,Hh^Uf,Ss",
set_terrain { "Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hhd^Fp,Hhd^Fp,Mm,Mm,Mm,Gg^Tf,Hh^Tf,Ss",
f.terrain("Gg"),
fraction = 3,
}
set_terrain { "Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hh^Fp,Hh^Fp,Mm,Mm,Mm,Gs^Uf,Hh^Uf,Ss",
set_terrain { "Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hh,Hh^Fp,Hh^Fp,Mm,Mm,Mm,Gs^Tf,Hh^Tf,Ss",
f.terrain("Gs"),
fraction = 4,
}

4
data/campaigns/World_Conquest/lua/map/postgeneration_utils/noise.lua
View file

@ -45,7 +45,7 @@ function world_conquest_tek_map_noise_classic(tree)
per_thousand = 222,
exact = false,
},
{ "Ur,Uu^Uf,Uh,Uu",
{ "Ur,Uu^Tf,Uh,Uu",
f.terrain("Uu,Uh,Uu^Tf"),
per_thousand = 420,
exact = false,
@ -126,7 +126,7 @@ function world_conquest_tek_map_noise_maritime()
per_thousand = 222,
exact = false,
},
{ "Ur,Uu^Uf,Uh,Uu",
{ "Ur,Uu^Tf,Uh,Uu",
f.terrain("Uu,Uh,Uu^Tf"),
per_thousand = 410,
exact = false,

2
data/campaigns/World_Conquest/lua/map/postgeneration_utils/utilities.lua
View file

@ -54,7 +54,7 @@ function world_conquest_tek_map_rebuild(cave, reef)
f.all(
f.terrain("Hh,Hh^F*"),
f.adjacent(f.terrain("A*^*,Ms^*,Ha^*"), nil, 0),
f.radius(2, f.terrain("Mm,Md,Xu,Mm^Xm,Uu,Uh,Uu^Uf,Ql,Qxu,Mv"))
f.radius(2, f.terrain("Mm,Md,Xu,Mm^Xm,Uu,Uh,Uu^Tf,Ql,Qxu,Mv"))
),
nlocs = r,
}

44
data/campaigns/World_Conquest/lua/map/postgeneration_utils/wild_zones.lua
View file

@ -164,7 +164,7 @@ local wild_replacement_chances_zone_1_4 = {
local wild_replacement_chances_zone_2_1 = {
default = {
wct_terrain_replace { terrain = "Gg" },
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Mm,Gg^Uf,Gg^Fmf", percentage = 20, strict = false}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Mm,Gg^Tf,Gg^Fmf", percentage = 20, strict = false}
},
chances = {
{
@ -187,7 +187,7 @@ local wild_replacement_chances_zone_2_1 = {
local wild_replacement_chances_zone_2_2 = {
default = {
wct_terrain_replace { terrain = "Gg,Gg,Gg,Ss"},
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Mm,Gg^Uf,Gg^Fds,Gg^Fp", percentage = 20, strict = false}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Mm,Gg^Tf,Gg^Fds,Gg^Fp", percentage = 20, strict = false}
},
chances = {
{
@ -202,7 +202,7 @@ local wild_replacement_chances_zone_2_2 = {
local wild_replacement_chances_zone_2_3 = {
default = {
wct_terrain_replace { terrain = "Gg,Gs,Ss"},
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Uf,Gs^Ftp,Gs^Fds,Gs^Ftp", percentage = 20, strict = false}
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Tf,Gs^Ftp,Gs^Fds,Gs^Ftp", percentage = 20, strict = false}
},
chances = {
{
@ -217,7 +217,7 @@ local wild_replacement_chances_zone_2_3 = {
local wild_replacement_chances_zone_2_4 = {
default = {
wct_terrain_replace { terrain = "Gs" },
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Md,Hh^Uf,Gs^Ftp,Gs^Ftd", percentage = 20, strict = false}
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Md,Hh^Tf,Gs^Ftp,Gs^Ftd", percentage = 20, strict = false}
},
chances = {
{
@ -245,7 +245,7 @@ local wild_replacement_chances_zone_2_4 = {
local wild_replacement_chances_zone_3_1 = {
default = {
wct_terrain_replace { terrain = "Gg" },
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Mm,Gg^Uf,Gg^Fmf", percentage = 25, strict = false}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Mm,Gg^Tf,Gg^Fmf", percentage = 25, strict = false}
},
chances = {
{
@ -268,7 +268,7 @@ local wild_replacement_chances_zone_3_1 = {
local wild_replacement_chances_zone_3_2 = {
default = {
wct_terrain_replace { terrain = "Gg" },
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Mm,Gg^Uf,Gg^Fds,Gg^Fp", percentage = 25, strict = false}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Mm,Gg^Tf,Gg^Fds,Gg^Fp", percentage = 25, strict = false}
},
chances = {
{
@ -283,7 +283,7 @@ local wild_replacement_chances_zone_3_2 = {
local wild_replacement_chances_zone_3_3 = {
default = {
wct_terrain_replace { terrain = "Gg,Gg,Gs"},
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Uf,Gs^Ftp,Gs^Fds,Gs^Ftp", percentage = 25, strict = false}
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Tf,Gs^Ftp,Gs^Fds,Gs^Ftp", percentage = 25, strict = false}
},
chances = {
{
@ -298,7 +298,7 @@ local wild_replacement_chances_zone_3_3 = {
local wild_replacement_chances_zone_3_4 = {
default = {
wct_terrain_replace { terrain = "Gs" },
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Md,Hh^Uf,Gs^Ftp,Gs^Ftd", percentage = 25, strict = false}
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Md,Hh^Tf,Gs^Ftp,Gs^Ftd", percentage = 25, strict = false}
},
chances = {
{
@ -332,7 +332,7 @@ local wild_replacement_chances_zone_3_4 = {
local wild_replacement_chances_zone_4_1 = {
default = {
wct_terrain_replace { terrain = "Gg" },
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Mm,Gg^Uf,Hh,Hh,Hh^Fp,Ms,Hh,Hh,Hh^Fp,Gg^Fmf", percentage = 52, strict = false}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Gg^Fp,Gg^Fp,Hh,Hh,Hh^Fp,Mm,Gg^Tf,Hh,Hh,Hh^Fp,Ms,Hh,Hh,Hh^Fp,Gg^Fmf", percentage = 52, strict = false}
},
chances = {
{
@ -347,7 +347,7 @@ local wild_replacement_chances_zone_4_1 = {
local wild_replacement_chances_zone_4_2 = {
default = {
wct_terrain_replace { terrain = "Gg,Gg^Efm"},
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Mm,Gg^Uf,Hh,Hh,Hh^Fp,Mm,Hh,Hh,Hh^Fp,Gg^Fds,Gg^Fp", percentage = 52, strict = false}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Mm,Gg^Tf,Hh,Hh,Hh^Fp,Mm,Hh,Hh,Hh^Fp,Gg^Fds,Gg^Fp", percentage = 52, strict = false}
},
chances = {
{
@ -362,7 +362,7 @@ local wild_replacement_chances_zone_4_2 = {
local wild_replacement_chances_zone_4_3 = {
default = {
wct_terrain_replace { terrain = "Gg,Gg,Gs"},
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Uf,Hh,Hh,Hh^Fds,Mm,Hh,Hh,Hh^Fds,Gs^Fds,Gs^Ftp", percentage = 52, strict = false}
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Tf,Hh,Hh,Hh^Fds,Mm,Hh,Hh,Hh^Fds,Gs^Fds,Gs^Ftp", percentage = 52, strict = false}
},
chances = {
{
@ -377,7 +377,7 @@ local wild_replacement_chances_zone_4_3 = {
local wild_replacement_chances_zone_4_4 = {
default = {
wct_terrain_replace { terrain = "Gs" },
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Md,Hh^Uf,Hh,Hh,Hh^Fds,Md,Hh,Hh,Hh^Fds,Gs^Ftp", percentage = 52, strict = false}
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Md,Hh^Tf,Hh,Hh,Hh^Fds,Md,Hh,Hh,Hh^Fds,Gs^Ftp", percentage = 52, strict = false}
},
chances = {
{
@ -432,7 +432,7 @@ local wild_replacement_chances_zone_5_1 = {
local wild_replacement_chances_zone_5_2 = {
default = {
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Hh^Fp,Mm,Gg^Uf,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Gg,Gg,Gg,Gg,Gg,Gg,Gg,Hh^Fp,Gg^Fds,Hh"}
wct_terrain_replace { terrain = "Gg^Fp,Gg^Fms,Hh,Hh,Hh^Fms,Gg^Fms,Gg^Fds,Hh,Hh,Hh^Fp,Hh^Fp,Mm,Gg^Tf,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Gg,Gg,Gg,Gg,Gg,Gg,Gg,Hh^Fp,Gg^Fds,Hh"}
},
chances = {
{
@ -446,7 +446,7 @@ local wild_replacement_chances_zone_5_2 = {
local wild_replacement_chances_zone_5_3 = {
default = {
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Uf,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Gg,Gg,Gs,Gg,Gg,Gs,Gg,Gs^Ftp,Gs^Fds,Hh"}
wct_terrain_replace { terrain = "Gg^Fds,Gg^Fms,Hh,Hh,Hh^Fms,Hh^Fms,Gg^Ftr,Gg^Ftr,Hh,Hh,Hh^Fds,Mm,Hh^Tf,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Mm,Gg,Gg,Gs,Gg,Gg,Gs,Gg,Gs^Ftp,Gs^Fds,Hh"}
},
chances = {
{
@ -460,7 +460,7 @@ local wild_replacement_chances_zone_5_3 = {
local wild_replacement_chances_zone_5_4 = {
default = {
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Hh^Fds,Md,Hh^Uf,Md,Md,Md,Md,Md,Md,Md,Md,Gg,Gs,Gg,Gs,Gg,Gs,Gs,Gs^Ftp,Gs^Ftr,Hh"}
wct_terrain_replace { terrain = "Gs^Fds,Gs^Ftp,Hh,Hh,Hh^Ftp,Gs^Fts,Gs^Ft,Hh,Hh,Hh^Fds,Hh^Fds,Md,Hh^Tf,Md,Md,Md,Md,Md,Md,Md,Md,Gg,Gs,Gg,Gs,Gg,Gs,Gs,Gs^Ftp,Gs^Ftr,Hh"}
},
chances = {
{
@ -501,7 +501,7 @@ local wild_replacement_chances_zone_6_1 = {
local wild_replacement_chances_zone_6_2 = {
default = {
wct_terrain_replace { terrain = "Mm,Ms^Xm,Mm^Xm,Mm^Xm,Mm,Ms^Xm,Mm^Xm,Mm^Xm,Mm,Ms^Xm,Mm^Xm,Mm^Xm,Hh^Fp,Hh^Uf,Gg,Hh^Fms,Hh"}
wct_terrain_replace { terrain = "Mm,Ms^Xm,Mm^Xm,Mm^Xm,Mm,Ms^Xm,Mm^Xm,Mm^Xm,Mm,Ms^Xm,Mm^Xm,Mm^Xm,Hh^Fp,Hh^Tf,Gg,Hh^Fms,Hh"}
},
chances = {
{
@ -515,7 +515,7 @@ local wild_replacement_chances_zone_6_2 = {
local wild_replacement_chances_zone_6_3 = {
default = {
wct_terrain_replace { terrain = "Mm,Mm^Xm,Mm^Xm,Mm^Xm,Mm,Mm^Xm,Mm^Xm,Mm^Xm,Mm,Mm^Xm,Mm^Xm,Mm^Xm,Hh^Fms,Hh^Uf,Gg,Hh^Fds,Hh"}
wct_terrain_replace { terrain = "Mm,Mm^Xm,Mm^Xm,Mm^Xm,Mm,Mm^Xm,Mm^Xm,Mm^Xm,Mm,Mm^Xm,Mm^Xm,Mm^Xm,Hh^Fms,Hh^Tf,Gg,Hh^Fds,Hh"}
},
chances = {
{
@ -529,7 +529,7 @@ local wild_replacement_chances_zone_6_3 = {
local wild_replacement_chances_zone_6_4 = {
default = {
wct_terrain_replace { terrain = "Md,Md^Xm,Md^Xm,Md^Xm,Md,Md^Xm,Md^Xm,Md^Xm,Md,Md^Xm,Md^Xm,Md^Xm,Hh^Fds,Hh^Uf,Gs,Hh^Ftp,Hh"}
wct_terrain_replace { terrain = "Md,Md^Xm,Md^Xm,Md^Xm,Md,Md^Xm,Md^Xm,Md^Xm,Md,Md^Xm,Md^Xm,Md^Xm,Hh^Fds,Hh^Tf,Gs,Hh^Ftp,Hh"}
},
chances = {
{
@ -548,7 +548,7 @@ local wild_replacement_chances_zone_6_4 = {
{
value=1,
command = {
wct_terrain_replace { terrain = "Sm,Sm,Sm,Sm,Sm,Sm^Uf,Mm,Hh"}
wct_terrain_replace { terrain = "Sm,Sm,Sm,Sm,Sm,Sm^Tf,Mm,Hh"}
}
}
}
@ -588,7 +588,7 @@ local wild_replacement_chances_zone_7_1 = {
local wild_replacement_chances_zone_7_2 = {
default = {
wct_terrain_replace { terrain = "Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uu,Re,Ww,Wwf,Qxu,Uu^Uf,Uh,Uu,Uu,Uh,Uu,Uu^Em,Uu^Tf"}
wct_terrain_replace { terrain = "Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uu,Re,Ww,Wwf,Qxu,Uu^Tf,Uh,Uu,Uu,Uh,Uu,Uu^Em,Uu^Tf"}
},
chances = {
{
@ -626,7 +626,7 @@ local wild_replacement_chances_zone_7_2 = {
local wild_replacement_chances_zone_7_3 = {
default = {
wct_terrain_replace { terrain = "Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uu^Uf,Uu,Uu,Re,Uh^Uf,Wwf,Ql,Uu^Uf,Uh,Uu,Uu,Uh,Uu,Uu^Em,Uu^Tf"}
wct_terrain_replace { terrain = "Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uh,Uu,Uu^Tf,Uu,Uu,Re,Uh^Tf,Wwf,Ql,Uu^Tf,Uh,Uu,Uu,Uh,Uu,Uu^Em,Uu^Tf"}
},
chances = {
{
@ -646,7 +646,7 @@ local wild_replacement_chances_zone_7_3 = {
local wild_replacement_chances_zone_7_4 = {
default = {
wct_terrain_replace { terrain = "Ql,Uh,Uu,Uu^Uf,Uh^Uf,Uh,Uu,Ql,Uh,Uu,Re,Ur,Uh,Uu,Uu,Uh,Uu,Uu^Em,Uu^Tf"}
wct_terrain_replace { terrain = "Ql,Uh,Uu,Uu^Tf,Uh^Tf,Uh,Uu,Ql,Uh,Uu,Re,Ur,Uh,Uu,Uu,Uh,Uu,Uu^Em,Uu^Tf"}
},
chances = {
{

4
data/campaigns/World_Conquest/lua/optional_mechanics/destruction.lua
View file

@ -36,7 +36,7 @@ on_event("die", function(cx)
if wml.variables.wc2_config_enable_terrain_destruction == false then
return
end
if not loc:matches{terrain = "K*^*,C*^*,*^Fet,G*^F*,G*^Uf,A*,*^B*,Rrc,Iwr,*^Vhh,*^Vh*,*^Fda*"} then
if not loc:matches{terrain = "K*^*,C*^*,*^Fet,G*^F*,G*^Tf,A*,*^B*,Rrc,Iwr,*^Vhh,*^Vh*,*^Fda*"} then
return
end
local function item(image)
@ -66,7 +66,7 @@ on_event("die", function(cx)
elseif loc:matches{terrain = "Kd"} then
map[loc] = "Kdr^Es"
elseif loc:matches{terrain = "Gg^Fmf,Gg^Fdf,Gg^Fp,Gg^Uf,Gs^Fmf,Gs^Fdf,Gs^Fp,Gs^Tf"} then
elseif loc:matches{terrain = "Gg^Fmf,Gg^Fdf,Gg^Fp,Gg^Tf,Gs^Fmf,Gs^Fdf,Gs^Fp,Gs^Tf"} then
map[loc] = "Gll^"
elseif loc:matches{terrain = "Cv^Fds"} then