Preparation for 1.8.0 release

readme.txt

@@ -229,7 +229,6 @@ https://github.com/Andrettin/Wyrmsun
 -----------------------------------------------------------------------
 
 * Buildings
-- The Dwarven and Teuton Dock buildings are now buildable in RTS mode.
 - Guard Towers now provide +1 range for the ranged units attacking from within them.
 - Buildings no longer provide experience when destroyed.
 - Buildings now always drop items when destroyed.
@@ -264,14 +263,9 @@ https://github.com/Andrettin/Wyrmsun
 * Miscellaneous
 - Units' names now appear in a tooltip when they are hovered.
 
-* Quests
-- The Caverns of Flame quest (Dwarf) now gives 2 technology points instead of 1.
-- The Razing of Opitergium quest (Teuton) now gives 3 technology points instead of 2.
-
 * Units
 - Improved the calculation of the XP required for level up.
 - Improved the XP bar display.
-- Added Dwarven Transport (graphics by Jinn).
 - Germanic Skutans and Goblin Archers no longer use different animations for melee and ranged attacks.
 - Blood Bats and Dread Bats now give more experience.
 - Dread Bats now deal less damage.

scripts/civilizations/dwarf/units.lua

@@ -577,7 +577,7 @@ DefineUnitType("unit-dwarven-ballista", { Name = _("Ballista"),
 DefineUnitType("unit-dwarven-transport-ship", { Name = _("Transport"),
 	Parent = "unit-template-transport-ship",
 	Civilization = "dwarf",
-	Description = _("Sailing the Deep Sea and underground rivers alike, these ships are manned by hearty dwarven crews. Every journey brings back new tales, be it of a kobold dwarf-eating tribe, or of treacherous goblin pirates..."),
+--	Description = _("Sailing the Deep Sea and underground rivers alike, these ships are manned by hearty dwarven crews. Every journey brings back new tales, be it of a kobold dwarf-eating tribe, or of treacherous goblin pirates..."),
 	Image = {"file", "dwarf/units/transport.png", "size", {72, 72}},
 	Animations = "animations-transport-ship", Icon = "icon-dwarven-ballista",
 	Sounds = {

scripts/menus/techtree.lua

@@ -174,12 +174,14 @@ function RunTechTreeMenu(civilization_number)
 					if ((GetArrayIncludes(wyr.preferences.TechnologyAcquired, GetCivilizationClassUnitType("lumber-mill", civilization)) == false and GetTechnologyPointCost(civilization, GetCivilizationClassUnitType("lumber-mill", civilization)) > 0) or (GetArrayIncludes(wyr.preferences.TechnologyAcquired, GetCivilizationClassUnitType("smithy", civilization)) == false and GetTechnologyPointCost(civilization, GetCivilizationClassUnitType("smithy", civilization)) > 0)) then
 						tech_allowed = false
 					end
+				--[[
 				elseif (GetUnitTypeData(unitName, "Class") == "transport-ship") then
 					tech_icon_x = 6
 					tech_icon_y = 6
 					if ((GetArrayIncludes(wyr.preferences.TechnologyAcquired, GetCivilizationClassUnitType("dock", civilization)) == false and GetTechnologyPointCost(civilization, GetCivilizationClassUnitType("dock", civilization)) > 0)) then
 						tech_allowed = false
 					end
+				--]]
 				elseif (GetUnitTypeData(unitName, "Class") == "flying-rider") then
 					tech_icon_x = 8
 					tech_icon_y = 4
@@ -217,12 +219,14 @@ function RunTechTreeMenu(civilization_number)
 					if (GetArrayIncludes(wyr.preferences.TechnologyAcquired, GetCivilizationClassUnitType("lumber-mill", civilization)) == false and GetTechnologyPointCost(civilization, GetCivilizationClassUnitType("lumber-mill", civilization)) > 0) then
 						tech_allowed = false
 					end
+				--[[
 				elseif (GetUnitTypeData(unitName, "Class") == "dock") then
 					tech_icon_x = 6
 					tech_icon_y = 5
 					if (GetArrayIncludes(wyr.preferences.TechnologyAcquired, GetCivilizationClassUnitType("lumber-mill", civilization)) == false and GetTechnologyPointCost(civilization, GetCivilizationClassUnitType("lumber-mill", civilization)) > 0) then
 						tech_allowed = false
 					end
+				--]]
 				elseif (GetUnitTypeData(unitName, "Class") == "watch-tower") then
 					tech_icon_x = 9
 					tech_icon_y = 2
@@ -424,9 +428,11 @@ function GetTechnologyAllowsString(technology, civilization)
 			if (GetCivilizationClassUnitType("stables", civilization) ~= nil) then
 				table.insert(allowed_technologies, GetCivilizationClassUnitType("stables", civilization))
 			end
+			--[[
 			if (GetCivilizationClassUnitType("dock", civilization) ~= nil) then
 				table.insert(allowed_technologies, GetCivilizationClassUnitType("dock", civilization))
 			end
+			--]]
 			if (GetCivilizationClassUnitType("wood-plow", civilization) ~= nil) then
 				table.insert(allowed_technologies, GetCivilizationClassUnitType("wood-plow", civilization))
 			end
@@ -456,10 +462,12 @@ function GetTechnologyAllowsString(technology, civilization)
 			if (GetCivilizationClassUnitType("cavalry", civilization) ~= nil) then
 				table.insert(allowed_technologies, GetCivilizationClassUnitType("cavalry", civilization))
 			end
+		--[[
 		elseif (GetUnitTypeData(technology, "Class") == "dock") then
 			if (GetCivilizationClassUnitType("transport-ship", civilization) ~= nil) then
 				table.insert(allowed_technologies, GetCivilizationClassUnitType("transport-ship", civilization))
 			end
+		--]]
 		elseif (GetUnitTypeData(technology, "Class") == "watch-tower") then
 			if (GetCivilizationClassUnitType("guard-tower", civilization) ~= nil) then
 				table.insert(allowed_technologies, GetCivilizationClassUnitType("guard-tower", civilization))

scripts/quests.lua

@@ -130,7 +130,7 @@ DefineQuest("The Razing of Opitergium", {
 	RequiredQuest = "The Sack of Iuvavum",
 	World = "Earth",
 	Civilization = "teuton",
-	TechnologyPoints = 3,
+	TechnologyPoints = 2,
 	Map = "maps/earth/oderzo.smp",
 	Scenario = "scripts/civilizations/teuton/scenarios/the_razing_of_opitergium.lua",
 	X = 8,
@@ -339,7 +339,7 @@ DefineQuest("Caverns of Flame", {
 	RequiredQuest = "The Wyrm",
 	World = "Nidavellir",
 	Civilization = "dwarf",
-	TechnologyPoints = 2,
+	TechnologyPoints = 1,
 	Map = "maps/nidavellir/caverns-of-flame.smp",
 	Scenario = "scripts/civilizations/dwarf/scenarios/caverns_of_flame.lua",
 	X = 4,

scripts/stratagus.lua

@@ -1624,6 +1624,7 @@ function PersistencyUpdates()
 		end
 		wyr.preferences.Heroes = nil
 		SavePreferences()
+		SaveHeroes()
 	end
 
 	if (wyr.preferences.SavedGrandStrategyGames ~= nil) then -- grand strategy games are now saved in separate files
@@ -1962,11 +1963,12 @@ Load("scripts/grand_strategy/grand_strategy_events.lua")
 
 Load("scripts/0_ad_equivalencies.lua")
 
-if (CanAccessFile("wyr/heroes.lua")) then -- load persistent heroes
+if (CanAccessFile("wyr/heroes.lua")) then -- keep compatibility with how heroes were saved before
 	Load("heroes.lua")
 	SaveHeroes()
+else
+	LoadHeroes() -- load persistent heroes
 end
-LoadHeroes()
 
 DebugPrint("... ready!\n")