diff --git a/data/base/script/rules.js b/data/base/script/rules.js index 22ab54d9e42..9da6c7e6a85 100644 --- a/data/base/script/rules.js +++ b/data/base/script/rules.js @@ -244,14 +244,10 @@ function setupGame() { setCampaignNumber(2); replaceTexture("page-7-barbarians-arizona.png", "page-7-barbarians-urban.png"); - replaceTexture("page-8-player-buildings-bases.png", "page-8-player-buildings-bases-urban.png"); - replaceTexture("page-9-player-buildings-bases.png", "page-9-player-buildings-bases-urban.png"); } else if (tilesetType === "ROCKIES") { setCampaignNumber(3); - replaceTexture("page-8-player-buildings-bases.png", "page-8-player-buildings-bases-rockies.png"); - replaceTexture("page-9-player-buildings-bases.png", "page-9-player-buildings-bases-rockies.png"); replaceTexture("page-7-barbarians-arizona.png", "page-7-barbarians-kevlar.png"); } diff --git a/data/base/structs/blbcfact.pie b/data/base/structs/blbcfact.pie index 19ba964e874..2fe8dfd7bd5 100644 --- a/data/base/structs/blbcfact.pie +++ b/data/base/structs/blbcfact.pie @@ -1,6 +1,8 @@ -PIE 3 +PIE 4 TYPE 200 -TEXTURE 0 page-9-player-buildings-bases.png 0 0 +TEXTURE 0 page-9-player-buildings-bases.png +TEXTURE 1 page-9-player-buildings-bases-urban.png +TEXTURE 2 page-9-player-buildings-bases-rockies.png LEVELS 1 LEVEL 1 POINTS 4 diff --git a/data/base/structs/blbdrdcm.pie b/data/base/structs/blbdrdcm.pie index b699d3a19dc..4ddcd9e74bc 100644 --- a/data/base/structs/blbdrdcm.pie +++ b/data/base/structs/blbdrdcm.pie @@ -1,6 +1,8 @@ -PIE 3 +PIE 4 TYPE 200 -TEXTURE 0 page-8-player-buildings-bases.png 0 0 +TEXTURE 0 page-8-player-buildings-bases.png +TEXTURE 1 page-8-player-buildings-bases-urban.png +TEXTURE 2 page-8-player-buildings-bases-rockies.png LEVELS 1 LEVEL 1 POINTS 4 diff --git a/data/base/structs/blbfact.pie b/data/base/structs/blbfact.pie index 222a7161732..a62e4851506 100644 --- a/data/base/structs/blbfact.pie +++ b/data/base/structs/blbfact.pie @@ -1,6 +1,8 @@ -PIE 3 +PIE 4 TYPE 200 -TEXTURE 0 page-9-player-buildings-bases.png 0 0 +TEXTURE 0 page-9-player-buildings-bases.png +TEXTURE 1 page-9-player-buildings-bases-urban.png +TEXTURE 2 page-9-player-buildings-bases-rockies.png LEVELS 1 LEVEL 1 POINTS 4 diff --git a/data/base/structs/blbhq.pie b/data/base/structs/blbhq.pie index aaada12b7ea..b4d8c77fb43 100644 --- a/data/base/structs/blbhq.pie +++ b/data/base/structs/blbhq.pie @@ -1,6 +1,8 @@ -PIE 3 +PIE 4 TYPE 200 -TEXTURE 0 page-8-player-buildings-bases.png 0 0 +TEXTURE 0 page-8-player-buildings-bases.png +TEXTURE 1 page-8-player-buildings-bases-urban.png +TEXTURE 2 page-8-player-buildings-bases-rockies.png LEVELS 1 LEVEL 1 POINTS 4 diff --git a/data/base/structs/blbpower.pie b/data/base/structs/blbpower.pie index e9883d222f0..5b6b20c2db7 100644 --- a/data/base/structs/blbpower.pie +++ b/data/base/structs/blbpower.pie @@ -1,6 +1,8 @@ -PIE 3 +PIE 4 TYPE 200 -TEXTURE 0 page-8-player-buildings-bases.png 0 0 +TEXTURE 0 page-8-player-buildings-bases.png +TEXTURE 1 page-8-player-buildings-bases-urban.png +TEXTURE 2 page-8-player-buildings-bases-rockies.png LEVELS 1 LEVEL 1 POINTS 4 diff --git a/data/base/structs/blbresch.pie b/data/base/structs/blbresch.pie index e7676e2332d..5df7f430b38 100644 --- a/data/base/structs/blbresch.pie +++ b/data/base/structs/blbresch.pie @@ -1,6 +1,8 @@ -PIE 3 +PIE 4 TYPE 200 -TEXTURE 0 page-8-player-buildings-bases.png 0 0 +TEXTURE 0 page-8-player-buildings-bases.png +TEXTURE 1 page-8-player-buildings-bases-urban.png +TEXTURE 2 page-8-player-buildings-bases-rockies.png LEVELS 1 LEVEL 1 POINTS 4 diff --git a/data/base/wrf/cam2/cam2change.wrf b/data/base/wrf/cam2/cam2change.wrf index 77200193d04..00757c76fa2 100644 --- a/data/base/wrf/cam2/cam2change.wrf +++ b/data/base/wrf/cam2/cam2change.wrf @@ -10,8 +10,6 @@ directory "texpages" file TERTILES "tertilesc2hw" file TEXPAGE "page-31-features-urban.png" file TEXPAGE "page-7-barbarians-urban.png" -file TEXPAGE "page-8-player-buildings-bases-urban.png" -file TEXPAGE "page-9-player-buildings-bases-urban.png" /* These come from ../vidmem2.wrf */ file TEXPAGE "page-25-sky-urban.png" file TEXPAGE "page-80-water-1.png" @@ -26,4 +24,3 @@ file TEXPAGE "page-95-brown-rocks-urban.png" file TEXPAGE "page-96-burned-ground-urban.png" file TEXPAGE "page-97-burned-tiles-urban.png" file TEXPAGE "page-98-bottom-urban.png" - diff --git a/data/base/wrf/cam3/cam3change.wrf b/data/base/wrf/cam3/cam3change.wrf index cddecc94a32..705fd428fd6 100644 --- a/data/base/wrf/cam3/cam3change.wrf +++ b/data/base/wrf/cam3/cam3change.wrf @@ -10,8 +10,6 @@ directory "texpages" file TERTILES "tertilesc3hw" file TEXPAGE "page-30-features-rockies.png" file TEXPAGE "page-7-barbarians-kevlar.png" -file TEXPAGE "page-8-player-buildings-bases-rockies.png" -file TEXPAGE "page-9-player-buildings-bases-rockies.png" /* These come from ../vidmem3.wrf */ file TEXPAGE "page-25-sky-urban.png" file TEXPAGE "page-80-water-1.png" @@ -26,4 +24,3 @@ file TEXPAGE "page-105-snow-rockies.png" file TEXPAGE "page-106-snowrock-rockies.png" file TEXPAGE "page-107-brown-earth-rockies.png" file TEXPAGE "page-108-snowcliff-rockies.png" - diff --git a/data/mp/multiplay/script/rules/setupgame.js b/data/mp/multiplay/script/rules/setupgame.js index 4e7a3f782c1..6b070a0af94 100644 --- a/data/mp/multiplay/script/rules/setupgame.js +++ b/data/mp/multiplay/script/rules/setupgame.js @@ -10,15 +10,11 @@ function setupGame() else if (tilesetType === "URBAN") { setCampaignNumber(2); - replaceTexture("page-8-player-buildings-bases.png", "page-8-player-buildings-bases-urban.png"); - replaceTexture("page-9-player-buildings-bases.png", "page-9-player-buildings-bases-urban.png"); replaceTexture("page-7-barbarians-arizona.png", "page-7-barbarians-urban.png"); } else if (tilesetType === "ROCKIES") { setCampaignNumber(3); - replaceTexture("page-8-player-buildings-bases.png", "page-8-player-buildings-bases-rockies.png"); - replaceTexture("page-9-player-buildings-bases.png", "page-9-player-buildings-bases-rockies.png"); replaceTexture("page-7-barbarians-arizona.png", "page-7-barbarians-kevlar.png"); // for some reason rockies will use arizona babas }