From 7c30fd64792a5b7f109cc36322f2b8c4ed84d1fa Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sun, 10 May 2009 04:33:02 +0000
Subject: [PATCH] Follow through on a name change.

---
 .../scenarios/08a_Elvish_Princess.cfg         |  2 +-
 .../scenarios/09a_Introductions.cfg           |  4 +--
 .../scenarios/10a_Stolen_Gold.cfg             | 10 +++----
 .../scenarios/12a_Get_the_Gold.cfg            | 26 +++++++++----------
 .../scenarios/13a_Showdown.cfg                | 12 ++++-----
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
index 9f92710e04e..d44cb1d606c 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
@@ -485,7 +485,7 @@
         [/message]
     [/event]
 
-    # Freeing anita event - victory proceed to introductions
+    # Freeing eryssa event - victory proceed to introductions
     [event]
         name=moveto
         [filter]
diff --git a/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg b/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
index cdfc17876ee..b972f021d24 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
@@ -213,7 +213,7 @@
                     speaker=Tallin
                     message= _ "Sounds good...I mean, let it be so."
                 [/message]
-                {VARIABLE anita_hostile no}
+                {VARIABLE eryssa_hostile no}
             [/then]
             [else]
                 [message]
@@ -317,7 +317,7 @@
                     speaker=Tallin
                     message= _ "Well, it's pointless to linger here. Let's get back to Knalga."
                 [/message]
-                {VARIABLE anita_hostile yes}
+                {VARIABLE eryssa_hostile yes}
             [/else]
         [/if]
         # Set objectives
diff --git a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
index 4160a82d3fc..6f7b82a6f54 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
@@ -80,7 +80,7 @@
         # Eryssa alive and friendly
         [if]
             [variable]
-                name=anita_hostile
+                name=eryssa_hostile
                 equals=no
             [/variable]
             [then]
@@ -150,7 +150,7 @@
             [else]
                 [if]
                     [variable]
-                        name=anita_hostile
+                        name=eryssa_hostile
                         equals=yes
                     [/variable]
                     # Eryssa is dead
@@ -468,7 +468,7 @@
 
         [if]
             [variable]
-                name=anita_hostile
+                name=eryssa_hostile
                 equals=yes
             [/variable]
 
@@ -914,7 +914,7 @@
             [else]
                 [if]
                     [variable]
-                        name=anita_hostile
+                        name=eryssa_hostile
                         equals=yes
                     [/variable]
                     [then]
@@ -1211,7 +1211,7 @@
         [/if]
         [if]
             [variable]
-                name=anita_hostile
+                name=eryssa_hostile
                 equals=yes
             [/variable]
             [variable]
diff --git a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
index 3659277e3eb..4a325bf04bb 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
@@ -248,25 +248,25 @@
             [then]
                 [store_starting_location]
                     side=9
-                    variable=anita_starts_at
+                    variable=eryssa_starts_at
                 [/store_starting_location]
                 [store_unit]
                     [filter]
                         id=Eryssa
                     [/filter]
-                    variable=place_anita_at
+                    variable=place_eryssa_at
                     kill=yes
                     fire_event=no
                 [/store_unit]
-                {VARIABLE place_anita_at.side 9}
-                {VARIABLE place_anita_at.x $anita_starts_at.x}
-                {VARIABLE place_anita_at.y $anita_starts_at.y}
-                {VARIABLE place_anita_at.canrecruit yes}
+                {VARIABLE place_eryssa_at.side 9}
+                {VARIABLE place_eryssa_at.x $eryssa_starts_at.x}
+                {VARIABLE place_eryssa_at.y $eryssa_starts_at.y}
+                {VARIABLE place_eryssa_at.canrecruit yes}
                 [unstore_unit]
-                    variable=place_anita_at
+                    variable=place_eryssa_at
                 [/unstore_unit]
-                {CLEAR_VARIABLE place_anita_at}
-                {CLEAR_VARIABLE anita_starts_at}
+                {CLEAR_VARIABLE place_eryssa_at}
+                {CLEAR_VARIABLE eryssa_starts_at}
             [/then]
         [/if]
     [/event]
@@ -572,13 +572,13 @@
                 id=Eryssa
             [/filter]
             kill=no
-            variable=anita_hack
+            variable=eryssa_hack
         [/store_unit]
-        {VARIABLE anita_hack.side 1}
+        {VARIABLE eryssa_hack.side 1}
         [unstore_unit]
-            variable=anita_hack
+            variable=eryssa_hack
         [/unstore_unit]
-        {CLEAR_VARIABLE anita_hack}
+        {CLEAR_VARIABLE eryssa_hack}
     [/event]
     # Load death events
     {campaigns/Northern_Rebirth/utils/herodeaths.cfg}
diff --git a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
index 946ae86dfd3..a83826966bb 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
@@ -356,15 +356,15 @@
                     [/filter]
                     kill=yes
                     fire_event=no
-                    variable=place_anita_at
+                    variable=place_eryssa_at
                 [/store_unit]
-                {VARIABLE place_anita_at.x $side_nine_starts_at.x}
-                {VARIABLE place_anita_at.y $side_nine_starts_at.y}
-                {VARIABLE place_anita_at.side 9}
+                {VARIABLE place_eryssa_at.x $side_nine_starts_at.x}
+                {VARIABLE place_eryssa_at.y $side_nine_starts_at.y}
+                {VARIABLE place_eryssa_at.side 9}
                 [unstore_unit]
-                    variable=place_anita_at
+                    variable=place_eryssa_at
                 [/unstore_unit]
-                {CLEAR_VARIABLE place_anita_at}
+                {CLEAR_VARIABLE place_eryssa_at}
             [/then]
             [else]
                 [store_unit]