Updated language elements

Andrettin · Jul 4, 2015 · c90eb69 · c90eb69
1 parent 11ea02c
commit c90eb69
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 18 deletions.
diff --git a/scripts/civilizations.lua b/scripts/civilizations.lua
@@ -539,17 +539,11 @@ DefineRaceNames(
 		},
 		"province-name-prefixes", {
 			"Branden", -- example: "Brandenburg"
-			"Burgen", -- "Burgen" = "Cities"/"Castles"; example: "Burgenland"
 			"Mecklen", -- example: "Mecklenburg"
 			"Steier", -- example: "Steiermark" (Styria)
-			"Vorarl", -- example: "Vorarlberg"
-			"West" -- "West" = "West"; example: "Westphalien" (Westphalia)
+			"Vorarl" -- example: "Vorarlberg"
 		},
 		"province-name-suffixes", {
-			"berg", -- "berg" = "mountain"; example: "Vorarlberg"
-			"burg", -- "burg" = "city"/"castle"; example: "Brandenburg"
-			"land", -- "land" = "country"/"land"/"state"; example: "Burgenland"
-			"mark", -- "mark" = "march"; example: "Steiermark" (Styria)
 			"phalien" -- example: "Westphalien" (Westphalia)
 		},
 		"settlement-names", {
@@ -569,7 +563,6 @@ DefineRaceNames(
 			"Görz",
 			"Graz", -- from the same Slavic root as "Grad"
 			"Ischl",
-			"Königinhof",
 			"Krems",
 			"Kremsier",
 			"Kufstein",
@@ -594,12 +587,9 @@ DefineRaceNames(
 			"Wien" -- "Wien" = "Vienna"; from the Latin name "Vindobona"
 		},
 		"settlement-name-prefixes", {
-			"Alt", -- "Alt" = "Old"; example: "Altsohl"
-			"Eisen", -- "Eisen" = "Iron"; example: "Eisenstadt"
 			"Frohs", -- example: "Frohsdorf"
-			"Gänsern", -- "Gänsern = "Geese"; example: "Gänserndorf"
+			"Gänsern", -- "Gänse = "Geese" ("Gänsern" is presumably a variation thereof); example: "Gänserndorf"
 			"Ham", -- example: "Hamburg"
-			"Hühner", -- "Hühner" = "Chickens"; example: "Hühnerwasser"
 			"Inns", -- "Inns" = "Inn's" (related to the Inn river); example: "Innsbruck"
 --			"Josef", -- example: "Josefstadt"
 			"Karls", -- "Karls" = "Charles'"; example: "Karlsbad"
@@ -611,25 +601,21 @@ DefineRaceNames(
 			"Mar", -- example: "Marburg"
 			"Mühlen", -- example: "Mühlenbach"
 			"München", -- example: "Münchengrätz"
-			"Neu", -- "Neu" = "New"; example: "Neusohl"
 --			"Nikols", -- "Nikols" = "Nicholas'"; example: "Nikolsburg"
 			"Öden", -- example: "Ödenburg"
 			"Pres", -- example: "Presburg"
 			"Regens", -- example: "Regensburg"
 			"Schäss", -- example: "Schässburg"
 			"Spiel", -- "Spiel" = "Game"/"Play"; example: "Spielberg"
 			"Stuhl", -- "Stuhl" = "Chair"; example: "Stuhlweissenburg"
-			"Weiss", -- "Weiss" = "White"; example: "Weisskirchen"
 			"Ziller" -- example: "Zillertal"
 		},
 		"settlement-name-suffixes", {
 			"bach", -- example: "Mühlenbach"
 			"bad", -- example: "Karlsbad"
-			"berg", -- "berg" = "mountain"; examples: "Adelsberg", "Lemberg", "Spielberg"
 			"furt", -- example: "Klagenfurt"
 			"grätz", -- examples: "Königgrätz", "Münchengrätz"
 			"sohl", -- examples: "Altsohl", "Neusohl"
-			"wasser", -- "wasser" = "water"; example: "Hühnerwasser"
 			"weissenburg" -- "weissenburg" = "white castle"; example: "Stuhlweissenburg"
 		},
 		"settlement-name-translations", {

diff --git a/scripts/grand_strategy/grand_strategy_provinces.lua b/scripts/grand_strategy/grand_strategy_provinces.lua
@@ -882,6 +882,7 @@ function LoadProvinces(world)
 			Owner = "",
 			SettlementName = "Syracuse",
 			CulturalSettlementNames = {
+				greek = "Syracusae",
 				latin = "Syracusae"
 			},
 			SettlementLocation = {129, 37}, -- Palermo

diff --git a/scripts/languages.lua b/scripts/languages.lua
@@ -380,6 +380,15 @@ DefineCivilizationLanguage("teuton", -- German
 			"prefix-singular", true,
 			"prefix-settlement-name", true -- example: "Adelsberg"
 		},
+		"Berg", {
+			"meaning", "Mountain", -- can also mean "hill"
+			"singular-nominative", "Berg",
+			"plural-nominative", "Berge",
+			"gender", "Masculine",
+			"suffix-singular", true,
+			"suffix-province-name", true, -- example: "Vorarlberg"
+			"suffix-settlement-name", true -- examples: "Adelsberg", "Lemberg", "Spielberg"
+		},
 		"Bruck", {
 			"meaning", "Bridge",
 			"singular-nominative", "Bruck",
@@ -393,7 +402,10 @@ DefineCivilizationLanguage("teuton", -- German
 			"singular-nominative", "Burg",
 			"plural-nominative", "Burgen",
 			"gender", "Feminine",
+			"prefix-plural", true,
+			"prefix-province-name", true, -- example: "Burgenland"
 			"suffix-singular", true,
+			"suffix-province-name", true, -- example: "Brandenburg"
 			"suffix-settlement-name", true -- examples: Hamburg, Klausenburg, Marburg, Nikolsburg, Ödenburg, Regensburg, Salzburg, Schässburg
 		},
 		"Dorf", {
@@ -404,13 +416,39 @@ DefineCivilizationLanguage("teuton", -- German
 			"suffix-singular", true,
 			"suffix-settlement-name", true -- examples: Frohsdorf, Gänserndorf
 		},
+		"Eisen", {
+			"meaning", "Iron",
+			"singular-nominative", "Eisen",
+			"gender", "Neutral",
+			"uncountable", true,
+			"prefix-singular", true,
+			"prefix-settlement-name", true -- example: "Eisenstadt"
+		},
 		"Gott", {
 			"meaning", "God",
 			"singular-nominative", "Gott",
 			"gender", "Masculine",
 			"prefix-singular", true,
 			"prefix-personal-name", true -- example: Gottfried
 		},
+		"Hof", {
+			"meaning", "Court",
+			"singular-nominative", "Hof",
+			"plural-nominative", "Höfe",
+			"gender", "Masculine",
+			"suffix-singular", true,
+			"suffix-settlement-name", true -- example: "Königinhof"
+		},
+		"Huhn", {
+			"meaning", "Chicken",
+			"singular-nominative", "Huhn",
+			"singular-genitive", "Huhns", -- could also be "Huhnes"
+			"plural-nominative", "Hühner",
+			"plural-genitive", "Hühner",
+			"gender", "Neutral",
+			"prefix-plural", true,
+			"prefix-settlement-name", true -- example: "Hühnerwasser"
+		},
 		"Kirche", {
 			"meaning", "Church",
 			"singular-nominative", "Kirche",
@@ -428,6 +466,25 @@ DefineCivilizationLanguage("teuton", -- German
 			"prefix-singular", true,
 			"prefix-settlement-name", true -- example: Königgrätz
 		},
+		"Königin", {
+			"meaning", "Queen",
+			"singular-nominative", "Königin",
+			"singular-genitive", "Königin",
+			"plural-nominative", "Königinnen",
+			"gender", "Feminine",
+			"prefix-singular", true,
+			"prefix-settlement-name", true -- example: "Königinhof"
+		},
+		"Land", {
+			"meaning", "Country",
+			"singular-nominative", "Land",
+			"singular-genitive", "Landes",
+			"plural-nominative", "Länder",
+			"plural-genitive", "Länder",
+			"gender", "Neutral",
+			"suffix-singular", true,
+			"suffix-province-name", true -- example: "Burgenland"
+		},
 		"Mann", {
 			"meaning", "Man",
 			"singular-nominative", "Mann",
@@ -436,6 +493,14 @@ DefineCivilizationLanguage("teuton", -- German
 			"suffix-singular", true,
 			"suffix-personal-name", true -- example: Hermann, Karlmann
 		},
+		"Mark", {
+			"meaning", "March",
+			"singular-nominative", "Mark",
+			"plural-nominative", "Marken",
+			"gender", "Feminine",
+			"suffix-singular", true,
+			"suffix-province-name", true -- example: "Steiermark" (Styria)
+		},
 		"Mut", {
 			"meaning", "Courage",
 			"singular-nominative", "Mut",
@@ -468,6 +533,13 @@ DefineCivilizationLanguage("teuton", -- German
 			"suffix-singular", true,
 			"suffix-settlement-name", true -- examples: "Eisenstadt", "Josefstadt", "Kronstadt", "Leopoldstadt"
 		},
+		"Stuhl", {
+			"meaning", "Chair",
+			"singular-nominative", "Stuhl",
+			"singular-genitive", "Stuhls",
+			"gender", "Masculine"
+			-- Stuhlweissenburg uses as a prefix, but without being genitive?
+		},
 		"Tal", {
 			"meaning", "Valley",
 			"singular-nominative", "Tal",
@@ -476,6 +548,22 @@ DefineCivilizationLanguage("teuton", -- German
 			"suffix-singular", true,
 			"suffix-settlement-name", true -- examples: "Zillertal"
 		},
+		"Wasser", {
+			"meaning", "Water",
+			"singular-nominative", "Wasser",
+			"gender", "Neutral",
+			"uncountable", true,
+			"suffix-singular", true,
+			"suffix-settlement-name", true -- example: "Hühnerwasser"
+		},
+		"West", {
+			"meaning", "West",
+			"singular-nominative", "West",
+			"singular-genitive", "West",
+			"gender", "Masculine",
+			"prefix-singular", true,
+			"prefix-province-name", true -- example: "Westphalien"
+		},
 		"Wolf", {
 			"meaning", "Wolf",
 			"singular-nominative", "Wolf",
@@ -485,6 +573,20 @@ DefineCivilizationLanguage("teuton", -- German
 			"prefix-personal-name", true
 		}
 	},
+	"adjectives", {
+		"Alt", {
+			"meaning", "Old",
+			"prefix-settlement-name", true -- example: "Altsohl"
+		},
+		"Neu", {
+			"meaning", "New",
+			"prefix-settlement-name", true -- example: "Neusohl"
+		},
+		"Weiss", {
+			"meaning", "White",
+			"prefix-settlement-name", true -- example: "Weisskirchen"
+		}
+	},
 	"numerals", {
 		"Fünf", {
 			"number", 5,
@@ -705,11 +807,9 @@ DefineCivilizationLanguage("old-high-german", -- Old High German
 		},
 		"Mēro", { -- Source: Richard M. Runge, "The Phonetic Realization of Proto-Germanic /r/", 1973, p. 236.
 			"meaning", "More", -- perhaps a "determiner" class of words should be added?
-			"singular-nominative", "Mēro"
 		},
 		"Rōt", { -- Source: Richard M. Runge, "The Phonetic Realization of Proto-Germanic /r/", 1973, p. 236.
 			"meaning", "Red",
-			"singular-nominative", "Rōt"
 		}
 	},
 	"adverbs", {