Moved the whole Dwarvish Runesmith line from SoF to core,

...replaced the old sprites with Sleepwalker's new (unanimated) ones,
made some tweaks to the experience limits and recruit costs and
removed the old core version of Dwarvish Runemaster.

data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runemaster.cfg

@@ -1,83 +0,0 @@
-#textdomain wesnoth-sof
-[unit_type]
-    id=Dwarvish Runemaster_alt
-    name= _ "Dwarvish Runemaster"
-    race=dwarf
-    image=units/dwarves/runemasteralt.png
-    profile="portraits/dwarves/runemaster.png"
-    hitpoints=48
-    movement_type=dwarvishfoot
-    [resistance]
-        blade=50
-        pierce=60
-        impact=60
-    [/resistance]
-    movement=4
-    level=3
-    alignment=neutral
-    cost=50
-    usage=fighter
-    experience=150
-    advances_to=null
-    {AMLA_DEFAULT}
-    description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
-    {DEFENSE_ANIM "units/dwarves/runemasteralt-defend.png" "units/dwarves/runemasteralt.png" {SOUND_LIST:DWARF_HIT} }
-    die_sound={SOUND_LIST:DWARF_DIE}
-    [portrait]
-        size=400
-        side="left"
-        mirror="false"
-        image="portraits/dwarves/transparent/runemaster.png"
-    [/portrait]
-    [portrait]
-        size=400
-        side="right"
-        mirror="true"
-        image="portraits/dwarves/transparent/runemaster.png"
-    [/portrait]
-    [attack]
-        name=hammer
-        description= _"hammer"
-        icon=attacks/hammer-dwarven-runic.png
-        type=impact
-        [specials]
-            {WEAPON_SPECIAL_MAGICAL}
-        [/specials]
-        range=melee
-        damage=18
-        number=2
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=hammer
-        [/filter_attack]
-        [frame]
-            begin=-200
-            end=-100
-            image=units/dwarves/runemasteralt-attack1.png
-        [/frame]
-        [if]
-            hits=yes
-            [frame]
-                begin=-100
-                end=100
-                image=units/dwarves/runemasteralt-attack2.png
-                sound=mace.wav
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                begin=-100
-                end=100
-                image=units/dwarves/runemasteralt-attack2.png
-                sound={SOUND_LIST:MISS}
-            [/frame]
-        [/else]
-        [frame]
-            begin=100
-            end=175
-            image=units/dwarves/runemasteralt-attack3.png
-        [/frame]
-    [/attack_anim]
-[/unit_type]

data/core/units/dwarves/Arcanister.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-sof
+#textdomain wesnoth-units
 [unit_type]
     id=Dwarvish Arcanister
     name= _ "Dwarvish Arcanister"
@@ -6,6 +6,7 @@
     race=dwarf
     image=units/dwarves/arcanister.png
     profile="portraits/dwarves/runemaster.png"
+    {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=54
     movement_type=dwarvishfoot
     [resistance]
@@ -16,14 +17,20 @@
     movement=4
     level=4
     alignment=neutral
-    cost=50
+    cost=80
+    undead_variation=dwarf
     usage=fighter
     advances_to=null
     experience=150
+#ifdef ENABLE_DWARVISH_ARCANISTER
+    [advancefrom]
+        unit=Dwarvish Runemaster
+        experience=210
+    [/advancefrom]
+#endif
     {AMLA_DEFAULT}
     description= _ "The most powerful of all the runecrafters, the Dwarvish Arcanister destroys wounded enemies almost instantly, and rarely fails to cause a wound when that is his intent. His skill in runecrafting is unrivaled, and the glyphs he carves into his weapons and armor deflect the blows of his enemies."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
-    {DEFENSE_ANIM_RANGE "units/dwarves/arcanister-defend.png" "units/dwarves/arcanister.png" {SOUND_LIST:DWARF_HIT} melee}
-    {DEFENSE_ANIM_RANGE "units/dwarves/arcanister-defend-ranged.png" "units/dwarves/arcanister.png" {SOUND_LIST:DWARF_HIT} ranged}
+    {DEFENSE_ANIM "units/dwarves/arcanister.png" "units/dwarves/arcanister.png" {SOUND_LIST:DWARF_HIT} }
     die_sound={SOUND_LIST:DWARF_DIE}
     [portrait]
         size=400
@@ -53,17 +60,18 @@
         [filter_attack]
             name=hammer
         [/filter_attack]
+        offset=0.0~0.3,0.3~0.5,0.5~0.6,0.6~0.5,0.5~0.3,0.3~0.0
         [frame]
-            begin=-200
+            begin=-350
             end=-100
-            image=units/dwarves/arcanister-attack1.png
+            image=units/dwarves/arcanister.png
         [/frame]
         [if]
             hits=yes
             [frame]
                 begin=-100
-                end=100
-                image=units/dwarves/arcanister-attack2.png
+                end=300
+                image=units/dwarves/arcanister.png
                 sound=mace.wav
             [/frame]
         [/if]
@@ -71,15 +79,10 @@
             hits=no
             [frame]
                 begin=-100
-                end=100
-                image=units/dwarves/arcanister-attack2.png
+                end=300
+                image=units/dwarves/arcanister.png
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
-        [frame]
-            begin=100
-            end=175
-            image=units/dwarves/arcanister-attack3.png
-        [/frame]
     [/attack_anim]
 [/unit_type]

data/core/units/dwarves/Runemaster.cfg

@@ -2,25 +2,29 @@
 [unit_type]
     id=Dwarvish Runemaster
     name= _ "Dwarvish Runemaster"
-    # wmllint: general spelling runemaster runemasters
     race=dwarf
     image="units/dwarves/runemaster.png"
     profile="portraits/dwarves/runemaster.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
-    hitpoints=75
+    hitpoints=48
     movement_type=dwarvishfoot
-    movement=5
-    experience=150
+    [resistance]
+        blade=50
+        pierce=60
+        impact=60
+    [/resistance]
+    movement=4
     level=3
     alignment=neutral
+    cost=50
+    undead_variation=dwarf
+    usage=fighter
+    experience=150
     advances_to=null
     {AMLA_DEFAULT}
-    undead_variation=dwarf
-    cost=60
-    usage=fighter
-    description= _ "Dwarven magic most often manifests itself by the inscription of runes in the surface of an object, which by their mere presence somehow imbue it with power. Though rarely seen in combat, a master of these runes can put them to terrifying use."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
+    description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
+    {DEFENSE_ANIM "units/dwarves/runemaster.png" "units/dwarves/runemaster.png" {SOUND_LIST:DWARF_HIT} }
     die_sound={SOUND_LIST:DWARF_DIE}
-    {DEFENSE_ANIM "units/dwarves/runemaster-defend.png" "units/dwarves/runemaster.png" {SOUND_LIST:DWARF_HIT} }
     [portrait]
         size=400
         side="left"
@@ -34,106 +38,33 @@
         image="portraits/dwarves/transparent/runemaster.png"
     [/portrait]
     [attack]
-        name=runic hammer
-        description=_"runic hammer"
-        type=impact
-        range=melee
-        damage=14
-        number=3
+        name=hammer
+        description= _"hammer"
         icon=attacks/hammer-dwarven-runic.png
-    [/attack]
-    [attack]
-        name=lightning bolt
-        description=_"lightning bolt"
-        icon=attacks/lightning.png
-        type=fire
-        range=ranged
-        damage=14
-        number=2
+        type=impact
         [specials]
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
+        range=melee
+        damage=18
+        number=2
     [/attack]
-    [idle_anim]
-        {STANDARD_IDLE_FILTER}
-        start_time=0
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-3.png"
-        [/frame]
-        [frame]
-            duration=200
-            image="units/dwarves/runemaster-idle-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-6.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-7.png"
-        [/frame]
-        [frame]
-            duration=200
-            image="units/dwarves/runemaster-idle-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-6.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-7.png"
-        [/frame]
-        [frame]
-            duration=600
-            image="units/dwarves/runemaster-idle-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-5.png"
-        [/frame]
-        [frame]
-            duration=300
-            image="units/dwarves/runemaster-idle-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-idle-1.png"
-        [/frame]
-    [/idle_anim]
     [attack_anim]
         [filter_attack]
-            name=runic hammer
+            name=hammer
         [/filter_attack]
+        offset=0.0~0.3,0.3~0.5,0.5~0.6,0.6~0.5,0.5~0.3,0.3~0.0
         [frame]
-            begin=-300
-            end=-200
-            image=units/dwarves/runemaster-attack1.png
-        [/frame]
-        [frame]
-            begin=-200
+            begin=-350
             end=-100
-            image=units/dwarves/runemaster-attack2.png
+            image=units/dwarves/runemaster.png
         [/frame]
         [if]
             hits=yes
             [frame]
                 begin=-100
-                end=100
-                image=units/dwarves/runemaster-attack3.png
+                end=300
+                image=units/dwarves/runemaster.png
                 sound=mace.wav
             [/frame]
         [/if]
@@ -141,57 +72,10 @@
             hits=no
             [frame]
                 begin=-100
-                end=100
-                image=units/dwarves/runemaster-attack3.png
+                end=300
+                image=units/dwarves/runemaster.png
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
     [/attack_anim]
-#define RUNEMASTER_LIGHTNING DIRECTION_NUMBER
-    [attack_anim]
-        [filter_attack]
-            name=lightning bolt
-        [/filter_attack]
-
-        {LIGHTNING_BOLT {DIRECTION_NUMBER} }
-
-        start_time=-250
-        [if]
-            hits=yes
-            [frame]
-                duration=50
-                image="units/dwarves/runemaster.png"
-                sound=lightning.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                duration=50
-                image="units/dwarves/runemaster.png"
-                sound=lightning-miss.ogg
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-attack1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-attack2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/dwarves/runemaster-attack1.png"
-        [/frame]
-        [frame]
-            duration=50
-            image="units/dwarves/runemaster.png"
-        [/frame]
-    [/attack_anim]
-#enddef
-
-    {RUNEMASTER_LIGHTNING 1}
-    {RUNEMASTER_LIGHTNING 2}
-    {RUNEMASTER_LIGHTNING 3}
 [/unit_type]

data/core/units/dwarves/Runesmith.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-sof
+#textdomain wesnoth-units
 [unit_type]
     id=Dwarvish Runesmith
     name= _ "Dwarvish Runesmith"
@@ -6,6 +6,7 @@
     race=dwarf
     image=units/dwarves/runesmith.png
     profile="portraits/dwarves/runemaster.png"
+    {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=40
     movement_type=dwarvishfoot
     [resistance]
@@ -17,14 +18,17 @@
     level=2
     alignment=neutral
     cost=30
+    undead_variation=dwarf
     usage=fighter
-    experience=64
-    advances_to=Dwarvish Runemaster_alt
+    experience=86
+    advances_to=Dwarvish Runemaster
+#ifdef ENABLE_DWARVISH_RUNESMITH
     [advancefrom]
         unit=Dwarvish Fighter
     [/advancefrom]
+#endif
     description= _ "Dwarvish runesmiths, now practiced at their craft, carve arcane runes into their weapons and armor. These runes infuse the runesmith’s blows with power and accuracy, and disrupt the blows of their enemies, causing them to strike softly, weakly and on the armor of the defender."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
-    {DEFENSE_ANIM "units/dwarves/runesmith-defend.png" "units/dwarves/runesmith.png" {SOUND_LIST:DWARF_HIT} }
+    {DEFENSE_ANIM "units/dwarves/runesmith.png" "units/dwarves/runesmith.png" {SOUND_LIST:DWARF_HIT} }
     die_sound={SOUND_LIST:DWARF_DIE}
     [portrait]
         size=400
@@ -54,17 +58,18 @@
         [filter_attack]
             name=hammer
         [/filter_attack]
+        offset=0.0~0.3,0.3~0.5,0.5~0.6,0.6~0.5,0.5~0.3,0.3~0.0
         [frame]
-            begin=-200
+            begin=-350
             end=-100
-            image=units/dwarves/runesmith-attack1.png
+            image=units/dwarves/runesmith.png
         [/frame]
         [if]
             hits=yes
             [frame]
                 begin=-100
-                end=100
-                image=units/dwarves/runesmith-attack2.png
+                end=300
+                image=units/dwarves/runesmith.png
                 sound=mace.wav
             [/frame]
         [/if]
@@ -72,15 +77,10 @@
             hits=no
             [frame]
                 begin=-100
-                end=100
-                image=units/dwarves/runesmith-attack2.png
+                end=300
+                image=units/dwarves/runesmith.png
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
-        [frame]
-            begin=100
-            end=175
-            image=units/dwarves/runesmith-attack3.png
-        [/frame]
     [/attack_anim]
 [/unit_type]