Skip to content

Commit

Permalink
Preparations for releasing patch 1.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrettin committed Nov 30, 2015
1 parent 7cd56eb commit 8c3e909
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 11 deletions.
5 changes: 1 addition & 4 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -225,18 +225,16 @@ https://github.com/Andrettin/Wyrmsun
############################################################

-----------------------------------------------------------------------
- 1.8.0
- 1.7.2
-----------------------------------------------------------------------

* Buildings
- Fixed issue which sometimes caused the Teuton town hall to briefly flicker before changing graphics after the research of Masonry.
- Added dwarven Dock (graphics by Jinn) (requires a Lumber Mill).

* Grand Strategy
- Added three new dwarven characters who may potentially become rulers: Oin, Andvari and Regin.
- Added Hordaland province in Norway.
- Improved the performance of the grand strategy hero code.
- Building a Dock is now necessary for fishing and for attacking provinces through water.
- Added Orkney province off the coast of Scotland.

* Heroes
Expand All @@ -246,7 +244,6 @@ https://github.com/Andrettin/Wyrmsun
- Fixed issue with random map generation which caused bridges to sometimes not fully appear.

* Quests
- The Caverns of Flame quest (Dwarf) now gives 2 technology points instead of 1.
- Fixed issue which caused nothing to be clickable in-game after the initial quest dialogue, if the player had played a grand strategy game just before.

* Units
Expand Down
2 changes: 2 additions & 0 deletions scripts/civilizations/dwarf/buttons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,13 @@ DefineButton( { Pos = 7, Level = 1, Icon = "icon-dwarven-sentry-tower",
ForUnit = {"unit-dwarven-miner", "unit-gnomish-worker"}
} )

--[[
DefineButton( { Pos = 8, Level = 1, Icon = "icon-dwarven-dock",
Action = "build", Value = "unit-dwarven-dock",
Key = "d", Hint = _("Build ~!Dock"), Popup = "popup-building",
ForUnit = {"unit-dwarven-miner", "unit-gnomish-worker"}
} )
--]]

DefineButton( { Pos = 9, Level = 1, Icon = "icon-gold-mine",
Action = "build", Value = "unit-gold-mine",
Expand Down
2 changes: 1 addition & 1 deletion scripts/civilizations/dwarf/units.lua
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ DefineUnitType("unit-dwarven-guard-tower", { Name = _("Guard Tower"),
} )

DefineUnitType("unit-dwarven-dock", { Name = _("Dock"),
Parent = "unit-template-dock",
-- Parent = "unit-template-dock",
Civilization = "dwarf",
Description = _("Although nautical dwarves are few in number, dwarven shipwrighting is a refined craft. They construct sturdy ships, capable of braving oceans and subterranean rivers alike."),
Image = {"file", "dwarf/buildings/dock.png", "size", {96, 96}},
Expand Down
4 changes: 2 additions & 2 deletions scripts/grand_strategy/grand_strategy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ function CanAttackProvince(province, faction, province_from)
return false
end

if (ProvinceHasBorderWith(province_from, province) == false and (province.Coastal == false or ProvinceHasBuildingClass(province.Name, "dock") == false or ProvinceHasSecondaryBorderThroughWaterWith(province_from, province) == false)) then
if (ProvinceHasBorderWith(province_from, province) == false and (province.Coastal == false or ProvinceHasSecondaryBorderThroughWaterWith(province_from, province) == false)) then
return false
end

Expand Down Expand Up @@ -2750,7 +2750,7 @@ function AIDoTurn(ai_faction)
end
end

if (borders_foreign == false and ProvinceHasBuildingClass(WorldMapProvinces[key].Name, "dock")) then -- only look for potential targets through water if no targets connected by land exist
if (borders_foreign == false) then -- only look for potential targets through water if no targets connected by land exist
local secondary_border_provinces_through_water = GetProvinceSecondaryBorderProvincesThroughWater(WorldMapProvinces[key])
for second_i, second_key in ipairs(secondary_border_provinces_through_water) do
if ((WorldMapProvinces[second_key] ~= nil and GetProvinceOwner(WorldMapProvinces[second_key].Name) ~= ai_faction.Name) or WorldMapWaterProvinces[second_key] ~= nil) then
Expand Down
2 changes: 1 addition & 1 deletion scripts/menus/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ editor_types = {
"unit-dwarven-yale-pen",
"unit-dwarven-sentry-tower",
"unit-dwarven-guard-tower",
"unit-dwarven-dock",
-- "unit-dwarven-dock",

"unit-surghan-mercenary-steelclad",
"unit-surghan-mercenary-thane",
Expand Down
2 changes: 1 addition & 1 deletion scripts/quests.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion scripts/stratagus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DebugPrint("Stratagus default config file loading ...\n")
wyrmsun = {}

wyrmsun.Name = "Wyrmsun"
wyrmsun.Version = "1.8.0"
wyrmsun.Version = "1.7.2"
wyrmsun.Homepage = ""
wyrmsun.Licence = "GPL 2.0"
wyrmsun.Copyright = "Copyright (c) 2013-2015 by Andrettin"
Expand Down
2 changes: 1 addition & 1 deletion scripts/units.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Units = {
"unit-dwarven-lumber-mill", "unit-dwarven-smithy",
"unit-dwarven-yale-pen",
"unit-dwarven-sentry-tower", "unit-dwarven-guard-tower",
"unit-dwarven-dock",
-- "unit-dwarven-dock",
"upgrade-dwarven-broad-axe", "upgrade-dwarven-great-axe", "upgrade-dwarven-shield-1", "upgrade-dwarven-shield-2",
"upgrade-dwarven-throwing-axe-1", "upgrade-dwarven-throwing-axe-2", "upgrade-dwarven-ballista-bolt-1", "upgrade-dwarven-ballista-bolt-2",
"upgrade-dwarven-wood-plow", "upgrade-dwarven-iron-tipped-wood-plow",
Expand Down

0 comments on commit 8c3e909

Please sign in to comment.