Merge pull request #631 from Domaxs/master

Some Bug Fixes

avatar - four nations restored/common/special_troops/00_special_troops.txt

@@ -1,14 +1,3 @@
-horse_archers = { 
-	morale = 3
-	maintenance = 4
-	phase_skirmish_attack = 4
-	phase_melee_attack = 3
-	phase_pursue_attack = 7
-	phase_skirmish_defense = 4
-	phase_melee_defense = 4
-	phase_pursue_defense = 5
-	base_type = light_cavalry
-}
 
 #war_elephants = {
 #	morale = 15
@@ -130,6 +119,18 @@ air_benders = {
 	base_type = heavy_infantry
 }
 
+dragon_riders = {
+	morale = 1000
+	maintenance = 20
+	phase_skirmish_attack = 200
+	phase_melee_attack = 75
+	phase_pursue_attack = 250
+	phase_skirmish_defense = 80
+	phase_melee_defense = 70
+	phase_pursue_defense = 45
+	base_type = heavy_cavalry
+}
+
 sky_bison = {
 	morale = 20
 	maintenance = 5
@@ -142,14 +143,15 @@ sky_bison = {
 	base_type = heavy_cavalry
 }
 
-dragon_riders = {
-	morale = 1000
-	maintenance = 20
-	phase_skirmish_attack = 200
-	phase_melee_attack = 75
-	phase_pursue_attack = 250
-	phase_skirmish_defense = 80
-	phase_melee_defense = 70
-	phase_pursue_defense = 45
-	base_type = heavy_cavalry
+horse_archers = { 
+	morale = 3
+	maintenance = 4
+	phase_skirmish_attack = 4
+	phase_melee_attack = 3
+	phase_pursue_attack = 7
+	phase_skirmish_defense = 4
+	phase_melee_defense = 4
+	phase_pursue_defense = 5
+	base_type = light_cavalry
 }
+

avatar - four nations restored/interface/atla_2.gfx

@@ -107,30 +107,31 @@ spriteTypes = {
 		norefcount = yes
 		effectFile = "gfx/FX/buttonstate.lua"
 	}
+
 	spriteType = {
-		name = "GFX_imperial_ambitions_2"
-		texturefile = "gfx/interface/imperial_ambitions_2.dds"
+		name = "GFX_imperial_ambitions_3"
+		texturefile = "gfx/interface/imperial_ambitions_3.dds"
 		noOfFrames = 1
 		norefcount = yes
 		effectFile = "gfx/FX/buttonstate.lua"
 	}
 	spriteType = {
-		name = "GFX_imperial_ambitions_3"
-		texturefile = "gfx/interface/imperial_ambitions_1.dds"
+		name = "GFX_imperial_ambitions_4"
+		texturefile = "gfx/interface/imperial_ambitions_4.dds"
 		noOfFrames = 1
 		norefcount = yes
 		effectFile = "gfx/FX/buttonstate.lua"
 	}
 	spriteType = {
-		name = "GFX_imperial_ambitions_4"
-		texturefile = "gfx/interface/imperial_ambitions_1.dds"
+		name = "GFX_imperial_ambitions_5"
+		texturefile = "gfx/interface/imperial_ambitions_3.dds"
 		noOfFrames = 1
 		norefcount = yes
 		effectFile = "gfx/FX/buttonstate.lua"
 	}
 	spriteType = {
-		name = "GFX_imperial_ambitions_5"
-		texturefile = "gfx/interface/imperial_ambitions_3.dds"
+		name = "GFX_imperial_ambitions_6"
+		texturefile = "gfx/interface/imperial_ambitions_2.dds"
 		noOfFrames = 1
 		norefcount = yes
 		effectFile = "gfx/FX/buttonstate.lua"

avatar - four nations restored/interface/unitpanel.gfx

@@ -244,7 +244,7 @@ spriteTypes = {
 		texturefile = "gfx\\interface\\unitpanel_specialunits_smallstrip.dds"
 		noOfFrames = 9
 	}
-	
+
 	spriteType = {
 		name = "GFX_unitpanel_specialtroops_bigstrip"
 		texturefile = "gfx\\interface\\unitpanel_specialunits_bigstrip.dds"

avatar - four nations restored/localisation/000_new_imperialism.csv

@@ -4,14 +4,14 @@ imperial_ambitions_0;Destiny of the Fire Nation;;;;;;;;;;;;;x;
 imperial_ambitions_0_desc;The time has come for change in the world. This will open a new path for the Fire Nation;;;;;;;;;;;;;x;
 imperial_ambitions_1;The Colonies;;;;;;;;;;;;;x;
 imperial_ambitions_1_desc;In your hands is the greatest empire in history. The time has come to share that prosperity with the world. Numerous areas have been identified as the ideal location to establish what might be the first of many colonies.;;;;;;;;;;;;;x;
-imperial_ambitions_2;Colony Settlements;;;;;;;;;;;;;x;
-imperial_ambitions_2_desc;Now that our foothold in the Earth Kingdom is secure, we can send more waves of colonists to settle in the area. It will take a small investment from the royal treasury to ensure our subjects have everything they need to establish any new colonies.;;;;;;;;;;;;;x;
-imperial_ambitions_3;Found Imperialism;;;;;;;;;;;;;x;
-imperial_ambitions_3_desc;It is time to begin a new chapter in Fire Nation history. There should be no higher authority in this world than the Firelord, and all loyal subjects should vow their undying loyalty. More so, it is time to show the rest of the world the power of the superior element. ;;;;;;;;;;;;;x;
-imperial_ambitions_4;Imperial Pride;;;;;;;;;;;;;x;
-imperial_ambitions_4_desc;It is time to embark upon a campaign to remind this nation of it's pride. Military parades shall be held in the cities, festivals in the outlying villages. They should all know without a doubt that we are the most cultured and advanced nation in history.;;;;;;;;;;;;;x;
-imperial_ambitions_5;The Waking Dragon;;;;;;;;;;;;;x;
-imperial_ambitions_5_desc;It is time to usher in an era of industry for the nation. By building factories to take the best advantage of our resources, we will improve our wealth and military strength.;;;;;;;;;;;;;x;
+# imperial_ambitions_2;Colony Settlements;;;;;;;;;;;;;x;
+# imperial_ambitions_2_desc;Now that our foothold in the Earth Kingdom is secure, we can send more waves of colonists to settle in the area. It will take a small investment from the royal treasury to ensure our subjects have everything they need to establish any new colonies.;;;;;;;;;;;;;x;
+imperial_ambitions_4;Found Imperialism;;;;;;;;;;;;;x;
+imperial_ambitions_4_desc;It is time to begin a new chapter in Fire Nation history. There should be no higher authority in this world than the Firelord, and all loyal subjects should vow their undying loyalty. More so, it is time to show the rest of the world the power of the superior element. ;;;;;;;;;;;;;x;
+imperial_ambitions_5;Imperial Pride;;;;;;;;;;;;;x;
+imperial_ambitions_5_desc;It is time to embark upon a campaign to remind this nation of it's pride. Military parades shall be held in the cities, festivals in the outlying villages. They should all know without a doubt that we are the most cultured and advanced nation in history.;;;;;;;;;;;;;x;
+imperial_ambitions_6;The Waking Dragon;;;;;;;;;;;;;x;
+imperial_ambitions_6_desc;It is time to usher in an era of industry for the nation. By building factories to take the best advantage of our resources, we will improve our wealth and military strength.;;;;;;;;;;;;;x;
 imperial_ambitions_12;Prepare Air Temple Attack;;;;;;;;;;;;;x;
 imperial_ambitions_12_desc;The Avatar is dead and has been reborn into the Air Nomads. As long as they exist, the Fire Nation is threatened. When the Great Comet arrives, we must seize our destiny and destroy the Airbenders. With one element removed from the world forever, the Avatar Cycle will surely be destroyed.;;;;;;;;;;;;;x;
 imperial_ambitions_13;Fire Supremacy;;;;;;;;;;;;;x;