Move skeleton rider, bone knight, and death squire to core

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

Hide file tree

Showing 25 changed files with 9 additions and 161 deletions.
diff --git a/data/campaigns/Liberty/images/units/undead-skeletal/boneknight.png b/data/campaigns/Liberty/images/units/undead-skeletal/boneknight.png
diff --git a/data/campaigns/Liberty/images/units/undead-skeletal/rider-attack.png b/data/campaigns/Liberty/images/units/undead-skeletal/rider-attack.png
diff --git a/data/campaigns/Liberty/images/units/undead-skeletal/rider-defend.png b/data/campaigns/Liberty/images/units/undead-skeletal/rider-defend.png
diff --git a/data/campaigns/Liberty/images/units/undead-skeletal/rider-moving.png b/data/campaigns/Liberty/images/units/undead-skeletal/rider-moving.png
diff --git a/data/campaigns/Liberty/images/units/undead-skeletal/rider.png b/data/campaigns/Liberty/images/units/undead-skeletal/rider.png
diff --git a/data/campaigns/Liberty/units/Bone_Knight.cfg b/data/campaigns/Liberty/units/Bone_Knight.cfg
diff --git a/data/campaigns/Liberty/units/Skeleton_Rider.cfg b/data/campaigns/Liberty/units/Skeleton_Rider.cfg
diff --git a/.../campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-attack.png b/.../campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-attack.png
diff --git a/.../campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-defend.png b/.../campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-defend.png
diff --git a/.../campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-moving.png b/.../campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-moving.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider.png b/data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider.png
diff --git a/...ages/units/undead-skeletal/boneknight.png → ...ages/units/undead-skeletal/boneknight.png b/...ages/units/undead-skeletal/boneknight.png → ...ages/units/undead-skeletal/boneknight.png
diff --git a/.../undead-skeletal/deathsquire-attack-1.png → .../undead-skeletal/deathsquire-attack-1.png b/.../undead-skeletal/deathsquire-attack-1.png → .../undead-skeletal/deathsquire-attack-1.png
diff --git a/.../undead-skeletal/deathsquire-attack-2.png → .../undead-skeletal/deathsquire-attack-2.png b/.../undead-skeletal/deathsquire-attack-2.png → .../undead-skeletal/deathsquire-attack-2.png
diff --git a/.../undead-skeletal/deathsquire-attack-3.png → .../undead-skeletal/deathsquire-attack-3.png b/.../undead-skeletal/deathsquire-attack-3.png → .../undead-skeletal/deathsquire-attack-3.png
diff --git a/...ts/undead-skeletal/deathsquire-defend.png → ...ts/undead-skeletal/deathsquire-defend.png b/...ts/undead-skeletal/deathsquire-defend.png → ...ts/undead-skeletal/deathsquire-defend.png
diff --git a/...s/undead-skeletal/deathsquire-leading.png → ...s/undead-skeletal/deathsquire-leading.png b/...s/undead-skeletal/deathsquire-leading.png → ...s/undead-skeletal/deathsquire-leading.png
diff --git a/...ges/units/undead-skeletal/deathsquire.png → ...ges/units/undead-skeletal/deathsquire.png b/...ges/units/undead-skeletal/deathsquire.png → ...ges/units/undead-skeletal/deathsquire.png
diff --git a/...es/units/undead-skeletal/rider-attack.png → ...es/units/undead-skeletal/rider-attack.png b/...es/units/undead-skeletal/rider-attack.png → ...es/units/undead-skeletal/rider-attack.png
diff --git a/...es/units/undead-skeletal/rider-defend.png → ...es/units/undead-skeletal/rider-defend.png b/...es/units/undead-skeletal/rider-defend.png → ...es/units/undead-skeletal/rider-defend.png
diff --git a/...es/units/undead-skeletal/rider-moving.png → ...es/units/undead-skeletal/rider-moving.png b/...es/units/undead-skeletal/rider-moving.png → ...es/units/undead-skeletal/rider-moving.png
diff --git a/...on/images/units/undead-skeletal/rider.png → ...re/images/units/undead-skeletal/rider.png b/...on/images/units/undead-skeletal/rider.png → ...re/images/units/undead-skeletal/rider.png
diff --git a/...ns/Eastern_Invasion/units/Bone_Knight.cfg → data/core/units/undead/Skele_Bone_Knight.cfg b/...ns/Eastern_Invasion/units/Bone_Knight.cfg → data/core/units/undead/Skele_Bone_Knight.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-ei
+#textdomain wesnoth-units
 
 [unit_type]
     id=Bone Knight

diff --git a/.../campaigns/Liberty/units/Death_Squire.cfg → .../core/units/undead/Skele_Death_Squire.cfg b/.../campaigns/Liberty/units/Death_Squire.cfg → .../core/units/undead/Skele_Death_Squire.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-l
+#textdomain wesnoth-units
 [unit_type]
     id=Death Squire
     name= _ "Death Squire"
@@ -17,6 +17,12 @@
     level=2
     alignment=chaotic
     advances_to=Death Knight
+#ifdef ENABLE_DEATH_SQUIRE
+    [advancefrom]
+        unit=Skeleton
+        experience=120
+    [/advancefrom]
+#endif
     cost=36
     [abilities]
         {ABILITY_LEADERSHIP}

diff --git a/...Eastern_Invasion/units/Skeleton_Rider.cfg → data/core/units/undead/Skele_Rider.cfg b/...Eastern_Invasion/units/Skeleton_Rider.cfg → data/core/units/undead/Skele_Rider.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-ei
+#textdomain wesnoth-units
 
 [unit_type]
     id=Skeleton Rider