merge trunk 2007-01-06T11:38:54Z!koraq@xs4all.nl..2007-01-12T23:09:05Z!jeremy.rosen@enst-bretagne.fr

changelog

@@ -53,12 +53,16 @@ Version 1.3-svn:
      * added peaks to the impassable mountains
    * unit art
      * added a recruit animation for Skeleton
+     * added death animations for Orcish Assassin and Grunt, and Undead Ghoul
+     * changed name on Dwarvish Warrior art files to Dwarvish Steelclad, to conform
+       to unit .cfg file name
+     * new undead axes icons
    * fix gryphon not being in the center of their hex
    * Fixed incorrect WML in some units causing female variations to use male
  * language and i18n:
    * new/updated man pages:
-   * updated translations: British English, Dutch, French, German, Italian,
-     Russian, Swedish
+   * updated translations: British English, Dutch, Estonian, French, German, Italian,
+     Russian, Slovak, Swedish
    * fixed huge list of spelling mistakes in the en_US version
    * allow sighted messages to be translated with correct plural form (bug #8161)
  * multiplayer
@@ -75,7 +79,8 @@ Version 1.3-svn:
        settings previously ignored in multiplayer
    * maps:
      * new multiplayer maps: The Manzivan Traps
-     * revised maps: Blitz
+     * revised maps: Blitz, Sablestone Delta, Sulla's Ruins
+     * made the AI recruit less scouts by setting the village_per_scout parameter
  * Python AI
    * Added various input validations
    * Set Python errors upon error
@@ -100,6 +105,7 @@ Version 1.3-svn:
      * healthy (+3HP, +4 rest healing), fearless (ignore unfavorable ToD)
    * new units
      * added the Armageddon Drake (not used in any mainline eras)
+     * added dwarvish walking corpse/soulless variations
    * added a generic macro to have a standard filter for all idle anim
  * user interface
    * use "Save Replay" instead of "Save Game" when asking to save a replay
@@ -122,9 +128,15 @@ Version 1.3-svn:
      (patch #605)A
    * changed the zoom hotkeys from 'z', 'x' and 'c' to '+', '-' and '0'
    * fix the completion when controlling multiple sides (bug #8101, patch #653)
-   * add a friend list in MP lobby, they will display a special icon in lobby,
+   * added a friend list in MP lobby, they will display a special icon in lobby,
      and you can be warned when they join the lobby even when not receiving
      lobby joins
+   * added an option to specify what you want to see as joins: all, friends,
+   none
+   * added a sub tab of multiplayer to the preferences menu to view and edit
+     your friends and ignores list
+   * if you choose to sort the lobby list your current login name will be
+   displayed on the top of the list
    * added option to have random time of day in begin of multiplayer game
  * WML engine
    * added prerecruit event that takes place after the unit is created but
@@ -189,6 +201,7 @@ Version 1.3-svn:
    * better handling of SDL_ListModes return code (no user impact)
    * first turn of a game is saved again (fixes bug #7909 and bug #8117)
    * reduce CPU usage by removing calls to SDL_GetTicks for idle animations
+   * changed network thread management to be more scalable
 
 Version 1.2:
  * campaigns:

data/abilities.cfg

@@ -56,7 +56,7 @@ A curer can cure a unit of poison, although that unit will receive no additional
 		id=regenerates
 		name= _ "regenerates"
 		description= _ "Regenerates:
-The unit will heal itself 8 hp per turn. If it is poisoned, it will remove the poison instead of healing."
+The unit will heal itself 8 HP per turn. If it is poisoned, it will remove the poison instead of healing."
 		affect_self=yes
 		poison=cured
 	[/regenerate]

data/about.cfg

@@ -43,6 +43,7 @@ Slainte
 Svetac
 Johanna Manninen (lohari)
 Tristan Millner (tatmf)
+EEL (EELuminatus)
 *
 Gideon Chia (Deonjo)
 John-Robert Funck (XJaPaN)
@@ -588,6 +589,7 @@ Josef Reidinger (qk)
 Pauli Nieminen (coren/suokko)
 Jonas Lihnell (Roze)
 Miguel Zapico (elricz)
+Priit Laes (plaes)
 "
 [/about]
 

data/campaigns/Heir_To_The_Throne/scenarios/01_Elves_Besieged.cfg

@@ -457,7 +457,7 @@ name=moveto
 	[/filter]
 	[message]
 	description=Konrad
-	message= _ "They are destroying our home!"
+	message= _ "Oh no! They are destroying our home!"
 	[/message]
 	[message]
 	description=Delfador

data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg

@@ -651,14 +651,9 @@ name=prestart
 	name=elf_entered_water
 	value=0
 	[/set_variable]
-
-	[set_variable]
-	name=test_counter
-	value=0
-	[/set_variable]
 	
 	[set_variable]
-	name=immortal_hero
+	name=test_counter
 	value=0
 	[/set_variable]
 
@@ -3226,35 +3221,24 @@ first_time_only=no
 	[filter]
 		description=Zhul
 	[/filter]
-	kill=yes
+	kill=no
 	variable=Zhul_var
 	[/store_unit]
 
-	[set_variable]
-	name=temp
-	value=$Zhul_var.type
-	[/set_variable]
+	[store_unit]
+	[filter]
+	x,y=$Zhul_var.x,$Zhul_var.y
+	[/filter]
+	kill=yes
+	variable=Zhul_statue
+	[/store_unit]
 
-	[if]
-		[variable]
-		name=temp
-		equals="Desert Druid"
-		[/variable]
-
-		[then]
-
-		{PUT_IMG items/desert-elvish-druid-statue.png 52 15}
-
-		[/then]
-
-		[else]
-
-		{PUT_IMG items/desert-elvish-shyde-statue.png 52 15}
-
-		[/else]
-	[/if]
-
-	{CLEAR_VARIABLE temp}
+	{VARIABLE Zhul_statue.description "Zhul_statue"}
+	{VARIABLE Zhul_statue.status.stone "on"}
+	
+	[unstore_unit]
+	variable=Zhul_statue
+	[/unstore_unit]
 
 	[/then]
 [/if]
@@ -4060,12 +4044,14 @@ message= _ "That was just an apparition, but if we meet again I will make her pa
 	[/then]
 [/if]
 
-[removeitem]
-	x,y=52,15
-[/removeitem]
+[kill]
+	description=Zhul_statue
+	animate=no
+	fire_event=no
+[/kill]
 
 [unstore_unit]
-	find_vacant=yes
+	find_vacant=no
 	variable=Zhul_var
 [/unstore_unit]
 
@@ -4130,39 +4116,6 @@ message= _ "Peace Zhul, we can discuss theology later. We still have work to do.
 	[/then]
 [/if]
 
-# A bug seems to cause Zhul to die after this event happens
-# this flag prevents Zhul from dying
-[set_variable]
-name=immortal_hero
-value=1
-[/set_variable]
-
-[/event]
-
-# if Zhul causes the immortal_hero variable to be set to 1, her death event
-# should reset it back to 0. But just in case it doesn't, this event
-# resets the variable at the start of the next turn
-
-[event]
-name=new turn
-first_time_only=no
-
-[if]
-	[variable]
-	name=immortal_hero
-	numerical_equals=1
-	[/variable]
-
-	[then]
-
-	[set_variable]
-	name=immortal_hero
-	value=0
-	[/set_variable]
-
-	[/then]
-[/if]
-
 [/event]
 
 # Event 9: Meeting and Death of Tanstafaal

data/campaigns/Under_the_Burning_Suns/units/Crab_Man.cfg

@@ -14,7 +14,7 @@
 	alignment=neutral
 	cost=17
 	usage=fighter
-	unit_description= _ "The Crab Men are part crab, part humanoid, and are certainly one of the most twisted monsters ever recorded by the sages of Wesnoth. Probably the creation of some twisted mage, these monstrosities have spread into the wild and prefer live around coastal waters, preying on both humans and animals."
+	unit_description= _ "The Crab Men are part crab, part humanoid, and are certainly one of the most twisted monsters ever recorded by the sages of Wesnoth. Probably the creation of some twisted mage, these monstrosities have spread into the wild and prefer to live around coastal waters, preying on both humans and animals."
 	[attack]
 		name=claws
 		description= _"claws"

data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg

@@ -64,7 +64,8 @@ symbol_image=lava
  id=lava
  name= _ "Lava"
  char=y
- aliasof=S
+ mvt_alias=+ul
+ def_alias=-ul
  submerge=0.4
  unit_height_adjust=-4
  [/terrain]

data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg

@@ -4,10 +4,101 @@
 {terrain-graphics}
 {./adjacent_custom.cfg}
 
+# These three take care that no transitions of dirt, road etc are drawn over the
+# custom lava (so that we can then draw some lava transitions over those
+# terrains).
+
+[terrain_graphics]
+	map="
+  2
+.   .
+  1
+.   .
+  .
+"
+	[tile]
+		pos=1
+		type=!y
+	[/tile]
+	[tile]
+		pos=2
+		type=y
+
+		[image]
+			layer=-50
+			name=lava
+		[/image]
+
+		no_flag=custom_lava
+		set_flag=custom_lava
+	[/tile]
+
+	probability=33
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   .
+  1
+.   .
+  .
+"
+	[tile]
+		pos=1
+		type=!y
+	[/tile]
+	[tile]
+		pos=2
+		type=y
+
+		[image]
+			layer=-50
+			name=lava2
+		[/image]
+
+		no_flag=custom_lava
+		set_flag=custom_lava
+	[/tile]
+
+	probability=50
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+[terrain_graphics]
+	map="
+  2
+.   .
+  1
+.   .
+  .
+"
+	[tile]
+		pos=1
+		type=!y
+	[/tile]
+	[tile]
+		pos=2
+		type=y
+
+		[image]
+			layer=-50
+			name=lava3
+		[/image]
+
+		no_flag=custom_lava
+		set_flag=custom_lava
+	[/tile]
+
+	probability=100
+	rotations=n,ne,se,s,sw,nw
+[/terrain_graphics]
+
+{TERRAIN_ADJACENT_CUSTOM -400 y !yW lava custom_lava}
+
+
 {TERRAIN_ADJACENT_PREC          -150        z      !zCNhKx	desert}
 {TERRAIN_ADJACENT_PREC          -150        x      !xCNhKz	desert}
-
-{TERRAIN_ADJACENT_PREC          -182        y      !y	lava}
-
 {TERRAIN_ADJACENT_PREC          -182        ^     !^&ur	cave-floor1}
 {TERRAIN_ADJACENT_PREC          -150        %     !%ur	cave-floor1}

data/maps/multiplayer/2p_Sablestone_Delta

@@ -1,17 +1,17 @@
 GGwwwGwwYGwwwGGccG[WW
 cGGGGGw1wGGGGGcGGGGYW
 GYccccGoGccccGGccWroo
-GGGGcooGoocGGGGccWwrr
-GGccGGcccGGwwGGGGrror
+GGGGcooGoocGGGcccWwrr
+GGccGGcccGGwGGGGGrror
 ccGGccGGGGwGGcccWrwrr
 ccGcGcGpccGGcGGoWWDWw
 ckDGG[oWGGGoGG[YccWWo
-cWoETTuGGhocmTGGThWW[
-TWGGGGGkmGGcGGGGGGWWT
-cWuWE[ETGwEwcE[oToTWo
-[WGoWoEEGwcwGTE[WWGW[
-oWThTG[GccEGGkETEEuWc
-TWWGGGGTGcGhmGGGGGGWT
+cWoETTuGGhokmTGGThWW[
+TWGGGGGkmGGkGGGGGGWWT
+cWuWE[ETGwhckE[oToTWo
+[WGoWoEEGccwGTE[WWGW[
+oWThTG[GkkhGGkETEEuWc
+TWWGGGGTGkGhmGGGGGGWT
 [WWcTYGGmooGGWE[TGokc
 oWWWco[GGGGcGpocGcDcc
 wrDrWcGccGGGcGGcGGGcc
@@ -21,4 +21,4 @@ rowWccccGcccooocccGYG
 oYrGcGGccGcGG2GGcGccG
 WWGGGcGGGwGGwwwGGwGGc
 WW[WcGGwwwwGYwGGwwwwG
-ccWWWwGwWWWwwGWWWWGwW
+ccWWWwGwWWWwwGWWWWGwW

data/scenarios/multiplayer/2p_Blitz.cfg

@@ -12,6 +12,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -20,6 +23,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Caves_of_the_Basilisk.cfg

@@ -36,6 +36,9 @@ description= _ "Players must maneuver their units through the divisive terrain o
 {DEFAULT_MUSIC_PLAYLIST}
 
 [side]
+	[ai]
+		villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -44,6 +47,9 @@ description= _ "Players must maneuver their units through the divisive terrain o
 [/side]
 
 [side]
+	[ai]
+		villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Charge.cfg

@@ -12,6 +12,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -20,6 +23,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg

@@ -12,6 +12,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -21,6 +24,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Den_of_Onis.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -16,6 +19,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Hamlets.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -16,6 +19,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Hornshark_Island.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -16,6 +19,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Meteor_Lake.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -16,6 +19,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Sablestone_Delta.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -16,6 +19,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -16,6 +19,9 @@
 	fog=yes
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/2p_Sullas_Ruins.cfg

@@ -38,6 +38,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -46,6 +49,9 @@
 	[/side]
 
 	[side]
+	[ai]
+	villages_per_scout=8
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -17,6 +20,9 @@
 	user_team_name= _ "teamname^North"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -24,6 +30,9 @@
 	user_team_name= _ "teamname^East"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/3p_Morituri.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -15,6 +18,9 @@
 	user_team_name= _ "teamname^North"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -22,6 +28,9 @@
 	user_team_name= _ "teamname^East"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/3p_Triple_Blitz.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -15,6 +18,9 @@
 	user_team_name= _ "teamname^North"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -22,6 +28,9 @@
 	user_team_name= _ "teamname^East"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=12
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/4p_Blue_Water_Province.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -15,6 +18,9 @@
 	user_team_name= _ "teamname^Team 1"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -22,6 +28,9 @@
 	user_team_name= _ "teamname^Team 2"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human
@@ -29,6 +38,9 @@
 	user_team_name= _ "teamname^Team 2"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/4p_Castle_Hopping_Isle.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -17,6 +20,9 @@
 	user_team_name= _ "teamname^East"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -24,6 +30,9 @@
 	user_team_name= _ "teamname^West"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human
@@ -31,6 +40,9 @@
 	user_team_name= _ "teamname^West"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/4p_Clash.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	team_name=west
 	user_team_name= _ "teamname^West"
@@ -15,6 +18,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	team_name=east
 	user_team_name= _ "teamname^East"
@@ -22,6 +28,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	team_name=west
 	user_team_name= _ "teamname^West"
@@ -29,6 +38,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	team_name=east
 	user_team_name= _ "teamname^East"

data/scenarios/multiplayer/4p_Isars_Cross.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
    [side]
+      [ai]
+         villages_per_scout=16
+      [/ai]
       side=1
       team_name=south-west
       user_team_name= _ "teamname^South-West"
@@ -18,6 +21,9 @@
       gold=75
    [/side]
    [side]
+      [ai]
+         villages_per_scout=16
+      [/ai]
       side=2
       team_name=north-east
       user_team_name= _ "teamname^North-East"
@@ -26,6 +32,9 @@
       gold=75
    [/side]
    [side]
+      [ai]
+         villages_per_scout=16
+      [/ai]
       side=3
       team_name=north-east
       user_team_name= _ "teamname^North-East"
@@ -34,6 +43,9 @@
       gold=75
    [/side]
    [side]
+      [ai]
+         villages_per_scout=16
+      [/ai]
       side=4
       team_name=south-west
       user_team_name= _ "teamname^South-West"

data/scenarios/multiplayer/4p_King_of_the_Hill.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	team_name=south-west
 	user_team_name= _ "teamname^South-West"
@@ -18,6 +21,9 @@
 	gold=150
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	team_name=south-east
 	user_team_name= _ "teamname^South-East"
@@ -26,6 +32,9 @@
 	gold=150
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	team_name=north-east
 	user_team_name= _ "teamname^North-East"
@@ -34,6 +43,9 @@
 	gold=150
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	team_name=north-west
 	user_team_name= _ "teamname^North-West"

data/scenarios/multiplayer/4p_Lagoon.cfg

@@ -8,21 +8,33 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/4p_Loris_River.cfg

@@ -16,6 +16,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	team_name=north-west
 	user_team_name= _ "teamname^North-West"
@@ -23,6 +26,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	team_name=south-east
 	user_team_name= _ "teamname^South-East"
@@ -30,6 +36,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	team_name=south-east
 	user_team_name= _ "teamname^South-East"
@@ -37,6 +46,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	team_name=north-west
 	user_team_name= _ "teamname^North-West"

data/scenarios/multiplayer/4p_Morituri.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	team_name=north
 	user_team_name= _ "teamname^North"
@@ -15,6 +18,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	team_name=south
 	user_team_name= _ "teamname^South"
@@ -22,6 +28,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	team_name=south
 	user_team_name= _ "teamname^South"
@@ -29,6 +38,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	team_name=north
 	user_team_name= _ "teamname^North"

data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	team_name=west
 	user_team_name= _ "teamname^West"
@@ -17,6 +20,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	team_name=east
 	user_team_name= _ "teamname^East"
@@ -24,6 +30,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	team_name=east
 	user_team_name= _ "teamname^East"
@@ -31,6 +40,9 @@
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	team_name=west
 	user_team_name= _ "teamname^West"

data/scenarios/multiplayer/4p_Siege_Castles.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -18,6 +21,9 @@
 	gold=150
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -26,6 +32,9 @@
 	gold=150
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human
@@ -34,6 +43,9 @@
 	gold=150
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/4p_The_Wilderlands.cfg

@@ -8,21 +8,33 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=16
+	[/ai]
 	side=4
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/5p_Forest_of_Fear.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+	[ai]
+	villages_per_scout=20
+	[/ai]
 	side=1
 	canrecruit=1
 	controller=human
@@ -15,6 +18,9 @@
 	user_team_name= _ "teamname^North"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=20
+	[/ai]
 	side=2
 	canrecruit=1
 	controller=human
@@ -22,6 +28,9 @@
 	user_team_name= _ "teamname^West"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=20
+	[/ai]
 	side=3
 	canrecruit=1
 	controller=human
@@ -29,6 +38,9 @@
 	user_team_name= _ "teamname^South-East"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=20
+	[/ai]
 	side=4
 	canrecruit=1
 	controller=human
@@ -36,6 +48,9 @@
 	user_team_name= _ "teamname^North-East"
 	[/side]
 	[side]
+	[ai]
+	villages_per_scout=20
+	[/ai]
 	side=5
 	canrecruit=1
 	controller=human

data/scenarios/multiplayer/6p_Amohsad_Caldera.cfg

@@ -7,6 +7,9 @@
 	{DEFAULT_SCHEDULE}
 	{DEFAULT_MUSIC_PLAYLIST}
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=1
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -14,6 +17,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=2
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -21,6 +27,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=3
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -28,6 +37,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=4
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -35,6 +47,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=5
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -42,6 +57,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=6
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"

data/scenarios/multiplayer/6p_Crusaders_Field.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=1
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -15,6 +18,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=2
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -22,6 +28,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=3
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -29,6 +38,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=4
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -36,6 +48,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=5
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -43,6 +58,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=6
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"

data/scenarios/multiplayer/6p_Hexcake.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=1
 		team_name=north-east
 		user_team_name= _ "teamname^North-East"
@@ -15,6 +18,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=2
 		team_name=south-west
 		user_team_name= _ "teamname^South-West"
@@ -22,6 +28,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=3
 		team_name=south-west
 		user_team_name= _ "teamname^South-West"
@@ -29,6 +38,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=4
 		team_name=north-east
 		user_team_name= _ "teamname^North-East"
@@ -36,6 +48,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=5
 		team_name=north-east
 		user_team_name= _ "teamname^North-East"
@@ -43,6 +58,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=24
+		[/ai]
 		side=6
 		team_name=south-west
 		user_team_name= _ "teamname^South-West"

data/scenarios/multiplayer/6p_Team_Survival.cfg

@@ -307,7 +307,7 @@ c
 
 	{ON_PRESTART (
 		{SET_OBJECTIVES 0 (_ "Survive for 32 turns.") (_ "Hint: Learning the enemy spawnpoints and types helps alot.") (
-			{VICTORY_CONDITION (_ "Survival all enemy attacks.")}
+			{VICTORY_CONDITION (_ "Survive all enemy attacks.")}
 			{DEFEAT_CONDITION (_ "Death of your team leaders.")}
 		)}
 	)}
@@ -330,7 +330,7 @@ c
 	)}
 
 	{ON_VICTORY (
-		{MESSAGE narrator (units/elves-wood/shyde.png) (Faery) (_ "Congratulations for surviving the map that so many people claim is impossible. Frankly, I don't got a clue to how you did it, so send me the replay by mail to: roze@roze.mine.nu. Thank You!")}
+		{MESSAGE narrator (units/elves-wood/shyde.png) (Faery) (_ "Congratulations for surviving the map that so many people claim is impossible. Frankly, I haven't got a clue as to how you did it, so send me the replay by mail to: roze@roze.mine.nu. Thank You!")}
 	)}
 	{ON_DEFEAT (
 		{MESSAGE narrator (units/undead/wraith.png) (Death) (_ "You have lost this game, but fear not. You can always try again. And again. And again. *Muahahaha*")}

data/scenarios/multiplayer/6p_The_Manzivan_Traps.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
   [side]
+      [ai]
+          villages_per_scout=24
+      [/ai]
       side=1
       team_name=east
       user_team_name= _ "teamname^East"
@@ -18,6 +21,9 @@
       gold=100
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=2
       team_name=west
       user_team_name= _ "teamname^West"
@@ -26,6 +32,9 @@
       gold=100
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=3
       team_name=west
       user_team_name= _ "teamname^West"
@@ -34,6 +43,9 @@
       gold=100
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=4
       team_name=east
       user_team_name= _ "teamname^East"
@@ -42,6 +54,9 @@
       gold=100
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=5
       team_name=east
       user_team_name= _ "teamname^East"
@@ -50,6 +65,9 @@
       gold=100
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=6
       team_name=west
       user_team_name= _ "teamname^West"

data/scenarios/multiplayer/6p_Waterloo_Sunset.cfg

@@ -10,6 +10,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
   [side]
+      [ai]
+          villages_per_scout=24
+      [/ai]
       side=1
       team_name=south
       user_team_name= _ "teamname^South"
@@ -18,6 +21,9 @@
       gold=150
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=2
       team_name=north
       user_team_name= _ "teamname^North"
@@ -26,6 +32,9 @@
       gold=150
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=3
       team_name=north
       user_team_name= _ "teamname^North"
@@ -34,6 +43,9 @@
       gold=150
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=4
       team_name=south
       user_team_name= _ "teamname^South"
@@ -42,6 +54,9 @@
       gold=150
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=5
       team_name=south
       user_team_name= _ "teamname^South"
@@ -50,6 +65,9 @@
       gold=150
    [/side]
    [side]
+      [ai]
+         villages_per_scout=24
+      [/ai]
       side=6
       team_name=north
       user_team_name= _ "teamname^North"

data/scenarios/multiplayer/8p_Morituri.cfg

@@ -8,6 +8,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=1
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -15,6 +18,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=2
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -22,6 +28,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=3
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -29,6 +38,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=4
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"
@@ -36,6 +48,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=5
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -43,6 +58,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=6
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -50,6 +68,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=7
 		team_name=Team 1
 		user_team_name= _ "teamname^Team 1"
@@ -57,6 +78,9 @@
 		controller=human
 	[/side]
 	[side]
+		[ai]
+			villages_per_scout=32
+		[/ai]
 		side=8
 		team_name=Team 2
 		user_team_name= _ "teamname^Team 2"

data/scenarios/multiplayer/9p_Merkwuerdigliebe.cfg

@@ -17,6 +17,9 @@
 	{DEFAULT_MUSIC_PLAYLIST}
 
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=1
       team_name=north
       user_team_name= _ "teamname^North"
@@ -24,6 +27,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=2
       team_name=south-east
       user_team_name= _ "teamname^South-East"
@@ -31,6 +37,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=3
       team_name=south-west
       user_team_name= _ "teamname^South-West"
@@ -38,6 +47,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=4
       team_name=south-west
       user_team_name= _ "teamname^South-West"
@@ -45,6 +57,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=5
       team_name=north
       user_team_name= _ "teamname^North"
@@ -52,6 +67,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=6
       team_name=south-east
       user_team_name= _ "teamname^South-East"
@@ -59,6 +77,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=7
       team_name=south-east
       user_team_name= _ "teamname^South-East"
@@ -66,6 +87,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=8
       team_name=south-west
       user_team_name= _ "teamname^South-West"
@@ -73,6 +97,9 @@
       controller=human
    [/side]
    [side]
+      [ai]
+         villages_per_scout=36
+      [/ai]
       side=9
       team_name=north
       user_team_name= _ "teamname^North"

data/tutorial/scenarios/2_Tutorial.cfg

@@ -25,7 +25,7 @@
 	{LABEL (_"Patch of forest") 10,14}
 	{TALK_ABOUT_LOC 10,14 (_"Now put an unwounded unit, preferably a fighter, in that patch of forest on the south-east of the island: a nice, defensible spot.")}
 	{STUDENT (_"Can one unit survive against all those enemies?")}
-	{TEACHER (_"With a little help, yes.  If your move your Shaman next to the defending unit, it will heal it by 4 hitpoints per turn.  Just be careful not to expose the Shaman to attack: it is fairly weak itself.")}
+	{TEACHER (_"With a little help, yes.  If you move your Shaman next to the defending unit, it will heal it by 4 hitpoints per turn.  Just be careful not to expose the Shaman to attack: it is fairly weak itself.")}
 	{PRINT (_"Move a unit (fighter if possible) to the patch of forest")}
 	[event]
 		name=moveto

data/units/Dwarvish_Berserker.cfg

@@ -12,6 +12,7 @@
 	alignment=neutral
 	advanceto=null
 	{AMLA_TOUGH 3}
+	undead_variation=dwarf
 	cost=33
 	usage=fighter
 	unit_description= _ "Dwarves are an ancient race of powerful fighters. Their Berserkers forget all defense in exchange for massive damage against their enemies.

data/units/Dwarvish_Dragonguard.cfg

@@ -12,6 +12,7 @@
 	alignment=neutral
 	advanceto=null
 	{AMLA_TOUGH 3}
+	undead_variation=dwarf
 	cost=46
 	usage=archer
 	unit_description= _ "It is not clear why the Dragonguards are called what they are, a name given by their dwarven brethren. Some speculate that the name comes from their weapon of choice, these strange staves that belch fire and death. Others have surmised that it is because such weapons would be a threat against even a true Dragon, should such a thing be seen again in the known world. Whatever the case, it is for these weapons that the guardians of the great Dwarven citadels are both renowned and feared; weapons that have broken the mightiest of warriors in a single blow."

data/units/Dwarvish_Fighter.cfg

@@ -16,6 +16,7 @@
 	level=1
 	alignment=neutral
 	advanceto=Dwarvish Steelclad
+	undead_variation=dwarf
 	cost=16
 	usage=fighter
 	unit_description= _ "Dwarvish Fighters wield mighty battle axes and hammers, which make them feared opponents in close range combat. They are excellent in mountainous terrain or underground. Though not swift, their power and endurance more than compensate."

data/units/Dwarvish_Guardsman.cfg

@@ -13,6 +13,7 @@
 	level=1
 	alignment=neutral
 	advanceto=Dwarvish Stalwart
+	undead_variation=dwarf
 	cost=19
 	usage=fighter
 	unit_description= _ "The most resilient dwarves sometimes join the Dwarvish army as Guardsmen. Slow and without a strong attack, they guard the Army's flank, soaking up a lot of damage, and hurling heavy spears for defense.

data/units/Dwarvish_Lord.cfg

@@ -13,6 +13,7 @@
 	alignment=neutral
 	advanceto=null
 	{AMLA_TOUGH 3}
+	undead_variation=dwarf
 	cost=54
 	usage=fighter
 	unit_description= _ "Clad in shining armor, these dwarves look like kings from under the mountains. They wield axe and hammer with masterful skill, and can hit a target with a thrown hand axe at several paces. Though slow on their feet, these dwarves are a testament to the prowess of their kin."

data/units/Dwarvish_Runemaster.cfg

@@ -12,6 +12,7 @@
 	alignment=neutral
 	advanceto=null
 	{AMLA_TOUGH 3}
+	undead_variation=dwarf
 	cost=60
 	usage=fighter
 	unit_description= _ "Dwarven magic, inasmuch as is known, most often manifests itself by the inscription of runes in the surface of an object, which by their mere presence somehow imbue it with power. Though rarely seen in combat, a master of these runes can put them to terrifying use."

data/units/Dwarvish_Sentinel.cfg

@@ -13,6 +13,7 @@
 	alignment=neutral
 	advanceto=null
 	{AMLA_TOUGH 3}
+	undead_variation=dwarf
 	cost=41
 	usage=fighter
 	unit_description= _ "The Sentinel, with his tower shield and great courage, refuses to yield under even the strongest of enemy attacks.

data/units/Dwarvish_Stalwart.cfg

@@ -12,6 +12,7 @@
 	level=2
 	alignment=neutral
 	advanceto=Dwarvish Sentinel
+	undead_variation=dwarf
 	cost=32
 	usage=fighter
 	unit_description= _ "Stalwarts, after years in battle, have fashioned new shields and strong armor from the ruins of their enemies. While slow, they are feared for their resilience and strength.

data/units/Dwarvish_Steelclad.cfg

@@ -12,6 +12,7 @@
 	level=2
 	alignment=neutral
 	advanceto=Dwarvish Lord
+	undead_variation=dwarf
 	cost=32
 	usage=fighter
 	unit_description= _ "The more experienced Dwarvish Steelclad fighters wear heavy chain mail and plate armor, for which they are rightly famous."

data/units/Dwarvish_Thunderer.cfg

@@ -12,6 +12,7 @@
 	level=1
 	alignment=neutral
 	advanceto=Dwarvish Thunderguard
+	undead_variation=dwarf
 	cost=17
 	usage=mixed fighter
 	unit_description= _ "When the men of Wesnoth first encountered the dwarves, they were mystified by the power of the Dwarvish Thunderers, who were able to hurl death from afar through the apparatus of these strange ... 'wands' they carried into battle. After the peace instituted by the Ka'lian came into effect, Haldric's people, not understanding these weapons, and certainly unable to make any of their own, realized they were lucky to no longer be fighting the dwarves, and vowed never to do so again."

data/units/Dwarvish_Thunderguard.cfg

@@ -11,6 +11,7 @@
 	level=2
 	alignment=neutral
 	advanceto=Dwarvish Dragonguard
+	undead_variation=dwarf
 	cost=30
 	usage=fighter
 	unit_description= _ "The Dwarven Thunderguards are famed for their curious weaponry, these strange staves of wood and iron that make a thunderous noise in their anger. The machinations behind this weaponry are a mystery, a secret taken to the grave by the dwarves of Knalga who wield them, and are assumed to have even forged them. The most that is known are reports of dwarves pouring a strange black dust into the mouth of their weapons, which some say is a food to fuel the beast imprisoned within.

data/units/Dwarvish_Ulfserker.cfg

@@ -12,6 +12,7 @@
 	level=1
 	alignment=neutral
 	advanceto=Dwarvish Berserker
+	undead_variation=dwarf
 	cost=19
 	usage=fighter
 	unit_description= _ "Dwarves are an ancient race of powerful fighters. Ulfserkers are the most ferocious of these in battle: they persist until either their enemy is dead or they themselves perish, paying little heed to how many wounds they may receive.

data/units/Orcish_Assassin.cfg

@@ -19,6 +19,49 @@
 
 Special Notes:"+{SPECIAL_NOTES_POISON}
 	die_sound={SOUND_LIST:ORC_SMALL_DIE}
+	[death]
+		start_time=0
+		[frame]
+			duration=120
+			image="units/orcs/assassin-die-1.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-2.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-3.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-4.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-5.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/orcs/assassin-die-6.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/orcs/assassin-die-7.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-8.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-9.png"
+		[/frame]
+		[frame]
+			duration=100
+			image="units/orcs/assassin-die-10.png"
+		[/frame]
+	[/death]
 	{DEFENSE_ANIM "units/orcs/assassin-defend.png" "units/orcs/assassin.png" {SOUND_LIST:ORC_SMALL_HIT} }
 	[attack]
 		name=dagger

data/units/Orcish_Grunt.cfg

@@ -18,6 +18,41 @@
 	unit_description= _ "Orcish Grunts form the core of the orcish forces. Although slower than human or elven fighters, Grunts can deliver much more powerful blows, and take more hits before falling."
 	get_hit_sound={SOUND_LIST:ORC_HIT}
 	die_sound={SOUND_LIST:ORC_DIE}
+	[death]
+		start_time=0
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-1.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-2.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-3.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-4.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-5.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-6.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-7.png"
+		[/frame]
+		[frame]
+			duration=120
+			image="units/orcs/grunt-die-8.png"
+		[/frame]
+	[/death]
 	[defend]
 		[frame]
 			begin=-150

data/units/Undead_Corpse_Ghoul.cfg

@@ -30,6 +30,37 @@ Special Notes:"+{SPECIAL_NOTES_POISON}
 		fire=90
 		cold=60
 	[/resistance]
+	[death]
+		start_time=0
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-1.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-2.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-3.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-4.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-5.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-6.png"
+		[/frame]
+		[frame]
+			duration=80
+			image="units/undead/ghoul-die-7.png"
+		[/frame]
+	[/death]
 	[attack]
 		name=claws
 		icon=attacks/claws-undead.png

data/units/Undead_Corpse_Soulless.cfg

@@ -127,5 +127,12 @@ die_sound={SOUND_LIST:ZOMBIE_HIT}
             deep_water=4
         [/movement_costs]
     [/variation]
+    [variation]
+        variation_name=dwarf
+	{UNIT_BODY_SOULLESS zombie-dwarf dwarvishfoot 3 33}
+        [movement_costs]
+            deep_water=3
+        [/movement_costs]
+    [/variation]
 [/unit]
 #undef UNIT_BODY_SOULLESS

data/units/Undead_Corpse_Walking.cfg

@@ -4,6 +4,7 @@ id=Walking Corpse
 name= _ "Walking Corpse"
 race=undead
 image="units/undead/{BASE_IMAGE}.png"
+{MAGENTA_IS_THE_TEAM_COLOR}
 ellipse="misc/ellipse-nozoc"
 hitpoints={HP}
 movement_type={MOVETYPE}
@@ -18,10 +19,11 @@ unit_description= _ "Walking Corpses are the bodies of the dead, re-animated by
 
 Special Notes:"+{SPECIAL_NOTES_PLAGUE}
 die_sound={SOUND_LIST:ZOMBIE_WEAK_HIT}
-{DEFENSE_ANIM "units/undead/{BASE_IMAGE}-attack.png" "units/undead/{BASE_IMAGE}.png" {SOUND_LIST:ZOMBIE_WEAK_HIT} }
+{DEFENSE_ANIM "units/undead/{BASE_IMAGE}-defend.png" "units/undead/{BASE_IMAGE}.png" {SOUND_LIST:ZOMBIE_WEAK_HIT} }
 [resistance]
     holy=200
 [/resistance]
+[comment]
 [death]
     [frame]
         begin=0
@@ -39,6 +41,7 @@ die_sound={SOUND_LIST:ZOMBIE_WEAK_HIT}
         image="units/undead/{BASE_IMAGE}-die-3.png"
     [/frame]
 [/death]
+[/comment]
 [attack]
     name=touch
     icon=attacks/touch-zombie.png
@@ -126,5 +129,12 @@ die_sound={SOUND_LIST:ZOMBIE_WEAK_HIT}
             deep_water=4
         [/movement_costs]
     [/variation]
+    [variation]
+        variation_name=dwarf
+        {UNIT_BODY_WALKING_CORPSE zombie-dwarf dwarvishfoot 3 21}
+        [movement_costs]
+            deep_water=3
+        [/movement_costs]
+    [/variation]
 [/unit]
 #undef UNIT_BODY_WALKING_CORPSE

data/units/Undead_Skele_Death_Knight.cfg

@@ -42,11 +42,11 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 	[/death]
 	[attack]
 		name=battle axe
+		icon=attacks/battleaxe-undead.png
 		type=blade
 		range=melee
 		damage=11
 		number=4
-		icon=attacks/battleaxe.png
 		[animation]
 			[frame]
 				begin=-200

data/units/Undead_Skele_Deathblade.cfg

@@ -40,6 +40,7 @@ Special Notes:"+{SPECIAL_NOTES_SUBMERGE}
 	[/death]
 	[attack]
 		name=axe
+		icon=attacks/axe-deathblade.png
 		type=blade
 		range=melee
 		damage=8

data/units/Undead_Skele_Draug.cfg

@@ -40,7 +40,7 @@ Special Notes:"+{SPECIAL_NOTES_SUBMERGE}
 	[/death]
 	[attack]
 		name=axe
-		icon=attacks/battleaxe.png
+		icon=attacks/battleaxe-undead.png
 		type=blade
 		range=melee
 		damage=12

data/units/Undead_Skele_Revenant.cfg

@@ -39,6 +39,7 @@ Special Notes:"+{SPECIAL_NOTES_SUBMERGE}
 	[/death]
 	[attack]
 		name=axe
+		icon=attacks/axe-undead.png
 		type=blade
 		range=melee
 		damage=8

data/units/Undead_Skeleton.cfg

@@ -104,6 +104,7 @@ Special Notes:"+{SPECIAL_NOTES_SUBMERGE}
 	[/resistance]
 	[attack]
 		name=axe
+		icon=attacks/axe-undead.png
 		type=blade
 		range=melee
 		damage=7