Added two paths of advancement for Drake Fighter

* Drake Warrior
  * Drake Guard

* Drake Petit has been given a more classical flying defense

* Balanced some units

* Oh, and... Drakonians are now called Drakes!

data/game.cfg

@@ -959,9 +959,9 @@
 	[/movetype]
 
 	[movetype]
-	name=drakonianfly
+	name=drakefly
 	flies=true
-	# Drakonians are huge (easy targets) flying beast, but are different
+	# Drakes are huge (easy targets) flying beast, but are different
 	# from the classical flying unit: to fight they have to land
 	# They love caves and mountains, and above all: warmth
 		[movement costs]
@@ -1006,8 +1006,8 @@
 	[/movetype]
 
 	[movetype]
-	name=drakonianfoot
-	# These Drakonians have crippled wings - they don't fly
+	name=drakefoot
+	# These Drakes have crippled wings - they don't fly
 		[movement costs]
 		deep water=100
 		shallow water=3

data/multiplayer.cfg

@@ -417,12 +417,12 @@ id=era_default
 [/multiplayer_side]
 
 [multiplayer_side]
-	name=&drakonian-fighter.png,Drakonians
-	type=Drakonian Fighter
-	recruit=Drakonian Fighter,Drakonian Slave,Drakonian Petit,Drakonian Burner,Drakonian Mage,Drakonian Clasher
+	name=&drake-fighter.png,Drakes
+	type=Drake Warrior
+	recruit=Drake Fighter,Drake Slave,Drake Petit,Drake Burner,Drake Mage,Drake Clasher
 	terrain_liked=hm
 		[ai]
-		recruitment_pattern=fighter,fighter,archer,scout,mage
+		recruitment_pattern=fighter,fighter,archer,scout
 		[/ai]
 [/multiplayer_side]
 [/era]

data/units/Drake_Burner.cfg

@@ -1,17 +1,17 @@
 [unit]
-name=Drakonian Burner
-race=drakonian
-image=drakonian-burner.png
-image_defensive=drakonian-burner-defend.png
-hitpoints=47
-movement_type=drakonianfly
+name=Drake Burner
+race=drake
+image=drake-burner.png
+image_defensive=drake-burner-defend.png
+hitpoints=48
+movement_type=drakefly
 movement=5
 experience=56
 level=1
 alignment=neutral
 advanceto=null
-#advanceto=Drakonian FireDrake
-cost=25
+#advanceto=Fire Drake
+cost=24
 usage=archer
 unit_description=""
 get_hit_sound=groan.wav
@@ -24,12 +24,12 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-200
 		end=-50
-		image=drakonian-burner-attack-close1.png
+		image=drake-burner-attack-close1.png
 		[/frame]
 		[frame]
 		begin=-50
 		end=100
-		image=drakonian-burner-attack-close2.png
+		image=drake-burner-attack-close2.png
 		[/frame]
 		[sound]
 		time=-150
@@ -46,7 +46,9 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-250
 		end=-50
-		image=drakonian-burner-attack-ranged.png
+		image=drake-burner-attack-ranged.png
+		halo=halo/fireball1.png,halo/fireball2.png,halo/fireball3.png,halo/fireball4.png,halo/fireball5.png,halo/fireball6.png
+		halo_x,halo_y=14,-14
 		[/frame]
 		[sound]
 		time=-200
@@ -56,8 +58,8 @@ get_hit_sound=groan.wav
 		begin=-100
 		end=0
 		image=fireball.png
-		halo=fireball-halo.png
+		halo=halo/fireball7.png
+		halo_x,halo_y=14,-14
 		[/missile_frame]
 	[/attack]
-
 [/unit]

data/units/Drake_Clasher.cfg

@@ -1,16 +1,16 @@
 [unit]
-name=Drakonian Clasher
-race=drakonian
-image=drakonian-clasher.png
-image_defensive=drakonian-clasher-defend.png
+name=Drake Clasher
+race=drake
+image=drake-clasher.png
+image_defensive=drake-clasher-defend.png
 hitpoints=45
-movement_type=drakonianfoot
+movement_type=drakefoot
 movement=6
 experience=45
 level=1
 alignment=neutral
 advanceto=null
-#advanceto=Drakonian ?
+#advanceto=Drake Dualclash
 cost=19
 usage=fighter
 unit_description=""
@@ -24,22 +24,22 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-300
 		end=-200
-		image=drakonian-clasher-attack-sword1.png
+		image=drake-clasher-attack-sword1.png
 		[/frame]
 		[frame]
 		begin=-200
 		end=-100
-		image=drakonian-clasher-attack-sword2.png
+		image=drake-clasher-attack-sword2.png
 		[/frame]
 		[frame]
 		begin=-100
 		end=0
-		image=drakonian-clasher-attack-sword3.png
+		image=drake-clasher-attack-sword3.png
 		[/frame]
 		[frame]
 		begin=0
 		end=50
-		image=drakonian-clasher-attack-sword4.png
+		image=drake-clasher-attack-sword4.png
 		[/frame]
 		[sound]
 		time=-150
@@ -56,12 +56,12 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-300
 		end=-200
-		image=drakonian-clasher-attack-spear1.png
+		image=drake-clasher-attack-spear1.png
 		[/frame]
 		[frame]
 		begin=-200
 		end=-50
-		image=drakonian-clasher-attack-spear2.png
+		image=drake-clasher-attack-spear2.png
 		[/frame]
 	[/attack]
 

data/units/Drake_Fighter.cfg

@@ -1,16 +1,15 @@
 [unit]
-name=Drakonian Fighter
-race=drakonian
-image=drakonian-fighter.png
-image_defensive=drakonian-fighter-defend.png
+name=Drake Fighter
+race=drake
+image=drake-fighter.png
+image_defensive=drake-fighter-defend.png
 hitpoints=45
-movement_type=drakonianfly
+movement_type=drakefly
 movement=5
 experience=50
 level=1
 alignment=neutral
-advanceto=null
-#advanceto=Drakonian Warrior, Drakonian Guard
+advanceto=Drake Warrior,Drake Guard
 cost=22
 usage=fighter
 unit_description=""
@@ -24,12 +23,12 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-200
 		end=-50
-		image=drakonian-fighter-attack-close1.png
+		image=drake-fighter-attack-close1.png
 		[/frame]
 		[frame]
 		begin=-50
 		end=100
-		image=drakonian-fighter-attack-close2.png
+		image=drake-fighter-attack-close2.png
 		[/frame]
 		[sound]
 		time=-150
@@ -46,12 +45,12 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-300
 		end=-200
-		image=drakonian-fighter-attack-fire1.png
+		image=drake-fighter-attack-fire1.png
 		[/frame]
 		[frame]
 		begin=-200
 		end=-100
-		image=drakonian-fighter-attack-fire2.png
+		image=drake-fighter-attack-fire2.png
 		[/frame]
 		[sound]
 		time=-200
@@ -61,7 +60,8 @@ get_hit_sound=groan.wav
 		begin=-100
 		end=0
 		image=fireball.png
-		halo=fireball-halo.png
+		halo=halo/fireball7.png
+		halo_x,halo_y=14,-14
 		[/missile_frame]
 	[/attack]
 

data/units/Drake_Guard.cfg

@@ -0,0 +1,69 @@
+[unit]
+name=Drake Guard
+race=drake
+image=drake-guard.png
+image_defensive=drake-guard-defend.png
+# should be less HP, but with the "shielding" ability
+hitpoints=57
+movement_type=drakefly
+movement=5
+experience=70
+level=1
+alignment=neutral
+advanceto=null
+#advanceto=Drake Highguard
+cost=29
+usage=fighter
+#ability=shielding
+unit_description=""
+get_hit_sound=groan.wav
+	[attack]
+	name=spear
+	type=pierce
+	range=short
+	damage=9
+	number=3
+		[frame]
+		begin=-200
+		end=-50
+		image=drake-guard-attack-close1.png
+		[/frame]
+		[frame]
+		begin=-50
+		end=100
+		image=drake-guard-attack-close2.png
+		[/frame]
+		[sound]
+		time=-150
+		sound=sword-swish.wav
+		[/sound]
+	[/attack]
+
+	[attack]
+	name=fire breath
+	type=fire
+	range=long
+	damage=9
+	number=2
+		[frame]
+		begin=-300
+		end=-100
+		image=drake-guard-attack-ranged.png
+		halo=halo/fireball1.png,halo/fireball2.png,halo/fireball3.png,halo/fireball4.png,halo/fireball5.png,halo/fireball6.png
+		halo_x,halo_y=14,-14
+		[/frame]
+		[sound]
+		time=-200
+		sound=fire.wav
+		[/sound]
+		[missile_frame]
+		begin=-100
+		end=0
+		image=fireball.png
+		halo=halo/fireball7.png
+		halo_x,halo_y=14,-14
+		[/missile_frame]
+
+	[/attack]
+
+[/unit]

data/units/Drake_Mage.cfg

@@ -1,18 +1,18 @@
 [unit]
-name=Drakonian Mage
-race=drakonian
-image=drakonian-mage.png
-image_defensive=drakonian-mage-defend.png
+name=Drake Mage
+race=drake
+image=drake-mage.png
+image_defensive=drake-mage-defend.png
 hitpoints=32
-movement_type=drakonianfoot
+movement_type=drakefoot
 movement=5
 experience=55
 level=1
 alignment=neutral
 advanceto=null
-#advanceto=Drakonian Warmage
-cost=26
-usage=mage
+#advanceto=Drake Warmage
+cost=25
+usage=archer
 unit_description=""
 get_hit_sound=groan.wav
 	[attack]
@@ -24,7 +24,7 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-200
 		end=-50
-		image=drakonian-mage-attack-close.png
+		image=drake-mage-attack-close.png
 		[/frame]
 		[sound]
 		time=-150
@@ -41,7 +41,9 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-300
 		end=-100
-		image=drakonian-mage-attack-ranged-breath.png
+		image=drake-mage-attack-ranged-breath.png
+		halo=halo/fireball1.png,halo/fireball2.png,halo/fireball3.png,halo/fireball4.png,halo/fireball5.png,halo/fireball6.png
+		halo_x,halo_y=14,-14
 		[/frame]
 		[sound]
 		time=-200
@@ -51,7 +53,8 @@ get_hit_sound=groan.wav
 		begin=-100
 		end=0
 		image=fireball.png
-		halo=fireball-halo.png
+		halo=halo/fireball7.png
+		halo_x,halo_y=14,-14
 		[/missile_frame]
 	[/attack]
 
@@ -65,12 +68,12 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-300
 		end=-200
-		image=drakonian-mage-attack-ranged-staff1.png
+		image=drake-mage-attack-ranged-staff1.png
 		[/frame]
 		[frame]
 		begin=-200
 		end=-100
-		image=drakonian-mage-attack-ranged-staff2.png
+		image=drake-mage-attack-ranged-staff2.png
 		[/frame]
 		[sound]
 		time=-200
@@ -83,5 +86,4 @@ get_hit_sound=groan.wav
                 image_diagonal=magicmissile-ne.png
 		[/missile_frame]
 	[/attack]
-
 [/unit]

data/units/Drake_Petit.cfg

@@ -0,0 +1,48 @@
+[unit]
+name=Drake Petit
+race=drake
+image=drake-petit.png
+image_defensive=drake-petit-defend.png
+hitpoints=28
+movement_type=drakefly
+movement=7
+experience=30
+level=1
+alignment=neutral
+advanceto=null
+#advanceto=Drake Beak
+cost=15
+usage=scout
+unit_description=""
+get_hit_sound=groan.wav
+
+	# this drake is smaller, more agile, he doesn't need to land
+	# before fighting
+	[defense]
+	deep water=50
+	shallow water=50
+	swamp water=50
+	grassland=50
+	sand=50
+	forest=50
+	hills=50
+	mountains=50
+	village=50
+	castle=50
+	tundra=50
+	cave=80
+	[/defense]
+
+	[attack]
+	name=beak
+	type=impact
+	range=short
+	damage=5
+	number=3
+		[frame]
+		begin=-300
+		end=-50
+		image=drake-petit-attack.png
+		[/frame]
+	[/attack]
+[/unit]

data/units/Drake_Slave.cfg

@@ -1,16 +1,16 @@
 [unit]
-name=Drakonian Slave
-race=drakonian
-image=drakonian-slave.png
-image_defensive=drakonian-slave-defend.png
+name=Drake Slave
+race=drake
+image=drake-slave.png
+image_defensive=drake-slave-defend.png
 hitpoints=35
-movement_type=drakonianfoot
+movement_type=drakefoot
 movement=5
 experience=38
 level=1
 alignment=neutral
 advanceto=null
-#advanceto=Drakonian Worker
+#advanceto=Drake Worker
 cost=16
 usage=fighter
 unit_description=""
@@ -24,12 +24,12 @@ get_hit_sound=groan.wav
 		[frame]
 		begin=-200
 		end=-50
-		image=drakonian-slave-attack1.png
+		image=drake-slave-attack1.png
 		[/frame]
 		[frame]
 		begin=-50
 		end=100
-		image=drakonian-slave-attack2.png
+		image=drake-slave-attack2.png
 		[/frame]
 		[sound]
 		time=-150

data/units/Drake_Warrior.cfg

@@ -0,0 +1,66 @@
+[unit]
+name=Drake Warrior
+race=drake
+image=drake-warrior.png
+image_defensive=drake-warrior-defend.png
+hitpoints=50
+movement_type=drakefly
+movement=5
+experience=75
+level=2
+alignment=neutral
+advanceto=null
+#advanceto=Drake Flameheart
+cost=31
+usage=fighter
+unit_description=""
+get_hit_sound=groan.wav
+	[attack]
+	name=sword
+	type=blade
+	range=short
+	damage=11
+	number=3
+		[frame]
+		begin=-200
+		end=-50
+		image=drake-warrior-attack-close1.png
+		[/frame]
+		[frame]
+		begin=-50
+		end=100
+		image=drake-warrior-attack-close2.png
+		[/frame]
+		[sound]
+		time=-150
+		sound=sword-swish.wav
+		[/sound]
+	[/attack]
+
+	[attack]
+	name=fire breath
+	type=fire
+	range=long
+	damage=9
+	number=2
+		[frame]
+		begin=-300
+		end=-100
+		image=drake-warrior-attack-ranged.png
+		halo=halo/fireball1.png,halo/fireball2.png,halo/fireball3.png,halo/fireball4.png,halo/fireball5.png,halo/fireball6.png
+		halo_x,halo_y=14,-14
+		[/frame]
+		[sound]
+		time=-200
+		sound=fire.wav
+		[/sound]
+		[missile_frame]
+		begin=-100
+		end=0
+		image=fireball.png
+		halo=halo/fireball7.png
+		halo_x,halo_y=14,-14
+		[/missile_frame]
+	[/attack]
+
+[/unit]

data/units/Drakonian_Petit.cfg

@@ -1,30 +0,0 @@
-[unit]
-name=Drakonian Petit
-race=drakonian
-image=drakonian-petit.png
-image_defensive=drakonian-petit-defend.png
-hitpoints=28
-movement_type=drakonianfly
-movement=7
-experience=30
-level=1
-alignment=neutral
-advanceto=null
-#advanceto=Drakonian Beak
-cost=15
-usage=scout
-unit_description=""
-get_hit_sound=groan.wav
-	[attack]
-	name=beak
-	type=impact
-	range=short
-	damage=5
-	number=3
-		[frame]
-		begin=-300
-		end=-50
-		image=drakonian-petit-attack.png
-		[/frame]
-	[/attack]
-[/unit]