Muspelheim and Niflheim are now described as planes, rather than worl…

…ds. Helheim has now been subsumed into Niflheim
Andrettin · Sep 3, 2017 · c8356cf · c8356cf
1 parent cb2b45d
commit c8356cf
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/readme.txt b/readme.txt
@@ -87,6  87,7 @@ https://github.com/Andrettin/Wyrmsun
 - The initial random seed for the game now varies according to the computer's time and date, so that random maps should no longer yield the same result multiple times.
 - Added an encyclopedia page explaining the No Randomness mode in the Game Concepts section.
 - Added Diamond Rock (recolor of the Copper Rock by Kriss7475).
 - Muspelheim and Niflheim are now described as planes, rather than worlds. Helheim has now been subsumed into Niflheim, which is more accurate to the mythology.
 
 * Scenarios
 - A diamond deposit is now generated for the Nidavellir map.

diff --git a/scripts/deities.lua b/scripts/deities.lua
@@ -56,7  56,7 @@ DefineDeity("gaia", { -- Source: Jenny March, "Dictionary of Classical Mythology
 DefineDeity("gathaarl", { -- from Tyrant, Goblin God of Battle
 	Name = "Gathaarl",
 	Pantheon = "Goblin",
-	HomePlane = "helheim",
 	HomePlane = "niflheim",
 	Civilizations = {"goblin"},
 	Religions = {"paganism"},
 	Domains = {"chaos", "earth", "wrath"},
@@ -72,7  72,7 @@ DefineDeity("gathaarl", { -- from Tyrant, Goblin God of Battle
 
 DefineDeity("griknagh", { -- From Under the Burning Suns (Battle for Wesnoth)
 	Name = "Griknagh",
-	HomePlane = "helheim",
 	HomePlane = "niflheim",
 	Civilizations = {"troll"},
 	Religions = {"paganism"},
 	Gender = "male",
@@ -81,7  81,7 @@ DefineDeity("griknagh", { -- From Under the Burning Suns (Battle for Wesnoth)
 
 DefineDeity("mzivult", { -- by Jesse Crider
 	Name = "Mzivult",
-	HomePlane = "helheim",
 	HomePlane = "niflheim",
 	Civilizations = {"gnome"}, -- Derro deity
 	Religions = {"paganism"},
 	Domains = {"wrath", "earth", "darkness"},

diff --git a/scripts/deities_aesir.lua b/scripts/deities_aesir.lua
@@ -236,7  236,7 @@ DefineDeity("heimdall", { -- the horn Gjall belongs to him; identified with Rig
 DefineDeity("hel", { -- Source: Anders Andrén, "Behind Heathendom: Archaeological Studies of Old Norse Religion", 2005, p. 116.
 	Name = "Hel",
 	Pantheon = "Aesir",
-	HomePlane = "helheim",
 	HomePlane = "niflheim",
 	Civilizations = {"norse"},
 	Religions = {"paganism"},
 	Gender = "male",

diff --git a/scripts/menus/encyclopedia.lua b/scripts/menus/encyclopedia.lua
@@ -1364,7  1364,7 @@ function OpenEncyclopediaPlaneEntry(plane)
 	local offx = (Video.Width - 640) / 2
 	local offy = (Video.Height - 480) / 2
 
-	encyclopedia_entry_menu:addLabel("~<" .. plane .. "~>", offx   320, offy   104   36*-2, nil, true)
 	encyclopedia_entry_menu:addLabel("~<" .. GetPlaneData(plane, "Name") .. "~>", offx   320, offy   104   36*-2, nil, true)
 
 	local l = MultiLineLabel()
 	l:setFont(Fonts["game"])
@@ -1529,7  1529,7 @@ function OpenEncyclopediaWorldEntry(world)
 	local offx = (Video.Width - 640) / 2
 	local offy = (Video.Height - 480) / 2
 
-	encyclopedia_entry_menu:addLabel("~<" .. world .. "~>", offx   320, offy   104   36*-2, nil, true)
 	encyclopedia_entry_menu:addLabel("~<" .. GetWorldData(world, "Name") .. "~>", offx   320, offy   104   36*-2, nil, true)
 
 	local l = MultiLineLabel()
 	l:setFont(Fonts["game"])

diff --git a/scripts/planes.lua b/scripts/planes.lua
@@ -50,12  50,6 @@ DefinePlane("heaven", {
 	Description = _("Within Heaven the monotheistic God dwells, served by a large host of angels. The forces of Heaven deplore those they deem to be false deities, such as the Aesir, a sentiment which sometimes erupts into open hostility. Their greatest enemies, however, are the demons of Hell.")
 })
 
-DefinePlane("helheim", {
-	Name = "Helheim",
---	Description = _("Inhabited by the monstrous Hel, this realm is one of the many underworld planes. It harbors the souls of the dead who worshiped the Aesir, and yet were deemed unworthy of entry into Asgard. In Helheim lies one of the roots of the mighty interplanar tree, Yggdrasill, the root having been corrupted by the dark forces of the plane.")
-	Description = _("Inhabited by the monstrous Hel, this realm is one of the many underworld planes. It harbors the souls of the dead who worshiped the Aesir, but were denied entry into Asgard by virtue of not having died in battle.")
-})
-
 DefinePlane("hell", {
 	Name = "Hell",
 	Description = _("Hell is the home to the sadistic creatures known as demons. Though its vicious inhabitants are powerful creatures, they are kept at bay by the forces of Heaven.")
@@ -66,6  60,18 @@ DefinePlane("material-plane", {
 	Description = _("The material plane is the normal plane of existence, where worlds such as Earth and Nidavellir are located. As the other planes are made of pure magic, it is almost impossible for their inhabitants to travel to the material plane, as the difference in the composition of the realms would risk the traveller's very existence. The major exception being that particularly powerful mortal sorcerers are sometimes able to summon extraplanar beings for very short periods of time, maintaining their presence in a great effort of magical prowess. As more powerful extraplanar creatures are generally more rich in magic, they are also more difficult to summon.")
 })
 
 DefinePlane("muspelheim", {
 	Name = "Muspelheim",
 	Description = _("A primordial realm of flame, Muspelheim is inhabited by fiery creatures."),
 	Background = _("Muspelheim was the fire world of Norse mythology, the encounter of its heat with Niflheim's cold resulting in the creation of the cosmos.")
 })
 
 DefinePlane("niflheim", {
 	Name = "Niflheim",
 	Description = _("A dark, cold plane, Niflheim is inhabited by icy beings who can thrive in its freezing conditions. The abode of the goddess Hel is located in Niflheim. The plane harbors the souls of the dead who worshiped the Aesir, and yet were deemed unworthy of entry into Asgard by virtue of not having died in battle. In Helheim lies one of the roots of the mighty interplanar tree, Yggdrasill, the root having been corrupted by the dark forces of the plane."),
 	Background = _("Niflheim was the ice world of Norse mythology, the encounter of its cold with Muspelheim's heat resulting in the creation of the cosmos. Hel was a part of Niflheim.")
 })
 
 DefinePlane("nun", { -- Source: Claude Traunecker, "Os Deuses do Egito", 1992, p. 50.
 	Name = "Nun",
 	Description = _("Nun is a primordial water plane, which is sometimes used as refuge by the deities of the Pharaonic pantheon.")

diff --git a/scripts/species/ethereal/elemental.lua b/scripts/species/ethereal/elemental.lua
@@ -78,7  78,13 @@ DefineSpecies("efreet", {
 
 DefineSpecies("fire-elemental", {
 	Name = "Fire Elemental",
-	HomePlane = "hades", -- change this to something else?
 	HomePlane = "muspelheim",
 	Sapient = true
 })
 
 DefineSpecies("ice-elemental", {
 	Name = "Ice Elemental",
 	HomePlane = "niflheim",
 	Sapient = true
 })
 

diff --git a/scripts/units.lua b/scripts/units.lua
@@ -4324,9  4324,10 @@ DefineUnitType("unit-orc-shaman", { Name = _("Shaman"),
 	HiddenInEditor = true
 } )
 
-DefineUnitType("unit-water-elemental", { Name = _("Water Elemental"),
 DefineUnitType("unit-water-elemental", {
 	Name = "Water Elemental",
 	Parent = "unit-template-unit",
---	Description = _("These creatures inhabit the warmer parts of the world of Niflheim. Although in many respects they act like a living being, they seem to be nearly entirely made out of water, putting in doubt just what they really are."),
 --	Description = "These creatures inhabit the primordial water plane of Nun. Although in many respects they act like a living being, they seem to be nearly entirely made out of water, putting in doubt just what they really are.",
 --	Image = {"file", "dwarf/units/dwarven_axefighter.png", "size", {72, 72}},
 	Animations = "animations-dwarven-axefighter", Icon = "icon-water-elemental",
 	Costs = {"time", 70, "copper", 500, "lumber", 150},

diff --git a/scripts/worlds.lua b/scripts/worlds.lua
@@ -48,13  48,6 @@ DefineWorld("jotunheim", {
 	Background = _("Jotunheim was the world of the giants in Norse mythology. The ~<Alvissmol~> mentions that the giants call the sun \"Ever-Bright\", and the moon \"Rapid Traveller\".")
 })
 
-DefineWorld("muspelheim", {
-	Name = "Muspelheim",
-	Plane = "material-plane",
-	Description = _("A volcanic planet, Muspelheim is inhabited by fiery creatures."),
-	Background = _("Muspelheim was the fire world of Norse mythology, the encounter of its heat with Niflheim's cold resulting in the creation of the cosmos.")
-})
-
 DefineWorld("nidavellir", {
 	Name = "Nidavellir",
 	Plane = "material-plane",
@@ -63,10  56,3 @@ DefineWorld("nidavellir", {
 	Background = _("Nidavellir was the world of the dwarves in Norse mythology. The name means \"the Dark Fields\" or \"the Dark Crags\". Nidavellir is mentioned in the ~<Voluspo~>. In the ~<Alvissmol~> it is said that \"the Gleamer\" is the dwarves' term for the moon, while \"the Deceiver of Dvalin\" is their term for the sun."),
 	BaseTerrain = "Dark Plains"
 })
-
-DefineWorld("niflheim", {
-	Name = "Niflheim",
-	Plane = "material-plane",
-	Description = _("A dark, cold world, Niflheim is inhabited by resilient creatures who can thrive in its freezing conditions."),
-	Background = _("Niflheim was the ice world of Norse mythology, the encounter of its cold with Muspelheim's heat resulting in the creation of the cosmos. Hel was a part of Niflheim.")
-})