Update to 0.9.3:

Version 0.9.3:
 * user interface improvements:
   * restored dialog titles for multiplayer screens (#13049)
   * --nosound commandline option no longer initializes sound (part of #11669)
   * players can now control multiple sides in multiplayer
   * prevented user campaigns with errors from making the game unstartable
   * user campaigns can no longer redefine standard units
   * multiplayer replays no longer show 'The End' and credits (part of #13375)
   * fixed off-by-one error in Unit List (#13323)
   * fixed multiple Returns registered by some dialogs (part of #13332)
   * "Observers" setting for multiplayer games is now obeyed again (#13374)
 * language and i18n:
   * fixed 'make dist' not removing stamp-po files, causing broken translations
   * updated translations:
     * British English, Catalan, Finnish, German, Hungarian, Swedish, Turkish
   * updated MANUAL: English (also synched with wiki), German, Swedish
   * man pages: updated English and German, added Swedish
   * added descriptions to all multiplayer maps (#9763)
   * user visible error messages are now translatable (#12605)
   * added files to POTFILES.in: fix untranslatable strings (#13350)
   * fixed untranslatable strings on Windows (#13347)
   * fixed user campaign translations not working on Windows (#11848)
 * campaigns
   * Eastern Invasion:
     * made Captured and Approaching Weldyn easier
     * reduced the turn limit in The Drowned Plains
   * Heir to the Throne:
     * made campaign easier on "Easy" level
     * fixed Hasty Alliance crash: avoid cavewall endpoints (part of #13334)
     * updated story image 4 to remove glitch (#13385)
   * Son of the Black Eye:
     * made To The Harbour of Tirigaz and Black Flag easier
 * unit graphics and sound improvements:
   * new or modified images for Dwarvish Thunderer, Elvish Outrider,
     Elvish Rider, Elvish Scout, Giant Mudcrawler, Goblin Knight,
     Goblin Pillager, Mudcrawler, Orcish Warlord, Wolf Rider
   * new death animations for Dwarvish Thunderer, Elvish Archer,
     Elvish Avenger, Elvish Ranger, Giant Mudcrawler, Mudcrawler, Spearman,
     Young Ogre, Nightgaunt, Spectre
   * new orc portraits, now used in Heir to the Throne
   * new unit portraits for Bandit, Grand Knight, Halberdier, Horseman,
     Javelineer, Knight, Lancer, Paladin, Peasant, Pikeman, Royal Guard,
     Swordsman, Thug
 * terrain graphics
   * new multihex snow forest
   * new snow transition
   * new ice tiles
   * new dirt tiles
   * new villages
 * new units
   * added Orcish Slurbow and Dark Sorcerer
 * unit balancing and modifications:
   * applied 0.9.2 changes to Thief, Elvish Archer, Elvish Ranger,
     Elvish Avenger to female units also
   * steadfast now doubles resistances up to 50%; vulnerabilities are unaffected
   * decreased Dwarvish Guardsman line resistance to cold from 20% to 10%
   * decreased Dwarvish Stalwart defense in grassland from 50% to 40%
   * increased Dwarvish Ulfserker cost from 18 to 19
   * changed Thug attack from 6-3 to 5-4
   * increased Poacher experience needed to advance from 24 to 29
   * increased Orcish Shaman (Novice and Old also) hitpoints from 18 to 20
   * increased Pikeman attack from 9-3 to 10-3
   * increased Master Bowman hitpoints from 46 to 50
   * increased undeadspirit (Ghost line) resistance to fire from 0% to 10%
   * decreased Ghost, Shadow and Nightgaunt resistance to impact from 60% to 50%
   * changed Ghoul and Necrophage resistances: impact -10% -> 0%,
     fire -20% -> 0%, cold 60% -> 40%
   * decreased undeadfoot movement cost on mountains from 4 to 3
   * decreased undeadfoot movement cost on hills from 3 to 2
   * Demilich now advances to Dread Lich (previously Ancient Lich)
   * increased Naga hitpoints from 30 to 33 and experience from 25 to 32
   * increased Naga Warrior hitpoints from 40 to 43
   * decreased Naga Warrior experience needed to advance from 70 to 66
   * decreased Naga Warrior attack from 6-5 to 5-5
   * decreased Merman Hunter ranged attack from 6-3 to 5-3
   * decreased Merman Spearman ranged attack from 7-4 to 6-4
   * decreased Merman Spearman meele attack from 6-3 to 6-2
   * decreased Merman Spearman hitpoints from 45 to 40
   * decreased Merman Netcaster hitpoints from 42 to 40
   * increased Merman Netcaster ranged attack from 7-2 to 9-2
   * increased Merman Fighter hitpoints from 32 to 36
   * increased Merman Warrior hitpoints from 48 to 50 and attack from 7-4 to 8-4
   * decreased Elvish defence in swamp from 40% to 30%
   * increased Elvish Shaman ranged attack from 3-2 to 4-2
   * decreased Elvish Shaman meele attack from 3-2 to 2-2
   * decreased Elvish Druid meele attack from 4-2 to 3-2
   * Elvish Shaman and Druid are now able to inflict slow through melee
   * decreased Elvish Shaman cost from 18 to 17
   * increased movement cost of movetype "fly" units in caves from 2 to 3
   * increased Drake Clasher line movement cost in caves from 1 to 2
   * decreased Drakes' defence in caves from 40% to 30%
   * increased Revenant hitpoints from 40 to 43
   * increased Deathblade hitpoints from 32 to 35
   * increased Skeleton Archer ranged attack from 4-3 to 6-3
   * increased Skeleton Archer experience needed to advance from 30 to 35
   * increased Bone Shooter meele attack from 5-2 to 6-2
   * increased Bone Shooter ranged attack from 7-3 to 9-3
   * increased Soul Shooter meele attack from 6-2 to 8-2
   * increased Soul Shooter ranged attack from 11-3 to 12-3
   * Rebels can now choose White Mage as leader in Default era
   * Rebels can now choose Mage of Light as leader in Age of Heroes era
   * Nagas can no longer move on mountains
 * multiplayer scenarios
   * added Sablestone Delta
   * modified Den of Onis, Hornshark Island, Meteor Lake, Silverhead Crossing
 * server
   * no longer rejects :control command with "Side not found"
   * write a summary of commands when a fifo command is not recognized
   * fix assertion failure in network_worker.cpp
 * move_unit_fake with illegal coordinates now logs error instead of
   causing assertion failure crash (part of #13334)
 * various bug fixes and code cleanups

Version 0.9.2:
 * user interface improvements:
   * sped up frame rate when scrolling the map
   * connecting to a server now shows dialog that allows the user to cancel
     the connection rather than blocking (#12614)
   * sped up help
   * added hotkey for cycle to previous unit (shift-N) (part of #10703)
   * added hotkey for hold position (shift-space) (patch 3994)
   * made the right Command key on Mac OS X work like the left one
   * made menu widgets sortable
   * made network dialogs show progress of data transfers again
   * added display of unit defense over the terrain when choosing move
   * added visual cue for movement in specific terrain when choosing move
   * added %-to-kill to Damage Calculations
   * fixed female units not appearing in help (broken since 0.9.0)
   * added support for unit portraits in help (forum thread 6017)
   * reduced required width of weapon area in help
   * fixed items appearing in traits description (#12603)
   * preserve trait ordering to distinguish quick,resilient and resilient,quick
   * improved layout of objectives dialog
   * made the text of disabled buttons grayed out
   * made room for observers in DFool theme (#13027)
   * added clock to DFool theme (#10650)
   * added Experimental theme
   * tweaked multiplayer lobby
   * improved position and size of 'users' menu in multiplayer lobby (#13120)
   * selecting colors for multiplayer sides now works correctly (#13255)
   * typing a chat message quickly no longer lags the game (#12097)
   * pasting multiline text now discards lines after the first (#12282)
   * better checking for 'control' command arguments in multiplayer (#13086)
   * added 'Advanced' preferences: 'binary save files', 'show combat'
   * fixed village name being shown over shroud (#10690)
   * made ordering of terrain data consistent (#10665)
   * display error if save cannot be completed (eg. disk full) (#13232)
   * fixed halo position when unit is in water (#12493)
   * fixed titlescreen background disappearing on switch to fullscreen (#11863)
   * disabled mousewheel scrolling during combat and unit movement (#12021)
   * fixed pathfinding issues with respect to unreachable hexes (#11480, #13295)
 * campaign improvements:
   * Eastern Invasion:
     * Unexpected Appearance: fixed Dacyn not being [recall]-ed (#12830)
     * Evacuation: units left on the wrong side of river now really die (#10619)
     * Northern Outpost: killing enemies in "wrong" order is now a win (#12922)
     * Northern Outpost: added a Holy Water bottle
     * Captured: fixed bugs (#10512, #12998), but replaced scenario anyway
     * Drowned Plains: new map and scenario modification, bug fixed (#13013)
   * Heir to the Throne:
     * Siege of Elensefar: fixed thieves not appearing (forum thread 5719)
   * Son of the Black Eye:
     * prevented the shamans from being recallable (#11932)
     * Siege of Barag Gor: killing enemy leader is no longer a win
     * End of Peace: increased turn limit 24 -> 26 due to Lieutenant upgrade
     * Desert of Death: fixed invalid type=RogueAssassin on Hard
     * removed duplicate file inclusion - campaign should now start faster
     * more accurate difficulty labels
     * Toward Mountains of Haag: fixed enemy making "never pushed so far" speech
 * new units
   * added Drake Warden, Hurricane Drake and Drake Blademaster
 * unit balancing and modifications:
   * slow now affects units with 2 or more attacks (not just 1 remaining)
   * slow now works with berserk and is persistent across berserk rounds
   * changed Lieutenant attack from 6-3 to 9-3
   * reduced Fencer cost from 18 to 16
   * changed Iron Mauler attack from 22-2 to 25-2
   * changed Soulless attack from 7-2 to 7-3
   * changed Soulless attack from plague to plague(Walking Corpse)
   * Walking Corpse created by plague can advance to Soulless again (#13056)
   * reduced Skeleton Archer cost from 15 to 14
   * changed Skeletal Dragon resistances (only used in Eastern Invasion)
   * tweaked Watch Tower, Pirate Galleon and Transport Galleon and removed
     their multihex attacks (only used as real units in Son of the Black Eye)
   * reduced Dwarvish Fighter cost from 17 to 16
   * reduced Dwarvish Fighter line Axe (blade) damage by 1 point
   * reduced Dwarvish Thunderer cost from 19 to 17
   * reduced Gryphon Rider cost from 25 to 24
   * Dwarvish Ulfserker stats reverted to those from version 0.8.11
   * increased Thief cost from 12 to 13
   * changed Elvish Lord and Elvish High Lord's ranged attack from fire to cold
   * changed Elvish Ranger meele attack from 7-4 to 7-3
   * changed Elvish Avenger meele attack from 10-4 to 9-4
   * increased Walking Corpse cost from 5 to 6
   * trolls can no longer get "intelligent" random trait
   * increased Troll Whelp experience needed to advance from 32 to 33 XP
   * increased Troll experience needed to advance from 52 to 60 XP
   * Goblin Knight -> Direwolf Rider upgrade reduced from 150 to 65 XP
   * added flaming arrow to orcish archer line as a new attack
   * reduced Saurian Skirmisher movement to 6, increased its cost from 14 to 15
   * changed Drake Gladiator from 65 to 59 HP
   * changed Drake Gladiator pierce resistance from 10% to -10%
   * changed Drake Slasher from 59 to 65 HP
   * changed Drake Slasher pierce resistance from -10% to 10%
   * increased Drake Slasher and Drake Gladiator cost to 45
 * Doc Paterson's modifications to the MP map catalogue
   * added "Divide and Conquer", "Silverhead Crossing", "Meteor Lake",
     "Den of Onis", "Hamlets", "Hornshark Island", "Sulla's Ruins",
     "1v1v1Hex" (3p), "Lagoon" (4p), "The Wilderlands" (4p),
     "3-player Morituri", "3-player Blitz (Triple Blitz)"
   * removed "Broken Bridge", "Battle For Weslin Bridge",
     "Princess's Battlefield", "Three Rivers", "The Isles of the Damned",
     "The Isle of Anduin", "Dwarven Wasteland"
 * unit graphics and sound improvements:
   * new death animations for: Ancient Lich, Ancient Wose, Arch Mage,
     Assassin, Bandit, Battle Princess, Blood Bat, Bone Shooter, Bowman,
     Cavalier, Cavalryman, Cave Spider, Chocobone, Cockatrice,
     Commander, Cuttle Fish, Dark Adept, Dark Queen, Dark Spirit,
     Deathblade, Death Knight, Deathmaster, Demilich, Direwolf Rider,
     Dragoon, Duelist, Draug, Drake Burner, Drake Clasher, Drake Fighter,
     Fire Drake
   * new or modified graphics for Dragoon, Dwarvish Dragonguard,
     Elvish High Lord, Elvish Lord, Halberdier, Lady Parandra, Noble Lord,
     Royal Guard, Soulshooter, Swordsman
   * fixed several image files being referred to by wrong name
   * new Soulless variation images
   * added flaming arrow images
 * language and i18n:
   * language fixes and polishing (English) (also fixed #12613, #10714)
   * updated MANUAL
   * new translations: Serbian
   * updated translations: Afrikaans, British English, Catalan, Chinese,
     Czech (#12864), Estonian, Finnish, French, German (also fixed
     #13147), Greek, Hungarian, Italian, Japanese, Polish, Russian,
     Slovenian, Spanish, Swedish, Turkish
   * updated gettext support to GNU gettext 0.14.4
   * removed the intl/ directory, since libintl is now widespread enough
     for gettextize to default to not installing it
 * WML improvements:
   * new WML preprocessor, allows for nested parentheses in macros (#10995)
   * note= attribute for [objectives], shown as footer, eg. for hints (#12927)
   * increase_attacks= attribute of [effect] now allows percentages (#13033)
   * new [random] representation as list allows complex scenarios to be saved
     (forum thread 5659)
   * better diagnostics on parsing: show file inclusion sequence
   * added [scroll_to] (patch #3388, forum thread 3235)
   * added [advancefrom] (patch #3625, forum thread 4186)
   * [recall] tag can now work even if the recruiter is not in a keep
     (#10543, #11735, #12974)
   * next_scenario: tentative start of MP campaign support
   * tidied up game.cfg and traits.cfg; game startup should now be faster
 * editor improvements:
   * fixed editor file chooser when starting directory has many files (#11698)
   * the starting position in the editor now starts counting from 1 (#10625)
 * improvements and bug fixes of the logging system
 * fixed replays with idle_ai, as seen in user scenario Rebellion (#12943)
 * saving during an AI unit's turn no longer makes that unit disappear (#13023)
 * fixed Windows build crashing when trying to recruit units (#12926)
 * tutorial start and end scenario savegames can now be loaded (#10332)
 * various bug fixes and code cleanups (including #13264 #12954 #12734 #13263)

Version 0.9.1:
 * user interface improvements:
   * added a shortcut for making screenshots
   * added support for Home/End in menus, ctrl-a/e/u in textboxes
   * fixed the formatting of wrapped text lines being lost
   * fixed the screen being incorrectly redrawn when resizing
   * fixed bug #12654 causing prestart events to be shown to the player
   * fixed bug #12758: gendered unit types repeated in attack type tooltip
   * fixed bug #12612: no description in help for units at first encounter as upgrade
   * fixed excess space in MP "/me " emotes
 * campaign improvements:
   * fixed bug in Northern Winter (HttT) where the Orcs attack each other
   * fixed the 'knockback' for WML Plague in TRoW
   * fixed missing music in the Crossroads (HttT)
 * multiplayer improvements:
   * fixed the lobby chat window not wrapping text
   * fixed the lobby chat staying at top when changing lobby screens
   * fixed the multiplayer "wait" lobby screen not correctly displaying empty and vacant slots.
   * made renaming units visible on replays and on multiplayer games
   * fixed bug #12759: "number of turns" not being remembered when creating multiplayer games
   * fixed bug #12791: Statistics doesn't reset in multiplayer games.
 * terrain improvements:
   * new forest tiles
 * unit balancing:
     * Dwarvish Guardsmen line removed as leaders in multiplayer
     * Dwarvish Guardsmen line only get 1 trait instead of 2
     * revert Drakes pierce resistance to 110%
     * revert Orcish Assassin to 3-3 ranged attack
     * reduced resistance of Ulfserker and Berserker
     * Elvish Rider: increase melee to 6-4, increase ranged to 7-3
     * Elvish Outrider: increase melee to 8-4, increase ranged to 7-4
 * language and i18n:
   * updated English and German manpages
   * language fixes and polishing (English)
   * fixed the description of traits in the help & tutorial
   * fixed user-campaigns not being translatable anymore
   * fixed some untranslatable strings
   * new translations:
     * Turkish
   * updated translations:
     * Afrikaans
     * British English
     * Catalan
     * Chinese
     * French
     * German
     * Hungarian
     * Italian
     * Japanese
     * Slovenian
     * Swedish
   * added a ./configure --enable-dummy-locales option for Wesnoth to generate
     its own set of i18n locale files and use them instead of the potentially
     missing system files (highly experimental)
   * made the width of the non-breaking space in Vera font be half that of
     the normal space, instead of twice that width.
 * added support for num_traits in individual unit_types overriding race num_traits
 * fixed the missing 'elder-mage-halo7.png' in the Elder Mage
 * fixed the advanceto field in Dark_Adept.cfg
 * fixed some OoS errors when chatting while a fight is taking place
 * fixed the spurious "statistics verification failed" messages
 * fixed bug #12611: modifying villages with [terrain] interacting badly with capturing them.
 * fixed bug #12698: segfault with --decompress on relative path
 * various bug fixes and code cleanups

5 files changed, 430 insertions, 418 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index c86f4ec9a38..573520ffd2d 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/04/19 01:50:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/14 21:47:57 wiz Exp $
 #
 
-DISTNAME=	wesnoth-0.9.0
+DISTNAME=	wesnoth-0.9.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 
@@ -23,7 +23,9 @@ BUILDLINK_DEPENDS.SDL_mixer=	SDL_mixer>=1.2.5nb3
 # use included SDL_ttf library
 #.include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 85962f88156..922202bcd04 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/04/19 01:50:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/07/14 21:47:57 wiz Exp $
 bin/wesnoth
 bin/wmlxgettext
 man/de/man6/wesnoth.6
@@ -108,10 +108,22 @@ share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Vanguard
 share/wesnoth/data/maps/The_Rise_of_Wesnoth/Troll_Hole
 share/wesnoth/data/maps/Tutorial/Basic_Training
 share/wesnoth/data/maps/Tutorial/Traits_and_Specialties
+share/wesnoth/data/maps/multiplayer/2p_Den_of_Onis
+share/wesnoth/data/maps/multiplayer/2p_Divide_and_Conquer
+share/wesnoth/data/maps/multiplayer/2p_Hamlets
+share/wesnoth/data/maps/multiplayer/2p_Hornshark_Island
+share/wesnoth/data/maps/multiplayer/2p_Meteor_Lake
+share/wesnoth/data/maps/multiplayer/2p_Sablestone_Delta
+share/wesnoth/data/maps/multiplayer/2p_Silverhead_Crossing
+share/wesnoth/data/maps/multiplayer/2p_Sullas_Ruins
+share/wesnoth/data/maps/multiplayer/3p_1v1v1Hex
+share/wesnoth/data/maps/multiplayer/3p_Morituri
+share/wesnoth/data/maps/multiplayer/3p_Triple_Blitz
+share/wesnoth/data/maps/multiplayer/4p_Lagoon
+share/wesnoth/data/maps/multiplayer/4p_The_Wilderlands
 share/wesnoth/data/maps/multiplayer/An_Island
 share/wesnoth/data/maps/multiplayer/BattleWorld
 share/wesnoth/data/maps/multiplayer/Blitz
-share/wesnoth/data/maps/multiplayer/Broken_Bridge
 share/wesnoth/data/maps/multiplayer/CastleHoppingIsle
 share/wesnoth/data/maps/multiplayer/Castles
 share/wesnoth/data/maps/multiplayer/Charge
@@ -120,9 +132,7 @@ share/wesnoth/data/maps/multiplayer/ForestofFear
 share/wesnoth/data/maps/multiplayer/Hexcake
 share/wesnoth/data/maps/multiplayer/Icy_Waters
 share/wesnoth/data/maps/multiplayer/King_of_the_Hill
-share/wesnoth/data/maps/multiplayer/Three_Rivers
 share/wesnoth/data/maps/multiplayer/Wesbowl
-share/wesnoth/data/maps/multiplayer/Weslin
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
 share/wesnoth/data/scenario-test.cfg
@@ -191,9 +201,9 @@ share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg
-share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg
-share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg
-share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg
+share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils/deaths.cfg
+share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils/story.cfg
+share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils/utils.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg
@@ -236,23 +246,36 @@ share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg
-share/wesnoth/data/scenarios/multiplayer/An_Island.cfg
-share/wesnoth/data/scenarios/multiplayer/Blitz.cfg
-share/wesnoth/data/scenarios/multiplayer/BrokenBridge.cfg
-share/wesnoth/data/scenarios/multiplayer/CastleHoppingIsle.cfg
-share/wesnoth/data/scenarios/multiplayer/Charge.cfg
-share/wesnoth/data/scenarios/multiplayer/Clash.cfg
-share/wesnoth/data/scenarios/multiplayer/ForestOfFear.cfg
-share/wesnoth/data/scenarios/multiplayer/Hexcake.cfg
-share/wesnoth/data/scenarios/multiplayer/IcyWaters.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Blitz.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Charge.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Den_of_Onis.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Hamlets.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Hornshark_Island.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_IcyWaters.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Meteor_Lake.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg
+share/wesnoth/data/scenarios/multiplayer/2p_Wesbowl.cfg
+share/wesnoth/data/scenarios/multiplayer/3p_1v1v1Hex.cfg
+share/wesnoth/data/scenarios/multiplayer/3p_Morituri.cfg
+share/wesnoth/data/scenarios/multiplayer/3p_Triple_Blitz.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_An_Island.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_Clash.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_Lagoon.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_Siege_Castles.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_The_Valley_of_Death.cfg
+share/wesnoth/data/scenarios/multiplayer/4p_The_Wilderlands.cfg
+share/wesnoth/data/scenarios/multiplayer/5p_ForestOfFear.cfg
+share/wesnoth/data/scenarios/multiplayer/6p_Hexcake.cfg
+share/wesnoth/data/scenarios/multiplayer/7p_battleworld.cfg
 share/wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg
 share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg
 share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
 share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
-share/wesnoth/data/scenarios/multiplayer/Wesbowl.cfg
-share/wesnoth/data/scenarios/multiplayer/WeslinBridge.cfg
-share/wesnoth/data/scenarios/multiplayer/battleworld.cfg
-share/wesnoth/data/scenarios/multiplayer/castles.cfg
 share/wesnoth/data/scenarios/multiplayer/scenarios.cfg
 share/wesnoth/data/scenarios/tutorial/Basic_Training.cfg
 share/wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg
@@ -272,6 +295,7 @@ share/wesnoth/data/terrain.cfg
 share/wesnoth/data/themes/default.cfg
 share/wesnoth/data/themes/dfool.cfg
 share/wesnoth/data/themes/editor.cfg
+share/wesnoth/data/themes/experimental.cfg
 share/wesnoth/data/tips.cfg
 share/wesnoth/data/tools/exploder/castle-concave.cfg
 share/wesnoth/data/tools/exploder/castle-convex.cfg
@@ -294,6 +318,7 @@ share/wesnoth/data/tools/exploder/wall-exploded-concave.cfg
 share/wesnoth/data/tools/exploder/wall-exploded-convex.cfg
 share/wesnoth/data/traits.cfg
 share/wesnoth/data/translations/english.cfg
+share/wesnoth/data/units.cfg
 share/wesnoth/data/units/Ancient_Lich.cfg
 share/wesnoth/data/units/Ancient_Wose.cfg
 share/wesnoth/data/units/Arch_Mage.cfg
@@ -320,19 +345,24 @@ share/wesnoth/data/units/Deathmaster.cfg
 share/wesnoth/data/units/Demilich.cfg
 share/wesnoth/data/units/Direwolf_Rider.cfg
 share/wesnoth/data/units/Dragoon.cfg
+share/wesnoth/data/units/Drake_Blademaster.cfg
 share/wesnoth/data/units/Drake_Burner.cfg
 share/wesnoth/data/units/Drake_Clasher.cfg
+share/wesnoth/data/units/Drake_Enforcer.cfg
 share/wesnoth/data/units/Drake_Fighter.cfg
 share/wesnoth/data/units/Drake_Fire.cfg
 share/wesnoth/data/units/Drake_Flameheart.cfg
 share/wesnoth/data/units/Drake_Flare.cfg
 share/wesnoth/data/units/Drake_Gladiator.cfg
 share/wesnoth/data/units/Drake_Glider.cfg
+share/wesnoth/data/units/Drake_Hurricane.cfg
 share/wesnoth/data/units/Drake_Inferno.cfg
 share/wesnoth/data/units/Drake_Sky.cfg
 share/wesnoth/data/units/Drake_Slasher.cfg
+share/wesnoth/data/units/Drake_Warden.cfg
 share/wesnoth/data/units/Drake_Warrior.cfg
 share/wesnoth/data/units/Draug.cfg
+share/wesnoth/data/units/Dread_Lich.cfg
 share/wesnoth/data/units/Duelist.cfg
 share/wesnoth/data/units/Dwarvish_Berserker.cfg
 share/wesnoth/data/units/Dwarvish_Dragonguard.cfg
@@ -449,6 +479,7 @@ share/wesnoth/data/units/Orcish_Leader.cfg
 share/wesnoth/data/units/Orcish_Ruler.cfg
 share/wesnoth/data/units/Orcish_Shaman.cfg
 share/wesnoth/data/units/Orcish_Slayer.cfg
+share/wesnoth/data/units/Orcish_Slurbow.cfg
 share/wesnoth/data/units/Orcish_Sovereign.cfg
 share/wesnoth/data/units/Orcish_Warlord.cfg
 share/wesnoth/data/units/Orcish_Warrior.cfg
@@ -518,6 +549,8 @@ share/wesnoth/fonts/Bepa-Roman.ttf
 share/wesnoth/fonts/FreeSans.ttf
 share/wesnoth/fonts/Vera.ttf
 share/wesnoth/images/arch-mage+female-defend.png
+share/wesnoth/images/arch-mage+female-die-1.png
+share/wesnoth/images/arch-mage+female-die-2.png
 share/wesnoth/images/arch-mage+female-fireball-1.png
 share/wesnoth/images/arch-mage+female-fireball-2.png
 share/wesnoth/images/arch-mage+female-fireball-3.png
@@ -525,6 +558,8 @@ share/wesnoth/images/arch-mage+female-staff-1.png
 share/wesnoth/images/arch-mage+female-staff-2.png
 share/wesnoth/images/arch-mage+female.png
 share/wesnoth/images/arch-mage-defend.png
+share/wesnoth/images/arch-mage-die-1.png
+share/wesnoth/images/arch-mage-die-2.png
 share/wesnoth/images/arch-mage-fireball-1.png
 share/wesnoth/images/arch-mage-fireball-2.png
 share/wesnoth/images/arch-mage-fireball-3.png
@@ -540,6 +575,8 @@ share/wesnoth/images/assassin+female.png
 share/wesnoth/images/assassin-attack.png
 share/wesnoth/images/assassin-attack2.png
 share/wesnoth/images/assassin-defend.png
+share/wesnoth/images/assassin-die-1.png
+share/wesnoth/images/assassin-die-2.png
 share/wesnoth/images/assassin-throwknife1.png
 share/wesnoth/images/assassin-throwknife2.png
 share/wesnoth/images/assassin.png
@@ -583,6 +620,7 @@ share/wesnoth/images/attacks/longbow.png
 share/wesnoth/images/attacks/mace.png
 share/wesnoth/images/attacks/missile.png
 share/wesnoth/images/attacks/morning_star.png
+share/wesnoth/images/attacks/mud-glob.png
 share/wesnoth/images/attacks/paladinsword.png
 share/wesnoth/images/attacks/pike.png
 share/wesnoth/images/attacks/pincers.png
@@ -616,6 +654,8 @@ share/wesnoth/images/buttons/checkbox.png
 share/wesnoth/images/buttons/downarrow-button-active.png
 share/wesnoth/images/buttons/downarrow-button-pressed.png
 share/wesnoth/images/buttons/downarrow-button.png
+share/wesnoth/images/buttons/endturn-button-active.png
+share/wesnoth/images/buttons/endturn-button.png
 share/wesnoth/images/buttons/lite-active.png
 share/wesnoth/images/buttons/lite-pressed.png
 share/wesnoth/images/buttons/lite.png
@@ -655,16 +695,22 @@ share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/maps/sotbe3.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/maps/the_great_continent.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/story/east.png
+share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/story/fall_of_eldaric.png
+share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/story/prince_finds_wesnoth.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/story/the_duel.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/story/trow-logo.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/story/west.png
 share/wesnoth/images/cavespider-attack-melee.png
 share/wesnoth/images/cavespider-attack-ranged.png
 share/wesnoth/images/cavespider-defend.png
+share/wesnoth/images/cavespider-die-1.png
+share/wesnoth/images/cavespider-die-2.png
 share/wesnoth/images/cavespider.png
 share/wesnoth/images/cockatrice-attack1.png
 share/wesnoth/images/cockatrice-attack2.png
 share/wesnoth/images/cockatrice-defend.png
+share/wesnoth/images/cockatrice-die-1.png
+share/wesnoth/images/cockatrice-die-2.png
 share/wesnoth/images/cockatrice.png
 share/wesnoth/images/cursors-bw/attack.png
 share/wesnoth/images/cursors-bw/move.png
@@ -682,20 +728,28 @@ share/wesnoth/images/cuttlefish-attack-4.png
 share/wesnoth/images/cuttlefish-attack-ink.png
 share/wesnoth/images/cuttlefish-attack.png
 share/wesnoth/images/cuttlefish-defend.png
+share/wesnoth/images/cuttlefish-die-1.png
+share/wesnoth/images/cuttlefish-die-2.png
 share/wesnoth/images/cuttlefish.png
 share/wesnoth/images/deep-tentacle-attack.png
 share/wesnoth/images/deep-tentacle-defend.png
 share/wesnoth/images/deep-tentacle.png
 share/wesnoth/images/direwolf_rider.png
+share/wesnoth/images/drake-blademaster-attack-close1.png
+share/wesnoth/images/drake-blademaster-attack-close2.png
+share/wesnoth/images/drake-blademaster-attack-ranged.png
+share/wesnoth/images/drake-blademaster-defend.png
+share/wesnoth/images/drake-blademaster-flying.png
+share/wesnoth/images/drake-blademaster.png
 share/wesnoth/images/drake-burner-attack-close.png
-share/wesnoth/images/drake-burner-attack-close1.png
-share/wesnoth/images/drake-burner-attack-close2.png
-share/wesnoth/images/drake-burner-attack-ranged.png
 share/wesnoth/images/drake-burner-attack-ranged1.png
 share/wesnoth/images/drake-burner-attack-ranged2.png
 share/wesnoth/images/drake-burner-defend.png
+share/wesnoth/images/drake-burner-die-1.png
+share/wesnoth/images/drake-burner-die-2.png
 share/wesnoth/images/drake-burner-flying.png
 share/wesnoth/images/drake-burner.png
+share/wesnoth/images/drake-clasher-attack-mace.png
 share/wesnoth/images/drake-clasher-attack-spear.png
 share/wesnoth/images/drake-clasher-attack-spear1.png
 share/wesnoth/images/drake-clasher-attack-spear2.png
@@ -705,18 +759,25 @@ share/wesnoth/images/drake-clasher-attack-sword2.png
 share/wesnoth/images/drake-clasher-attack-sword3.png
 share/wesnoth/images/drake-clasher-attack-sword4.png
 share/wesnoth/images/drake-clasher-defend.png
+share/wesnoth/images/drake-clasher-die-1.png
+share/wesnoth/images/drake-clasher-die-2.png
 share/wesnoth/images/drake-clasher-flying.png
 share/wesnoth/images/drake-clasher.png
+share/wesnoth/images/drake-enforcer.png
 share/wesnoth/images/drake-fighter-attack-close1.png
 share/wesnoth/images/drake-fighter-attack-close2.png
 share/wesnoth/images/drake-fighter-attack-fire1.png
 share/wesnoth/images/drake-fighter-attack-fire2.png
 share/wesnoth/images/drake-fighter-defend.png
+share/wesnoth/images/drake-fighter-die-1.png
+share/wesnoth/images/drake-fighter-die-2.png
 share/wesnoth/images/drake-fighter-flying.png
 share/wesnoth/images/drake-fighter.png
 share/wesnoth/images/drake-fire-attack-close.png
 share/wesnoth/images/drake-fire-attack-ranged.png
 share/wesnoth/images/drake-fire-defend.png
+share/wesnoth/images/drake-fire-die-1.png
+share/wesnoth/images/drake-fire-die-2.png
 share/wesnoth/images/drake-fire-flying.png
 share/wesnoth/images/drake-fire.png
 share/wesnoth/images/drake-flameheart-attack-close1.png
@@ -744,6 +805,12 @@ share/wesnoth/images/drake-glider-defend.png
 share/wesnoth/images/drake-glider-flying.png
 share/wesnoth/images/drake-glider-ranged-attack.png
 share/wesnoth/images/drake-glider.png
+share/wesnoth/images/drake-hurricane-attack-melee1.png
+share/wesnoth/images/drake-hurricane-attack-melee2.png
+share/wesnoth/images/drake-hurricane-attack-ranged-fire1.png
+share/wesnoth/images/drake-hurricane-attack-ranged-fire2.png
+share/wesnoth/images/drake-hurricane-flying.png
+share/wesnoth/images/drake-hurricane.png
 share/wesnoth/images/drake-inferno-attack-close.png
 share/wesnoth/images/drake-inferno-attack-ranged.png
 share/wesnoth/images/drake-inferno-defend.png
@@ -755,20 +822,16 @@ share/wesnoth/images/drake-sky-attack-ranged-fire.png
 share/wesnoth/images/drake-sky-attack-ranged-impact.png
 share/wesnoth/images/drake-sky-defend.png
 share/wesnoth/images/drake-sky.png
-share/wesnoth/images/drake-slasher-attack-blade1.png
-share/wesnoth/images/drake-slasher-attack-blade2.png
-share/wesnoth/images/drake-slasher-attack-blade3.png
-share/wesnoth/images/drake-slasher-attack-blade4.png
-share/wesnoth/images/drake-slasher-attack-mace1.png
-share/wesnoth/images/drake-slasher-attack-mace2.png
-share/wesnoth/images/drake-slasher-attack-spear1.png
-share/wesnoth/images/drake-slasher-attack-spear2.png
-share/wesnoth/images/drake-slasher-attack-spear3.png
 share/wesnoth/images/drake-slasher-defend.png
 share/wesnoth/images/drake-slasher-flying.png
 share/wesnoth/images/drake-slasher-pierce.png
 share/wesnoth/images/drake-slasher-slash.png
 share/wesnoth/images/drake-slasher.png
+share/wesnoth/images/drake-warden-defend.png
+share/wesnoth/images/drake-warden-flying.png
+share/wesnoth/images/drake-warden-pierce.png
+share/wesnoth/images/drake-warden-slash.png
+share/wesnoth/images/drake-warden.png
 share/wesnoth/images/drake-warrior-attack-close1.png
 share/wesnoth/images/drake-warrior-attack-close2.png
 share/wesnoth/images/drake-warrior-attack-ranged.png
@@ -806,6 +869,11 @@ share/wesnoth/images/dwarf-stalwart.png
 share/wesnoth/images/dwarf-thunderer-attack.png
 share/wesnoth/images/dwarf-thunderer-attack1.png
 share/wesnoth/images/dwarf-thunderer-defend.png
+share/wesnoth/images/dwarf-thunderer-die1.png
+share/wesnoth/images/dwarf-thunderer-die2.png
+share/wesnoth/images/dwarf-thunderer-die3.png
+share/wesnoth/images/dwarf-thunderer-melee1.png
+share/wesnoth/images/dwarf-thunderer-melee2.png
 share/wesnoth/images/dwarf-thunderer.png
 share/wesnoth/images/dwarf-thunderguard-attack.png
 share/wesnoth/images/dwarf-thunderguard-attack1.png
@@ -841,7 +909,15 @@ share/wesnoth/images/elvish-archer-attack3.png
 share/wesnoth/images/elvish-archer-bow-defend.png
 share/wesnoth/images/elvish-archer-bow.png
 share/wesnoth/images/elvish-archer-defend.png
+share/wesnoth/images/elvish-archer-die1.png
+share/wesnoth/images/elvish-archer-die2.png
+share/wesnoth/images/elvish-archer-die3.png
+share/wesnoth/images/elvish-archer-die4.png
 share/wesnoth/images/elvish-archer.png
+share/wesnoth/images/elvish-archer_female-die1.png
+share/wesnoth/images/elvish-archer_female-die2.png
+share/wesnoth/images/elvish-archer_female-die3.png
+share/wesnoth/images/elvish-archer_female-die4.png
 share/wesnoth/images/elvish-avenger+female-attack.png
 share/wesnoth/images/elvish-avenger+female-attack1.png
 share/wesnoth/images/elvish-avenger+female-attack2.png
@@ -857,6 +933,10 @@ share/wesnoth/images/elvish-avenger-attack3.png
 share/wesnoth/images/elvish-avenger-bow-defend.png
 share/wesnoth/images/elvish-avenger-bow.png
 share/wesnoth/images/elvish-avenger-defend.png
+share/wesnoth/images/elvish-avenger-die1.png
+share/wesnoth/images/elvish-avenger-die2.png
+share/wesnoth/images/elvish-avenger-die3.png
+share/wesnoth/images/elvish-avenger-die4.png
 share/wesnoth/images/elvish-avenger.png
 share/wesnoth/images/elvish-captain-attack.png
 share/wesnoth/images/elvish-captain-bow-attack1.png
@@ -940,6 +1020,7 @@ share/wesnoth/images/elvish-lord-ranged-defend.png
 share/wesnoth/images/elvish-lord-ranged.png
 share/wesnoth/images/elvish-lord-ranged1.png
 share/wesnoth/images/elvish-lord-ranged2.png
+share/wesnoth/images/elvish-lord-ranged3.png
 share/wesnoth/images/elvish-lord.png
 share/wesnoth/images/elvish-marksman+female-attack.png
 share/wesnoth/images/elvish-marksman+female-attack1.png
@@ -973,6 +1054,7 @@ share/wesnoth/images/elvish-outrider-attack.png
 share/wesnoth/images/elvish-outrider-attack1.png
 share/wesnoth/images/elvish-outrider-attack2.png
 share/wesnoth/images/elvish-outrider-defend.png
+share/wesnoth/images/elvish-outrider-moving.png
 share/wesnoth/images/elvish-outrider.png
 share/wesnoth/images/elvish-ranger+female-attack.png
 share/wesnoth/images/elvish-ranger+female-attack1.png
@@ -989,6 +1071,10 @@ share/wesnoth/images/elvish-ranger-attack3.png
 share/wesnoth/images/elvish-ranger-bow-defend.png
 share/wesnoth/images/elvish-ranger-bow.png
 share/wesnoth/images/elvish-ranger-defend.png
+share/wesnoth/images/elvish-ranger-die1.png
+share/wesnoth/images/elvish-ranger-die2.png
+share/wesnoth/images/elvish-ranger-die3.png
+share/wesnoth/images/elvish-ranger-die4.png
 share/wesnoth/images/elvish-ranger.png
 share/wesnoth/images/elvish-rider-attack.png
 share/wesnoth/images/elvish-rider-attack1.png
@@ -1092,12 +1178,20 @@ share/wesnoth/images/fire-dragon-attack-tail.png
 share/wesnoth/images/fire-dragon-defend.png
 share/wesnoth/images/fire-dragon.png
 share/wesnoth/images/galleon.png
+share/wesnoth/images/giant-mudcrawler-attack.png
 share/wesnoth/images/giant-mudcrawler-attack1.png
 share/wesnoth/images/giant-mudcrawler-attack2.png
+share/wesnoth/images/giant-mudcrawler-death1.png
+share/wesnoth/images/giant-mudcrawler-death2.png
+share/wesnoth/images/giant-mudcrawler-death3.png
+share/wesnoth/images/giant-mudcrawler-death4.png
 share/wesnoth/images/giant-mudcrawler-defend.png
 share/wesnoth/images/giant-mudcrawler.png
 share/wesnoth/images/goblin-direwolver-attack.png
 share/wesnoth/images/goblin-direwolver-defend.png
+share/wesnoth/images/goblin-direwolver-die-1.png
+share/wesnoth/images/goblin-direwolver-die-2.png
+share/wesnoth/images/goblin-direwolver-die-3.png
 share/wesnoth/images/goblin-direwolver.png
 share/wesnoth/images/goblin-impaler-attack-ranged1.png
 share/wesnoth/images/goblin-impaler-attack-ranged2.png
@@ -1107,10 +1201,12 @@ share/wesnoth/images/goblin-impaler-defend.png
 share/wesnoth/images/goblin-impaler.png
 share/wesnoth/images/goblin-knight-attack.png
 share/wesnoth/images/goblin-knight-defend.png
+share/wesnoth/images/goblin-knight-moving.png
 share/wesnoth/images/goblin-knight.png
 share/wesnoth/images/goblin-pillager-attack.png
 share/wesnoth/images/goblin-pillager-attack2.png
 share/wesnoth/images/goblin-pillager-defend.png
+share/wesnoth/images/goblin-pillager-moving.png
 share/wesnoth/images/goblin-pillager.png
 share/wesnoth/images/goblin-spearman-defend.png
 share/wesnoth/images/goblin-spearman-melee.png
@@ -1185,6 +1281,10 @@ share/wesnoth/images/halo/ice-halo2.png
 share/wesnoth/images/halo/ice-halo3.png
 share/wesnoth/images/halo/ice-halo4.png
 share/wesnoth/images/halo/ice-halo5.png
+share/wesnoth/images/halo/ice-halo6.png
+share/wesnoth/images/halo/ice-halo7.png
+share/wesnoth/images/halo/ice-halo8.png
+share/wesnoth/images/halo/ice-halo9.png
 share/wesnoth/images/halo/lighthouse-aura.png
 share/wesnoth/images/halo/mage-halo1.png
 share/wesnoth/images/halo/mage-halo2-big.png
@@ -1226,6 +1326,8 @@ share/wesnoth/images/horseman-moving.png
 share/wesnoth/images/horseman.png
 share/wesnoth/images/human-battleprincess-attack.png
 share/wesnoth/images/human-battleprincess-defend.png
+share/wesnoth/images/human-battleprincess-die-1.png
+share/wesnoth/images/human-battleprincess-die-2.png
 share/wesnoth/images/human-battleprincess-leading.png
 share/wesnoth/images/human-battleprincess.png
 share/wesnoth/images/human-bowman-attack-sword.png
@@ -1233,21 +1335,30 @@ share/wesnoth/images/human-bowman-attack1.png
 share/wesnoth/images/human-bowman-attack2.png
 share/wesnoth/images/human-bowman-attack3.png
 share/wesnoth/images/human-bowman-defend.png
+share/wesnoth/images/human-bowman-die-1.png
+share/wesnoth/images/human-bowman-die-2.png
 share/wesnoth/images/human-bowman.png
 share/wesnoth/images/human-cavalier-attack.png
 share/wesnoth/images/human-cavalier-defend.png
+share/wesnoth/images/human-cavalier-die-1.png
+share/wesnoth/images/human-cavalier-die-2.png
 share/wesnoth/images/human-cavalier-moving.png
 share/wesnoth/images/human-cavalier-range1.png
 share/wesnoth/images/human-cavalier-range2.png
 share/wesnoth/images/human-cavalier.png
 share/wesnoth/images/human-dragoon-attack.png
 share/wesnoth/images/human-dragoon-defend.png
+share/wesnoth/images/human-dragoon-die-1.png
+share/wesnoth/images/human-dragoon-die-2.png
+share/wesnoth/images/human-dragoon-die-3.png
 share/wesnoth/images/human-dragoon-moving.png
 share/wesnoth/images/human-dragoon-ranged1.png
 share/wesnoth/images/human-dragoon-ranged2.png
 share/wesnoth/images/human-dragoon.png
 share/wesnoth/images/human-duelist-attack.png
 share/wesnoth/images/human-duelist-defend.png
+share/wesnoth/images/human-duelist-die-1.png
+share/wesnoth/images/human-duelist-die-2.png
 share/wesnoth/images/human-duelist-ranged.png
 share/wesnoth/images/human-duelist.png
 share/wesnoth/images/human-fencer-attack.png
@@ -1259,9 +1370,14 @@ share/wesnoth/images/human-general-attack-sword2.png
 share/wesnoth/images/human-general-defend.png
 share/wesnoth/images/human-general-leading.png
 share/wesnoth/images/human-general.png
-share/wesnoth/images/human-halbardier.png
-share/wesnoth/images/human-halberdier-pierce-1.png
-share/wesnoth/images/human-halberdier-pierce-2.png
+share/wesnoth/images/human-halberdier-defend.png
+share/wesnoth/images/human-halberdier-pierce-n.png
+share/wesnoth/images/human-halberdier-pierce-ne.png
+share/wesnoth/images/human-halberdier-pierce-s.png
+share/wesnoth/images/human-halberdier-pierce-se.png
+share/wesnoth/images/human-halberdier-slash-se-1.png
+share/wesnoth/images/human-halberdier-slash-se-2.png
+share/wesnoth/images/human-halberdier.png
 share/wesnoth/images/human-heavyinfantry-attack.png
 share/wesnoth/images/human-heavyinfantry-defend.png
 share/wesnoth/images/human-heavyinfantry.png
@@ -1298,20 +1414,27 @@ share/wesnoth/images/human-masterbowman-attack-ranged3.png
 share/wesnoth/images/human-masterbowman-attack-ranged4.png
 share/wesnoth/images/human-masterbowman-defend.png
 share/wesnoth/images/human-masterbowman.png
-share/wesnoth/images/human-pikeman-attack-1.png
-share/wesnoth/images/human-pikeman-attack-2.png
+share/wesnoth/images/human-pikeman-attack-n.png
+share/wesnoth/images/human-pikeman-attack-ne.png
+share/wesnoth/images/human-pikeman-attack-s.png
+share/wesnoth/images/human-pikeman-attack-se.png
 share/wesnoth/images/human-pikeman-defend.png
 share/wesnoth/images/human-pikeman.png
 share/wesnoth/images/human-princess-attack.png
 share/wesnoth/images/human-princess-defend.png
 share/wesnoth/images/human-princess-leading.png
 share/wesnoth/images/human-princess.png
+share/wesnoth/images/human-queen-die-1.png
+share/wesnoth/images/human-queen-die-2.png
 share/wesnoth/images/human-queen.png
 share/wesnoth/images/human-royalguard-attack.png
+share/wesnoth/images/human-royalguard-attack2.png
 share/wesnoth/images/human-royalguard-defend.png
 share/wesnoth/images/human-royalguard.png
 share/wesnoth/images/human-scout-attack.png
 share/wesnoth/images/human-scout-defend.png
+share/wesnoth/images/human-scout-die-1.png
+share/wesnoth/images/human-scout-die-2.png
 share/wesnoth/images/human-scout-moving.png
 share/wesnoth/images/human-scout.png
 share/wesnoth/images/human-sergeant-attack-crossbow.png
@@ -1332,6 +1455,10 @@ share/wesnoth/images/human-spearman-attack-south-1.png
 share/wesnoth/images/human-spearman-attack-south-2.png
 share/wesnoth/images/human-spearman-attack-south-3.png
 share/wesnoth/images/human-spearman-attack.png
+share/wesnoth/images/human-spearman-death1.png
+share/wesnoth/images/human-spearman-death2.png
+share/wesnoth/images/human-spearman-death3.png
+share/wesnoth/images/human-spearman-death4.png
 share/wesnoth/images/human-spearman-defend-2.png
 share/wesnoth/images/human-spearman-defend.png
 share/wesnoth/images/human-spearman.png
@@ -1341,6 +1468,7 @@ share/wesnoth/images/human-swordman.png
 share/wesnoth/images/human-wallguard-attack.png
 share/wesnoth/images/human-wallguard-defense.png
 share/wesnoth/images/human-wallguard.png
+share/wesnoth/images/icons/icon-advanced.png
 share/wesnoth/images/icons/icon-ai.png
 share/wesnoth/images/icons/icon-display.png
 share/wesnoth/images/icons/icon-general.png
@@ -1398,6 +1526,8 @@ share/wesnoth/images/knight-moving.png
 share/wesnoth/images/knight.png
 share/wesnoth/images/konrad-commander-attack.png
 share/wesnoth/images/konrad-commander-defend.png
+share/wesnoth/images/konrad-commander-die-1.png
+share/wesnoth/images/konrad-commander-die-2.png
 share/wesnoth/images/konrad-commander-leading.png
 share/wesnoth/images/konrad-commander-ranged-defend.png
 share/wesnoth/images/konrad-commander-ranged.png
@@ -1570,12 +1700,17 @@ share/wesnoth/images/misc/ellipse-8.png
 share/wesnoth/images/misc/ellipse-9-bottom.png
 share/wesnoth/images/misc/ellipse-9-top.png
 share/wesnoth/images/misc/ellipse-9.png
+share/wesnoth/images/misc/experimental-rightside.png
 share/wesnoth/images/misc/eye.png
 share/wesnoth/images/misc/folder-icon.png
 share/wesnoth/images/misc/font8x8.png
+share/wesnoth/images/misc/foot-left-n-slow.png
 share/wesnoth/images/misc/foot-left-n.png
+share/wesnoth/images/misc/foot-left-nw-slow.png
 share/wesnoth/images/misc/foot-left-nw.png
+share/wesnoth/images/misc/foot-right-n-slow.png
 share/wesnoth/images/misc/foot-right-n.png
+share/wesnoth/images/misc/foot-right-nw-slow.png
 share/wesnoth/images/misc/foot-right-nw.png
 share/wesnoth/images/misc/gold.png
 share/wesnoth/images/misc/income.png
@@ -1652,6 +1787,8 @@ share/wesnoth/images/misc/selected-ellipse-8-top.png
 share/wesnoth/images/misc/selected-ellipse-9-bottom.png
 share/wesnoth/images/misc/selected-ellipse-9-top.png
 share/wesnoth/images/misc/slowed.png
+share/wesnoth/images/misc/sort-arrow-reverse.png
+share/wesnoth/images/misc/sort-arrow.png
 share/wesnoth/images/misc/status-bg.png
 share/wesnoth/images/misc/stone.png
 share/wesnoth/images/misc/timeofday.png
@@ -1660,19 +1797,15 @@ share/wesnoth/images/misc/top-bg.png
 share/wesnoth/images/misc/topleft-corner.png
 share/wesnoth/images/misc/topright-corner.png
 share/wesnoth/images/misc/trapdoor.png
-share/wesnoth/images/misc/tutorial1.png
-share/wesnoth/images/misc/tutorial2.png
-share/wesnoth/images/misc/tutorial3.png
-share/wesnoth/images/misc/tutorial3b.png
-share/wesnoth/images/misc/tutorial4.png
-share/wesnoth/images/misc/tutorial5.png
-share/wesnoth/images/misc/tutorial6.png
-share/wesnoth/images/misc/tutorial7.png
 share/wesnoth/images/misc/unit.png
 share/wesnoth/images/misc/units.png
 share/wesnoth/images/misc/upkeep.png
 share/wesnoth/images/misc/villages.png
 share/wesnoth/images/mudcrawler-attack.png
+share/wesnoth/images/mudcrawler-death1.png
+share/wesnoth/images/mudcrawler-death2.png
+share/wesnoth/images/mudcrawler-death3.png
+share/wesnoth/images/mudcrawler-death4.png
 share/wesnoth/images/mudcrawler-defend.png
 share/wesnoth/images/mudcrawler.png
 share/wesnoth/images/naga-attack.png
@@ -1698,6 +1831,8 @@ share/wesnoth/images/naga-warrior.png
 share/wesnoth/images/naga.png
 share/wesnoth/images/neutral-bandit-attack.png
 share/wesnoth/images/neutral-bandit-defend.png
+share/wesnoth/images/neutral-bandit-die-1.png
+share/wesnoth/images/neutral-bandit-die-2.png
 share/wesnoth/images/neutral-bandit.png
 share/wesnoth/images/neutral-footpad+female-attack.png
 share/wesnoth/images/neutral-footpad+female-attack1.png
@@ -1766,7 +1901,9 @@ share/wesnoth/images/noble-fighter-defend.png
 share/wesnoth/images/noble-fighter.png
 share/wesnoth/images/noble-lord-attack-ranged1.png
 share/wesnoth/images/noble-lord-attack-ranged2.png
+share/wesnoth/images/noble-lord-attack-ranged3.png
 share/wesnoth/images/noble-lord-attack-sword.png
+share/wesnoth/images/noble-lord-bow.png
 share/wesnoth/images/noble-lord-defend.png
 share/wesnoth/images/noble-lord-leading.png
 share/wesnoth/images/noble-lord.png
@@ -1830,6 +1967,8 @@ share/wesnoth/images/orcish-sovereign-defend.png
 share/wesnoth/images/orcish-sovereign-ranged-1.png
 share/wesnoth/images/orcish-sovereign-ranged-2.png
 share/wesnoth/images/orcish-sovereign.png
+share/wesnoth/images/orcish-warlord-attack-sword-1.png
+share/wesnoth/images/orcish-warlord-attack-sword-2.png
 share/wesnoth/images/orcish-warlord-defend.png
 share/wesnoth/images/orcish-warlord-ranged-1.png
 share/wesnoth/images/orcish-warlord-ranged-2.png
@@ -1885,6 +2024,25 @@ share/wesnoth/images/portraits/The_Rise_of_Wesnoth/lich.png
 share/wesnoth/images/portraits/The_Rise_of_Wesnoth/logalmier.png
 share/wesnoth/images/portraits/The_Rise_of_Wesnoth/rithrandil.png
 share/wesnoth/images/portraits/The_Rise_of_Wesnoth/typhon.png
+share/wesnoth/images/portraits/core/James_Woo/orc-warlord.png
+share/wesnoth/images/portraits/core/James_Woo/orc-warlord2.png
+share/wesnoth/images/portraits/core/James_Woo/orc-warlord3.png
+share/wesnoth/images/portraits/core/James_Woo/orc-warlord4.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-bandit.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-grand-knight.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-halberdier.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-highwayman.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-horseman.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-javelineer.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-knight.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-lancer.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-paladin.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-peasant.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-pikeman.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-royalguard.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-spearman.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-swordsman.png
+share/wesnoth/images/portraits/core/Jason_Lutes/human-thug.png
 share/wesnoth/images/projectiles/bone-n.png
 share/wesnoth/images/projectiles/bone-ne.png
 share/wesnoth/images/projectiles/bullet.png
@@ -1911,6 +2069,8 @@ share/wesnoth/images/projectiles/lightning-n.png
 share/wesnoth/images/projectiles/lightning-ne.png
 share/wesnoth/images/projectiles/magicmissile-n.png
 share/wesnoth/images/projectiles/magicmissile-ne.png
+share/wesnoth/images/projectiles/missile-fire-n.png
+share/wesnoth/images/projectiles/missile-fire-ne.png
 share/wesnoth/images/projectiles/missile-n.png
 share/wesnoth/images/projectiles/missile-ne.png
 share/wesnoth/images/projectiles/missile-nw.png
@@ -1918,6 +2078,7 @@ share/wesnoth/images/projectiles/missile-s.png
 share/wesnoth/images/projectiles/missile-se.png
 share/wesnoth/images/projectiles/missile-sw.png
 share/wesnoth/images/projectiles/missile.png
+share/wesnoth/images/projectiles/mud-glob.png
 share/wesnoth/images/projectiles/pitchfork-n.png
 share/wesnoth/images/projectiles/pitchfork-ne.png
 share/wesnoth/images/projectiles/spear-n.png
@@ -2055,7 +2216,6 @@ share/wesnoth/images/terrain/bridge-se-nw.png
 share/wesnoth/images/terrain/bridge-se.png
 share/wesnoth/images/terrain/bridge-sw-end.png
 share/wesnoth/images/terrain/bridge-sw.png
-share/wesnoth/images/terrain/bridge.png
 share/wesnoth/images/terrain/canyon-all.png
 share/wesnoth/images/terrain/canyon-n-ne-s.png
 share/wesnoth/images/terrain/canyon-n-ne.png
@@ -2125,25 +2285,6 @@ share/wesnoth/images/terrain/cave-floor1.png
 share/wesnoth/images/terrain/cave-floor2.png
 share/wesnoth/images/terrain/cave-floor3.png
 share/wesnoth/images/terrain/cave-floor4.png
-share/wesnoth/images/terrain/cave-n-ne-se-s.png
-share/wesnoth/images/terrain/cave-n-ne-se.png
-share/wesnoth/images/terrain/cave-n-ne.png
-share/wesnoth/images/terrain/cave-n.png
-share/wesnoth/images/terrain/cave-ne-se-s.png
-share/wesnoth/images/terrain/cave-ne-se.png
-share/wesnoth/images/terrain/cave-ne.png
-share/wesnoth/images/terrain/cave-nw-n.png
-share/wesnoth/images/terrain/cave-nw.png
-share/wesnoth/images/terrain/cave-s-sw-nw-n.png
-share/wesnoth/images/terrain/cave-s-sw-nw.png
-share/wesnoth/images/terrain/cave-s-sw.png
-share/wesnoth/images/terrain/cave-s.png
-share/wesnoth/images/terrain/cave-se-s.png
-share/wesnoth/images/terrain/cave-se-sw-nw.png
-share/wesnoth/images/terrain/cave-se.png
-share/wesnoth/images/terrain/cave-sw-nw-n.png
-share/wesnoth/images/terrain/cave-sw-nw.png
-share/wesnoth/images/terrain/cave-sw.png
 share/wesnoth/images/terrain/cave.png
 share/wesnoth/images/terrain/cavewall-concave-e.png
 share/wesnoth/images/terrain/cavewall-concave-ne.png
@@ -2167,7 +2308,6 @@ share/wesnoth/images/terrain/coast-sw.png
 share/wesnoth/images/terrain/coast.png
 share/wesnoth/images/terrain/coast2.png
 share/wesnoth/images/terrain/coast3.png
-share/wesnoth/images/terrain/dark_grass.png
 share/wesnoth/images/terrain/dawn.png
 share/wesnoth/images/terrain/desert-hills-n.png
 share/wesnoth/images/terrain/desert-hills-ne.png
@@ -2236,11 +2376,25 @@ share/wesnoth/images/terrain/desert4.png
 share/wesnoth/images/terrain/desert5.png
 share/wesnoth/images/terrain/desert6.png
 share/wesnoth/images/terrain/desert7.png
+share/wesnoth/images/terrain/dirt-n-ne-se-s.png
+share/wesnoth/images/terrain/dirt-n-ne-se.png
+share/wesnoth/images/terrain/dirt-n-ne.png
 share/wesnoth/images/terrain/dirt-n.png
+share/wesnoth/images/terrain/dirt-ne-se-s.png
+share/wesnoth/images/terrain/dirt-ne-se.png
 share/wesnoth/images/terrain/dirt-ne.png
+share/wesnoth/images/terrain/dirt-nw-n-ne.png
+share/wesnoth/images/terrain/dirt-nw-n.png
 share/wesnoth/images/terrain/dirt-nw.png
+share/wesnoth/images/terrain/dirt-s-sw-nw-n.png
+share/wesnoth/images/terrain/dirt-s-sw-nw.png
+share/wesnoth/images/terrain/dirt-s-sw.png
 share/wesnoth/images/terrain/dirt-s.png
+share/wesnoth/images/terrain/dirt-se-s-sw.png
+share/wesnoth/images/terrain/dirt-se-s.png
 share/wesnoth/images/terrain/dirt-se.png
+share/wesnoth/images/terrain/dirt-sw-nw-n.png
+share/wesnoth/images/terrain/dirt-sw-nw.png
 share/wesnoth/images/terrain/dirt-sw.png
 share/wesnoth/images/terrain/dirt.png
 share/wesnoth/images/terrain/dwarven-castle-concave-e.png
@@ -2342,64 +2496,23 @@ share/wesnoth/images/terrain/fog-sw.png
 share/wesnoth/images/terrain/fog.png
 share/wesnoth/images/terrain/ford.png
 share/wesnoth/images/terrain/ford2.png
-share/wesnoth/images/terrain/forest-ctrans-n-ne.png
-share/wesnoth/images/terrain/forest-ctrans-n.png
-share/wesnoth/images/terrain/forest-ctrans-ne.png
-share/wesnoth/images/terrain/forest-ctrans-nw-n-ne.png
-share/wesnoth/images/terrain/forest-ctrans-nw-n.png
-share/wesnoth/images/terrain/forest-ctrans-nw-ne.png
-share/wesnoth/images/terrain/forest-ctrans-nw.png
-share/wesnoth/images/terrain/forest-etrans-n-ne.png
-share/wesnoth/images/terrain/forest-etrans-n.png
-share/wesnoth/images/terrain/forest-etrans-ne.png
-share/wesnoth/images/terrain/forest-etrans-nw-n-ne.png
-share/wesnoth/images/terrain/forest-etrans-nw-n.png
-share/wesnoth/images/terrain/forest-etrans-nw-ne.png
-share/wesnoth/images/terrain/forest-etrans-nw.png
-share/wesnoth/images/terrain/forest-n-ne-se.png
-share/wesnoth/images/terrain/forest-n-ne.png
-share/wesnoth/images/terrain/forest-n.png
-share/wesnoth/images/terrain/forest-ne-se-s.png
-share/wesnoth/images/terrain/forest-ne-se.png
-share/wesnoth/images/terrain/forest-ne.png
-share/wesnoth/images/terrain/forest-nw-n-ne-se.png
-share/wesnoth/images/terrain/forest-nw-n-ne.png
-share/wesnoth/images/terrain/forest-nw-n.png
-share/wesnoth/images/terrain/forest-nw.png
-share/wesnoth/images/terrain/forest-s-sw-nw-n.png
-share/wesnoth/images/terrain/forest-s-sw-nw.png
-share/wesnoth/images/terrain/forest-s-sw.png
-share/wesnoth/images/terrain/forest-s.png
-share/wesnoth/images/terrain/forest-se-s-sw.png
-share/wesnoth/images/terrain/forest-se-s.png
-share/wesnoth/images/terrain/forest-se.png
-share/wesnoth/images/terrain/forest-stones1.png
-share/wesnoth/images/terrain/forest-stones2.png
-share/wesnoth/images/terrain/forest-stones3.png
-share/wesnoth/images/terrain/forest-stones4.png
-share/wesnoth/images/terrain/forest-sw-nw-n.png
-share/wesnoth/images/terrain/forest-sw-nw.png
-share/wesnoth/images/terrain/forest-sw.png
-share/wesnoth/images/terrain/forest-to-water-n-ne.png
-share/wesnoth/images/terrain/forest-to-water-n.png
-share/wesnoth/images/terrain/forest-to-water-ne-se.png
-share/wesnoth/images/terrain/forest-to-water-ne.png
-share/wesnoth/images/terrain/forest-to-water-nw-n-ne.png
-share/wesnoth/images/terrain/forest-to-water-nw-n.png
-share/wesnoth/images/terrain/forest-to-water-nw.png
-share/wesnoth/images/terrain/forest-to-water-s.png
-share/wesnoth/images/terrain/forest-to-water-se-s.png
-share/wesnoth/images/terrain/forest-to-water-se.png
-share/wesnoth/images/terrain/forest-to-water-sw-nw.png
-share/wesnoth/images/terrain/forest-to-water-sw.png
+share/wesnoth/images/terrain/forest-castle-n.png
+share/wesnoth/images/terrain/forest-castle-ne.png
+share/wesnoth/images/terrain/forest-castle-nw.png
+share/wesnoth/images/terrain/forest-castle-s.png
+share/wesnoth/images/terrain/forest-castle-se.png
+share/wesnoth/images/terrain/forest-castle-sw.png
+share/wesnoth/images/terrain/forest-castle.png
 share/wesnoth/images/terrain/forest.png
 share/wesnoth/images/terrain/forest2.png
+share/wesnoth/images/terrain/forest2_small.png
 share/wesnoth/images/terrain/forest3.png
 share/wesnoth/images/terrain/forest4.png
 share/wesnoth/images/terrain/forest5.png
 share/wesnoth/images/terrain/forest6.png
 share/wesnoth/images/terrain/forest7.png
 share/wesnoth/images/terrain/forest8.png
+share/wesnoth/images/terrain/forest_small.png
 share/wesnoth/images/terrain/grassland-a.png
 share/wesnoth/images/terrain/grassland-flowers.png
 share/wesnoth/images/terrain/grassland-flowers1.png
@@ -2464,7 +2577,6 @@ share/wesnoth/images/terrain/hills-variation1.png
 share/wesnoth/images/terrain/hills-variation2.png
 share/wesnoth/images/terrain/hills-variation3.png
 share/wesnoth/images/terrain/hills.png
-share/wesnoth/images/terrain/ice-bridge-ne-sw.png
 share/wesnoth/images/terrain/ice-n-ne-se-s.png
 share/wesnoth/images/terrain/ice-n-ne.png
 share/wesnoth/images/terrain/ice-n.png
@@ -2473,7 +2585,6 @@ share/wesnoth/images/terrain/ice-ne.png
 share/wesnoth/images/terrain/ice-nw-n-ne.png
 share/wesnoth/images/terrain/ice-nw-n.png
 share/wesnoth/images/terrain/ice-nw.png
-share/wesnoth/images/terrain/ice-pier.png
 share/wesnoth/images/terrain/ice-s-sw-nw-n.png
 share/wesnoth/images/terrain/ice-s-sw.png
 share/wesnoth/images/terrain/ice-s.png
@@ -2483,7 +2594,11 @@ share/wesnoth/images/terrain/ice-se.png
 share/wesnoth/images/terrain/ice-sw-nw.png
 share/wesnoth/images/terrain/ice-sw.png
 share/wesnoth/images/terrain/ice.png
-share/wesnoth/images/terrain/icebridge-se-nw.png
+share/wesnoth/images/terrain/ice2.png
+share/wesnoth/images/terrain/ice3.png
+share/wesnoth/images/terrain/ice4.png
+share/wesnoth/images/terrain/ice5.png
+share/wesnoth/images/terrain/ice6.png
 share/wesnoth/images/terrain/keep-inside-e.png
 share/wesnoth/images/terrain/keep-inside-ne.png
 share/wesnoth/images/terrain/keep-inside-nw.png
@@ -2536,12 +2651,6 @@ share/wesnoth/images/terrain/mountains-sw.png
 share/wesnoth/images/terrain/mountains.png
 share/wesnoth/images/terrain/nest-empty.png
 share/wesnoth/images/terrain/nest-full.png
-share/wesnoth/images/terrain/ocean-n.png
-share/wesnoth/images/terrain/ocean-ne.png
-share/wesnoth/images/terrain/ocean-nw.png
-share/wesnoth/images/terrain/ocean-s.png
-share/wesnoth/images/terrain/ocean-se.png
-share/wesnoth/images/terrain/ocean-sw.png
 share/wesnoth/images/terrain/ocean.png
 share/wesnoth/images/terrain/ocean2.png
 share/wesnoth/images/terrain/ocean3.png
@@ -2752,27 +2861,22 @@ share/wesnoth/images/terrain/savanna-to-water-sw-nw-n.png
 share/wesnoth/images/terrain/savanna-to-water-sw-nw.png
 share/wesnoth/images/terrain/savanna-to-water-sw.png
 share/wesnoth/images/terrain/savanna.png
-share/wesnoth/images/terrain/snow-forest-ctrans-n-ne.png
-share/wesnoth/images/terrain/snow-forest-ctrans-n.png
-share/wesnoth/images/terrain/snow-forest-ctrans-ne.png
-share/wesnoth/images/terrain/snow-forest-ctrans-nw-n-ne.png
-share/wesnoth/images/terrain/snow-forest-ctrans-nw-n.png
-share/wesnoth/images/terrain/snow-forest-ctrans-nw-ne.png
-share/wesnoth/images/terrain/snow-forest-ctrans-nw.png
-share/wesnoth/images/terrain/snow-forest-n-ne.png
-share/wesnoth/images/terrain/snow-forest-n.png
-share/wesnoth/images/terrain/snow-forest-ne.png
-share/wesnoth/images/terrain/snow-forest-nw-n-ne.png
-share/wesnoth/images/terrain/snow-forest-nw.png
-share/wesnoth/images/terrain/snow-forest-s-sw.png
-share/wesnoth/images/terrain/snow-forest-s.png
-share/wesnoth/images/terrain/snow-forest-se-s-sw.png
-share/wesnoth/images/terrain/snow-forest-se-s.png
-share/wesnoth/images/terrain/snow-forest-se.png
-share/wesnoth/images/terrain/snow-forest-sw.png
+share/wesnoth/images/terrain/snow-forest-castle-n-ne.png
+share/wesnoth/images/terrain/snow-forest-castle-n.png
+share/wesnoth/images/terrain/snow-forest-castle-ne.png
+share/wesnoth/images/terrain/snow-forest-castle-nw-n-ne.png
+share/wesnoth/images/terrain/snow-forest-castle-nw-n.png
+share/wesnoth/images/terrain/snow-forest-castle-nw.png
+share/wesnoth/images/terrain/snow-forest-castle-s.png
+share/wesnoth/images/terrain/snow-forest-castle-se.png
+share/wesnoth/images/terrain/snow-forest-castle-sw-nw.png
+share/wesnoth/images/terrain/snow-forest-castle-sw.png
+share/wesnoth/images/terrain/snow-forest-castle.png
 share/wesnoth/images/terrain/snow-forest.png
 share/wesnoth/images/terrain/snow-forest2.png
 share/wesnoth/images/terrain/snow-forest3.png
+share/wesnoth/images/terrain/snow-forest4.png
+share/wesnoth/images/terrain/snow-forest_small.png
 share/wesnoth/images/terrain/snow-hills-n-ne.png
 share/wesnoth/images/terrain/snow-hills-n.png
 share/wesnoth/images/terrain/snow-hills-ne.png
@@ -2803,12 +2907,35 @@ share/wesnoth/images/terrain/snow-s.png
 share/wesnoth/images/terrain/snow-se-s-sw-nw.png
 share/wesnoth/images/terrain/snow-se-s-sw.png
 share/wesnoth/images/terrain/snow-se-s.png
-share/wesnoth/images/terrain/snow-se-sw-nw.png
 share/wesnoth/images/terrain/snow-se.png
 share/wesnoth/images/terrain/snow-sw-nw-n-ne.png
 share/wesnoth/images/terrain/snow-sw-nw-n.png
 share/wesnoth/images/terrain/snow-sw-nw.png
 share/wesnoth/images/terrain/snow-sw.png
+share/wesnoth/images/terrain/snow-to-water-n-ne-se-s.png
+share/wesnoth/images/terrain/snow-to-water-n-ne-se.png
+share/wesnoth/images/terrain/snow-to-water-n-ne.png
+share/wesnoth/images/terrain/snow-to-water-n.png
+share/wesnoth/images/terrain/snow-to-water-ne-se-s-sw.png
+share/wesnoth/images/terrain/snow-to-water-ne-se-s.png
+share/wesnoth/images/terrain/snow-to-water-ne-se.png
+share/wesnoth/images/terrain/snow-to-water-ne.png
+share/wesnoth/images/terrain/snow-to-water-nw-n-ne-se.png
+share/wesnoth/images/terrain/snow-to-water-nw-n-ne.png
+share/wesnoth/images/terrain/snow-to-water-nw-n.png
+share/wesnoth/images/terrain/snow-to-water-nw.png
+share/wesnoth/images/terrain/snow-to-water-s-sw-nw-n.png
+share/wesnoth/images/terrain/snow-to-water-s-sw-nw.png
+share/wesnoth/images/terrain/snow-to-water-s-sw.png
+share/wesnoth/images/terrain/snow-to-water-s.png
+share/wesnoth/images/terrain/snow-to-water-se-s-sw-nw.png
+share/wesnoth/images/terrain/snow-to-water-se-s-sw.png
+share/wesnoth/images/terrain/snow-to-water-se-s.png
+share/wesnoth/images/terrain/snow-to-water-se.png
+share/wesnoth/images/terrain/snow-to-water-sw-nw-n-ne.png
+share/wesnoth/images/terrain/snow-to-water-sw-nw-n.png
+share/wesnoth/images/terrain/snow-to-water-sw-nw.png
+share/wesnoth/images/terrain/snow-to-water-sw.png
 share/wesnoth/images/terrain/snow.png
 share/wesnoth/images/terrain/snow2.png
 share/wesnoth/images/terrain/snowbits.png
@@ -3054,16 +3181,14 @@ share/wesnoth/images/terrain/village-dusk.png
 share/wesnoth/images/terrain/village-dusk2.png
 share/wesnoth/images/terrain/village-dusk3.png
 share/wesnoth/images/terrain/village-dusk4.png
+share/wesnoth/images/terrain/village-elven.png
+share/wesnoth/images/terrain/village-elven2.png
 share/wesnoth/images/terrain/village-first_watch.png
 share/wesnoth/images/terrain/village-human.png
-share/wesnoth/images/terrain/village-n.png
-share/wesnoth/images/terrain/village-ne.png
-share/wesnoth/images/terrain/village-nw.png
-share/wesnoth/images/terrain/village-s.png
-share/wesnoth/images/terrain/village-se.png
+share/wesnoth/images/terrain/village-human2.png
+share/wesnoth/images/terrain/village-human3.png
 share/wesnoth/images/terrain/village-second_watch.png
 share/wesnoth/images/terrain/village-snow.png
-share/wesnoth/images/terrain/village-sw.png
 share/wesnoth/images/terrain/village-swampwater.png
 share/wesnoth/images/terrain/village-tropical-forest.png
 share/wesnoth/images/terrain/village.png
@@ -3132,9 +3257,14 @@ share/wesnoth/images/troll-whelp-defend.png
 share/wesnoth/images/troll-whelp.png
 share/wesnoth/images/undead-adept-attack.png
 share/wesnoth/images/undead-adept-defend.png
+share/wesnoth/images/undead-adept-die-1.png
+share/wesnoth/images/undead-adept-die-2.png
 share/wesnoth/images/undead-adept.png
 share/wesnoth/images/undead-ancient-lich-attack.png
 share/wesnoth/images/undead-ancient-lich-defend.png
+share/wesnoth/images/undead-ancient-lich-die-1.png
+share/wesnoth/images/undead-ancient-lich-die-2.png
+share/wesnoth/images/undead-ancient-lich-die-3.png
 share/wesnoth/images/undead-ancient-lich.png
 share/wesnoth/images/undead-archer-attack.png
 share/wesnoth/images/undead-archer-attack1.png
@@ -3147,34 +3277,48 @@ share/wesnoth/images/undead-bat.png
 share/wesnoth/images/undead-blackspell.png
 share/wesnoth/images/undead-bloodbat-attack.png
 share/wesnoth/images/undead-bloodbat-defend.png
+share/wesnoth/images/undead-bloodbat-die-1.png
+share/wesnoth/images/undead-bloodbat-die-2.png
 share/wesnoth/images/undead-bloodbat.png
 share/wesnoth/images/undead-boneshooter-attack.png
 share/wesnoth/images/undead-boneshooter-attack1.png
 share/wesnoth/images/undead-boneshooter-attack2.png
 share/wesnoth/images/undead-boneshooter-defend.png
+share/wesnoth/images/undead-boneshooter-die-1.png
+share/wesnoth/images/undead-boneshooter-die-2.png
 share/wesnoth/images/undead-boneshooter.png
 share/wesnoth/images/undead-chocobone-attack.png
 share/wesnoth/images/undead-chocobone-defend.png
+share/wesnoth/images/undead-chocobone-die-1.png
+share/wesnoth/images/undead-chocobone-die-2.png
 share/wesnoth/images/undead-chocobone-moving.png
 share/wesnoth/images/undead-chocobone.png
 share/wesnoth/images/undead-darkspirit-attack.png
 share/wesnoth/images/undead-darkspirit-attack1.png
 share/wesnoth/images/undead-darkspirit-defend.png
+share/wesnoth/images/undead-darkspirit-die-1.png
+share/wesnoth/images/undead-darkspirit-die-2.png
 share/wesnoth/images/undead-darkspirit.png
 share/wesnoth/images/undead-deathblade-attack1.png
 share/wesnoth/images/undead-deathblade-attack2.png
 share/wesnoth/images/undead-deathblade-attack3.png
 share/wesnoth/images/undead-deathblade-defend.png
+share/wesnoth/images/undead-deathblade-die-1.png
+share/wesnoth/images/undead-deathblade-die-2.png
 share/wesnoth/images/undead-deathblade.png
 share/wesnoth/images/undead-deathknight-attack-crossbow-1.png
 share/wesnoth/images/undead-deathknight-attack-crossbow-2.png
 share/wesnoth/images/undead-deathknight-attack.png
 share/wesnoth/images/undead-deathknight-defend.png
+share/wesnoth/images/undead-deathknight-die-1.png
+share/wesnoth/images/undead-deathknight-die-2.png
 share/wesnoth/images/undead-deathknight-leading.png
 share/wesnoth/images/undead-deathknight.png
 share/wesnoth/images/undead-deathmaster-attack1.png
 share/wesnoth/images/undead-deathmaster-attack2.png
 share/wesnoth/images/undead-deathmaster-defend.png
+share/wesnoth/images/undead-deathmaster-die-1.png
+share/wesnoth/images/undead-deathmaster-die-2.png
 share/wesnoth/images/undead-deathmaster-ranged1.png
 share/wesnoth/images/undead-deathmaster-ranged2.png
 share/wesnoth/images/undead-deathmaster-ranged3.png
@@ -3182,13 +3326,24 @@ share/wesnoth/images/undead-deathmaster-ranged4.png
 share/wesnoth/images/undead-deathmaster.png
 share/wesnoth/images/undead-demilich-attack.png
 share/wesnoth/images/undead-demilich-defend.png
+share/wesnoth/images/undead-demilich-die-1.png
+share/wesnoth/images/undead-demilich-die-2.png
 share/wesnoth/images/undead-demilich-ranged1.png
 share/wesnoth/images/undead-demilich-ranged2.png
 share/wesnoth/images/undead-demilich.png
 share/wesnoth/images/undead-draug-attack1.png
 share/wesnoth/images/undead-draug-attack2.png
 share/wesnoth/images/undead-draug-defend.png
+share/wesnoth/images/undead-draug-die-1.png
+share/wesnoth/images/undead-draug-die-2.png
 share/wesnoth/images/undead-draug.png
+share/wesnoth/images/undead-dread-lich-attack.png
+share/wesnoth/images/undead-dread-lich-attack1.png
+share/wesnoth/images/undead-dread-lich-attack2.png
+share/wesnoth/images/undead-dread-lich-attack3.png
+share/wesnoth/images/undead-dread-lich-attack4.png
+share/wesnoth/images/undead-dread-lich-defend.png
+share/wesnoth/images/undead-dread-lich.png
 share/wesnoth/images/undead-ghost-attack.png
 share/wesnoth/images/undead-ghost-attack1.png
 share/wesnoth/images/undead-ghost-defend.png
@@ -3215,6 +3370,11 @@ share/wesnoth/images/undead-necrophage.png
 share/wesnoth/images/undead-nightgaunt-attack.png
 share/wesnoth/images/undead-nightgaunt-attack2.png
 share/wesnoth/images/undead-nightgaunt-defend.png
+share/wesnoth/images/undead-nightgaunt-die-1.png
+share/wesnoth/images/undead-nightgaunt-die-2.png
+share/wesnoth/images/undead-nightgaunt-die-3.png
+share/wesnoth/images/undead-nightgaunt-die-4.png
+share/wesnoth/images/undead-nightgaunt-die-5.png
 share/wesnoth/images/undead-nightgaunt.png
 share/wesnoth/images/undead-revenant-attack.png
 share/wesnoth/images/undead-revenant-defend.png
@@ -3231,22 +3391,79 @@ share/wesnoth/images/undead-skeleton-dying-2.png
 share/wesnoth/images/undead-skeleton-dying.png
 share/wesnoth/images/undead-skeleton.png
 share/wesnoth/images/undead-sorcerer-defence.png
+share/wesnoth/images/undead-sorcerer-die-1.png
+share/wesnoth/images/undead-sorcerer-die-2.png
 share/wesnoth/images/undead-sorcerer-ranged1.png
 share/wesnoth/images/undead-sorcerer-ranged2.png
 share/wesnoth/images/undead-sorcerer-staff1.png
 share/wesnoth/images/undead-sorcerer-staff2.png
 share/wesnoth/images/undead-sorcerer.png
+share/wesnoth/images/undead-soulless-attack-n.png
+share/wesnoth/images/undead-soulless-attack-s.png
+share/wesnoth/images/undead-soulless-attack.png
 share/wesnoth/images/undead-soulless-defend.png
+share/wesnoth/images/undead-soulless-die-1.png
+share/wesnoth/images/undead-soulless-die-2.png
+share/wesnoth/images/undead-soulless-die-3.png
+share/wesnoth/images/undead-soulless-drake-attack-n.png
+share/wesnoth/images/undead-soulless-drake-attack-s.png
+share/wesnoth/images/undead-soulless-drake-attack.png
+share/wesnoth/images/undead-soulless-drake-die-1.png
+share/wesnoth/images/undead-soulless-drake-die-2.png
+share/wesnoth/images/undead-soulless-drake-die-3.png
+share/wesnoth/images/undead-soulless-drake.png
 share/wesnoth/images/undead-soulless-melee.png
+share/wesnoth/images/undead-soulless-mounted-attack-n.png
+share/wesnoth/images/undead-soulless-mounted-attack-s.png
+share/wesnoth/images/undead-soulless-mounted-attack.png
+share/wesnoth/images/undead-soulless-mounted-die-1.png
+share/wesnoth/images/undead-soulless-mounted-die-2.png
+share/wesnoth/images/undead-soulless-mounted-die-3.png
+share/wesnoth/images/undead-soulless-mounted.png
+share/wesnoth/images/undead-soulless-saurian-attack-n.png
+share/wesnoth/images/undead-soulless-saurian-attack-s.png
+share/wesnoth/images/undead-soulless-saurian-attack.png
+share/wesnoth/images/undead-soulless-saurian-die-1.png
+share/wesnoth/images/undead-soulless-saurian-die-2.png
+share/wesnoth/images/undead-soulless-saurian-die-3.png
+share/wesnoth/images/undead-soulless-saurian.png
+share/wesnoth/images/undead-soulless-swimmer-attack-n.png
+share/wesnoth/images/undead-soulless-swimmer-attack-s.png
+share/wesnoth/images/undead-soulless-swimmer-attack.png
+share/wesnoth/images/undead-soulless-swimmer-die-1.png
+share/wesnoth/images/undead-soulless-swimmer-die-2.png
+share/wesnoth/images/undead-soulless-swimmer-die-3.png
+share/wesnoth/images/undead-soulless-swimmer.png
+share/wesnoth/images/undead-soulless-troll-attack-n.png
+share/wesnoth/images/undead-soulless-troll-attack-s.png
+share/wesnoth/images/undead-soulless-troll-attack.png
+share/wesnoth/images/undead-soulless-troll-die-1.png
+share/wesnoth/images/undead-soulless-troll-die-2.png
+share/wesnoth/images/undead-soulless-troll-die-3.png
+share/wesnoth/images/undead-soulless-troll.png
+share/wesnoth/images/undead-soulless-wose-attack-n.png
+share/wesnoth/images/undead-soulless-wose-attack-s.png
+share/wesnoth/images/undead-soulless-wose-attack.png
+share/wesnoth/images/undead-soulless-wose-die-1.png
+share/wesnoth/images/undead-soulless-wose-die-2.png
+share/wesnoth/images/undead-soulless-wose-die-3.png
+share/wesnoth/images/undead-soulless-wose.png
 share/wesnoth/images/undead-soulless.png
 share/wesnoth/images/undead-soulshooter-attack.png
 share/wesnoth/images/undead-soulshooter-defend.png
 share/wesnoth/images/undead-soulshooter-ranged.png
+share/wesnoth/images/undead-soulshooter-ranged1.png
 share/wesnoth/images/undead-soulshooter-ranged2.png
+share/wesnoth/images/undead-soulshooter-ranged3.png
+share/wesnoth/images/undead-soulshooter-ranged4.png
 share/wesnoth/images/undead-soulshooter.png
 share/wesnoth/images/undead-spectre-attack.png
 share/wesnoth/images/undead-spectre-attack1.png
 share/wesnoth/images/undead-spectre-defend.png
+share/wesnoth/images/undead-spectre-die-1.png
+share/wesnoth/images/undead-spectre-die-2.png
+share/wesnoth/images/undead-spectre-die-3.png
+share/wesnoth/images/undead-spectre-die-4.png
 share/wesnoth/images/undead-spectre.png
 share/wesnoth/images/undead-vampirelady-attack.png
 share/wesnoth/images/undead-vampirelady-defend.png
@@ -3353,6 +3570,9 @@ share/wesnoth/images/wolf-rider-moving.png
 share/wesnoth/images/wolf-rider.png
 share/wesnoth/images/wose-ancient-attack.png
 share/wesnoth/images/wose-ancient-defend.png
+share/wesnoth/images/wose-ancient-die-1.png
+share/wesnoth/images/wose-ancient-die-2.png
+share/wesnoth/images/wose-ancient-die-3.png
 share/wesnoth/images/wose-ancient.png
 share/wesnoth/images/wose-attack-1.png
 share/wesnoth/images/wose-attack-2.png
@@ -3370,6 +3590,10 @@ share/wesnoth/images/yeti-defend.png
 share/wesnoth/images/yeti.png
 share/wesnoth/images/young-ogre-attack.png
 share/wesnoth/images/young-ogre-defend.png
+share/wesnoth/images/young-ogre-die-1.png
+share/wesnoth/images/young-ogre-die-2.png
+share/wesnoth/images/young-ogre-die-3.png
+share/wesnoth/images/young-ogre-die-4.png
 share/wesnoth/images/young-ogre.png
 share/wesnoth/music/elf-land.ogg
 share/wesnoth/music/frantic.ogg
@@ -3428,276 +3652,17 @@ share/wesnoth/sounds/sword-swish.wav
 share/wesnoth/sounds/torch-swish.wav
 share/wesnoth/sounds/ugg.wav
 share/wesnoth/sounds/wolf-attack.wav
-share/wesnoth/sounds/wolf-cry.wav
 share/wesnoth/sounds/zombie-attack.wav
 share/wesnoth/sounds/zombie-hit.wav
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/af/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/bg/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/ca/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/cs/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/da/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/de/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/es/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/et/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/eu/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/fi/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/fr/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/hu/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/it/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/ja/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/la/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/nl/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/no/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/pl/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/ru/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/sk/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/sl/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/sv/LC_MESSAGES/wesnoth.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-editor.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-ei.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-httt.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-lib.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-sotbe.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-tdh.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-trow.mo
-share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth.mo
-@dirrm share/wesnoth/translations/zh_CN/LC_MESSAGES
-@dirrm share/wesnoth/translations/zh_CN
-@dirrm share/wesnoth/translations/sv/LC_MESSAGES
-@dirrm share/wesnoth/translations/sv
-@dirrm share/wesnoth/translations/sl/LC_MESSAGES
-@dirrm share/wesnoth/translations/sl
-@dirrm share/wesnoth/translations/sk/LC_MESSAGES
-@dirrm share/wesnoth/translations/sk
-@dirrm share/wesnoth/translations/ru/LC_MESSAGES
-@dirrm share/wesnoth/translations/ru
-@dirrm share/wesnoth/translations/pt_BR/LC_MESSAGES
-@dirrm share/wesnoth/translations/pt_BR
-@dirrm share/wesnoth/translations/pl/LC_MESSAGES
-@dirrm share/wesnoth/translations/pl
-@dirrm share/wesnoth/translations/no/LC_MESSAGES
-@dirrm share/wesnoth/translations/no
-@dirrm share/wesnoth/translations/nl/LC_MESSAGES
-@dirrm share/wesnoth/translations/nl
-@dirrm share/wesnoth/translations/la/LC_MESSAGES
-@dirrm share/wesnoth/translations/la
-@dirrm share/wesnoth/translations/ja/LC_MESSAGES
-@dirrm share/wesnoth/translations/ja
-@dirrm share/wesnoth/translations/it/LC_MESSAGES
-@dirrm share/wesnoth/translations/it
-@dirrm share/wesnoth/translations/hu/LC_MESSAGES
-@dirrm share/wesnoth/translations/hu
-@dirrm share/wesnoth/translations/fr/LC_MESSAGES
-@dirrm share/wesnoth/translations/fr
-@dirrm share/wesnoth/translations/fi/LC_MESSAGES
-@dirrm share/wesnoth/translations/fi
-@dirrm share/wesnoth/translations/eu/LC_MESSAGES
-@dirrm share/wesnoth/translations/eu
-@dirrm share/wesnoth/translations/et/LC_MESSAGES
-@dirrm share/wesnoth/translations/et
-@dirrm share/wesnoth/translations/es/LC_MESSAGES
-@dirrm share/wesnoth/translations/es
-@dirrm share/wesnoth/translations/en_GB/LC_MESSAGES
-@dirrm share/wesnoth/translations/en_GB
-@dirrm share/wesnoth/translations/el_GR/LC_MESSAGES
-@dirrm share/wesnoth/translations/el_GR
-@dirrm share/wesnoth/translations/de/LC_MESSAGES
-@dirrm share/wesnoth/translations/de
-@dirrm share/wesnoth/translations/da/LC_MESSAGES
-@dirrm share/wesnoth/translations/da
-@dirrm share/wesnoth/translations/cs/LC_MESSAGES
-@dirrm share/wesnoth/translations/cs
-@dirrm share/wesnoth/translations/ca/LC_MESSAGES
-@dirrm share/wesnoth/translations/ca
-@dirrm share/wesnoth/translations/bg/LC_MESSAGES
-@dirrm share/wesnoth/translations/bg
-@dirrm share/wesnoth/translations/af/LC_MESSAGES
-@dirrm share/wesnoth/translations/af
-@dirrm share/wesnoth/translations
 @dirrm share/wesnoth/sounds
 @dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/tools/exploder
 @dirrm share/wesnoth/images/tools
 @dirrm share/wesnoth/images/terrain
 @dirrm share/wesnoth/images/projectiles
+@dirrm share/wesnoth/images/portraits/core/Jason_Lutes
+@dirrm share/wesnoth/images/portraits/core/James_Woo
+@dirrm share/wesnoth/images/portraits/core
 @dirrm share/wesnoth/images/portraits/The_Rise_of_Wesnoth
 @dirrm share/wesnoth/images/portraits/Heir_To_The_Throne
 @dirrm share/wesnoth/images/portraits/Eastern_Invasion
@@ -3736,6 +3701,7 @@ share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth.mo
 @dirrm share/wesnoth/data/scenarios/multiplayer
 @dirrm share/wesnoth/data/scenarios/The_Rise_of_Wesnoth
 @dirrm share/wesnoth/data/scenarios/The_Dark_Hordes
+@dirrm share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils
 @dirrm share/wesnoth/data/scenarios/Son_Of_The_Black_Eye
 @dirrm share/wesnoth/data/scenarios/Heir_To_The_Throne
 @dirrm share/wesnoth/data/scenarios/Eastern_Invasion
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 403d96dccae..d30e0d91e09 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/04/19 01:50:59 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/07/14 21:47:57 wiz Exp $
 
-SHA1 (wesnoth-0.9.0.tar.gz) = c0be5b4a8a6545570cf645aa1ca8cdd7a093d974
-RMD160 (wesnoth-0.9.0.tar.gz) = 43051ed078453c646c62de8c7df53c9884abcd06
-Size (wesnoth-0.9.0.tar.gz) = 36051074 bytes
+SHA1 (wesnoth-0.9.3.tar.gz) = b65889e8d280685badd30088e72091121e12f9a2
+RMD160 (wesnoth-0.9.3.tar.gz) = ae07f85acddd8f6bb82799367dc6521f7ced88fc
+Size (wesnoth-0.9.3.tar.gz) = 38203711 bytes
+SHA1 (patch-aa) = 4f5762c7acab394fb07d6da8ca668360aac32dbc
+SHA1 (patch-ac) = 8246b722aa76e86f51a1e5708a6532bc6be1b88c
diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa
new file mode 100644
index 00000000000..5f732d34d5c
--- /dev/null
+++ b/games/wesnoth/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2005/07/14 21:47:57 wiz Exp $
+
+--- Makefile.in.orig	2005-06-06 00:03:23.000000000 +0200
++++ Makefile.in
+@@ -762,8 +762,8 @@ install-data-local:
+ @INSTALLDATA_TRUE@	srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ @INSTALLDATA_TRUE@	( $(finddata) ) | while read p; do \
+ @INSTALLDATA_TRUE@	  $(w_preparefileinstall) \
+-@INSTALLDATA_TRUE@	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+-@INSTALLDATA_TRUE@	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
++@INSTALLDATA_TRUE@	  echo $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
++@INSTALLDATA_TRUE@	  $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ @INSTALLDATA_TRUE@	done
+ @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@	$(mkdir_p) "$(DESTDIR)$(pkgdatadir)/locales"
+ @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@	if test -d "$(DESTDIR)$(pkgdatadir)/locales/C" ; then rm -r "$(DESTDIR)$(pkgdatadir)/locales/C" ; fi
diff --git a/games/wesnoth/patches/patch-ac b/games/wesnoth/patches/patch-ac
new file mode 100644
index 00000000000..88b17e21602
--- /dev/null
+++ b/games/wesnoth/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.3 2005/07/14 21:47:57 wiz Exp $
+
+--- configure.orig	2005-06-06 00:03:23.000000000 +0200
++++ configure
+@@ -8588,7 +8588,7 @@ fi
+ done
+ test -n "$PNG_CONFIG" || PNG_CONFIG="none"
+ 
+-
++if false; then
+ if test "x$PNG_CONFIG" = "xnone"; then
+     pngfound=no
+     { echo "$as_me:$LINENO: WARNING: *** LIBPNG not found." >&5
+@@ -8598,8 +8598,11 @@ else
+     PNG_CFLAGS=`$PNG_CONFIG --cflags`
+     PNG_LIBS=`$PNG_CONFIG --libs`
+ fi
+-
+-
++else
++    pngfound=yes
++    PNG_CFLAGS=`pkg-config --cflags libpng12`
++    PNG_LIBS=`pkg-config --libs libpng12`
++fi
+ 
+ 
+