Added words for 'soldier' for many languages, readme update, version …

…update
Andrettin · Oct 30, 2017 · f8ba8ad · f8ba8ad
1 parent e170377
commit f8ba8ad
Show file tree

Hide file tree

Showing 54 changed files with 816 additions and 19 deletions.
diff --git a/readme.txt b/readme.txt
@@ -56,6 +56,16 @@ https://github.com/Andrettin/Wyrmsun
 # Changelog
 ############################################################
 
+-----------------------------------------------------------------------
+- 2.9.1
+-----------------------------------------------------------------------
+
+* Miscellaneous
+- Fixed issue which could cause a crash for maps that are smaller than the screen's "map area".
+
+* Terrain
+- Added Snow Rock tiles (by Jinn).
+
 -----------------------------------------------------------------------
 - 2.9.0
 -----------------------------------------------------------------------

diff --git a/scripts/grand_strategy/earth_events.lua b/scripts/grand_strategy/earth_events.lua
@@ -150,7 +150,7 @@ local EarthEvents = {
 	},
 	CelticAndAntediluvianAntiquities = { -- Source: "Ancient Europe 8000 B.C.-A.D. 1000: Encyclopedia of the Barbarian World", 2004, vol. 1, p. 17.
 		Name = "Celtic and Antediluvian Antiquities",
-		Description = "The French customs officer and amateur archaeologist, Jacques Boucher de Crèvecoeur de Perthes, after doing excavations in the Somme region, has published a his Celtic and Antediluvian Antiquities in three volumes. In his work, he established a stark division between ancient flaked tools (which he called Antediluvian) and the more recent polished ones (which he named Celtic).",
+		Description = "The French customs officer and amateur archaeologist, Jacques Boucher de Crèvecoeur de Perthes, after doing excavations in the Somme region, has published a his Celtic and Antediluvian Antiquities in three volumes. In his work, he established a stark division between ancient flaked tools (which he called Antediluvian) and the more recent polished ones (which he named Celtic).",
 		Conditions = function(s)
 			if (
 				GetProvinceOwner("France") == EventFaction.Name
@@ -196,8 +196,8 @@ local EarthEvents = {
 		OptionTooltips = {"+100 Research"}
 	},
 	MateriauxPourLHistoireDeLHomme = { -- Source: "Ancient Europe 8000 B.C.-A.D. 1000: Encyclopedia of the Barbarian World", 2004, vol. 1, p. 18.
-		Name = "Matériaux pour l'histoire de l'homme",
-		Description = "A new periodical has been founded in France, the Matériaux pour l'histoire positive et philosophique de l'homme, which preoccupies itself with research on prehistory.",
+		Name = "Matériaux pour l'histoire de l'homme",
+		Description = "A new periodical has been founded in France, the Matériaux pour l'histoire positive et philosophique de l'homme, which preoccupies itself with research on prehistory.",
 		Conditions = function(s)
 			if (
 				GetProvinceOwner("France") == EventFaction.Name

diff --git a/scripts/languages.lua b/scripts/languages.lua
@@ -109,14 +109,19 @@ DefineLanguage("kobold", {
 	Name = "Kobold"
 })
 
-Load("scripts/languages_baltic.lua")
 Load("scripts/languages_celtic.lua")
 Load("scripts/languages_germanic.lua")
 Load("scripts/languages_hellenic.lua")
 Load("scripts/languages_indic.lua")
 Load("scripts/languages_iranian.lua")
 Load("scripts/languages_italic.lua")
 Load("scripts/languages_slavic.lua")
+Load("scripts/languages_baltic.lua")
+
+DefineLanguage("yakut", {
+	Name = "Yakut"
+})
+
 
 local languages = GetLanguages()
 

diff --git a/scripts/languages/albanian_loanwords.lua b/scripts/languages/albanian_loanwords.lua
@@ -39,6 +39,13 @@ DefineLanguageWord("Niza", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,
 	-- according to the source, the word is of Turkish origin
 })
 
+DefineLanguageWord("Ushtār", { -- source also gives the alternative form "ushϵtār"; Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 15.
+	Language = "albanian",
+	Type = "noun",
+	Meanings = {"Soldier"}
+	-- from "ushtrī"
+})
+
 DefineLanguageWord("Ushtrī", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 12.
 	Language = "albanian",
 	Type = "noun",

diff --git a/scripts/languages/armenian_loanwords.lua b/scripts/languages/armenian_loanwords.lua
@@ -39,6 +39,20 @@ DefineLanguageWord("Paterazm", { -- Source: Carl D. Buck, "Words for 'Battle,' '
 	DerivesFrom = {"parthian", "noun", "Pātrazm"}
 })
 
+DefineLanguageWord("Zēn", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 15.
+	Language = "armenian",
+	Type = "noun",
+	Meanings = {"Arms", "Weapons"}
+	-- Iranian loan word
+})
+
+DefineLanguageWord("Zinvor", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 15.
+	Language = "armenian",
+	Type = "noun",
+	Meanings = {"Soldier"}
+	-- from "zēn"
+})
+
 DefineLanguageWord("Zor", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 15.
 	Language = "armenian",
 	Type = "noun",

diff --git a/scripts/languages/baltic/latvian.lua b/scripts/languages/baltic/latvian.lua
@@ -39,31 +39,43 @@ DefineLanguageWord("Gnīde", { -- Source: August Fick and Alf Torp, "Wortschatz
 })
 
 DefineLanguageWord("Jauda", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 3.
-	Language = "latvian", -- source gives Lettish
+	Language = "latvian", -- source gives Lettic
 	Type = "noun", -- presumably
 	Meanings = {"Might"}
 })
 
 DefineLanguageWord("Karaspehks", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 15.
-	Language = "latvian", -- source gives Lettish
+	Language = "latvian", -- source gives Lettic
 	Type = "noun",
 	Meanings = {"Army", "War Might"}
 })
 
+DefineLanguageWord("Karawihrs", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "latvian", -- source gives Lettic
+	Type = "noun",
+	Meanings = {"War Man", "Soldier"}
+})
+
+DefineLanguageWord("Kareiwis", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "latvian", -- source gives Lettic
+	Type = "noun",
+	Meanings = {"One Who Goes to War"}
+})
+
 DefineLanguageWord("Karsch", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, pp. 9, 11.
-	Language = "latvian", -- source gives Lettish
+	Language = "latvian", -- source gives Lettic
 	Type = "noun",
 	Meanings = {"War"}
 })
 
 DefineLanguageWord("Kauja", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 4.
-	Language = "latvian", -- source gives Lettish
+	Language = "latvian", -- source gives Lettic
 	Type = "noun",
 	Meanings = {"Battle"}
 })
 
 DefineLanguageWord("Kaut", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 4.
-	Language = "latvian", -- source gives Lettish
+	Language = "latvian", -- source gives Lettic
 	Type = "verb",
 	Meanings = {"Smite", "Kill"}
 })

diff --git a/scripts/languages/baltic/latvian_loanwords.lua b/scripts/languages/baltic/latvian_loanwords.lua
@@ -0,0 +1,33 @@
+--       _________ __                 __
+--      /   _____//  |_____________ _/  |______     ____  __ __  ______
+--      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
+--      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \
+--     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
+--             \/                  \/          \//_____/            \/
+--  ______________________                           ______________________
+--                        T H E   W A R   B E G I N S
+--         Stratagus - A free fantasy real time strategy game engine
+--
+--      (c) Copyright 2017 by Andrettin
+--
+--      This program is free software; you can redistribute it and/or modify
+--      it under the terms of the GNU General Public License as published by
+--      the Free Software Foundation; either version 2 of the License, or
+--      (at your option) any later version.
+--
+--      This program is distributed in the hope that it will be useful,
+--      but WITHOUT ANY WARRANTY; without even the implied warranty of
+--      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--      GNU General Public License for more details.
+--
+--      You should have received a copy of the GNU General Public License
+--      along with this program; if not, write to the Free Software
+--      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+--
+
+DefineLanguageWord("Saldats", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, pp. 17-18.
+	Language = "latvian", -- source gives Lettic
+	Type = "noun",
+	Meanings = {"Soldier"},
+	DerivesFrom = {"french", "noun", "Soldat"}
+})
diff --git a/scripts/languages/baltic/lithuanian.lua b/scripts/languages/baltic/lithuanian.lua
@@ -102,6 +102,18 @@ DefineLanguageWord("Dë̂vas", { -- Source: H. Munro Chadwick, "The Oak and the
 	Meanings = {"God"}
 })
 
+DefineLanguageWord("Draugas", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "lithuanian",
+	Type = "noun",
+	Meanings = {"Companion"}
+})
+
+DefineLanguageWord("Drauge", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "lithuanian",
+	Type = "adposition",
+	Meanings = {"With"}
+})
+
 DefineLanguageWord("Dubùs", { -- Source: Winfred P. Lehmann, "A Grammar of Proto-Germanic", 2005, Chapter 2, Section 3.
 	Language = "lithuanian",
 	Type = "adjective",
@@ -114,6 +126,12 @@ DefineLanguageWord("Dvýlika", { -- Source: Winfred P. Lehmann, "A Grammar of Pr
 	Number = 12
 })
 
+DefineLanguageWord("Eiti", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "lithuanian",
+	Type = "verb",
+	Meanings = {"Go"}
+})
+
 DefineLanguageWord("Jéras", { -- Source: Winfred P. Lehmann, "A Grammar of Proto-Germanic", 2005, Chapter 2, Section 3.
 	Language = "lithuanian",
 	Type = "noun",
@@ -138,7 +156,7 @@ DefineLanguageWord("Kalti", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War
 	Meanings = {"Smite"}
 })
 
-DefineLanguageWord("Karas", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, pp. 9, 11.
+DefineLanguageWord("Karas", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, pp. 9, 11, 16.
 	Language = "lithuanian",
 	Type = "noun",
 	Meanings = {"War"}
@@ -339,3 +357,15 @@ DefineLanguageWord("Žìrnis", { -- Source: Winfred P. Lehmann, "A Grammar of Pr
 	Type = "noun",
 	Meanings = {"Pea"}
 })
+
+-- Compounds
+
+DefineLanguageWord("Kareivis", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "lithuanian",
+	Type = "noun",
+	Meanings = {"One Who Goes to War", "Soldier"},
+	CompoundElements = {
+		"prefix", "lithuanian", "noun", "Karas",
+		"suffix", "lithuanian", "verb", "Eiti"
+	}
+})
diff --git a/scripts/languages/baltic/lithuanian_loanwords.lua b/scripts/languages/baltic/lithuanian_loanwords.lua
@@ -31,3 +31,10 @@ DefineLanguageWord("Vaiskas", { -- Source: Carl D. Buck, "Words for 'Battle,' 'W
 	Meanings = {"Army"},
 	DerivesFrom = {"polish", "noun", "Wojsko"}
 })
+
+DefineLanguageWord("Żalniėrius", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, pp. 17-18.
+	Language = "lithuanian",
+	Type = "noun",
+	Meanings = {"Soldier"},
+	DerivesFrom = {"polish", "noun", "Žolnierz"}
+})
diff --git a/scripts/languages/celtic/breton_loanwords.lua b/scripts/languages/celtic/breton_loanwords.lua
@@ -32,3 +32,9 @@ DefineLanguageWord("Arme", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,
 	DerivesFrom = {"french", "noun", "Armée"}
 })
 
+DefineLanguageWord("Soudard", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 17.
+	Language = "breton",
+	Type = "noun",
+	Meanings = {"Soldier"},
+	DerivesFrom = {"old-french", "noun", "Soudoier"}
+})
diff --git a/scripts/languages/celtic/irish_loanwords.lua b/scripts/languages/celtic/irish_loanwords.lua
@@ -25,6 +25,13 @@
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 --
 
+DefineLanguageWord("Sáighdiur", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 17.
+	Language = "irish",
+	Type = "noun",
+	Meanings = {"Soldier"},
+--	DerivesFrom = {"middle-irish", "noun", "Saigdeoir"} -- blend of Middle Irish "saigdeoir" and Middle English "soudoier"/"sougeour"
+})
+
 DefineLanguageWord("Scell", { -- Source: August Fick and Alf Torp, "Wortschatz der Germanischen Spracheinheit", 2006, p. 229.
 	Language = "irish",
 	Type = "noun",

diff --git a/scripts/languages/celtic/middle_irish.lua b/scripts/languages/celtic/middle_irish.lua
@@ -25,6 +25,12 @@
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 --
 
+DefineLanguageWord("Cathfer", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "middle-irish",
+	Type = "noun",
+	Meanings = {"Man of Battle", "Warrior"}
+})
+
 DefineLanguageWord("Cellach", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 4.
 	Language = "middle-irish",
 	Type = "noun",

diff --git a/scripts/languages/celtic/middle_irish_loanwords.lua b/scripts/languages/celtic/middle_irish_loanwords.lua
@@ -0,0 +1,48 @@
+--       _________ __                 __
+--      /   _____//  |_____________ _/  |______     ____  __ __  ______
+--      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
+--      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \
+--     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
+--             \/                  \/          \//_____/            \/
+--  ______________________                           ______________________
+--                        T H E   W A R   B E G I N S
+--         Stratagus - A free fantasy real time strategy game engine
+--
+--      (c) Copyright 2017 by Andrettin
+--
+--      This program is free software; you can redistribute it and/or modify
+--      it under the terms of the GNU General Public License as published by
+--      the Free Software Foundation; either version 2 of the License, or
+--      (at your option) any later version.
+--
+--      This program is distributed in the hope that it will be useful,
+--      but WITHOUT ANY WARRANTY; without even the implied warranty of
+--      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--      GNU General Public License for more details.
+--
+--      You should have received a copy of the GNU General Public License
+--      along with this program; if not, write to the Free Software
+--      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+--
+
+DefineLanguageWord("Cathmil", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 17.
+	Language = "middle-irish",
+	Type = "noun",
+	Meanings = {"Battle Soldier"},
+	DerivesFrom = {"latin", "noun", "Mīles"}
+})
+
+DefineLanguageWord("Míl", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 17.
+	Language = "middle-irish",
+	Type = "noun",
+	Meanings = {},
+	DerivesFrom = {"latin", "noun", "Mīles"}
+})
+
+DefineLanguageWord("Saigdeoir", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 17.
+	Language = "middle-irish",
+	Type = "noun",
+	Meanings = {"Archer"},
+	DerivesFrom = {"latin", "noun", "Sagitta"}
+})
+
diff --git a/scripts/languages/celtic/old_cornish.lua b/scripts/languages/celtic/old_cornish.lua
@@ -0,0 +1,32 @@
+--       _________ __                 __
+--      /   _____//  |_____________ _/  |______     ____  __ __  ______
+--      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
+--      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \
+--     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
+--             \/                  \/          \//_____/            \/
+--  ______________________                           ______________________
+--                        T H E   W A R   B E G I N S
+--         Stratagus - A free fantasy real time strategy game engine
+--
+--      (c) Copyright 2017 by Andrettin
+--
+--      This program is free software; you can redistribute it and/or modify
+--      it under the terms of the GNU General Public License as published by
+--      the Free Software Foundation; either version 2 of the License, or
+--      (at your option) any later version.
+--
+--      This program is distributed in the hope that it will be useful,
+--      but WITHOUT ANY WARRANTY; without even the implied warranty of
+--      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--      GNU General Public License for more details.
+--
+--      You should have received a copy of the GNU General Public License
+--      along with this program; if not, write to the Free Software
+--      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+--
+
+DefineLanguageWord("Cadwur", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "old-cornish",
+	Type = "noun",
+	Meanings = {"Soldier"} -- gloss of Latin "miles"
+})
diff --git a/scripts/languages/celtic/welsh.lua b/scripts/languages/celtic/welsh.lua
@@ -67,6 +67,12 @@ DefineLanguageWord("Cad", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,'
 	Meanings = {"Battle"}
 })
 
+DefineLanguageWord("Cadwar", { -- Source: Carl D. Buck, "Words for 'Battle,' 'War,' 'Army,' and 'Soldier'", 1919, p. 16.
+	Language = "welsh",
+	Type = "noun",
+	Meanings = {"Soldier"} -- gloss of Latin "miles"
+})
+
 DefineLanguageWord("Cant", { -- Source: Bernhard Maier (trans.), "Das Sagenbuch der Walisischen Kelten", 1999, p. 117.
 	Language = "welsh",
 	Type = "numeral",