Merge Missouri.

zond · Feb 28, 2024 · 8a2839b · 8a2839b
2 parents 6bb96bd + 0fd20f2
commit 8a2839b
Show file tree

Hide file tree

Showing 16 changed files with 55,974 additions and 1 deletion.
diff --git a/variants/beta/gatewaywest/bindata.go b/variants/beta/gatewaywest/bindata.go
diff --git a/variants/beta/gatewaywest/gatewaywest.go b/variants/beta/gatewaywest/gatewaywest.go
diff --git a/variants/beta/gatewaywest/svg/army.svg b/variants/beta/gatewaywest/svg/army.svg
diff --git a/variants/beta/gatewaywest/svg/chickasaw.svg b/variants/beta/gatewaywest/svg/chickasaw.svg
diff --git a/variants/beta/gatewaywest/svg/fleet.svg b/variants/beta/gatewaywest/svg/fleet.svg
diff --git a/variants/beta/gatewaywest/svg/gatewaywestmap.svg b/variants/beta/gatewaywest/svg/gatewaywestmap.svg
diff --git a/variants/beta/gatewaywest/svg/illini.svg b/variants/beta/gatewaywest/svg/illini.svg
diff --git a/variants/beta/gatewaywest/svg/ioway.svg b/variants/beta/gatewaywest/svg/ioway.svg
diff --git a/variants/beta/gatewaywest/svg/missouria.svg b/variants/beta/gatewaywest/svg/missouria.svg
diff --git a/variants/beta/gatewaywest/svg/osage.svg b/variants/beta/gatewaywest/svg/osage.svg
diff --git a/variants/beta/gatewaywest/svg/otoe.svg b/variants/beta/gatewaywest/svg/otoe.svg
diff --git a/variants/beta/gatewaywest/svg/quapaw.svg b/variants/beta/gatewaywest/svg/quapaw.svg
diff --git a/variants/generator/archive/gatewaywest.yml b/variants/generator/archive/gatewaywest.yml
@@ -0,0 +1,35 @@
+# The first year of the game
+START_YEAR: 1826
+# The starting units
+START_UNITS:
+  Oto:
+     Army: ['Platte', 'Nishnabotna']
+     Fleet: ['Clay']
+  Missouria:
+     Army: ['Jackson']
+     Fleet: ['Saline', 'Lafayette']
+  Chickasaw:
+     Army: ['Scott', 'St. Francis']
+     Fleet: ['New Madrid']
+  Quapaw:
+     Army: ['Wayne', 'Butler', 'Black']
+  Osage:
+     Army: ['Osage', 'Ozark', 'Cole']
+  Illini:
+     Army: ['St. Louis', 'Lincoln']
+     Fleet: ['St. Charles']
+  Ioway:
+     Army: ['Grand', 'North Grand', 'Musse']
+# Abbreviations that should be used (rather than letting the script try to guess an abbreviation).
+ABBREVIATIONS:
+  'South Central Mississippi River': 'scp'
+# Overrides to swap centers. This only needs to contain something if the greedy algorithm fails.
+CENTER_OVERRIDES: [
+  ["South Mississippi River", "Scott"],
+]
+# Overrides to swap region names. This only needs to contain something if the greedy algorithm fails.
+REGION_OVERRIDES: [
+  ["Scott", "South Mississippi River"],
+  ["Illinois", "South East Missouri River"],
+  ["Illinois", "St. Louis"],
+]
diff --git a/variants/generator/archive/gatewaywest_input.svg b/variants/generator/archive/gatewaywest_input.svg
diff --git a/variants/generator/generate.py b/variants/generator/generate.py
@@ -12,7 +12,7 @@
 from string import Template
 
 # The name of the variant
-VARIANT = 'ThreeKingdoms'
+VARIANT = 'GatewayWest'
 
 # Set to true to create an output map where it's easier to check the regions and centers have the right ids.
 OVERRIDE_CHECK_MODE = False

diff --git a/variants/variants.go b/variants/variants.go
@@ -1,6 +1,7 @@
 package variants
 
 import (
+	"github.com/zond/godip/variants/beta/gatewaywest"
 	"github.com/zond/godip/variants/classicalcrowded"
 	"github.com/zond/godip/variants/beta/threekingdoms"
 	"github.com/zond/godip/variants/ancientmediterranean"
@@ -35,6 +36,7 @@ func init() {
 var Variants = map[string]common.Variant{}
 
 var OrderedVariants = []common.Variant{
+	gatewaywest.GatewayWestVariant,
 	classicalcrowded.ClassicalCrowdedVariant,
 	threekingdoms.ThreeKingdomsVariant,
 	ancientmediterranean.AncientMediterraneanVariant,