WoV: Update to match the 1.0.1 version on the 1.14 add-on server

Changes: S01: Objectives clarified. S02: Objectives clarified. S02: Up turn limit & enemy income so leveling objective is easier. S03: Replace hard-coding of recruit with dynamic storing. S05: Lower difficulty. S06: Use all 6 permutations for temple contents. S08: Fix OOS in replay of the scenario. Misc: A few dialog, grammar and punctuation fixes.
wesnoth · Jul 10, 2019 · 6e27a3f · 6e27a3f
1 parent 0154550
commit 6e27a3f
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 32 deletions.
diff --git a/data/campaigns/Wings_of_Victory/dist/version b/data/campaigns/Wings_of_Victory/dist/version
@@ -1 +1 @@
-1.0.0
+1.0.1
diff --git a/data/campaigns/Wings_of_Victory/scenarios/01_The_Hunt.cfg b/data/campaigns/Wings_of_Victory/scenarios/01_The_Hunt.cfg
@@ -187,12 +187,12 @@
         {MODIFY_UNIT side=1 facing ne}
         [objectives]
             [objective]
-                description= _ "All enemies are defeated and Galun is an Aspirant (reached level two)"
+                description= _ "All enemies are defeated and Galun has become an Aspirant (reached level two)"
                 condition=win
             [/objective]
             {OBJECTIVE_OR}
             [objective]
-                description= _ "Turns run out and Galun is an Aspirant (reached level two)"
+                description= _ "Turns run out and Galun has become an Aspirant (reached level two)"
                 condition=win
             [/objective]
             [objective]
@@ -464,7 +464,7 @@
         [/message]
         [message]
             speaker=Vank
-            message= _ "The hunt is done for now. The air is too thick this low; it clogs my lungs. Let’s fly back to the eyrie."
+            message= _ "We have taken all the game we can for now. The air is too thick this low; it clogs my lungs. Let’s fly back to the eyrie."
         [/message]
     [/event]
 

diff --git a/data/campaigns/Wings_of_Victory/scenarios/02_The_Raid.cfg b/data/campaigns/Wings_of_Victory/scenarios/02_The_Raid.cfg
@@ -5,7 +5,7 @@
     name= _ "The Raid"
     next_scenario=03_The_Contention
     {WOV_MAP 02_The_Raid.map} # TRoW Peoples in Decline map with side 1 in eastern keep, side 2 in northwest encampment.
-    {TURNS 20 20 18}
+    {TURNS 25 25 22}
     {DEFAULT_SCHEDULE_FIRST_WATCH}
     carryover_percentage=0
 
@@ -58,7 +58,7 @@
         controller=ai
         recruit=Goblin Spearman, Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider
         {GOLD 120 150 180}
-        {INCOME 2 5 8}
+        {INCOME 6 9 12}
         team_name=orcs
         user_team_name= _ "Orcs"
         {FLAG_VARIANT6 ragged}
@@ -82,12 +82,12 @@
         [objectives]
             side=1
             [objective]
-                description= _ "Capture Viragar by reducing him to 0 hitpoints or lower"
+                description= _ "Capture Viragar (reduce him to 0 hitpoints or lower)"
                 condition=win
             [/objective]
             {OBJECTIVE_AND}
             [objective]
-                description= _ "Galun has impressive stature (reached level three)"
+                description= _ "Galun has become an impressive Aspirant (reached level three)"
                 condition=win
             [/objective]
             [objective]
@@ -99,7 +99,7 @@
                 condition=lose
             [/objective]
             [objective]
-                description= _ "Galun is less than level three after Viragar is captured"
+                description= _ "Galun has not become more impressive (still level two) after Viragar is captured"
                 condition=lose
             [/objective]
             {TURNS_RUN_OUT}

diff --git a/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg b/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg
@@ -197,25 +197,41 @@
         [/message]
     [/event]
 
-    # Remove recruit type when recruited. When recruit list is empty, it is refilled.
+    # Remove recruit type when recruited and store it. When recruit list is empty, it is refilled.
     [event]
         name=recruit
         first_time_only=no
         [disallow_recruit]
             side=$unit.side
             type=$unit.type
         [/disallow_recruit]
-        # TODO: store removed recruit in an side_specific array to avoid the hard-coding below
+        [set_variables]
+            name=$unit.side|_recruit
+            mode=append
+            [value]
+                type=$unit.type
+            [/value]
+        [/set_variables]
         [store_side]
             side=$unit.side
         [/store_side]
         [if]
             {VARIABLE_CONDITIONAL side.recruit equals ""}
             [then]
+                [set_variable]
+                    name=recruit
+                    [join]
+                        variable=$unit.side|_recruit
+                        key=type
+                        separator=,
+                        remove_empty=yes
+                    [/join]
+                [/set_variable]
                 [allow_recruit]
                     side=$unit.side
-                    type=Drake Burner, Drake Clasher, Drake Fighter, Drake Glider
+                    type=$recruit
                 [/allow_recruit]
+                {CLEAR_VARIABLE (recruit,$unit.side|_recruit)}
             [/then]
         [/if]
         {CLEAR_VARIABLE side}
@@ -308,4 +324,9 @@
             message= _ "By his victory, Galun earned the privilege of founding a new Flight in accordance with the Way. As custom required, he would be gifted with breeders and fledglings from each of the other Flights."
         [/message]
     [/event]
+
+    [event]
+        name=scenario end
+        {CLEAR_VARIABLE 1_recruit,2_recruit}
+    [/event]
 [/scenario]
diff --git a/data/campaigns/Wings_of_Victory/scenarios/05_Islands.cfg b/data/campaigns/Wings_of_Victory/scenarios/05_Islands.cfg
@@ -55,7 +55,7 @@
         side=2
         controller=ai
         recruit=Naga Fighter, Vampire Bat
-        {GOLD 75 100 125}
+        {GOLD 50 75 100}
         {INCOME 2 4 6}
         team_name=nagas
         user_team_name= _ "Nagas"
@@ -75,7 +75,7 @@
         side=3
         controller=ai
         recruit=Naga Fighter, Vampire Bat
-        {GOLD 75 100 125}
+        {GOLD 50 75 100}
         {INCOME 2 4 6}
         team_name=nagas
         user_team_name= _ "Nagas"
@@ -95,7 +95,7 @@
         side=4
         controller=ai
         recruit=Naga Fighter, Vampire Bat
-        {GOLD 75 100 125}
+        {GOLD 50 75 100}
         {INCOME 2 4 6}
         team_name=nagas
         user_team_name= _ "Nagas"

diff --git a/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg b/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg
@@ -158,29 +158,47 @@
         name=prestart
         {MODIFY_UNIT side=1 facing ne}
 
-        {PLACE_IMAGE (scenery/temple1.png) 11 13}
+        {PLACE_IMAGE (scenery/temple1.png) 09 15}
         {PLACE_IMAGE (scenery/temple1.png) 10 17}
-        {PLACE_IMAGE (scenery/temple1.png) 9 15}
-        {RANDOM 1..3}
+        {PLACE_IMAGE (scenery/temple1.png) 11 13}
+        {RANDOM 1..6}
         [switch]
             variable=random
             [case]
                 value=1
-                {TEMP_LOOT 11 13}
-                {TEMP_EMPTY 10 17}
-                {TEMP_MONSTERS 9 15}
+                {TEMP_LOOT     09 15}
+                {TEMP_EMPTY    10 17}
+                {TEMP_MONSTERS 11 13}
             [/case]
             [case]
                 value=2
-                {TEMP_LOOT 10 17}
-                {TEMP_EMPTY 9 15}
+                {TEMP_LOOT     09 15}
+                {TEMP_EMPTY    11 13}
+                {TEMP_MONSTERS 10 17}
+            [/case]
+            [case]
+                value=3
+                {TEMP_LOOT     10 17}
+                {TEMP_EMPTY    09 15}
                 {TEMP_MONSTERS 11 13}
             [/case]
-            [else]
-                # value=3 and "can't happen, but just in case" case
-                {TEMP_LOOT 9 15}
-                {TEMP_EMPTY 11 13}
+            [case]
+                value=4
+                {TEMP_LOOT     10 17}
+                {TEMP_EMPTY    11 13}
+                {TEMP_MONSTERS 09 15}
+            [/case]
+            [case]
+                value=5
+                {TEMP_LOOT     11 13}
+                {TEMP_EMPTY    09 15}
                 {TEMP_MONSTERS 10 17}
+            [/case]
+            [else]
+                # value=6 and "can't happen, but just in case" case
+                {TEMP_LOOT     11 13}
+                {TEMP_EMPTY    10 17}
+                {TEMP_MONSTERS 09 15}
             [/else]
         [/switch]
         {CLEAR_VARIABLE random}

diff --git a/data/campaigns/Wings_of_Victory/scenarios/07_Elensefar.cfg b/data/campaigns/Wings_of_Victory/scenarios/07_Elensefar.cfg
@@ -136,7 +136,7 @@
         [/redraw]
         [message]
             speaker=Vorlyan
-            message= _ "Flying monsters are approaching, sound the alarm!"
+            message= _ "Flying monsters are approaching; sound the alarm!"
         [/message]
     [/event]
 

diff --git a/data/campaigns/Wings_of_Victory/scenarios/08_Wesmere.cfg b/data/campaigns/Wings_of_Victory/scenarios/08_Wesmere.cfg
@@ -138,7 +138,7 @@
     [/event]
 
     [event]
-        name=victory
+        name=enemies defeated # not a victory event, as unit placement caused an oos error in the replay
         [message]
             speaker=Galun
             message= _ "That was brisk."

diff --git a/data/campaigns/Wings_of_Victory/scenarios/09_Foothills.cfg b/data/campaigns/Wings_of_Victory/scenarios/09_Foothills.cfg
@@ -186,7 +186,7 @@
         [/message]
         [message]
             speaker=Galun
-            message= _ "I am Galun, and I am not ’ruled’ by anyone."
+            message= _ "I am Galun, and I am not ‘ruled’ by anyone."
         [/message]
         [message]
             speaker=Naemir
@@ -297,7 +297,7 @@
         [/delay]
         [message]
             speaker=Vank
-            message= _ "That did it, the storm outside is lifting."
+            message= _ "That did it! The storm outside is lifting."
         [/message]
         [endlevel]
             result=victory

diff --git a/data/campaigns/Wings_of_Victory/story/drakipedia.txt b/data/campaigns/Wings_of_Victory/story/drakipedia.txt
@@ -104,4 +104,4 @@ Wikidrakia
 
 * Verkon, Drake -- Dominant of his @Flight. In this flight @Galun was bred.
 
-* Long Prey --  South Seas pidgin for human meat.
+* Long Prey -- Drake term for bipedal game (e.g., humans). Derived from "long pig", which is South Seas pidgin for human meat.