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

[world conquest] [1.16] update to new mushroom terrain from the deprecated mushroom terrain (#5960)

Browse source 
replace deprecated ^Uf and Uft with ^Tf and Tt respectively
This commit is contained in:
Tahsin Jahin Khalid 2021-08-12 00:11:08 +06:00 • committed by GitHub
parent ef80064ed8
commit 1a1f971fe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 247 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/World_Conquest/lua/game_mechanics/effects.lua
View file

@ -2,7 +2,7 @@ local _ = wesnoth.textdomain 'wesnoth-wc'
local helper = wesnoth.require("helper")
local T = wml.tag
local terrain_map = { fungus = "Uft", cave = "Ut", sand = "Dt",
local terrain_map = { fungus = "Tt", cave = "Ut", sand = "Dt",
reef = "Wrt", hills = "Ht", swamp_water = "St", shallow_water = "Wst", castle = "Ct",
mountains = "Mt", deep_water = "Wdt", flat = "Gt", forest = "Ft", frozen = "At",
village = "Vt", impassable = "Xt", unwalkable = "Qt", rails = "Rt"

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

@ -42,11 +42,11 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_convert(0, 999, 450, 520, "Gg,Gs", "Gs^Ft"),
dr_convert(0, 999, 450, 520, "Hh", "Hh^Ft"),
-- fungus appears at med temp and high
dr_convert(825, 950, 500, 525, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 550, 575, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 600, 625, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 500, 525, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 550, 575, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 600, 625, "Uu, Uh", "Uu^Tf"),
-- lava appears at extreme temp and height
dr_convert(800, 999, 850, 999, "Uu, Uh, Uu^Uf", "Ql"),
dr_convert(800, 999, 850, 999, "Uu, Uh, Uu^Tf", "Ql"),
-- desert appears at extreme temperatures
dr_convert(0, 999, 800, 999, "Gg", "Dd"),
-- dunes at extreme temp and mod elevation

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

@ -12,15 +12,15 @@ local function generate(length, villages, castle, iterations, size, players, isl
res.height = {
-- list of common terrain types which come in at different heights, from highest to lowest
dr_height(955, "Uh"),
dr_height(945, "Uu^Uf"),
dr_height(945, "Uu^Tf"),
dr_height(900, "Uu"),
dr_height(855, "Uh"),
dr_height(845, "Uu^Uf"),
dr_height(845, "Uu^Tf"),
dr_height(825, "Uu"),
dr_height(775, "Xu"),
dr_height(750, "Mm^Xm"),
dr_height(700, "Mm"),
dr_height(690, "Hh^Uf"),
dr_height(690, "Hh^Tf"),
dr_height(660, "Hh^Fp"),
dr_height(625, "Hh"),
-- most rough terrain is added post generation
@ -33,7 +33,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
wct_fix_river_into_ocean("g", 29),
-- DR_CONVERT MIN_HT MAX_HT MIN_TMP MAX_TMP FROM TO
-- lava appears at extreme temp and height
dr_convert(800, 999, 850, 999, "Uu, Uh, Uu^Uf", "Ql"),
dr_convert(800, 999, 850, 999, "Uu, Uh, Uu^Tf", "Ql"),
-- DR_TEMPERATURE FROM MIN MAX TO),
-- less wet flat as higher temperature
dr_temperature("Gg", 720, 999, "Dd"),
@ -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^Uf",
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

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

@ -25,15 +25,15 @@ local function generate(length, villages, castle, iterations, size, players, isl
res.height = {
dr_height(955, "Uh"),
dr_height(945, "Uu^Uf"),
dr_height(945, "Uu^Tf"),
dr_height(900, "Uu"),
dr_height(855, "Uh"),
dr_height(845, "Uu^Uf"),
dr_height(845, "Uu^Tf"),
dr_height(825, "Uu"),
dr_height(775, "Xu"),
dr_height(750, "Mm^Xm"),
dr_height(700, "Mm"),
dr_height(690, "Hh^Uf"),
dr_height(690, "Hh^Tf"),
dr_height(660, "Hh^Fp"),
dr_height(625, "Hh"),
dr_height(540, "Gg"),
@ -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^Uf",
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/delta.lua
View file

@ -36,11 +36,11 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_convert(nil, nil, 350, 420, "Gg", "Gs^Fp"),
-- fungus
-- DR_CONVERT MIN_HT MAX_HT MIN_TMP MAX_TMP FROM TO
dr_convert(825, 950, 500, 525, "Uue, Uue^Dr", "Uue^Uf"),
dr_convert(825, 950, 550, 575, "Uue, Uue^Dr", "Uue^Uf"),
dr_convert(825, 950, 600, 625, "Uue, Uue^Dr", "Uue^Uf"),
dr_convert(825, 950, 500, 525, "Uue, Uue^Dr", "Uue^Tf"),
dr_convert(825, 950, 550, 575, "Uue, Uue^Dr", "Uue^Tf"),
dr_convert(825, 950, 600, 625, "Uue, Uue^Dr", "Uue^Tf"),
-- lava
dr_convert(800, nil, 850, nil, "Uue, Uue^Dr, Uue^Uf", "Ql"),
dr_convert(800, nil, 850, nil, "Uue, Uue^Dr, Uue^Tf", "Ql"),
}
res.road_cost = {
dr_road("Gg", "Re", 10),

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

@ -22,7 +22,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_height(715, "Hh"),
dr_height(710, "Hh^Fp"),
dr_height(685, "Hh"),
dr_height(675, "Hh^Uf"),
dr_height(675, "Hh^Tf"),
dr_height(650, "Hh"),
dr_height(645, "Hh^Fp"),
dr_height(610, "Hh"),
@ -34,9 +34,9 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_height(420, "Hh^Fp"),
dr_height(410, "Gg"),
dr_height(400, "Mm"),
dr_height(395, "Gs^Uf"),
dr_height(395, "Gs^Tf"),
dr_height(380, "Ss"),
dr_height(375, "Gs^Uf"),
dr_height(375, "Gs^Tf"),
dr_height(360, "Gg"),
dr_height(340, "Hh^Fp"),
dr_height(320, "Gg"),
@ -55,22 +55,22 @@ local function generate(length, villages, castle, iterations, size, players, isl
-- DR_CONVERT MIN_HT MAX_HT MIN_TMP MAX_TMP FROM TO
-- low temperatures
dr_convert(80, 999, 0, 375, "Gg, Gs^Uf", "Aa"),
dr_convert(80, 999, 0, 375, "Gg, Gs^Tf", "Aa"),
dr_convert(250, 999, 0, 375, "Ss", "Ai"),
dr_convert(80, 999, 370, 425, "Gg", "Gs"),
dr_convert(80, 999, 0, 375, "Gs^Fp", "Aa^Fpa"),
dr_convert(80, 999, 375, 425, "Gs^Fp", "Gs^Fmw"),
dr_convert(0, 999, 0, 400, "Hh^Fp, Hh^Uf", "Ha^Fpa"),
dr_convert(0, 999, 0, 400, "Hh^Fp, Hh^Tf", "Ha^Fpa"),
dr_convert(80, 999, 400, 450, "Hh^Fp", "Hh^Fmw"),
dr_convert(0, 999, 0, 425, "Hh", "Ha"),
dr_convert(0, 999, 0, 450, "Mm", "Ms"),
dr_convert(750, 999, 0, 460, "Mm^Xm", "Ms^Xm"),
-- fungus
dr_convert(850, 950, 500, 525, "Uu, Uh", "Uu^Uf"),
dr_convert(850, 950, 550, 575, "Uu, Uh", "Uu^Uf"),
dr_convert(850, 950, 600, 625, "Uu, Uh", "Uu^Uf"),
dr_convert(850, 950, 500, 525, "Uu, Uh", "Uu^Tf"),
dr_convert(850, 950, 550, 575, "Uu, Uh", "Uu^Tf"),
dr_convert(850, 950, 600, 625, "Uu, Uh", "Uu^Tf"),
-- high temperatures
dr_convert(825, 999, 850, 999, "Uu, Uh, Uu^Uf", "Ql"),
dr_convert(825, 999, 850, 999, "Uu, Uh, Uu^Tf", "Ql"),
dr_convert(0, 999, 800, 999, "Gg", "Dd"),
dr_convert(250, 999, 800, 999, "Ss", "Dd^Do"),
dr_convert(80, 999, 750, 800, "Gg", "Gs"),
@ -93,7 +93,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_road("Hh^Fmf", "Urb", 30),
dr_road("Hh^Fmw", "Urb", 30),
dr_road("Hh^Fms", "Urb", 30),
dr_road("Hh^Uf", "Urb", 25),
dr_road("Hh^Tf", "Urb", 25),
dr_road("Mm", "Urb", 40),
dr_road("Mm^Xm", "Urb", 75),
dr_bridge("Ql", "Ql^Bs", "Urb", 100),
@ -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^Uf",
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,
}

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

@ -59,11 +59,11 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_convert(300, 999, 510, 540, "Gg,Gs", "Gg^Fds"),
dr_convert(300, 999, 510, 540, "Hh", "Hh^Fds"),
-- fungus appears at med temp and high
dr_convert(825, 950, 500, 525, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 550, 575, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 600, 625, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 500, 525, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 550, 575, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 600, 625, "Uu, Uh", "Uu^Tf"),
-- high temperatures
dr_convert(800, 999, 850, 999, "Uu, Uh, Uu^Uf", "Ql"),
dr_convert(800, 999, 850, 999, "Uu, Uh, Uu^Tf", "Ql"),
dr_convert(260, 999, 800, 999, "Gg", "Dd"),
dr_convert(230, 999, 750, 999, "Gg", "Gd"),
dr_convert(100, 999, 650, 999, "Gg", "Gs"),

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

@ -54,8 +54,8 @@ local function generate(length, villages, castle, iterations, size, players, isl
res.convert = {
-- DR_CONVERT MIN_HT MAX_HT MIN_TMP MAX_TMP FROM TO
dr_convert(70, 150, 10, 300, "Gg", "Ss"),
dr_convert(550, 680, 350, 370, "Gg", "Hh^Uf"),
dr_convert(550, 680, 620, 640, "Gg", "Hh^Uf"),
dr_convert(550, 680, 350, 370, "Gg", "Hh^Tf"),
dr_convert(550, 680, 620, 640, "Gg", "Hh^Tf"),
-- DR_TEMPERATURE FROM MIN MAX TO),
-- convert forest at different temperatures

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

@ -20,21 +20,21 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_height(720, "Mm"),
dr_height(670, "Hhd"),
dr_height(650, "Hh^Fp"),
dr_height(630, "Hhd^Uf"),
dr_height(630, "Hhd^Tf"),
dr_height(610, "Gll^Fp"),
dr_height(590, "Gll^Uf"),
dr_height(590, "Gll^Tf"),
dr_height(580, "Hhd"),
dr_height(400, "Gll"),
dr_height(395, "Hh"),
dr_height(360, "Ss"),
dr_height(340, "Gll^Ftr"),
dr_height(330, "Hh"),
dr_height(320, "Hh^Uf"),
dr_height(320, "Hh^Tf"),
dr_height(300, "Hh^Fp"),
dr_height(280, "Ss"),
dr_height(270, "Hh"),
dr_height(250, "Gll^Fp"),
dr_height(225, "Gll^Uf"),
dr_height(225, "Gll^Tf"),
dr_height(175, "Gll"),
dr_height(70, "Ds"),
dr_height(65, "Wwrt"),
@ -50,27 +50,27 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_convert(360, 999, 10, 400, "Ww", "Ai"),
dr_convert(475, 750, 10, 415, "Gll^Fp", "Aa^Fpa"),
dr_convert(450, 750, 10, 425, "Gll", "Aa"),
dr_convert(410, 750, 10, 465, "Gll,Gll^Uf", "Gd"),
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^Uf", "Ha^Uf"),
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"),
dr_convert(400, 750, 680, 700, "Gll", "Gll^Efm"),
dr_convert(475, 505, 725, 750, "Gll", "Ce"),
dr_convert(585, 595, 10, 440, "Aa,Gll^Uf", "Ms"),
dr_convert(585, 595, 10, 440, "Aa,Gll^Tf", "Ms"),
dr_convert(575, 585, 10, 440, "Aa", "Ha"),
dr_convert(475, 600, 870, 900, "Gll,Gll^Uf", "Ql"),
dr_convert(475, 600, 870, 900, "Gll,Gll^Tf", "Ql"),
-- DR_TEMPERATURE FROM MIN MAX TO),
dr_temperature("Mm", 10, 570, "Ms"),
dr_temperature("Mm^Xm", 10, 585, "Ms^Xm"),
dr_temperature("Ds", 870, 900, "Ds^Edpp"),
dr_temperature("Uu", 100, 300, "Ai"),
dr_temperature("Uu", 650, 700, "Uu^Uf"),
dr_temperature("Uh", 675, 725, "Uh^Uf"),
dr_temperature("(Uu,Uh,Uu^Uf)", 850, 999, "Ql"),
dr_temperature("Uu", 650, 700, "Uu^Tf"),
dr_temperature("Uh", 675, 725, "Uh^Tf"),
dr_temperature("(Uu,Uh,Uu^Tf)", 850, 999, "Ql"),
dr_temperature("Qxu", 800, 999, "Ql"),
}
res.road_cost = {
@ -81,9 +81,9 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_road("Gll^Fet", "Rb", 15),
dr_road("Ds", "Rb", 40),
dr_road("Ww", "Wwf", 50),
dr_road("Gll^Uf", "Rb", 15),
dr_road("Hh^Uf", "Rb", 15),
dr_road("Hhd^Uf", "Rb", 15),
dr_road("Gll^Tf", "Rb", 15),
dr_road("Hh^Tf", "Rb", 15),
dr_road("Hhd^Tf", "Rb", 15),
dr_road("Ss", "Rb", 15),
dr_road("Aa", "Rb", 10),
dr_road("Hh", "Rb", 20),
@ -95,7 +95,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_road("Ms", "Rb", 55),
dr_bridge("Ql", "Ql^Bsb", "Cud", 45),
dr_road("Uu", "Rb", 35),
dr_road("Uu^Uf", "Rb", 40),
dr_road("Uu^Tf", "Rb", 40),
dr_road("Uh", "Rb", 45),
dr_road("Xu", "Rb", 60),
dr_road("Rb", "Rb", 2),
@ -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,
}

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

@ -12,17 +12,17 @@ local function generate(length, villages, castle, iterations, size, players, isl
res.height = {
-- list of common terrain types which come in at different heights, from highest to lowest
dr_height(990, "Uh^Uf"),
dr_height(990, "Uh^Tf"),
dr_height(980, "Qxu"),
dr_height(970, "Uh"),
dr_height(950, "Uu^Uf"),
dr_height(950, "Uu^Tf"),
dr_height(920, "Uu"),
dr_height(915, "Qxu"),
dr_height(895, "Uh"),
dr_height(885, "Uu^Uf"),
dr_height(885, "Uu^Tf"),
dr_height(860, "Uu"),
dr_height(840, "Uh"),
dr_height(830, "Uu^Uf"),
dr_height(830, "Uu^Tf"),
dr_height(800, "Uu"),
dr_height(750, "Xu"),
dr_height(725, "Mm^Xm"),
@ -161,15 +161,15 @@ local function generate(length, villages, castle, iterations, size, players, isl
rating=1
},
dr_village {
terrain="Uu^Uf",
terrain="Uu^Tf",
convert_to="Uu^Vud",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uu^Uf,Uh^Uf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uu^Tf,Uh^Tf",
rating=3
},
dr_village {
terrain="Uh^Uf",
terrain="Uh^Tf",
convert_to="Uh^Vud",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uh^Uf,Uh^Uf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uh^Tf,Uh^Tf",
rating=2
},
}

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

@ -30,11 +30,11 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_temperature("Gg,Gs", 460, 520, "Gs^Ft"),
-- fungus appears at medium temperatures and extremely high elevation
-- DR_CONVERT MIN_HT MAX_HT MIN_TMP MAX_TMP FROM TO
dr_convert(825, 950, 500, 525, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 550, 575, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 600, 625, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 500, 525, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 550, 575, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 600, 625, "Uu, Uh", "Uu^Tf"),
-- lava appears at extreme temperatures and elevation
dr_convert(800, nil, 900, nil, "Uu, Uh, Uu^Uf", "Ql"),
dr_convert(800, nil, 900, nil, "Uu, Uh, Uu^Tf", "Ql"),
-- desert appears at high temperatures
dr_temperature("Gs", 475, 500, "Dd"),
dr_temperature("Gs", 600, 650, "Dd"),

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

@ -16,7 +16,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_height(765, "Xu"),
dr_height(750, "Mm^Xm"),
dr_height(700, "Mm"),
dr_height(680, "Hh^Uf"),
dr_height(680, "Hh^Tf"),
dr_height(650, "Gs^Fp"),
dr_height(625, "Hh^Fp"),
dr_height(575, "Hh"),
@ -40,13 +40,13 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_convert(450, 525, 425, 525, "Gs", "Sm"),
dr_convert(450, 490, 375, 425, "Gs", "Wwg"),
dr_convert(490, 525, 375, 425, "Gs", "Wwrg"),
dr_convert(450, 525, 225, 375, "Gs", "Gs^Uf"),
dr_convert(450, 525, 225, 375, "Gs", "Gs^Tf"),
dr_convert(450, 525, 10, 225, "Gs", "Gg^Fet"),
dr_convert(100, 999, 560, 999, "Gs", "Gd"),
dr_convert(100, 999, 10, 385, "Gs", "Gg"),
dr_convert(75, 999, 600, 999, "Ds", "Dd"),
dr_convert(200, 999, 600, 999, "Hh", "Hhd"),
dr_convert(200, 999, 650, 999, "Hh^Uf", "Hhd^Uf"),
dr_convert(200, 999, 650, 999, "Hh^Tf", "Hhd^Tf"),
dr_convert(200, 999, 600, 999, "Mm", "Md"),
-- DR_TEMPERATURE FROM MIN MAX TO),
@ -67,8 +67,8 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_temperature("Uu,Uh", 850, 999, "Ql"),
dr_temperature("Uu", 725, 850, "Uue"),
dr_temperature("Uh", 725, 850, "Uue^Dr"),
dr_temperature("Uu", 700, 725, "Uue^Uf"),
dr_temperature("Uu", 575, 600, "Uu^Uf"),
dr_temperature("Uu", 700, 725, "Uue^Tf"),
dr_temperature("Uu", 575, 600, "Uu^Tf"),
}
res.road_cost = {
dr_road("Gg", "Re", 10),
@ -91,7 +91,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_road("Dd", "Re", 15),
dr_road("Gs", "Re", 9),
dr_road("Gd", "Re", 10),
dr_road("Gs^Uf", "Re", 12),
dr_road("Gs^Tf", "Re", 12),
dr_road("Gs^Ftr", "Re", 20),
dr_road("Gs^Ftp", "Re", 20),
dr_road("Gs^Fet", "Re", 20),
@ -112,9 +112,9 @@ local function generate(length, villages, castle, iterations, size, players, isl
rating=4
},
dr_village {
terrain = "Gs^Uf",
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 {

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

@ -25,18 +25,18 @@ local function generate(length, villages, castle, iterations, size, players, isl
res.height = {
dr_height(955, "Uh"),
dr_height(945, "Uu^Uf"),
dr_height(945, "Uu^Tf"),
dr_height(900, "Uu"),
dr_height(855, "Uh"),
dr_height(845, "Uu^Uf"),
dr_height(845, "Uu^Tf"),
dr_height(825, "Uu"),
dr_height(775, "Xu"),
dr_height(750, "Mm^Xm"),
dr_height(700, "Mm"),
dr_height(690, "Hh^Uf"),
dr_height(690, "Hh^Tf"),
dr_height(660, "Hh^Fds"),
dr_height(625, "Hh"),
dr_height(615, "Hh^Uf"),
dr_height(615, "Hh^Tf"),
dr_height(600, "Hh^Fds"),
dr_height(500, "Gd"),
dr_height(310, "Gs"),
@ -55,7 +55,7 @@ local function generate(length, villages, castle, iterations, size, players, isl
dr_bridge("Ww", "Ww^Bw", "Wwf", 45),
dr_road("Hh", "Rb", 55),
dr_road("Hh^Fds", "Rb", 55),
dr_road("Hh^Uf", "Rb", 55),
dr_road("Hh^Tf", "Rb", 55),
dr_road("Mm", "Rb", 70),
dr_road("Rb", "Rb", 4),
}
@ -69,13 +69,13 @@ 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 {
terrain = "Gd",
convert_to="Gg^Vo",
adjacent_liked="Gg, Gs, Ww, Rb, Gd, Gs, Rb, Gg, Gs, Hh, Mm, Hh^Fds, Hh^Uf",
adjacent_liked="Gg, Gs, Ww, Rb, Gd, Gs, Rb, Gg, Gs, Hh, Mm, Hh^Fds, Hh^Tf",
rating=8
},
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^Uf",
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^Uf",
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

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

@ -11,24 +11,24 @@ local function generate(length, villages, castle, iterations, size, players, isl
res.road_windiness=3
res.height = {
dr_height(990, "Uh^Uf"),
dr_height(990, "Uh^Tf"),
dr_height(970, "Qxu"),
dr_height(950, "Uh"),
dr_height(940, "Uu^Uf"),
dr_height(940, "Uu^Tf"),
dr_height(920, "Uu"),
dr_height(910, "Qxu"),
dr_height(890, "Uh"),
dr_height(880, "Uu^Uf"),
dr_height(880, "Uu^Tf"),
dr_height(860, "Uu"),
dr_height(840, "Uh"),
dr_height(830, "Uu^Uf"),
dr_height(830, "Uu^Tf"),
dr_height(810, "Uu"),
dr_height(765, "Xu"),
dr_height(740, "Mm^Xm"),
dr_height(700, "Mm"),
dr_height(690, "Hh^Uf"),
dr_height(690, "Hh^Tf"),
dr_height(655, "Hh"),
dr_height(650, "Hh^Uf"),
dr_height(650, "Hh^Tf"),
dr_height(600, "Hh"),
dr_height(110, "Gg"),
dr_height(30, "Ds"),
@ -40,13 +40,13 @@ local function generate(length, villages, castle, iterations, size, players, isl
-- cold
dr_temperature("Mm^Xm", 1, 405, "Ms^Xm"),
dr_temperature("Mm", 1, 385, "Ms"),
dr_temperature("Hh,Hh^Uf", 1, 345, "Ha"),
dr_temperature("Hh,Hh^Tf", 1, 345, "Ha"),
dr_temperature("Gg", 1, 305, "Aa"),
dr_temperature("Ds", 1, 260, "Ai"),
dr_temperature("Gg", 305, 500, "Gs"),
-- hot
dr_temperature("Hh,Hh^Uf", 585, 760, "Hhd"),
dr_temperature("Hh,Hh^Uf", 760, 999, "Hd"),
dr_temperature("Hh,Hh^Tf", 585, 760, "Hhd"),
dr_temperature("Hh,Hh^Tf", 760, 999, "Hd"),
dr_temperature("Gg", 720, 999, "Dd"),
dr_temperature("Qxu", 850, 999, "Ql"),
}
@ -115,15 +115,15 @@ local function generate(length, villages, castle, iterations, size, players, isl
rating=5
},
dr_village {
terrain="Uu^Uf",
terrain="Uu^Tf",
convert_to="Uu^Vu",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uu^Uf,Uh^Uf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uu^Tf,Uh^Tf",
rating=5
},
dr_village {
terrain="Uh^Uf",
terrain="Uh^Tf",
convert_to="Uh^Vu",
adjacent_liked="Hh^Uf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Uf,Uh^Uf,Uh^Uf",
adjacent_liked="Hh^Tf,Hh,Mm,Uu,Uh,Xu,Qxu,Uu,Uu^Tf,Uh^Tf,Uh^Tf",
rating=5
},
dr_village {

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

@ -34,11 +34,11 @@ local function generate(length, villages, castle, iterations, size, players, isl
-- jungle appears at moderate temperatures
dr_convert(nil, nil, 200, 700, "Gg,Gs", "Gs^Ft"),
-- fungus appears at medium temperatures and extremely high elevation
dr_convert(825, 950, 475, 525, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 550, 600, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 625, 675, "Uu, Uh", "Uu^Uf"),
dr_convert(825, 950, 475, 525, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 550, 600, "Uu, Uh", "Uu^Tf"),
dr_convert(825, 950, 625, 675, "Uu, Uh", "Uu^Tf"),
-- lava appears at extreme temperatures and elevation
dr_convert(800, nil, 850, nil, "Uu, Uh, Uu^Uf", "Ql"),
dr_convert(800, nil, 850, nil, "Uu, Uh, Uu^Tf", "Ql"),
-- desert appears at extreme temperatures
dr_convert(nil, nil, 800, nil, "Gg", "Ds"),
-- dunes appear at extreme temperatures and moderate elevation

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

@ -1,8 +1,8 @@
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^Uf")
world_conquest_tek_map_dirt("Gg^Tf")
end
function world_conquest_tek_map_decoration_1()

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^Uf")
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"))
)

12
data/campaigns/World_Conquest/lua/map/postgeneration/2B_Lakes.lua
View file

@ -108,7 +108,7 @@ local function world_conquest_tek_map_repaint_2b()
set_terrain { "Ai",
f.all(
f.terrain("Ww,Wwg,Wo,Wog"),
f.adjacent(f.terrain("*^Uf"), nil, 0),
f.adjacent(f.terrain("*^Tf"), nil, 0),
f.none(
f.find_in("oceanic")
)
@ -120,21 +120,21 @@ local function world_conquest_tek_map_repaint_2b()
set_terrain { "Ms",
f.all(
f.terrain("M*"),
f.adjacent(f.terrain("*^Uf"), nil, 0),
f.adjacent(f.terrain("*^Tf"), nil, 0),
f.radius(2, f.terrain("Ai"))
),
}
set_terrain { "Ha",
f.all(
f.terrain("Hh"),
f.adjacent(f.terrain("*^Uf"), nil, 0),
f.adjacent(f.terrain("*^Tf"), nil, 0),
f.radius(1, f.terrain("Ai"))
),
}
set_terrain { "Ha^Fpa",
f.all(
f.terrain("Hh^F*"),
f.adjacent(f.terrain("*^Uf"), nil, 0),
f.adjacent(f.terrain("*^Tf"), nil, 0),
f.radius(1, f.terrain("Ai"))
),
}
@ -220,7 +220,7 @@ function world_conquest_tek_map_constructor_lakes()
}
-- add mushrooms
set_terrain { "Gg^Uf",
set_terrain { "Gg^Tf",
f.all(
f.adjacent(f.terrain("Wwt^*,Wot,Wwf")),
f.adjacent(f.terrain("A*^*,Ha^*,Ms^*"), nil, 0),
@ -233,7 +233,7 @@ function world_conquest_tek_map_constructor_lakes()
local r = mathx.random_choice(tostring(total_tiles // 675) .. ".." .. tostring(total_tiles // 285))
set_terrain { "Hh^Uf",
set_terrain { "Hh^Tf",
f.all(
f.terrain("Hh^F*,Hh"),
f.adjacent(f.terrain("A*^*,Ha^*,Ms^*"), nil, 0)

10
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
@ -17,10 +17,10 @@ function world_conquest_tek_map_decoration_2c()
f.terrain("Mm"),
}
set_terrain { "Ha^Fpa",
f.terrain("Uh^Uf"),
f.terrain("Uh^Tf"),
}
set_terrain { "Aa^Fpa",
f.terrain("Uu^Uf"),
f.terrain("Uu^Tf"),
}
set_terrain { "Ha",
f.terrain("Uh,Hd"),
@ -118,7 +118,7 @@ function world_conquest_tek_map_decoration_2c()
fraction = 2,
layer = "overlay",
}
set_terrain { "Hh^Uf",
set_terrain { "Hh^Tf",
f.all(
f.terrain("Hh^Fp"),
f.none(
@ -127,7 +127,7 @@ function world_conquest_tek_map_decoration_2c()
),
fraction = 10,
}
set_terrain { "Ss^Uf",
set_terrain { "Ss^Tf",
f.all(
f.terrain("Ss"),
f.none(

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^Uf")
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^*")),

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

@ -1,10 +1,10 @@
-- 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^Uf")
world_conquest_tek_map_dirt("Gs^Tf")
end
function world_conquest_tek_map_decoration_3a()
@ -71,9 +71,9 @@ function world_conquest_tek_map_decoration_3a()
f.adjacent(f.terrain("G*^F*"), nil, "0-1")
),
}
set_terrain { "Hhd^Uf",
set_terrain { "Hhd^Tf",
f.all(
f.terrain("Hh^Uf"),
f.terrain("Hh^Tf"),
f.adjacent(f.terrain("Dd,Hd"), nil, "2-6"),
f.adjacent(f.terrain("Ss,Wwt,Wot,Wwrt"), nil, 0)
),
@ -81,21 +81,21 @@ function world_conquest_tek_map_decoration_3a()
set_terrain { "Hhd",
f.all(
f.terrain("Hh"),
f.adjacent(f.terrain("Dd,Hd,Hhd^Uf"), nil, "2-6"),
f.adjacent(f.terrain("Dd,Hd,Hhd^Tf"), nil, "2-6"),
f.adjacent(f.terrain("Ss,Wwt,Wot,Wwrt"), nil, 0)
),
}
set_terrain { "Md",
f.all(
f.terrain("Mm"),
f.adjacent(f.terrain("Dd,Hd,Hhd,Hhd^Uf"), nil, "2-6")
f.adjacent(f.terrain("Dd,Hd,Hhd,Hhd^Tf"), nil, "2-6")
),
}
set_terrain { "Hh^Vl",
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"))
)
),
}

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

@ -1,8 +1,8 @@
-- 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^Uf")
world_conquest_tek_map_dirt("Gs^Tf")
end
function world_conquest_tek_map_decoration_3b()

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

@ -72,11 +72,11 @@ function wct_noise_delta()
f.terrain("Dd"),
fraction = 5,
}
set_terrain { "Ur,Uue^Uf,Uue^Dr,Uue",
f.terrain("U*,U*^Uf"),
set_terrain { "Ur,Uue^Tf,Uue^Dr,Uue",
f.terrain("U*,U*^Tf"),
fraction = 3,
}
set_terrain { "Gs,Gs,Gs,Gs,Hh,Hh,Hh,Gs^Ft,Gs^Ft,Gs^Ft,Gs^Uf",
set_terrain { "Gs,Gs,Gs,Gs,Hh,Hh,Hh,Gs^Ft,Gs^Ft,Gs^Ft,Gs^Tf",
f.terrain("Mm"),
fraction = 2,
}
@ -84,7 +84,7 @@ function wct_noise_delta()
f.terrain("Hh"),
fraction = 2,
}
set_terrain { "Gs,Gs,Gs,Gs,Gs,Gg,Hh^Ft,Gs^Ft,Gs^Ft,Gs^Ft,Mm,Gs^Uf",
set_terrain { "Gs,Gs,Gs,Gs,Gs,Gg,Hh^Ft,Gs^Ft,Gs^Ft,Gs^Ft,Mm,Gs^Tf",
f.terrain("Hh"),
fraction = 5,
}
@ -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,11 +119,11 @@ 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,
}
set_terrain { "Ww,Hh^Uf",
set_terrain { "Ww,Hh^Tf",
f.terrain("Xuce"),
fraction = 8,
}
@ -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",
@ -312,16 +312,16 @@ function world_conquest_tek_map_decoration_3c()
f.terrain("Dd")
),
}
set_terrain { "Ss^Uf",
set_terrain { "Ss^Tf",
f.all(
f.adjacent(f.terrain("Ss")),
f.terrain("Hh^Uf")
f.terrain("Hh^Tf")
),
}
set_terrain { "Sm^Uf",
set_terrain { "Sm^Tf",
f.all(
f.adjacent(f.terrain("D*^*,Hd*^*"), nil, 6),
f.terrain("Hh^Uf")
f.terrain("Hh^Tf")
),
}
set_terrain { "Uue,Uue,Uue,Uue,Ds,Ww,Uue^Dr,Sm",

6
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*^*")),
@ -30,7 +30,7 @@ function world_conquest_tek_map_repaint_3e()
fraction = 9,
}
set_terrain { "Gg",
f.terrain("Hh,Hh^F*,Hh^Uf"),
f.terrain("Hh,Hh^F*,Hh^Tf"),
fraction = 4,
}
set_terrain { "Ds^Ftd",

8
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()
@ -20,7 +20,7 @@ function world_conquest_tek_map_repaint_3f()
fraction = 4,
}
set_terrain { "Gd",
f.terrain("Hh,Hh^F*,Hh^Uf"),
f.terrain("Hh,Hh^F*,Hh^Tf"),
fraction = 4,
}
set_terrain { "Ss",
@ -32,7 +32,7 @@ function world_conquest_tek_map_repaint_3f()
fraction = 5,
layer = "overlay",
}
set_terrain { "*^Uf",
set_terrain { "*^Tf",
f.terrain("G*"),
fraction = 13,
layer = "overlay",

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^Uf")
world_conquest_tek_map_dirt("Gg^Tf,Gg^Tf,Gs^Tf")
end
function world_conquest_tek_map_decoration_4a()

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

@ -2,28 +2,28 @@
function world_conquest_tek_map_repaint_4b()
set_terrain { "Ql,Md,Md^Xm",
f.terrain("U*,U*^Uf"),
f.terrain("U*,U*^Tf"),
exact = false,
percentage = 10,
}
set_terrain { "Ql,Uu,Uh,Uh,Uu^Uf,Qxu,Uh^Uf",
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^Uf",
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^Uf"))
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,
}
@ -281,7 +281,7 @@ function world_conquest_tek_map_repaint_4b()
local r = mathx.random_choice(tostring(total_tiles // 600) .. ".." .. tostring(total_tiles // 300))
for mush_i = 1, math.min(r, #terrain_to_change) do
map[terrain_to_change[mush_i]] = "Hhd^Uf"
map[terrain_to_change[mush_i]] = "Hhd^Tf"
end
-- chances of few orcish castles
wct_possible_map4_castle("Co", 2)

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

@ -252,12 +252,12 @@ 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^Uf")
world_conquest_tek_map_dirt("Gg^Tf,Gg^Tf,Gs^Tf")
end
function wct_map_4c_post_bunus_decoration()
-- dwarvish forges and keeps
local terrain_to_change = map:find(f.all(
f.terrain("*^Uf"),
f.terrain("*^Tf"),
f.adjacent(f.terrain("*^Vud"))
))

6
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^Uf"),
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^Uf",
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)
@ -68,7 +68,7 @@ local function world_conquest_tek_map_repaint_4d()
}
-- better looking adjacences to lava and frozen
set_terrain { "Uu,Uh,Uu^Uf",
set_terrain { "Uu,Uh,Uu^Tf",
f.all(
f.terrain("W*"),
f.adjacent(f.terrain("Ql"))

6
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",
@ -173,7 +173,7 @@ function world_conquest_tek_map_repaint_4e()
}
-- swamp mushrooms east
set_terrain { "Ss^Uf",
set_terrain { "Ss^Tf",
f.all(
f.terrain("S*"),
f.none(

4
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^Uf"),
f.terrain("Uu,Uh,Uu^Tf,Uh^Tf"),
f.adjacent(f.terrain("G*^*,H*^*")),
f.adjacent(f.terrain("*^Xm"), nil, 0)
),
@ -172,7 +172,7 @@ function repaint(map_data)
),
f.all(
f.terrain("Gll^V*"),
f.adjacent(f.terrain("Gll^Uf"))
f.adjacent(f.terrain("Gll^Tf"))
)
),
layer = "overlay",

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^Uf")
world_conquest_tek_map_dirt("Gg^Tf,Gs^Tf")
end
local _ = wesnoth.textdomain 'wesnoth-wc'

6
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^Uf",
set_terrain { "Gs^Fp,Hh^Fp,Hh,Mm,Gs^Fp,Ss^Tf,Ss^Tf,Ss^Tf",
f.all(
f.terrain("Ss"),
f.none(
@ -347,7 +347,7 @@ function world_conquest_tek_map_decoration_6b()
}
-- some mushrooms on hills near river or caves
set_terrain { "Hh^Uf",
set_terrain { "Hh^Tf",
f.all(
f.terrain("Hh,Hh^F*"),
f.radius(5, f.terrain("Ww,Wwf,U*^*"))
@ -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()

10
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(
@ -582,7 +582,7 @@ local function world_conquest_tek_map_decoration_6c()
}
-- rough extra terrain noise
set_terrain { "Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fmw,Gs^Fmf,Hh^Fp,Hh,Hh,Mm,Mm,Gs^Uf",
set_terrain { "Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fp,Gs^Fmw,Gs^Fmf,Hh^Fp,Hh,Hh,Mm,Mm,Gs^Tf",
f.all(
f.terrain("G*"),
f.adjacent(f.terrain("Sm^*,C*^*,K*^*,W*^*,*^V*,Ds"), nil, 0)
@ -637,7 +637,7 @@ local function world_conquest_tek_map_repaint_6c()
-- soft hills clusters
set_terrain { "Gs,Gs,Gg,Gs,Gs,Gg,Gs,Gs,Gg,Gs,Gs,Gg,Hh^Fp",
f.all(
f.terrain("Hh,Hh^F*,Hh^Uf"),
f.terrain("Hh,Hh^F*,Hh^Tf"),
f.adjacent(f.terrain("H*^*,M*^*,C*,K*^*"), nil, 6)
),
fraction = 2,
@ -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()

16
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^Uf",
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*"),
@ -213,7 +213,7 @@ local function world_conquest_tek_map_repaint_6d()
f.terrain("Hh"),
fraction = 5,
}
set_terrain { "Hh^Fp,Hh^Uf",
set_terrain { "Hh^Fp,Hh^Tf",
f.terrain("Hh"),
fraction = 12,
}
@ -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^Uf",
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,
}

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

@ -45,8 +45,8 @@ function world_conquest_tek_map_noise_classic(tree)
per_thousand = 222,
exact = false,
},
{ "Ur,Uu^Uf,Uh,Uu",
f.terrain("Uu,Uh,Uu^Uf"),
{ "Ur,Uu^Tf,Uh,Uu",
f.terrain("Uu,Uh,Uu^Tf"),
per_thousand = 420,
exact = false,
},
@ -87,7 +87,7 @@ function world_conquest_tek_map_noise_classic(tree)
f.all(
f.terrain("Mm^Xm"),
f.adjacent(f.terrain("Xu")),
f.adjacent(f.terrain("Uu,Uh,Uu^Uf")),
f.adjacent(f.terrain("Uu,Uh,Uu^Tf")),
f.adjacent(f.none(
f.terrain("Uu,Uh,Uu^Uh,Xu")
))
@ -126,8 +126,8 @@ function world_conquest_tek_map_noise_maritime()
per_thousand = 222,
exact = false,
},
{ "Ur,Uu^Uf,Uh,Uu",
f.terrain("Uu,Uh,Uu^Uf"),
{ "Ur,Uu^Tf,Uh,Uu",
f.terrain("Uu,Uh,Uu^Tf"),
per_thousand = 410,
exact = false,
},
@ -160,7 +160,7 @@ function world_conquest_tek_map_noise_maritime()
f.all(
f.terrain("Mm^Xm"),
f.adjacent(f.terrain("Xu")),
f.adjacent(f.terrain("Uu,Uh,Uu^Uf")),
f.adjacent(f.terrain("Uu,Uh,Uu^Tf")),
f.adjacent(f.none(
f.terrain("Uu,Uh,Uu^Uh,Xu")
))

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

@ -114,9 +114,9 @@ function wct_expand_snow()
f.adjacent(f.terrain("Aa^*,Ai,Ms*^*,Ha^*,Kha,Cha"))
),
}
set_terrain { "Ha^Uf",
set_terrain { "Ha^Tf",
f.all(
f.terrain("Hh^Uf"),
f.terrain("Hh^Tf"),
f.adjacent(f.terrain("Aa^*,Ai,Ms*^*,Ha^*,Kha,Cha"), nil, "3-6")
),
}

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

@ -50,11 +50,11 @@ function world_conquest_tek_map_rebuild(cave, reef)
local r = mathx.random_choice(tostring(total_tiles // 500) .. ".." .. tostring(total_tiles // 250))
-- just to be sure.
r = tonumber(r)
set_terrain { "Hh^Uf",
set_terrain { "Hh^Tf",
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,
}

54
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,13 +187,13 @@ 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 = {
{
value=1,
command = {
wct_terrain_replace { terrain = "Ss,Ss,Ss,Ss,Ss,Ss,Ss^Uf"}
wct_terrain_replace { terrain = "Ss,Ss,Ss,Ss,Ss,Ss,Ss^Tf"}
}
}
}
@ -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,13 +268,13 @@ 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 = {
{
value=1,
command = {
wct_terrain_replace { terrain = "Ss,Ss,Ss,Ss,Ss,Ss,Ss^Uf"}
wct_terrain_replace { terrain = "Ss,Ss,Ss,Ss,Ss,Ss,Ss^Tf"}
}
}
}
@ -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,13 +347,13 @@ 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 = {
{
value=1,
command = {
wct_terrain_replace { terrain = "Ss,Ss,Ss,Ss,Ss,Ss,Ss^Uf"}
wct_terrain_replace { terrain = "Ss,Ss,Ss,Ss,Ss,Ss,Ss^Tf"}
}
}
}
@ -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^Uf"}
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,13 +626,13 @@ 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^Uf"}
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 = {
{
value=1,
command = {
wct_terrain_replace { terrain = "Gll^Uf"}
wct_terrain_replace { terrain = "Gll^Tf"}
}
},
{
@ -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^Uf"}
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 = {
{
@ -659,7 +659,7 @@ local wild_replacement_chances_zone_7_4 = {
{
value=1,
command = {
wct_terrain_replace { terrain = "Sm,Sm,Sm,Sm,Sm,Sm,Sm^Uf"}
wct_terrain_replace { terrain = "Sm,Sm,Sm,Sm,Sm,Sm,Sm^Tf"}
}
}
}

2
data/campaigns/World_Conquest/lua/map/scenario_utils/bonus_points.lua
View file

@ -191,7 +191,7 @@ function wct_bonus_chose_scenery(loc, theme, filter_extra)
f.terrain("G*"),
f.adjacent(f.terrain("Ss")),
f.adjacent(f.terrain("Hh^*,Ha^*")),
f.adjacent(f.terrain("G*^F*,A*^F*,G*^Uf"))
f.adjacent(f.terrain("G*^F*,A*^F*,G*^Tf"))
)) then
scenery = scenery .. "," .. "temple_green_g,temple_green_g,temple_green_g,temple_green_g2,temple_green_g2"

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^Uf"} 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