Move the wose sapling and shaman to mainline

wesnoth · Oct 24, 2018 · b92ac3e · b92ac3e
1 parent 1740952
commit b92ac3e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/...noth/images/units/wose-sapling-attack.png → ...mages/units/woses/wose-sapling-attack.png b/...noth/images/units/wose-sapling-attack.png → ...mages/units/woses/wose-sapling-attack.png
diff --git a/...noth/images/units/wose-sapling-defend.png → ...mages/units/woses/wose-sapling-defend.png b/...noth/images/units/wose-sapling-defend.png → ...mages/units/woses/wose-sapling-defend.png
diff --git a/..._Of_Wesnoth/images/units/wose-sapling.png → .../core/images/units/woses/wose-sapling.png b/..._Of_Wesnoth/images/units/wose-sapling.png → .../core/images/units/woses/wose-sapling.png
diff --git a/...dors_Memoirs/images/units/wose-shaman.png → data/core/images/units/woses/wose-shaman.png b/...dors_Memoirs/images/units/wose-shaman.png → data/core/images/units/woses/wose-shaman.png
diff --git a/...he_Rise_Of_Wesnoth/units/Wose_Sapling.cfg → data/core/units/wose/Wose_Sapling.cfg b/...he_Rise_Of_Wesnoth/units/Wose_Sapling.cfg → data/core/units/wose/Wose_Sapling.cfg
diff --git a/...s/Delfadors_Memoirs/units/Wose_Shaman.cfg → data/core/units/wose/Wose_Shaman.cfg b/...s/Delfadors_Memoirs/units/Wose_Shaman.cfg → data/core/units/wose/Wose_Shaman.cfg
@@ -12,6 +12,12 @@
         [/frame]
     [/standing_anim]
     {DEFENSE_ANIM units/wose-shaman.png units/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}