Merge pull request #1227 from Warcraft-GoA-Development-Team/new-chara…

…cters

New characters

common/coat_of_arms/coat_of_arms/00_wc_landed_titles.txt

@@ -230,6 +230,24 @@ k_gilneas = {
 		instance = { position = { 0.5 @single_charge_position } }
 	}
 }
+d_gilneas = {
+	pattern = "pattern_solid.dds"
+	color1 = rgb { 33 40 56 }
+	colored_emblem = {
+		texture = "ce_greymane.dds"
+		color1 = rgb { 129 19 19 }
+		instance = { position = { 0.5 @single_charge_position } }
+	}	
+}
+c_gilneas = {
+	pattern = "pattern_solid.dds"
+	color1 = "black"
+	colored_emblem = {
+		texture = "ce_greymane.dds"
+		color1 = rgb { 215 158 71 }
+		instance = { position = { 0.5 @single_charge_position } }
+	}	
+}
 
 ### Stormwind
 
@@ -863,6 +881,17 @@ d_darkspear = {
 	}
 }
 
+d_dulzin = {
+	pattern = "pattern_solid.dds"
+	color1 = "white"
+	colored_emblem = {
+		texture = "ce_rune_orc_Warcraft1.dds"
+		color1 = "black"
+		color2 = "red"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+
 ### Ogre ###
 e_gorian_empire = {
 	pattern = "pattern_solid.dds"
@@ -873,6 +902,16 @@ e_gorian_empire = {
 		instance = { position = { 0.5 @single_charge_position } }
 	}
 }
+d_stonemaul = {
+	pattern = "pattern_solid.dds"
+	color1 = "white"
+	colored_emblem = {
+		texture = "ce_ogre1.dds"
+		color1 = "red"
+		color2 = "black"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
 
 ### SCOURGE ###
 
@@ -1122,4 +1161,60 @@ custom_eastern_theramore = {
 			scale={ 0.870000 0.930000 }
 		}
 	}
+}
+
+e_green_dragonflight = {
+	pattern = "pattern_solid.dds"
+	color1 = "green"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "green"
+		color2 = "green"
+		color3 = "green"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+e_black_dragonflight = {
+	pattern = "pattern_solid.dds"
+	color1 = "black"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "black"
+		color2 = "black"
+		color3 = "black"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+e_red_dragonflight = {
+	pattern = "pattern_solid.dds"
+	color1 = "red"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "red"
+		color2 = "red"
+		color3 = "red"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+e_blue_dragonflight = {
+	pattern = "pattern_solid.dds"
+	color1 = "blue"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "blue"
+		color2 = "blue"
+		color3 = "blue"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+e_bronze_dragonflight = {
+	pattern = "pattern_solid.dds"
+	color1 = rgb { 205 127 50 }
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = rgb { 205 127 50 }
+		color2 = rgb { 205 127 50 }
+		color3 = rgb { 205 127 50 }
+		instance = { position = { 0.5 @single_charge_position } }
+	}
 }

common/coat_of_arms/coat_of_arms/wc_dynasties.txt

@@ -647,3 +647,72 @@ pattern="pattern_solid.dds"
 		texture="ce_african_frame_01.dds"}
 	}
 pygmy6 = house_duna
+
+### Dragons ###
+38000 = {
+	pattern = "pattern_solid.dds"
+	color1 = "green"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "green"
+		color2 = "green"
+		color3 = "green"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+38050 = {
+	pattern = "pattern_solid.dds"
+	color1 = "black"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "black"
+		color2 = "black"
+		color3 = "black"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+38100 = {
+	pattern = "pattern_solid.dds"
+	color1 = "red"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "red"
+		color2 = "red"
+		color3 = "red"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+38150 = {
+	pattern = "pattern_solid.dds"
+	color1 = "blue"
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = "blue"
+		color2 = "blue"
+		color3 = "blue"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+38200 = {
+	pattern = "pattern_solid.dds"
+	color1 = rgb { 205 127 50 }
+	colored_emblem = {
+		texture = "ce_dragon.dds"
+		color1 = rgb { 205 127 50 }
+		color2 = rgb { 205 127 50 }
+		color3 = rgb { 205 127 50 }
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+
+### Ogres ###
+42000 = {
+	pattern = "pattern_solid.dds"
+	color1 = "white"
+	colored_emblem = {
+		texture = "ce_ogre1.dds"
+		color1 = "red"
+		color2 = "black"
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}

common/culture/cultures/wc_highborne.txt

@@ -38,7 +38,7 @@
 
 high_elf = {
 	color = rgb { 255 255 0 }
-	
+
 	parents = { highborne }
 	created = 2.1.1
 

common/culture/name_lists/wc_amphibian.txt

@@ -23,23 +23,23 @@
 	male_names = {
 		Gmrmh Ghgrm Ghmgh Ghrhm Ghmlgh Gmghmr Ghgmhr Ghgmlgh Ghgmlmr Ghhgmh Ghhmlg
         Ghlml Ghmhlmr Ghmlghml Ghmlgmr Ghmmgm Ghmrghm Ghrmh Glrgm Gmghg Gmghgmm Gmghl Gmgml Gmlgm Gmlgmgm Gmlhg
-        Gmllr Gmmlg Gmmlgh Gmmlmg Gmrgml Gmmrhg Gmrhm Gmrml Gmrmlh Gmrmrl Gmrrgm Gmrrl Grgmgh Grml Hggmm Hghhg Hgmghr Hhhghl
+        Gmllr Gmmlg Gmmlgh Gmmlmg Gmrgml Gmmrhg Gmrhm Gmrml Gmrmlh Gmrmrl Gmrrgm Gmrrl Grgmgh Grml Grmlrml Hggmm Hghhg Hgmghr Hhhghl
         Hhrml Hlgghm Hllh Hllml Hlmrm Hmghh Hmghhlm Hmgmr Hmlgmh Hmlhgm Hmlmrl Hmml Hmrhr Lghmr Lghhg Lghml Lgmggm Lgmrr
         Lhmh Llgmmr Lhlmr Lhmrg Lmghm Lmhgm Lmlrml Lmrghmr Lmrhgh Lrmrm Mggmr Mghgh Mgmrgh Mgmgm Mgmgmr Mgmlgm Mgmlh Mgmrg Mhgmr
         Mhlgh Mlggm Mlghhr Mlghlmr Mlgmgm Mllhl Mllhlrr Mlrlg Mlmhg Mlmlrmr Mlmrll Mlmrmr Mlmrr Mlmrrgh Mlrg
-        Mlrgg Mlrlgh Mlrmlh Mrgghl Mrghgm Mrghmg Mrghmlr Mrgmmrg Mrgmmrgm Mrgmr Mrhgh Mrhgm Mrlgmgh Mrlhg Mrlhr Mrlhrh
-        Mrmlgmh Mrmlhl Mrmmrhl Mrmrghgh Mrrghmr Mrmrlh Mrmrml Mrrmh Rghmghml Rhmll Rhmrl Rhgrml Rhmrml Rmgmr Rmlgm Rmlgmg Rmll Rmlmh
+        Mlrgg Mlrlgh Mlrmlh Mrgghl Mrghgm Mrghmg Mrghmlr Mrgmmrg Mrgmmrgm Mrgmr Mrhgh Mrhgm Mrlgmgh Mrlgrlrl Mrlhg Mrlhr Mrlhrh
+        Mrmlgmh Mrmlhl Mrmmrhl Mrmrghgh Mrrghmr Mrrklr Mrmrlh Mrmrml Mrrmh Rghmghml Rhmll Rhmrl Rhgrml Rhmrml Rmgmr Rmlgm Rmlgmg Rmll Rmlmh
         Rmmrh Rmrhg Rmrlgh Rlgmh
 	}
 	female_names = {
 		Gmrmh Ghgrm Ghmgh Ghrhm Ghmlgh Gmghmr Ghgmhr Ghgmlgh Ghgmlmr Ghhgmh Ghhmlg
         Ghlml Ghmhlmr Ghmlghml Ghmlgmr Ghmmgm Ghmrghm Ghrmh Glrgm Gmghg Gmghgmm Gmghl Gmgml Gmlgm Gmlgmgm Gmlhg
-        Gmllr Gmmlg Gmmlgh Gmmlmg Gmrgml Gmmrhg Gmrhm Gmrml Gmrmlh Gmrmrl Gmrrgm Gmrrl Grgmgh Grml Hggmm Hghhg Hgmghr Hhhghl
+        Gmllr Gmmlg Gmmlgh Gmmlmg Gmrgml Gmmrhg Gmrhm Gmrml Gmrmlh Gmrmrl Gmrrgm Gmrrl Grgmgh Grml Grmlrml Hggmm Hghhg Hgmghr Hhhghl
         Hhrml Hlgghm Hllh Hllml Hlmrm Hmghh Hmghhlm Hmgmr Hmlgmh Hmlhgm Hmlmrl Hmml Hmrhr Lghmr Lghhg Lghml Lgmggm Lgmrr
         Lhmh Llgmmr Lhlmr Lhmrg Lmghm Lmhgm Lmlrml Lmrghmr Lmrhgh Lrmrm Mggmr Mghgh Mgmrgh Mgmgm Mgmgmr Mgmlgm Mgmlh Mgmrg Mhgmr
         Mhlgh Mlggm Mlghhr Mlghlmr Mlgmgm Mllhl Mllhlrr Mlrlg Mlmhg Mlmlrmr Mlmrll Mlmrmr Mlmrr Mlmrrgh Mlrg
-        Mlrgg Mlrlgh Mlrmlh Mrgghl Mrghgm Mrghmg Mrghmlr Mrgmmrg Mrgmmrgm Mrgmr Mrhgh Mrhgm Mrlgmgh Mrlhg Mrlhr Mrlhrh
-        Mrmlgmh Mrmlhl Mrmmrhl Mrmrghgh Mrrghmr Mrmrlh Mrmrml Mrrmh Rghmghml Rhmll Rhmrl Rhgrml Rhmrml Rmgmr Rmlgm Rmlgmg Rmll Rmlmh
+        Mlrgg Mlrlgh Mlrmlh Mrgghl Mrghgm Mrghmg Mrghmlr Mrgmmrg Mrgmmrgm Mrgmr Mrhgh Mrhgm Mrlgmgh Mrlgrlrl Mrlhg Mrlhr Mrlhrh
+        Mrmlgmh Mrmlhl Mrmmrhl Mrmrghgh Mrrghmr Mrrklr Mrmrlh Mrmrml Mrrmh Rghmghml Rhmll Rhmrl Rhgrml Rhmrml Rmgmr Rmlgm Rmlgmg Rmll Rmlmh
         Rmmrh Rmrhg Rmrlgh Rlgmh
 	}
 	dynasty_of_location_prefix = ""

common/culture/name_lists/wc_argusean.txt

@@ -32,7 +32,7 @@
 		Momdall Momdarua Momelle Momlun Momrala Moun Muborette Muhaelli Muhlae Muhri Muhrmere Muhstra Mula Muloaan Mumdoally Mumon Mumroera	 Mumrtia Mumsora Musdotia Negin Nehelle Nehirah Nehri Nenii Nerette Nesela Nesnii Nurghegin Nurgraa Nurgrakua
 		Nurmae Nurmis Nurstraa Nurzi Nuslaa Nuslae Nusmis Nusranii Nusrrii Phaebhaa Phaeere Phaeine Phaelun Phaleette Phasasa Phehaan Pheoh Pheralun Phestra Pheti Remedelaa Remehaa Remeine Remgin Remlaa Remsalaana Rukdua Rukhmena Rukla Seboela Selari
 		Seratra Seslaana Sesoh Sisaraa Sisemon Siszi Suldmis Sulhaa Sulla Sulnora Sultia Thelabaere Theladine Theladomae Thelahall Thelaloelle Thelasedine Thelatraa Thelbeelli Thelheret Thellaca Thellae Thellastraa Thelrah Thelsetia Trearaa Treboall
-		Treloette Trelorette Tretaa Trially Trilerii Tristra Tritraa Umdaun Umdetaa Umelle Umin Ummae Umrasa Uraboelli Urahoera Urarii Valdakua Valromon Valuheally Valuhi Valuloally		
+		Treloette Trelorette Tretaa Trially Trilerii Tristra Tritraa Umdaun Umdetaa Umelle Umin Ummae Umrasa Uraboelli Urahoera Urarii Valdakua Valromon Valuheally Valuhi Valuloally Uuna	
 	}
 	dynasty_of_location_prefix = ""
 	founder_named_dynasties = yes

common/culture/name_lists/wc_avianic.txt

@@ -38,8 +38,8 @@
 		Mamde Meshonna Methiedi Milra Miri Munkos Myngeh Nalnondi Namdada Nithera
 		Nuglanin Nyrveva Phabo Phagrien Phese Philme Phishis Phugnes Phusha Phyldi
 		Phylnata Phythirra Ralmianne Ramdo Rane Riga Rili Rilmolle Rinta Rungalda
-		Rurmondrin Rylmo Sadan Sasha Senkotha Sermo Shalneti Shanti Shelme Sherlori
-		Shivivis Shuntiale Shygredreh Shyre Sili Simgi Sizere Ulande Ulenda Ulridre
+		Rurmondrin Rylmo Sadan Sasha Senkotha Sermo Shalneti Shanti Shelda Shelme Sherlori
+		Shivivis Shuntiale Shygredreh Shyre Sili Simgi Sirana Sizere Ulande Ulenda Ulridre
 		Ungilmi Valre Vanaheh Varnol Vegne Vegrih Vinde Visa Vrunonde Vruthowe Vryrlo
 		Vungin Vylmieh Vylnati Ymde Yndinis Yntas Ynte Zadindra Zango Zegan Zemgeo Zigno
 		Zingerra Zirme Zyngoneh

common/culture/name_lists/wc_darnassian.txt

@@ -75,11 +75,11 @@
 	}
 
 	male_names = {
-		Aelgorn Aldryth Allendril Andalar Andoril Anelas Anren Arantir Ardan Aren Ashelan Astalor Astran Athridas Auran Baelir Balthule  
+		Aelgorn Aldryth Allendril Andalar Andoril Anelas Anren Arantir Ardan Aren Arvell Ashelan Astalor Astran Athridas Auran Baelir Balthule  
 		Baritanas Broll Cerellean Corithras Delandros Deldren Dralith Elerion Elloric Eranril Erelas Erion Eriun Evenar Faeolas Falorn   
 		Falrin Feronas Ferryn Filandras Firondren Foriel Fyldan Gaerolas Galind Gilshalan Golras Halsteth Idras Isoraen Ithalaine Ithis    
 		Iverron Jareth Kaldon Kalidan Kara'din Karius Kartanus Keldas Kelorn Koltharius Lyrath Lyrathos Maldryn Malor Maluressian Malvor   
-		Mathiel Melador Melithar Mydrannul Myrdodan Naresir Natheril Omnuron Orendil Orenthil Orrindis Orseus Porthannius Rellian Rensar   
+		Mathiel Melador Melithar Mydrannul Myrdodan Naresir Natheril Omnuron Orendil Orenthil Orrindis Orseus Porthannius Ralaar Rellian Rensar   
 		Renthel Sarius Seiren Sheldras Taldar Talren Telaron Telonis Tenaron Thaldrys Theras Theridran Tola'thion Ulthir Valadar Valdaron  
 		Valorn Valos Valstann Vandel Vesprytus Voramus Yldan