Heroes without unique portraits are now persistent and recruitable, d…

…eity encyclopedia entries now display portraits, added Gathaarl icon
Andrettin · Jan 9, 2017 · a2096c5 · a2096c5
1 parent fdd0ef6
commit a2096c5
Show file tree

Hide file tree

Showing 18 changed files with 228 additions and 240 deletions.
diff --git a/graphics/credits.txt b/graphics/credits.txt
@@ -472,6 472,7 @@
 /graphics/goblin/icons/coinage.png (by Jesse Crider and Jinn) (licensed under the CC0)
 /graphics/goblin/icons/embossed_shield.png (by Exidelo) (licensed under the CC0)
 /graphics/goblin/icons/embossed_shield_extra_1.png (by Exidelo) (licensed under the CC0)
 /graphics/goblin/icons/gathaarl.png (by Exidelo) (licensed under the CC0)
 /graphics/goblin/icons/glider.png (by Exidelo) (licensed under the CC0)
 /graphics/goblin/icons/goblin_archer.png (by Jinn) (licensed under the CC0)
 /graphics/goblin/icons/goblin_assassin.png (by Jinn) (licensed under the CC0)

diff --git a/graphics/goblin/icons/gathaarl.png b/graphics/goblin/icons/gathaarl.png
diff --git a/readme.txt b/readme.txt
@@ -60,6 60,13 @@ https://github.com/Andrettin/Wyrmsun
 - 2.5.4
 -----------------------------------------------------------------------
 
 * Heroes
 - Heroes without unique portraits can now also be recruited, and are likewise also persistent.
 - Barracks and mercenary camp buildings now allow choosing from up to three heroes to recruit.
 
 * Miscellaneous
 - Deity entries in the encyclopedia now display their portraits.
 
 * Terrain
 - Fixed issue which prevented trees from regrowing.
 

diff --git a/scripts/characters_aesir.lua b/scripts/characters_aesir.lua
@@ -32,7 32,6 @@ DefineCharacter("odin", {
  Deity = "odin",
  HairVariation = "gray-hair",
  Trait = "upgrade-wise",
- Persistent = true,
  Level = 95
 })
 
diff --git a/scripts/characters_vanir.lua b/scripts/characters_vanir.lua
@@ -32,7 32,6 @@ DefineCharacter("kvasir", {
  Deity = "kvasir",
  HairVariation = "gray-hair",
  Trait = "upgrade-wise",
- Persistent = true,
  Level = 25
 })
 
diff --git a/scripts/civilizations/dwarf/characters.lua b/scripts/civilizations/dwarf/characters.lua
@@ -40,11 40,16 @@ DefineCharacter("modsognir", { -- one of the earliest dwarven leaders; in Norse
  Trait = "upgrade-mighty",
  ProvinceOfOrigin = "Svarinshaug",
  Year = -3000,
- Persistent = true,
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"},
  HistoricalTitles = {
  "head-of-state", -3000, -3000   30, "dwarf", "brising-clan"
- }
  },
  Conditions = function(s)
  if (GetPlayerData(trigger_player, "Allow", "upgrade-dwarven-runewriting") ~= "R") then -- Modsognir shouldn't appear in eras with too advanced technology
  return true
  end
  return false
  end
 })
 
 DefineCharacter("durin", { -- deputy of Modsognir
@@ -60,8 65,13 @@ DefineCharacter("durin", { -- deputy of Modsognir
  Trait = "upgrade-dextrous",
  ProvinceOfOrigin = "Svarinshaug",
  Year = -3000,
- Persistent = true,
- ForbiddenUpgrades = {"unit-dwarven-yale-rider"}
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"},
  Conditions = function(s)
  if (GetPlayerData(trigger_player, "Allow", "upgrade-dwarven-runewriting") ~= "R") then -- Durin shouldn't appear in eras with too advanced technology
  return true
  end
  return false
  end
 })
 
 DefineCharacter("fjalar", {
@@ -71,12 81,16 @@ DefineCharacter("fjalar", {
  Civilization = "dwarf",
  Faction = "shadowcharm-clan",
  Description = _("The greedy Fjalar is joint chieftain of the Shadowcharm Clan together with his brother Galar. He is adept at deception and stealth."),
- Icon = "icon-modsognir",
  HairVariation = "brown-hair",
  Trait = "upgrade-cruel",
  Year = -3000,
--- Persistent = true,
- ForbiddenUpgrades = {"unit-dwarven-yale-rider"}
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"},
  Conditions = function(s)
  if (GetPlayerData(trigger_player, "Faction") == "shadowcharm-clan") then
  return true
  end
  return false
  end
 })
 
 DefineCharacter("galar", {
@@ -86,12 100,16 @@ DefineCharacter("galar", {
  Civilization = "dwarf",
  Faction = "shadowcharm-clan",
  Description = _("The envious Galar is joint chieftain of the Shadowcharm Clan together with his brother Fjalar. He is known for his thieving skills and his dabbling in magic."),
- Icon = "icon-modsognir",
  HairVariation = "brown-hair",
  Trait = "upgrade-cruel",
  Year = -3000,
--- Persistent = true,
- ForbiddenUpgrades = {"unit-dwarven-yale-rider"}
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"},
  Conditions = function(s)
  if (GetPlayerData(trigger_player, "Faction") == "shadowcharm-clan") then
  return true
  end
  return false
  end
 })
 
 DefineCharacter("regin", {
@@ -101,10 119,8 @@ DefineCharacter("regin", {
  Civilization = "dwarf",
  Faction = "brising-clan",
  Description = _("Regin is a dwarven mastersmith, unrivalled in his time. The mythical sword Gram was of his making, as were several other legendary blades."),
- Icon = "icon-thursagan",
  HairVariation = "brown-hair",
  Trait = "upgrade-intelligent",
--- Persistent = true,
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"}
 })
 
@@ -124,7 140,6 @@ DefineCharacter("thursagan", { -- from "The Sceptre of Fire" campaign of "Battle
  Year = -1,
  DeathYear = 40, -- died in 40 AD of a violent death
  ViolentDeath = true,
- Persistent = true,
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"},
  Items = {
  {
@@ -149,7 164,6 @@ DefineCharacter("baglur", { -- from "The Sceptre of Fire" campaign of "Battle fo
  Year = -1,
  DeathYear = 40, -- died in 40 AD of a violent death
  ViolentDeath = true,
- Persistent = true,
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"}
 })
 
@@ -167,7 181,6 @@ DefineCharacter("durstorn", { -- from "The Sceptre of Fire" campaign of "Battle
  Year = -1,
  DeathYear = 35, -- died in 35 AD of a violent death
  ViolentDeath = true,
- Persistent = true,
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"},
  HistoricalTitles = {
  "head-of-state", -1, 35, "dwarf", "norlund-clan"
@@ -186,7 199,13 @@ DefineCharacter("glonoin", { -- from "The Sceptre of Fire" campaign of "Battle f
  ViolentDeath = true,
  HistoricalTitles = {
  "head-of-state", -1, 29, "dwarf", "shorbear-clan"
- }
  },
  Conditions = function(s)
  if (GetPlayerData(trigger_player, "Faction") == "shorbear-clan") then
  return true
  end
  return false
  end
 })
 
 DefineCharacter("rugnur", { -- from "The Sceptre of Fire" campaign of "Battle for Wesnoth"; leader of the party of dwarves who handled the crafting of the Sceptre of Fire
@@ -204,6 223,5 @@ DefineCharacter("rugnur", { -- from "The Sceptre of Fire" campaign of "Battle fo
  Year = 25,
  DeathYear = 40, -- died in 40 AD of a violent death
  ViolentDeath = true,
- Persistent = true,
  ForbiddenUpgrades = {"unit-dwarven-yale-rider"}
 })
diff --git a/scripts/civilizations/germanic/characters.lua b/scripts/civilizations/germanic/characters.lua
@@ -26,7 26,7 @@
 --
 
 DefineCharacter("lorikus", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 6.
- Name = "Lóríkus", -- Duke of Thrudheim, married to Lórá (also called Glórá)
  Name = "Lorikus", -- "Lóríkus"; Duke of Thrudheim, married to Lórá (also called Glórá)
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -40,7 40,7 @@ DefineCharacter("lorikus", { -- Source: Snorri Sturlson, "The Prose Edda", 1916,
 })
 
 DefineCharacter("lora", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 6.
- Name = "Lórá", -- Lórá (also called Glórá) was Lóríkus' wife
  Name = "Lora", -- "Lórá"; Lórá (also called Glórá) was Lóríkus' wife
  Gender = "female",
  Type = "unit-germanic-archer",
  Civilization = "germanic",
@@ -49,7 49,7 @@ DefineCharacter("lora", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p.
 })
 
 DefineCharacter("troan", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 6.
- Name = "Tróán", -- Trór's mother; in the euhemerized account Tróán is said to be a daughter of the Trojan king Priam; however, since she doesn't seem to appear in any other account about Troy, it makes more sense to place this character together with Trór's genealogy (which we've placed to match the time of the Indo-European migrations to Scandinavia) rather than with Priam, specially since she's part of the account of how Scandinavia came to be settled
  Name = "Troan", -- "Tróán"; Trór's mother; in the euhemerized account Tróán is said to be a daughter of the Trojan king Priam; however, since she doesn't seem to appear in any other account about Troy, it makes more sense to place this character together with Trór's genealogy (which we've placed to match the time of the Indo-European migrations to Scandinavia) rather than with Priam, specially since she's part of the account of how Scandinavia came to be settled
  Gender = "female",
  Type = "unit-germanic-archer",
  Civilization = "germanic",
@@ -59,7 59,7 @@ DefineCharacter("troan", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p
 })
 
 DefineCharacter("tror", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 6.
- Name = "Trór", -- euhemerized version of Thor
  Name = "Tror", -- "Trór"; euhemerized version of Thor
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -75,7 75,7 @@ DefineCharacter("tror", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p.
 })
 
 DefineCharacter("loridi", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Lóridi", -- resembled his father, Trór
  Name = "Loridi", -- "Lóridi"; resembled his father, Trór
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -131,7 131,7 @@ DefineCharacter("vingener", { -- Source: Snorri Sturlson, "The Prose Edda", 1916
 })
 
 DefineCharacter("moda", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Móda",
  Name = "Moda", -- "Móda"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -201,7 201,7 @@ DefineCharacter("athra", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p
 })
 
 DefineCharacter("itermann", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Ítermann",
  Name = "Itermann", -- "Ítermann"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -215,7 215,7 @@ DefineCharacter("itermann", { -- Source: Snorri Sturlson, "The Prose Edda", 1916
 })
 
 DefineCharacter("heremod", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Heremód",
  Name = "Heremod", -- "Heremód"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -243,7 243,7 @@ DefineCharacter("skjaldun", { -- Source: Snorri Sturlson, "The Prose Edda", 1916
 })
 
 DefineCharacter("bjaf", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Bjáf",
  Name = "Bjaf", -- "Bjáf"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -257,7 257,7 @@ DefineCharacter("bjaf", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p.
 })
 
 DefineCharacter("jat", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Ját",
  Name = "Jat", -- "Ját"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -300,7 300,7 @@ DefineCharacter("finn", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p.
 })
 
 DefineCharacter("friallaf", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Fríallaf",
  Name = "Friallaf", -- "Fríallaf"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -314,7 314,7 @@ DefineCharacter("friallaf", { -- Source: Snorri Sturlson, "The Prose Edda", 1916
 })
 
 DefineCharacter("voden", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Vóden", -- euhemerized version of Odin; "far-famed for his wisdom and every accomplishment"; had "second sight"
  Name = "Voden", -- "Vóden"; euhemerized version of Odin; "far-famed for his wisdom and every accomplishment"; had "second sight"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -329,7 329,7 @@ DefineCharacter("voden", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p
 })
 
 DefineCharacter("frigida", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Frígídá", -- wife of Vóden; euhemerized version of Frigg; had "second sight"
  Name = "Frigida", -- "Frígídá"; wife of Vóden; euhemerized version of Frigg; had "second sight"
  Gender = "female",
  Type = "unit-germanic-archer",
  Civilization = "germanic",
@@ -386,7 386,7 @@ DefineCharacter("vitta", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p
 })
 
 DefineCharacter("heingistr", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 7.
- Name = "Heingistr",
  Name = "Heingist", -- "Heingistr"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -435,7 435,7 @@ DefineCharacter("branda", { -- Source: Snorri Sturlson, "The Prose Edda", 1916,
 })
 
 DefineCharacter("frjodigar", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 8.
- Name = "Frjódigar", -- also known as Fródi
  Name = "Frjodigar", -- "Frjódigar"; also known as Fródi
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -444,7 444,7 @@ DefineCharacter("frjodigar", { -- Source: Snorri Sturlson, "The Prose Edda", 191
 })
 
 DefineCharacter("freovin", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 8.
- Name = "Freóvin",
  Name = "Freovin", -- "Freóvin"
  Gender = "male",
  Type = "unit-germanic-warrior",
  Civilization = "germanic",
@@ -508,7 508,7 @@ DefineCharacter("skeldu", { -- Source: Snorri Sturlson, "The Prose Edda", 1916,
 })
 
 DefineCharacter("fridleifr-skeldung", { -- Source: Snorri Sturlson, "The Prose Edda", 1916, p. 8.
- Name = "Fridleifr",
  Name = "Fridleif", -- "Fridleifr"
  -- prefix is likely the Old Norse word "Friđr"
  FamilyName = "Skeldung", -- "Skjoldung" in the original Norse saga (from Skjöldr), here rendered as Skeldu (Proto-Germanic version of "Skjöldr") and -ung (the suffix in the original word; which should be changed for a Proto-Germanic version)
  Gender = "male",
@@ -522,7 522,7 @@ DefineCharacter("fridleifr-skeldung", { -- Source: Snorri Sturlson, "The Prose E
 })
 
 DefineCharacter("saemingr-yngling", { -- Source: Snorri Sturlson, "Heimskringla", 1844, p. 212; Source: Snorri Sturlson, "The Prose Edda", 1916, p. 9.
- Name = "Sæmingr", -- Yngve (or Vóden's) son set to rule over Norway
  Name = "Saeming", -- "Sæmingr"; Yngve (or Vóden's) son set to rule over Norway
  FamilyName = "Yngling",
  Gender = "male",
  Type = "unit-germanic-warrior",
@@ -540,6 540,5 @@ DefineCharacter("erala", {
  Description = _("The young warrior Erala believes his true father to be the god Rig. Feeling that his divine heritage has fated him to rule over vast lands, Erala sets about to carve territory for himself."),
  Icon = "icon-jarl",
  HairVariation = "blond-hair",
- Trait = "upgrade-strong",
- Persistent = true
  Trait = "upgrade-strong"
 })
diff --git a/scripts/civilizations/goblin/characters.lua b/scripts/civilizations/goblin/characters.lua
@@ -37,7 37,6 @@ DefineCharacter("agniss-tenebris", { -- invented by Jesse Crider
  Description = _("The leader of the Tenebris Syndicate, Agniss rules through mysticism and paranoia. The hooded hag is well-known amongst goblins for the terror she inspires."),
 -- Icon = "icon-agniss",
  ProvinceOfOrigin = "Tenebris",
--- Persistent = true,
  HistoricalTitles = {
 -- "head-of-state", 0, 0, "goblin", "tenebris"
  }
@@ -55,7 54,6 @@ DefineCharacter("dremac-paarsins", { -- invented by Jesse Crider
  Description = _("Dremac Paarsins is the gluttonous leader of the Myridian Syndicate. An extremely wealthy merchant lord, Dremac is known for his opulence and cunning. It is rumored that he rose to his ruling position by a mix of political blackmailing and his wealth's influence."),
 -- Icon = "icon-dremac-paarsins",
  ProvinceOfOrigin = "Myridia",
--- Persistent = true,
  HistoricalTitles = {
 -- "head-of-state", 0, 0, "goblin", "myridia"
  }
@@ -73,7 71,6 @@ DefineCharacter("ioun-stilgar", { -- invented by Jesse Crider
  Description = _("Ioun is a veteran tactician who leads the Stilgar Syndicate. He is known as \"Ioun the Just\" due to his record of honoring the contracts he enters."),
 -- Icon = "icon-ioun",
  ProvinceOfOrigin = "Stilgar",
--- Persistent = true,
  HistoricalTitles = {
 -- "head-of-state", 0, 0, "goblin", "stilgar"
  }
@@ -91,7 88,6 @@ DefineCharacter("orza-chahax", { -- invented by Jesse Crider
  Description = _("Orza Chahax is the leader of the Ezmarrian Syndicate. As a scholar, he is dedicated to science, though his methods are often questionable in their morality."),
 -- Icon = "icon-orza-chahax",
  ProvinceOfOrigin = "Ezmarria",
--- Persistent = true,
  HistoricalTitles = {
 -- "head-of-state", 0, 0, "goblin", "ezmarria"
  }

diff --git a/scripts/civilizations/goblin/icons.lua b/scripts/civilizations/goblin/icons.lua
@@ -241,6 241,12 @@ DefineIcon({
  File = "goblin/icons/goblin_banner.png"
 })
 
 DefineIcon({
  Name = "icon-gathaarl",
  Size = {46, 38},
  File = "goblin/icons/gathaarl.png"
 })
 
 DefineIcon({
  Name = "icon-agniss",
  Size = {46, 38},

diff --git a/scripts/civilizations/kobold/characters.lua b/scripts/civilizations/kobold/characters.lua
@@ -33,6 33,5 @@ DefineCharacter("fafnir", {
  Faction = "fafning-tribe",
  Description = _("Fafnir was originally a greedy dwarf, the son of Hreidmar and brother of Regin. Through potent magics he transformed himself into a wyrm."),
  Icon = "icon-wyrm-vicious",
- Trait = "upgrade-vicious",
- Persistent = true
  Trait = "upgrade-vicious"
 })