diff --git a/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg b/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg index 963855a3876..415dc527a0d 100644 --- a/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg +++ b/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg @@ -402,23 +402,33 @@ Defeat: [/if] [if] + [or] [variable] name=moremirmu - equals=1 + numerical_equals=1 [/variable] + [/or] + [or] + [variable] + name=moremirmu + numerical_equals=3 + [/variable] + [/or] - [kill] - description=Moremirmu - [/kill] - [kill] - description=Haldar - [/kill] - [kill] - description=Marcus - [/kill] - [kill] - description=Heldra - [/kill] + [then] + [kill] + description=Moremirmu + [/kill] + [kill] + description=Haldar + [/kill] + [kill] + description=Marcus + [/kill] + [kill] + description=Heldra + [/kill] + [/then] [/if] [endlevel] diff --git a/data/units/Arch_Mage.cfg b/data/units/Arch_Mage.cfg index 663e163a544..22927d61299 100644 --- a/data/units/Arch_Mage.cfg +++ b/data/units/Arch_Mage.cfg @@ -3,12 +3,12 @@ name=Arch Mage race=human image=arch-mage.png image_defensive=arch-mage-defend.png -hitpoints=58 +hitpoints=62 movement_type=smallfoot [resistance] fire=80 [/resistance] -movement=4 +movement=5 experience=220 level=3 alignment=neutral @@ -16,7 +16,7 @@ advanceto=Great Mage cost=100 usage=mixed fighter ability=teleport -unit_description="Leaders among the mages, the Arch Mages hurl huge balls of fire at their enemies. The Arch Mages can also teleport from any friendly village to another, translating themselves in an instant." +unit_description="Leaders among the mages, the Arch Mages hurl huge balls of fire at their enemies." get_hit_sound=groan.wav [attack] name=staff @@ -34,7 +34,7 @@ get_hit_sound=groan.wav type=fire range=long special=magical - damage=12 + damage=14 number=4 [sound] time=-200 diff --git a/data/units/Great_Mage.cfg b/data/units/Great_Mage.cfg index a526b24c309..5f48952f006 100644 --- a/data/units/Great_Mage.cfg +++ b/data/units/Great_Mage.cfg @@ -2,12 +2,12 @@ name=Great Mage race=human image=great-mage.png -hitpoints=70 +hitpoints=75 movement_type=smallfoot [resistance] fire=70 [/resistance] -movement=4 +movement=5 experience=500 level=4 alignment=neutral @@ -15,7 +15,7 @@ advanceto=null cost=150 usage=mixed fighter ability=teleport -unit_description="Great Mages are awesome and fearsome enemies, exceeding even the Arch Mages in power. Like the Arch Mages, the Great Mages can teleport between villages, projecting their great power to all corners of the battlefield." +unit_description="Great Mages are awesome and fearsome enemies, exceeding even the Arch Mages in power." get_hit_sound=groan.wav [attack] name=staff @@ -33,7 +33,7 @@ get_hit_sound=groan.wav type=fire range=long special=magical - damage=16 + damage=18 number=4 [sound] time=-200 diff --git a/data/units/Grey_Mage.cfg b/data/units/Grey_Mage.cfg new file mode 100644 index 00000000000..03a10208c7c --- /dev/null +++ b/data/units/Grey_Mage.cfg @@ -0,0 +1,71 @@ +[unit] +name=Grey Mage +race=human +image=grey-mage.png +image_defensive=grey-mage-defend.png +hitpoints=48 +movement_type=smallfoot + [resistance] + fire=50 + cold=50 + [/resistance] +movement=6 +experience=500 +level=3 +alignment=neutral +advanceto=null +cost=90 +usage=mixed fighter +ability=teleport +unit_description="Grey Mages are the most deft of foot and elusive of all mages. They can teleport from any friendly village to another, translating themselves in an instant. They are also highly resistant to most forms of magical attack." +get_hit_sound=groan.wav + [attack] + name=staff + type=blunt + range=short + damage=7 + number=2 + [frame] + begin=-100 + end=100 + image=grey-mage-melee.png + [/frame] + [sound] + time=-100 + sound=staff.wav + [/sound] + [/attack] + [attack] + name=fireball + type=fire + range=long + special=magical + damage=9 + number=4 + [frame] + begin=-300 + end=-200 + image=grey-mage-attack1.png + [/frame] + [frame] + begin=-200 + end=-100 + image=grey-mage-attack2.png + [/frame] + [frame] + begin=-100 + end=100 + image=grey-mage-attack3.png + [/frame] + [sound] + time=-200 + sound=fire.wav + [/sound] + [missile_frame] + begin=-100 + end=0 + image=fireball.png + halo=fireball-halo.png + [/missile_frame] + [/attack] +[/unit] diff --git a/data/units/Red_Mage.cfg b/data/units/Red_Mage.cfg index 448c9a3667a..6fa81198f23 100644 --- a/data/units/Red_Mage.cfg +++ b/data/units/Red_Mage.cfg @@ -12,7 +12,7 @@ movement=5 experience=100 level=2 alignment=neutral -advanceto=Arch Mage +advanceto=Arch Mage,Grey Mage cost=60 usage=mixed fighter unit_description="Red Mages attack with powerful magic fireballs that are guaranteed a good chance of hitting. Deft of foot, and skilled fighters both day and night, Red Mages are therefore valuable in almost all situations." diff --git a/images/grey-mage-attack1.png b/images/grey-mage-attack1.png new file mode 100644 index 00000000000..da9d4d08659 Binary files /dev/null and b/images/grey-mage-attack1.png differ diff --git a/images/grey-mage-attack2.png b/images/grey-mage-attack2.png new file mode 100644 index 00000000000..faaa3d5c525 Binary files /dev/null and b/images/grey-mage-attack2.png differ diff --git a/images/grey-mage-attack3.png b/images/grey-mage-attack3.png new file mode 100644 index 00000000000..8f954269e7a Binary files /dev/null and b/images/grey-mage-attack3.png differ diff --git a/images/grey-mage-defend.png b/images/grey-mage-defend.png new file mode 100644 index 00000000000..ae6a9b9e07a Binary files /dev/null and b/images/grey-mage-defend.png differ diff --git a/images/grey-mage-melee.png b/images/grey-mage-melee.png new file mode 100644 index 00000000000..cf77fd85440 Binary files /dev/null and b/images/grey-mage-melee.png differ diff --git a/images/grey-mage.png b/images/grey-mage.png new file mode 100644 index 00000000000..9677a99cc95 Binary files /dev/null and b/images/grey-mage.png differ