From e32da8b6bd5728c19d961dfdd9da658d459ffcfd Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Thu, 5 Apr 2018 20:37:32 -0400
Subject: [PATCH] SotA: Remove weird terrain='' convention

The wiki proscribes terrain=^ for this purpose, which has the bonus
of being detected as a valid terrain code by the schema.
---
 .../scenarios/02_Dark_Business.cfg                        | 4 ++--
 .../Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg   | 4 ++--
 .../Secrets_of_the_Ancients/scenarios/17_Mortality.cfg    | 8 ++++----
 .../Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg | 2 +-
 .../Secrets_of_the_Ancients/utils/sota-utils.cfg          | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
index aff73cdcb6f0..6f3108401080 100644
--- a/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
@@ -189,7 +189,7 @@ I decided to hide in the cemetery. That way I could try my experiment to animate
 
                     # Remove the overlay that defines this terrain as a grave:
                     [terrain]
-                        terrain=''
+                        terrain=^
                         layer=overlay
                         x,y=$zombie_x,$zombie_y
                     [/terrain]
@@ -329,7 +329,7 @@ of Healing"
 
         # Remove the (invisible) keep:
         [terrain]
-            terrain=''
+            terrain=^
             layer=overlay
             x=20,  21,  22
             y=6-7, 7-8, 7
diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg
index 1b28801862ca..60f30d6a4f8f 100644
--- a/data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg
@@ -183,12 +183,12 @@ When the captain retained his memories, I reasoned that it may have been because
             [then]
                 [terrain]
                     x,y=5,12
-                    terrain=''
+                    terrain=^
                     layer=overlay
                 [/terrain]
                 [terrain]
                     x,y=14,10
-                    terrain=''
+                    terrain=^
                     layer=overlay
                 [/terrain]
                 [terrain]
diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg
index 2e7de592795f..9daa20a2ce53 100644
--- a/data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg
@@ -182,12 +182,12 @@ Not far inside the cave was a ruined castle built in a style I did not recognize
         [/unit]
         [terrain]
             x,y=10,4
-            terrain=''
+            terrain=^
             layer=overlay
         [/terrain]
         [terrain]
             x,y=9,4
-            terrain=''
+            terrain=^
             layer=overlay
         [/terrain]
         {DELAY}
@@ -221,7 +221,7 @@ Not far inside the cave was a ruined castle built in a style I did not recognize
         [/modify_unit]
         [terrain]
             x,y=11,6
-            terrain=''
+            terrain=^
             layer=overlay
         [/terrain]
         {DELAY}
@@ -235,7 +235,7 @@ Not far inside the cave was a ruined castle built in a style I did not recognize
         [/modify_unit]
         [terrain]
             x,y=9,5
-            terrain=''
+            terrain=^
             layer=overlay
         [/terrain]
         [item]
diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
index 225d5cc31465..e8e324b07036 100644
--- a/data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
@@ -782,7 +782,7 @@ We left the fires of the mountain behind and plunged once more into darkness. Af
         [/item]
         [terrain]
             x,y=29,9
-            terrain=''
+            terrain=^
             layer=overlay
         [/terrain]
 
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 67de70fa614b..9a2145e840fd 100644
--- a/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
+++ b/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
@@ -953,13 +953,13 @@
             [terrain]
                 x=5
                 y="$(11+{OFFSET})"
-                terrain=''
+                terrain=^
                 layer=overlay
             [/terrain]
             [terrain]
                 x=14
                 y="$(9+{OFFSET})"
-                terrain=''
+                terrain=^
                 layer=overlay
             [/terrain]
             [terrain]
@@ -1004,7 +1004,7 @@
             [terrain]
                 x=7
                 y="$(9+{OFFSET})"
-                terrain=''
+                terrain=^
                 layer=overlay
             [/terrain]
             [set_variable]