Factor the TRoW Warrior King into a generic Rayal Warrior base unit...

...plus overlay, so we can use the Royal Warrior as a base for the
various kings and princes in the canon.

data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg

@@ -1,75 +1,16 @@
 #textdomain wesnoth-trow
 [unit_type]
     id=Warrior King
+    [base_unit]
+        id=Royal Warrior
+    [/base_unit]
     name= _ "Warrior King"
-    race=human
-    gender=male
-    image="units/warrior-king.png"
-    {MAGENTA_IS_THE_TEAM_COLOR}
-    {DEFENSE_ANIM "units/warrior-king-defend.png" "units/warrior-king.png" {SOUND_LIST:HUMAN_OLD_HIT} }
-    image_leading="units/warrior-king-leading.png"
-#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
     profile=portraits/eldaric.png
-#endif
-    hitpoints=64
-    movement_type=armoredfoot
-    movement=6
-    experience=150
-    level=3
-    alignment=lawful
-    advances_to=null
-    {AMLA_DEFAULT}
-    cost=40
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_3}
     [/abilities]
-    usage=fighter
     description= _ "As the leaders of the human Kingdoms, Kings are responsible for ruling and protecting their subjects. Kings can coordinate the attacks of level 1 and 2 units, thereby increasing their fighting efficiency."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
+    # This is a somewhat elderly royal warrior
     die_sound={SOUND_LIST:HUMAN_OLD_DIE}
-    [attack]
-        name=mace
-        description= _"mace"
-        type=impact
-        range=melee
-        damage=13
-        number=3
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=mace
-        [/filter_attack]
-        [frame]
-            begin=-200
-            end=-150
-            image="units/warrior-king.png"
-        [/frame]
-        [frame]
-            begin=-150
-            end=-75
-            image="units/warrior-king-attack1.png"
-        [/frame]
-        [if]
-            hits=yes
-            [frame]
-                begin=-75
-                end=100
-                image="units/warrior-king-attack2.png"
-                sound=mace.wav
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                begin=-75
-                end=100
-                image="units/warrior-king-attack2.png"
-                sound={SOUND_LIST:MISS}
-            [/frame]
-        [/else]
-        [frame]
-            begin=100
-            end=175
-            image="units/warrior-king.png"
-        [/frame]
-    [/attack_anim]
+    {DEFENSE_ANIM "units/human-loyalists/royal-warrior-defend.png" "units/human-loyalists/royal-warrior.png" {SOUND_LIST:HUMAN_OLD_HIT} }
 [/unit_type]

data/core/units/humans/Royal_Warrior.cfg

@@ -0,0 +1,73 @@
+#textdomain wesnoth-units
+
+# This unit is intended as a base for character units representing individual 
+# kings and princes.  It should probably not be used on its own.
+
+[unit_type]
+    id=Royal Warrior
+    name= _ "Royal Warrior"
+    race=human
+    gender=male
+    image="units/human-loyalists/royal-warrior.png"
+    {MAGENTA_IS_THE_TEAM_COLOR}
+    {DEFENSE_ANIM "units/human-loyalists/royal-warrior-defend.png" "units/human-loyalists/royal-warrior.png" {SOUND_LIST:HUMAN_HIT} }
+    image_leading="units/human-loyalists/royal-warrior-leading.png"
+    hitpoints=64
+    movement_type=armoredfoot
+    movement=6
+    experience=150
+    level=3
+    alignment=lawful
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=40
+    usage=fighter
+    description= _ "Royal warriors are the kings and princes of human noble houses, armed and armored to a degree heavier than that of their knights."
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    [attack]
+        name=mace
+        description= _"mace"
+        type=impact
+        range=melee
+        damage=13
+        number=3
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+        [frame]
+            begin=-200
+            end=-150
+            image="units/human-loyalists/royal-warrior.png"
+        [/frame]
+        [frame]
+            begin=-150
+            end=-75
+            image="units/human-loyalists/royal-warrior-attack1.png"
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-75
+                end=100
+                image="units/human-loyalists/royal-warrior-attack2.png"
+                sound=mace.wav
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-75
+                end=100
+                image="units/human-loyalists/royal-warrior-attack2.png"
+                sound={SOUND_LIST:MISS}
+            [/frame]
+        [/else]
+        [frame]
+            begin=100
+            end=175
+            image="units/human-loyalists/royal-warrior.png"
+        [/frame]
+    [/attack_anim]
+[/unit_type]