Skip to content

Commit

Permalink
Updated dwarven Sentry Tower and Guard Tower icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrettin committed Oct 30, 2015
1 parent fff9097 commit f9f94d1
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 40 deletions.
4 changes: 0 additions & 4 deletions graphics/credits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -992,10 +992,6 @@ Jim16:
/graphics/neutral/buildings/runestone.png (later modified by Nikita_Sadkov)

KPJ:
/graphics/neutral/buildings/silver_rock_1.png
/graphics/neutral/buildings/silver_rock_2.png
/graphics/neutral/buildings/silver_rock_3.png
/graphics/neutral/buildings/silver_rock_4.png
/graphics/ui/fonts/KPJsWyrmSunFont.png

Leo:
Expand Down
Binary file added graphics/dwarf/icons/guard_tower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/dwarf/icons/sentry_tower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed graphics/tilesets/forest/dwarf/icons/guard_tower.png
Binary file not shown.
Binary file not shown.
Binary file removed graphics/tilesets/swamp/dwarf/icons/guard_tower.png
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ https://github.com/Andrettin/Wyrmsun
- 1.5.1
-----------------------------------------------------------------------

* Buildings
- Updated dwarven Sentry Tower and Guard Tower icons.

* Grand Strategy
- Fixed grand strategy random map generation to produce silver and copper resources.

Expand Down
48 changes: 12 additions & 36 deletions scripts/icons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,18 @@ DefineIcon({
File = "dwarf/icons/yale_pen.png"
})

DefineIcon({
Name = "icon-dwarven-sentry-tower",
Size = {46, 38},
File = "dwarf/icons/sentry_tower.png"
})

DefineIcon({
Name = "icon-dwarven-guard-tower",
Size = {46, 38},
File = "dwarf/icons/guard_tower.png"
})

DefineIcon({
Name = "icon-dwarven-axe-1",
Size = {46, 38},
Expand Down Expand Up @@ -1458,18 +1470,6 @@ if (wyrmsun.tileset == "swamp" or wyrmsun.tileset == "dungeon") then
File = "tilesets/swamp/dwarf/icons/lumber_mill.png"
})

DefineIcon({
Name = "icon-dwarven-sentry-tower",
Size = {46, 38},
File = "tilesets/swamp/dwarf/icons/sentry_tower.png"
})

DefineIcon({
Name = "icon-dwarven-guard-tower",
Size = {46, 38},
File = "tilesets/swamp/dwarf/icons/guard_tower.png"
})

DefineIcon({
Name = "icon-gnomish-caravan",
Size = {46, 38},
Expand Down Expand Up @@ -1560,18 +1560,6 @@ elseif (wyrmsun.tileset == "conifer_forest_summer" or wyrmsun.tileset == "conife
File = "tilesets/forest/dwarf/icons/lumber_mill.png"
})

DefineIcon({
Name = "icon-dwarven-sentry-tower",
Size = {46, 38},
File = "tilesets/forest/dwarf/icons/sentry_tower.png"
})

DefineIcon({
Name = "icon-dwarven-guard-tower",
Size = {46, 38},
File = "tilesets/forest/dwarf/icons/guard_tower.png"
})

DefineIcon({
Name = "icon-gnomish-caravan",
Size = {46, 38},
Expand Down Expand Up @@ -1662,18 +1650,6 @@ else
File = "tilesets/swamp/dwarf/icons/lumber_mill.png"
})

DefineIcon({
Name = "icon-dwarven-sentry-tower",
Size = {46, 38},
File = "tilesets/swamp/dwarf/icons/sentry_tower.png"
})

DefineIcon({
Name = "icon-dwarven-guard-tower",
Size = {46, 38},
File = "tilesets/swamp/dwarf/icons/guard_tower.png"
})

DefineIcon({
Name = "icon-gnomish-caravan",
Size = {46, 38},
Expand Down

0 comments on commit f9f94d1

Please sign in to comment.