From 85c09d2aa06cdf6eb40c4fc69eef23416739a02f Mon Sep 17 00:00:00 2001
From: beetlenaut <dan@spacemandan.net>
Date: Fri, 11 Jan 2019 18:22:13 -0500
Subject: [PATCH] SotA: Type change to follow convention for the bat line

Second type change commit.
---
 .../scenarios/01_Slipping_Away.cfg                   |  2 +-
 .../Secrets_of_the_Ancients/units/Bat_Blood.cfg      |  4 ++--
 .../Secrets_of_the_Ancients/units/Bat_Dread.cfg      |  2 +-
 .../Secrets_of_the_Ancients/units/Bat_Vampire.cfg    |  4 ++--
 .../Secrets_of_the_Ancients/utils/sota-utils.cfg     | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg
index 6daee60fb8cb..23946fc1d810 100644
--- a/data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg
@@ -128,7 +128,7 @@ With further observation, I have determined that this is probably not the way to
     # *************************** MACROS ***************************
 #define PLACE_BAT X Y TRAIT1
     [unit]
-        type=Vampire Bat SotA
+        type=SotA Vampire Bat
         x={X}
         y={Y}
         side=1
diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Bat_Blood.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Bat_Blood.cfg
index 9c89010c5e8a..ef5831a7d805 100644
--- a/data/campaigns/Secrets_of_the_Ancients/units/Bat_Blood.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/units/Bat_Blood.cfg
@@ -1,10 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Blood Bat SotA
+    id=SotA Blood Bat
     [base_unit]
         id=Blood Bat
     [/base_unit]
-    advances_to=Dread Bat SotA
+    advances_to=SotA Dread Bat
     hide_help=yes
     do_not_list=yes
     [standing_anim]
diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Bat_Dread.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Bat_Dread.cfg
index d84482e036d7..96ade858db46 100644
--- a/data/campaigns/Secrets_of_the_Ancients/units/Bat_Dread.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/units/Bat_Dread.cfg
@@ -1,6 +1,6 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Dread Bat SotA
+    id=SotA Dread Bat
     [base_unit]
         id=Dread Bat
     [/base_unit]
diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Bat_Vampire.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Bat_Vampire.cfg
index aba80664b8f7..37a9813a7d0c 100644
--- a/data/campaigns/Secrets_of_the_Ancients/units/Bat_Vampire.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/units/Bat_Vampire.cfg
@@ -1,10 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Vampire Bat SotA
+    id=SotA Vampire Bat
     [base_unit]
         id=Vampire Bat
     [/base_unit]
-    advances_to=Blood Bat SotA
+    advances_to=SotA Blood Bat
     hide_help=yes
     do_not_list=yes
     [standing_anim]
diff --git a/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg b/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
index c7ce860bee0a..f696a90cf5fe 100644
--- a/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
@@ -26,7 +26,7 @@
 
 #define SIDE_1_ARDONNA_EARLY
     {SIDE_1_ARDONNA_BASE}
-    recruit=Vampire Bat SotA
+    recruit=SotA Vampire Bat
 #enddef
 
 #define SIDE_1_RAS-TABAHN
@@ -1053,7 +1053,7 @@
         # First, we'll make sure newly recruited ones will be correct
         [disallow_recruit]
             side=1
-            type=Vampire Bat SotA
+            type=SotA Vampire Bat
         [/disallow_recruit]
         [allow_recruit]
             side=1
@@ -1063,12 +1063,12 @@
         # Now the type of all bats on the recall list is changed
         [lua]
             code = <<
-                for i, u in ipairs(wesnoth.get_recall_units { type = 'Vampire Bat SotA, Blood Bat SotA, Dread Bat SotA' }) do
-                    if u.type == 'Vampire Bat SotA' then
+                for i, u in ipairs(wesnoth.get_recall_units { type = 'SotA Vampire Bat, SotA Blood Bat, SotA Dread Bat' }) do
+                    if u.type == 'SotA Vampire Bat' then
                         u:transform('Vampire Bat')
-                    elseif u.type == 'Blood Bat SotA' then
+                    elseif u.type == 'SotA Blood Bat' then
                         u:transform('Blood Bat')
-                    elseif u.type == 'Dread Bat SotA' then
+                    elseif u.type == 'SotA Dread Bat' then
                         u:transform('Dread Bat')
                     end
                 end