Move the Wose sapling and Shaman to mainline

The ranged-halo images are unused, the elven/nature halo is used
for the Shaman's ranged attack instead.

changelog.md

@@ -6,6 +6,8 @@
    * When the forum user handler is enabled, the Multiplayer Moderators group is now also used when determining if someone is a moderator. (PR#4136)
  ### Units
    * Fix typo in the Dune Ranger's advancements
+   * Move Wose Shaman from DM and WoV to core (PR#4226)
+   * Move Wose Sapling from TRoW to core (PR#4226)
  ### Miscellaneous and bug fixes
    * use the 1.15 add-ons server
 

data/campaigns/Wings_of_Victory/units/Wose_Shaman.cfg

@@ -1,86 +0,0 @@
-#textdomain wesnoth-wov
-[unit_type]
-    id=Wose Shaman
-    name=_ "Wose Shaman"
-    race=wose
-    image=units/wose-shaman.png
-    [standing_anim]
-        start_time=0
-        [frame]
-            image="units/wose-shaman.png"
-            halo="halo/wose-stationary-halo[1~8].png:150"
-        [/frame]
-    [/standing_anim]
-    {DEFENSE_ANIM units/wose-shaman.png units/wose-shaman.png {SOUND_LIST:HUMAN_OLD_HIT}}
-    die_sound=wose-die.ogg
-    [abilities]
-        {ABILITY_AMBUSH}
-        {ABILITY_REGENERATES}
-    [/abilities]
-    hitpoints=50
-    movement_type=treefolk
-    movement=3
-    experience=100
-    level=2
-    alignment=lawful
-    advances_to=null
-    {AMLA_DEFAULT}
-    cost=40
-    usage=mixed fighter
-    description=_"These woses are able to command forest plants such as vines and creepers to hinder their enemies."+{SPECIAL_NOTES}+{SPECIAL_NOTES_AMBUSH}+{SPECIAL_NOTES_REGENERATES}+{SPECIAL_NOTES_SLOW}
-    [attack]
-        name=crush
-        #textdomain wesnoth-units
-        description=_"crush"
-        type=impact
-        range=melee
-        damage=9
-        number=2
-        icon=attacks/crush-wose.png
-    [/attack]
-    [attack]
-        name=entangle
-        description=_"entangle"
-        #textdomain wesnoth-wov
-        type=impact
-        [specials]
-            {WEAPON_SPECIAL_SLOW}
-        [/specials]
-        damage=10
-        number=2
-        range=ranged
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=crush
-        [/filter_attack]
-        start_time=-500
-        {SOUND:HIT_AND_MISS wose-attack.ogg wose-miss.ogg -500}
-        #    [frame]
-        #        image=units/wose-shaman-attack-[1~2].png:[400,225]
-        #    [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=entangle
-        [/filter_attack]
-        missile_start_time=-250
-        [missile_frame]
-            offset=1.0
-            duration=250
-            image=projectiles/entangle.png
-            image_diagonal=projectiles/entangle.png
-        [/missile_frame]
-        start_time=-300
-        attack_sound_start_time=-100
-
-        [attack_sound_frame]
-            sound=entangle.wav
-        [/attack_sound_frame]
-
-        [frame]
-            image="units/wose-shaman.png"
-            halo="halo/elven/nature-halo[1~8].png:75"
-        [/frame]
-    [/attack_anim]
-[/unit_type]

data/core/units/wose/Wose_Sapling.cfg

@@ -1,12 +1,12 @@
-#textdomain wesnoth-trow
+#textdomain wesnoth-units
 [unit_type]
     [base_unit]
         id=Wose
     [/base_unit]
     id=Wose Sapling
     name= _ "Wose Sapling"
-    image="units/wose-sapling.png"
-    {DEFENSE_ANIM "units/wose-sapling-defend.png" "units/wose-sapling.png" wose-hit.ogg }
+    image="units/woses/wose-sapling.png"
+    {DEFENSE_ANIM "units/woses/wose-sapling-defend.png" "units/woses/wose-sapling.png" wose-hit.ogg }
     hitpoints=26
     experience=25
     level=0
@@ -22,13 +22,13 @@
         start_time=-500
         {SOUND:HIT_AND_MISS wose-attack.ogg wose-miss.ogg -500}
         [frame]
-            image="units/wose-sapling.png:400"
+            image="units/woses/wose-sapling.png:400"
         [/frame]
         [frame]
-            image="units/wose-sapling-attack.png:150"
+            image="units/woses/wose-sapling-attack.png:150"
         [/frame]
         [frame]
-            image="units/wose-sapling.png:75"
+            image="units/woses/wose-sapling.png:75"
         [/frame]
     [/attack_anim]
 [/unit_type]

data/core/units/wose/Wose_Shaman.cfg

@@ -1,17 +1,23 @@
-#textdomain wesnoth-dm
+#textdomain wesnoth-units
 [unit_type]
     id=Wose Shaman
     name=_ "Wose Shaman"
     race=wose
-    image=units/wose-shaman.png
+    image=units/woses/wose-shaman.png
     [standing_anim]
         start_time=0
         [frame]
-            image="units/wose-shaman.png"
-            halo="halo/wose-stationary-halo[1~8].png:150"
+            image="units/woses/wose-shaman.png"
+            halo="halo/woses/shaman-stationary-halo[1~8].png:150"
         [/frame]
     [/standing_anim]
-    {DEFENSE_ANIM units/wose-shaman.png units/wose-shaman.png {SOUND_LIST:HUMAN_OLD_HIT}}
+    {DEFENSE_ANIM units/woses/wose-shaman.png units/woses/wose-shaman.png {SOUND_LIST:HUMAN_OLD_HIT}}
+#ifdef ENABLE_WOSE_SHAMAN
+    [advancefrom]
+        unit=Wose
+        experience=80
+    [/advancefrom]
+#endif
     die_sound=wose-die.ogg
     [abilities]
         {ABILITY_AMBUSH}
@@ -30,7 +36,6 @@
     description=_"These woses are able to command forest plants such as vines and creepers to hinder their enemies."+{SPECIAL_NOTES}+{SPECIAL_NOTES_AMBUSH}+{SPECIAL_NOTES_REGENERATES}+{SPECIAL_NOTES_SLOW}
     [attack]
         name=crush
-        #textdomain wesnoth-units
         description=_"crush"
         type=impact
         range=melee
@@ -41,7 +46,6 @@
     [attack]
         name=entangle
         description=_"entangle"
-        #textdomain wesnoth-dm
         type=impact
         [specials]
             {WEAPON_SPECIAL_SLOW}
@@ -57,7 +61,7 @@
         start_time=-500
         {SOUND:HIT_AND_MISS wose-attack.ogg wose-miss.ogg -500}
         #    [frame]
-        #        image=units/wose-shaman-attack-[1~2].png:[400,225]
+        #        image=units/woses/wose-shaman-attack-[1~2].png:[400,225]
         #    [/frame]
     [/attack_anim]
     [attack_anim]
@@ -79,7 +83,7 @@
         [/attack_sound_frame]
 
         [frame]
-            image="units/wose-shaman.png"
+            image="units/woses/wose-shaman.png"
             halo="halo/elven/nature-halo[1~8].png:75"
         [/frame]
     [/attack_anim]