Merge branch 'master' of github.com:zond/godip

zond · Mar 28, 2020 · 47d64d4 · 47d64d4
2 parents 3638776 + f2f3536
commit 47d64d4
Show file tree

Hide file tree

Showing 42 changed files with 5,974 additions and 3,292 deletions.
diff --git a/README.md b/README.md
@@ -106,6 +106,12 @@ To remove these attributes from the svg use one of the [methods on this page](ht
 
 To prepare the svg file for use by go, the tool [go-bindata](https://github.com/jteeuwen/go-bindata) can be used. For example the command `go-bindata -pkg variants ./svg` will convert all assets in the svg directory into a script in the package "variants".
 
+#### Map style
+
+The Classical map is based on an [original work by trampolinebears](https://www.reddit.com/r/diplomacy/comments/8gx4ao/diplomacy_map/).
+
+![Godip Classical Map](variants/classical/svg/map.svg)
+
 ### Algorithm
 
 Heavily inspired by [The Math of Adjudication](http://www.diplom.org/Zine/S2009M/Kruijswijk/DipMath_Chp1.htm) by Lucas Kruijswijk.

diff --git a/variants/ancientmediterranean/ancientmediterranean.go b/variants/ancientmediterranean/ancientmediterranean.go
@@ -33,7 +33,7 @@ var AncientMediterraneanVariant = common.Variant{
 	SVGMap: func() ([]byte, error) {
 		return Asset("svg/ancientmediterraneanmap.svg")
 	},
-	SVGVersion: "3",
+	SVGVersion: "4",
 	SVGUnits: map[godip.UnitType]func() ([]byte, error){
 		godip.Army: func() ([]byte, error) {
 			return classical.Asset("svg/army.svg")

diff --git a/variants/ancientmediterranean/bindata.go b/variants/ancientmediterranean/bindata.go
diff --git a/variants/ancientmediterranean/svg/ancientmediterraneanmap.svg b/variants/ancientmediterranean/svg/ancientmediterraneanmap.svg
diff --git a/variants/canton/bindata.go b/variants/canton/bindata.go
diff --git a/variants/canton/canton.go b/variants/canton/canton.go
@@ -35,7 +35,7 @@ var CantonVariant = common.Variant{
 	SVGMap: func() ([]byte, error) {
 		return Asset("svg/cantonmap.svg")
 	},
-	SVGVersion: "3",
+	SVGVersion: "4",
 	SVGUnits: map[godip.UnitType]func() ([]byte, error){
 		godip.Army: func() ([]byte, error) {
 			return classical.Asset("svg/army.svg")

diff --git a/variants/canton/svg/cantonmap.svg b/variants/canton/svg/cantonmap.svg
diff --git a/variants/classical/bindata.go b/variants/classical/bindata.go
diff --git a/variants/classical/classical.go b/variants/classical/classical.go
@@ -85,7 +85,7 @@ var ClassicalVariant = common.Variant{
 	SVGMap: func() ([]byte, error) {
 		return Asset("svg/map.svg")
 	},
-	SVGVersion:  "7",
+	SVGVersion:  "8",
 	SVGUnits:    SVGUnits,
 	SVGFlags:    SVGFlags,
 	CreatedBy:   "Allan B. Calhamer",

diff --git a/variants/classical/svg/map.svg b/variants/classical/svg/map.svg
diff --git a/variants/coldwar/bindata.go b/variants/coldwar/bindata.go
diff --git a/variants/coldwar/coldwar.go b/variants/coldwar/coldwar.go
@@ -30,7 +30,7 @@ var ColdWarVariant = common.Variant{
 	SVGMap: func() ([]byte, error) {
 		return Asset("svg/coldwarmap.svg")
 	},
-	SVGVersion: "2",
+	SVGVersion: "3",
 	SVGUnits: map[godip.UnitType]func() ([]byte, error){
 		godip.Army: func() ([]byte, error) {
 			return classical.Asset("svg/army.svg")

diff --git a/variants/coldwar/svg/coldwarmap.svg b/variants/coldwar/svg/coldwarmap.svg
diff --git a/variants/empiresandcoalitions/bindata.go b/variants/empiresandcoalitions/bindata.go
diff --git a/variants/empiresandcoalitions/empiresandcoalitions.go b/variants/empiresandcoalitions/empiresandcoalitions.go
@@ -37,7 +37,7 @@ var EmpiresAndCoalitionsVariant = common.Variant{
 	SVGMap: func() ([]byte, error) {
 		return Asset("svg/empiresandcoalitionsmap.svg")
 	},
-	SVGVersion: "3",
+	SVGVersion: "5",
 	SVGUnits: map[godip.UnitType]func() ([]byte, error){
 		godip.Army: func() ([]byte, error) {
 			return classical.Asset("svg/army.svg")

diff --git a/variants/empiresandcoalitions/svg/empiresandcoalitionsmap.svg b/variants/empiresandcoalitions/svg/empiresandcoalitionsmap.svg
diff --git a/variants/europe1939/bindata.go b/variants/europe1939/bindata.go
diff --git a/variants/europe1939/europe1939.go b/variants/europe1939/europe1939.go
@@ -36,7 +36,7 @@ var Europe1939Variant = common.Variant{
 	SVGMap: func() ([]byte, error) {
 		return Asset("svg/europe1939map.svg")
 	},
-	SVGVersion: "1",
+	SVGVersion: "3",
 	SVGUnits: map[godip.UnitType]func() ([]byte, error){
 		godip.Army: func() ([]byte, error) {
 			return classical.Asset("svg/army.svg")

diff --git a/variants/europe1939/svg/europe1939map.svg b/variants/europe1939/svg/europe1939map.svg