diff --git a/data/multiplayer.cfg b/data/multiplayer.cfg index 0c18a1e8b65..759db74f74d 100644 --- a/data/multiplayer.cfg +++ b/data/multiplayer.cfg @@ -432,7 +432,7 @@ id=era_heroes [multiplayer_side] name=&elvish-lord.png,Rebels type=Elvish Lord - recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish Scout,Wose Sapling,Merman,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Outrider,Merman Lord + recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish Scout,Wose Sapling,Merman,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Rider,Merman Lord recruitment_pattern=fighter,fighter,scout music="wesnoth-4.ogg" terrain_liked=fwc diff --git a/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg b/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg index b0ec0ecc0e1..7cc7577d06a 100644 --- a/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg +++ b/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg @@ -587,7 +587,7 @@ The main cage where they keep most of the mermen is in the south-east!" [/message] [role] - type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Paladin,Mage,White Mage,Red Mage,Elvish Fighter,Elvish Archer,Elvish Shaman,Horseman + type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Rider,Elvish Outrider,Paladin,Mage,White Mage,Red Mage,Elvish Fighter,Elvish Archer,Elvish Shaman,Horseman role=Supporter [/role] [message] diff --git a/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg b/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg index 8e3106a424d..49cf49ed201 100644 --- a/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg +++ b/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg @@ -173,14 +173,14 @@ Defeat: [/sound] [move_unit_fake] - type=Elvish Outrider + type=Elvish Rider x=16,15,14,13,12,11,10,9 y=14,14,14,14,14,14,14,14 [/move_unit_fake] [unit] description=Eonihar - type=Elvish Outrider + type=Elvish Rider side=1 x=9 y=14 diff --git a/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg b/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg index dabfb82b144..616a497fcf4 100644 --- a/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg +++ b/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg @@ -83,7 +83,7 @@ Defeat: [event] name=start [role] - type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Paladin,Mage,White Mage,Red Mage + type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Rider,Elvish Outrider,Paladin,Mage,White Mage,Red Mage role=Advisor [/role] [recall] diff --git a/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg b/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg index c7192106eae..c7bade132ee 100644 --- a/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg +++ b/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg @@ -95,7 +95,7 @@ Defeat: description=Kalenz [/recall] [role] - type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Paladin,Mage,White Mage,Red Mage + type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Elvish Rider,Paladin,Mage,White Mage,Red Mage role=Advisor [/role] [recall] diff --git a/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg b/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg index d4c88fba423..257713a4f67 100644 --- a/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg +++ b/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg @@ -99,7 +99,7 @@ Defeat: [event] name=start [role] - type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Paladin,Mage,White Mage,Red Mage + type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Elvish Rider,Paladin,Mage,White Mage,Red Mage role=Advisor [/role] [recall] diff --git a/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg b/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg index d82b74a03d7..584834ec622 100644 --- a/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg +++ b/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg @@ -46,7 +46,7 @@ Defeat: canrecruit=1 team_name=enemies #ifdef HARD - recruit=Elvish Ranger,Elvish Sharpshooter,Gryphon Rider,Elvish Outrider,Elvish Fighter,Elvish Shaman + recruit=Elvish Ranger,Elvish Sharpshooter,Gryphon Rider,Elvish Rider,Elvish Fighter,Elvish Shaman #else recruit=Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout diff --git a/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg b/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg index 584cb25009e..2b444b9d285 100644 --- a/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg +++ b/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg @@ -78,7 +78,7 @@ Defeat: side=3 canrecruit=1 #ifdef HARD - recruit= Elvish Hero,Elvish Ranger,Elvish Captain,Elvish Outrider,Gryphon Rider,Elvish Druid,Elvish Sharpshooter + recruit= Elvish Hero,Elvish Ranger,Elvish Captain,Elvish Rider,Gryphon Rider,Elvish Druid,Elvish Sharpshooter #endif #ifdef NORMAL diff --git a/data/tutorial.cfg b/data/tutorial.cfg index e23da4f37ac..59ee3f8805f 100644 --- a/data/tutorial.cfg +++ b/data/tutorial.cfg @@ -86,7 +86,7 @@ Defeat: ai_special=guardian [/unit] [unit] - type=Elvish Outrider + type=Elvish Rider description=Uli'ar side=2 x=17 diff --git a/data/units/Elvish_Outrider.cfg b/data/units/Elvish_Outrider.cfg index 3af36b20505..e101dffca51 100644 --- a/data/units/Elvish_Outrider.cfg +++ b/data/units/Elvish_Outrider.cfg @@ -3,26 +3,20 @@ name=Elvish Outrider race=elf image=elvish-outrider.png image_defensive=elvish-outrider-defend.png -hitpoints=44 +hitpoints=50 movement_type=woodland movement=10 experience=500 -level=2 +level=3 alignment=neutral advanceto=null -cost=30 +cost=36 usage=scout - #mostly like a foot Elf, but they - #aren't good at defending in villages - [defense] - village=60 - [/defense] - #they are weak against piercing attacks [resistance] pierce=120 [/resistance] -unit_description="The swiftest of riders, Elvish Outriders are fast in the forest as well as in the open. They can even use a bow from horseback." +unit_description="Riding like the wind, Elvish Outriders breeze through the forests to strike at weaker units and exposed flanks. Equally skilled in both bow and sword, they strike hard before melting into the woods again to evade response." get_hit_sound=groan.wav [attack] name=sword @@ -45,7 +39,7 @@ get_hit_sound=groan.wav type=pierce range=long damage=5 - number=3 + number=4 [frame] begin=-300 end=-150 diff --git a/data/units/Elvish_Rider.cfg b/data/units/Elvish_Rider.cfg new file mode 100644 index 00000000000..86417ca09c1 --- /dev/null +++ b/data/units/Elvish_Rider.cfg @@ -0,0 +1,78 @@ +[unit] +name=Elvish Rider +race=elf +image=elvish-rider.png +image_defensive=elvish-rider-defend.png +hitpoints=42 +movement_type=woodland +movement=10 +experience=75 +level=2 +alignment=neutral +advanceto=Elvish Outrider +cost=28 +usage=scout + #mostly like a foot Elf, but they + #aren't good at defending in villages + [defense] + village=50 + [/defense] + + #they are weak against piercing attacks + [resistance] + pierce=120 + [/resistance] +unit_description="Swift riders, Elvish Riders are fast in the forest as well as in the open. They can even use a bow from horseback." +get_hit_sound=groan.wav + [attack] + name=sword + type=blade + range=short + damage=5 + number=4 + [frame] + begin=-100 + end=100 + image=elvish-rider-attack.png + [/frame] + [sound] + time=-100 + sound=horse-canter.wav + [/sound] + [/attack] + [attack] + name=bow + type=pierce + range=long + damage=5 + number=3 + [frame] + begin=-300 + end=-150 + image=elvish-rider-attack1.png + [/frame] + [frame] + begin=-150 + end=0 + image=elvish-rider-attack2.png + [/frame] + [sound] + time=-100 + sound=firearrow.wav + [/sound] + + [sound] + time=0 + sound=arrow-hit.wav + sound_miss=arrow-miss.wav + [/sound] + + [missile_frame] + begin=-100 + end=0 + image=missile-n.png + image_diagonal=missile-ne.png + [/missile_frame] + + [/attack] +[/unit] diff --git a/data/units/Elvish_Scout.cfg b/data/units/Elvish_Scout.cfg index 10ea7ed47e5..447e909c67d 100644 --- a/data/units/Elvish_Scout.cfg +++ b/data/units/Elvish_Scout.cfg @@ -7,9 +7,9 @@ hitpoints=32 movement_type=woodland #mostly like a foot Elf, but they - #aren't good at defending in villages + #are bad at defending in villages [defense] - village=60 + village=50 [/defense] #they are weak against piercing attacks @@ -20,7 +20,7 @@ movement=9 experience=37 level=1 alignment=neutral -advanceto=Elvish Outrider +advanceto=Elvish Rider cost=18 usage=scout unit_description="Elvish Scouts move swiftly through forest and grassland alike. Their skill on horseback is virtually unmatched, although they do lack power in combat." diff --git a/images/elvish-outrider-attack.png b/images/elvish-outrider-attack.png index aae8def8b6c..02297d1870d 100644 Binary files a/images/elvish-outrider-attack.png and b/images/elvish-outrider-attack.png differ diff --git a/images/elvish-outrider-attack1.png b/images/elvish-outrider-attack1.png index 4707acd0fab..8ecc74a47c1 100644 Binary files a/images/elvish-outrider-attack1.png and b/images/elvish-outrider-attack1.png differ diff --git a/images/elvish-outrider-attack2.png b/images/elvish-outrider-attack2.png index 8975a7d6c7b..ed52dd7ccff 100644 Binary files a/images/elvish-outrider-attack2.png and b/images/elvish-outrider-attack2.png differ diff --git a/images/elvish-outrider-defend.png b/images/elvish-outrider-defend.png index e4a9a5fe8f5..0136d30f8b3 100644 Binary files a/images/elvish-outrider-defend.png and b/images/elvish-outrider-defend.png differ diff --git a/images/elvish-outrider.png b/images/elvish-outrider.png index c5326915e5f..37bb2a0e3bc 100644 Binary files a/images/elvish-outrider.png and b/images/elvish-outrider.png differ diff --git a/images/elvish-rider-attack.png b/images/elvish-rider-attack.png new file mode 100644 index 00000000000..aae8def8b6c Binary files /dev/null and b/images/elvish-rider-attack.png differ diff --git a/images/elvish-rider-attack1.png b/images/elvish-rider-attack1.png new file mode 100644 index 00000000000..4707acd0fab Binary files /dev/null and b/images/elvish-rider-attack1.png differ diff --git a/images/elvish-rider-attack2.png b/images/elvish-rider-attack2.png new file mode 100644 index 00000000000..8975a7d6c7b Binary files /dev/null and b/images/elvish-rider-attack2.png differ diff --git a/images/elvish-rider-defend.png b/images/elvish-rider-defend.png new file mode 100644 index 00000000000..e4a9a5fe8f5 Binary files /dev/null and b/images/elvish-rider-defend.png differ diff --git a/images/elvish-rider.png b/images/elvish-rider.png new file mode 100644 index 00000000000..c5326915e5f Binary files /dev/null and b/images/elvish-rider.png differ