From 69f8e706790ec0c27161459219599e427497a61c Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Fri, 1 Dec 2017 23:45:23 -0500 Subject: [PATCH 1/9] Draft first rotation for Conquest --- servers/Conquest.xml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index ef4fd3a..93da513 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -1,17 +1,24 @@ - Green Hill Zone - Overgrown - City Scape - U-Bahn - Downtown - SuperPRISM - Actrix 2 - Ruins of the User - Ancient Lake - Illegal Office - Nevadaca - Abandoned Castle CTF - Dredmor - Stadium Arcadium + City Scape + Concourse + Heeled + + Stadium Arcadium + The Old Texas + Green Hill Zone + Good Morning Vietnam + Actrix 2 + The Grove + + + + + From 0dde6b6334883978fd1950c27f08051c6c2850d8 Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Fri, 1 Dec 2017 23:57:28 -0500 Subject: [PATCH 2/9] Replace Stadium Arcadium with Block Fort: FFA Will need to be converted to support FFA yet again --- servers/Conquest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index 93da513..d4fff61 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -4,7 +4,7 @@ Concourse Heeled - Stadium Arcadium + The Old Texas Green Hill Zone Good Morning Vietnam From 18885abb584ffa57e25d46057b82b923dcac3f24 Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Sat, 2 Dec 2017 00:02:15 -0500 Subject: [PATCH 3/9] Add Foundry, 5CP support Tournament maps were highly requested to start being merged into public rotation. A familiar gamemode with a competitive edge like this should encourage teamwork, and possibly start some fresh fun to Conquest. --- servers/Conquest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index d4fff61..209554f 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -5,7 +5,7 @@ Heeled - The Old Texas + Foundry Green Hill Zone Good Morning Vietnam Actrix 2 @@ -18,6 +18,7 @@ KoTH: 3 CTF: 2 FFA: 2 +5CP: 1 KoTF: 2 TDM: 3 --> From f480214ab30a9fc277127372fcd42ae5330ca548 Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Sun, 3 Dec 2017 00:37:29 -0500 Subject: [PATCH 4/9] Facility has been coded --- servers/Conquest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index 209554f..c5e70d6 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -3,7 +3,7 @@ City Scape Concourse Heeled - + Facility Foundry Green Hill Zone From 63690f74dfb54be8fb4731f503722f52249e189f Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Sun, 3 Dec 2017 01:37:28 -0500 Subject: [PATCH 5/9] University has been coded --- servers/Conquest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index c5e70d6..256ea33 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -10,7 +10,7 @@ Good Morning Vietnam Actrix 2 The Grove - + University From 92e67a3662fdd256fdee335bebb338f296091579 Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Sun, 3 Dec 2017 01:37:50 -0500 Subject: [PATCH 6/9] University has been coded --- servers/Conquest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index 256ea33..1684a61 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -10,7 +10,7 @@ Good Morning Vietnam Actrix 2 The Grove - University + University From be9bc3652cab17d8dcf538e0a7f1dbf77df9e88e Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Sun, 3 Dec 2017 01:38:54 -0500 Subject: [PATCH 7/9] Block Fort has been coded --- servers/Conquest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index 1684a61..ce7fc05 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -4,7 +4,7 @@ Concourse Heeled Facility - + Block Fort Foundry Green Hill Zone Good Morning Vietnam @@ -15,7 +15,7 @@ - Concourse - Heeled - Facility - Block Fort - Foundry - Green Hill Zone - Good Morning Vietnam - Actrix 2 - The Grove - University - + City Scape + Concourse + Heeled + Facility + Block Fort + Foundry + Green Hill Zone + Good Morning Vietnam + Actrix 2 + The Grove + University + BlockBlock - - - From 03174d038c199d90639fcf98bdda0ccbdc4f282f Mon Sep 17 00:00:00 2001 From: Seth Winston Date: Thu, 21 Dec 2017 03:34:22 -0500 Subject: [PATCH 9/9] Update to reflect Atlas changes --- servers/Conquest.xml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/servers/Conquest.xml b/servers/Conquest.xml index e728510..8713e3f 100644 --- a/servers/Conquest.xml +++ b/servers/Conquest.xml @@ -1,15 +1,17 @@ - - City Scape - Concourse - Heeled - Facility - Block Fort - Foundry - Green Hill Zone - Good Morning Vietnam - Actrix 2 - The Grove - University - BlockBlock - + + + City Scape + Concourse + Heeled + Facility + Block Fort + Foundry + Green Hill Zone + Good Morning Vietnam + Actrix 2 + The Grove + University + BlockBlock + +