Replace deprecated share_maps and share_view with share_vision.

Closes #6496. share_maps=yes -> share_vision=shroud share_view=yes -> share_vision=all (cherry picked from commit f983a99)
wesnoth · Feb 15, 2022 · 80c9263 · 80c9263
1 parent f47909a
commit 80c9263
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 54 deletions.
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
@@ -257,7 +257,8 @@
                 [/set_recruit]
                 [modify_side]
                     side=3
-                    share_maps=yes
+                    # Originaly share_maps=yes. Since player's side has fog=no, this is effectively share_vision=all.
+                    share_vision=shroud
                 [/modify_side]
                 [objectives]
                     side=1

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07c_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07c_A_Small_Favor3.cfg
@@ -31,7 +31,7 @@
         {CHARACTER_STATS_MALIN_KESHAR}
 
         shroud=yes
-        share_maps=yes
+        share_vision=shroud
         facing=nw
     [/side]
     # wmllint: validate-on
@@ -64,7 +64,7 @@
         color=black
         hidden=yes
         shroud=yes
-        share_maps=no
+        share_vision=none
 
         [ai]
             village_value=0

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
@@ -135,8 +135,7 @@
         {INCOME 5 4 3}
         fog=yes
         shroud=no
-        share_maps=no
-        share_view=no
+        share_vision=none
         {FLAG_VARIANT long}
     [/side]
 
@@ -178,7 +177,7 @@
         team_name=elves
         user_team_name=_"Rebels"
         fog=yes
-        share_view=no
+        share_vision=none
     [/side]
 
     [event]
@@ -697,7 +696,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
         [/filter_condition]
         [modify_side]
             side=4
-            share_view=yes
+            share_vision=all
         [/modify_side]
         [message]
             speaker=unit

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
@@ -81,8 +81,7 @@
         {GOLD 225 200 175}
         fog=yes
         shroud=yes
-        share_maps=no
-        share_view=no
+        share_vision=none
         {FLAG_VARIANT long}
     [/side]
 

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
@@ -180,7 +180,7 @@
         user_team_name= _ "Enemies"
         fog=yes
         shroud=yes
-        share_view=yes
+        share_vision=all
         gold=0
         village_gold=1
         recruit=""
@@ -262,7 +262,7 @@
         user_team_name= _ "Enemies"
         fog=yes
         shroud=yes
-        share_view=yes
+        share_vision=all
 #ifdef EASY
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Knight, Goblin Pillager, Goblin Spearman
 #endif
@@ -297,7 +297,7 @@
         user_team_name= _ "Enemies"
         shroud=yes
         fog=yes
-        share_view=yes
+        share_vision=all
 #ifdef EASY
         recruit=Orcish Crossbowman, Goblin Pillager, Goblin Knight
 #endif

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
@@ -135,7 +135,7 @@
         recruit=Mage, Gryphon
         {PLAYER_TEAM}
         fog=yes
-        share_view=no
+        share_vision=none
     [/side]
     {STARTING_VILLAGES_ALL 3}
 
@@ -197,7 +197,7 @@
         [/message]
         [modify_side]
             side=6
-            share_view=yes
+            share_vision=all
         [/modify_side]
     [/event]
 

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
@@ -35,7 +35,7 @@
     [side]
         side=1
         fog=yes
-        share_view=yes
+        share_vision=all
         {PLAYABLE}
         save_id=Kalenz
         disallow_shuffle=yes

diff --git a/data/campaigns/Legend_of_Wesmere/utils/characters.cfg b/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
@@ -15,7 +15,7 @@
     gold_lock=yes
     income_lock=yes
     faction=Custom
-    share_view=yes
+    share_vision=all
 #endif
 #enddef
 

diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
@@ -133,7 +133,7 @@
         {CHARACTER_STATS_TALLIN}
 
         fog=yes
-        share_view=yes
+        share_vision=all
         facing=se
     [/side]
     # wmllint: validate-on
@@ -160,7 +160,7 @@
 
         hitpoints=1
         fog=yes
-        share_view=yes
+        share_vision=all
         facing=se
 
         # Place some combatants at various states of hp/xp

diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
@@ -41,8 +41,7 @@
 
         fog=yes
         shroud=yes
-        share_view=yes
-        share_maps=yes
+        share_vision=all
 
         {GOLD 80 70 60}
         {INCOME 8 6 4}

diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg
@@ -1156,8 +1156,7 @@ Adjacent own units of lower level will do more damage in battle. When a unit adj
         canrecruit=yes
         fog=yes
         shroud=yes
-        share_maps=no
-        share_view=no
+        share_vision=none
     [/side]
     [event]
         name=turn refresh
@@ -1379,7 +1378,7 @@ end
         [/filter]
         [modify_side]
             side=3
-            share_maps=yes
+            share_vision=shroud
         [/modify_side]
         [message]
             speaker=unit

diff --git a/data/test/maps/pathfind_1.cfg b/data/test/maps/pathfind_1.cfg
@@ -121,8 +121,7 @@ victory_when_enemies_defeated=yes
     hidden=no
     income=4
     no_leader=yes
-    share_maps=no
-    share_view=no
+    share_vision=none
     shroud=no
     side=1
     team_name=1
@@ -806,8 +805,7 @@ victory_when_enemies_defeated=yes
     hidden=no
     income=4
     no_leader=yes
-    share_maps=no
-    share_view=no
+    share_vision=none
     shroud=no
     side=2
     team_name=2

diff --git a/data/test/scenarios/move_skip_sighted.cfg b/data/test/scenarios/move_skip_sighted.cfg
@@ -2,7 +2,7 @@
 # This series of tests checks that the skip_sighted option of
 # [move] is being implemented correctly.
 
-#define MOVE_SKIP_SIGHTED_SCEN ID STOP_X STOP_Y SKIP_SIGHTED SHARE_VIEW
+#define MOVE_SKIP_SIGHTED_SCEN ID STOP_X STOP_Y SKIP_SIGHTED SHARE_VISION
     [test]
         name = _ "Unit Test " + {ID}
         map_file=test/maps/move_skip_sighted.map
@@ -20,7 +20,7 @@
             type = Elvish Archer
             id=alice
             fog=yes
-            share_view={SHARE_VIEW}
+            share_vision={SHARE_VISION}
         [/side]
         [side]
             side=2
@@ -30,7 +30,7 @@
             id=bob
             fog=yes
             team_name=East
-            share_view={SHARE_VIEW}
+            share_vision={SHARE_VISION}
         [/side]
         [side]
             side=3
@@ -40,7 +40,7 @@
             id=dave
             fog=yes
             team_name=East
-            share_view={SHARE_VIEW}
+            share_vision={SHARE_VISION}
         [/side]
 
         [event]
@@ -69,9 +69,9 @@
     [/test]
 #enddef
 
-{MOVE_SKIP_SIGHTED_SCEN move_skip_no_sighted_no_share_view 15 3 no no}
-{MOVE_SKIP_SIGHTED_SCEN move_skip_ally_sighted_no_share_view 12 3 only_ally no}
-{MOVE_SKIP_SIGHTED_SCEN move_skip_all_sighted_no_share_view 11 3 all no}
-{MOVE_SKIP_SIGHTED_SCEN move_skip_no_sighted_yes_share_view 11 3 no yes}
-{MOVE_SKIP_SIGHTED_SCEN move_skip_ally_sighted_yes_share_view 11 3 only_ally yes}
-{MOVE_SKIP_SIGHTED_SCEN move_skip_all_sighted_yes_share_view 11 3 all yes}
+{MOVE_SKIP_SIGHTED_SCEN move_skip_no_sighted_no_share_vision 15 3 no none}
+{MOVE_SKIP_SIGHTED_SCEN move_skip_ally_sighted_no_share_vision 12 3 only_ally none}
+{MOVE_SKIP_SIGHTED_SCEN move_skip_all_sighted_no_share_vision 11 3 all none}
+{MOVE_SKIP_SIGHTED_SCEN move_skip_no_sighted_yes_share_vision 11 3 no all}
+{MOVE_SKIP_SIGHTED_SCEN move_skip_ally_sighted_yes_share_vision 11 3 only_ally all}
+{MOVE_SKIP_SIGHTED_SCEN move_skip_all_sighted_yes_share_vision 11 3 all all}
diff --git a/data/test/scenarios/simple_find_path.cfg b/data/test/scenarios/simple_find_path.cfg
@@ -58,7 +58,7 @@
         id=alice
         fog=no
         shroud=no
-        share_view=no
+        share_vision=none
     [/side]
     [side]
         side=2
@@ -68,7 +68,7 @@
         id=bob
         fog=no
         shroud=no
-        share_view=no
+        share_vision=none
     [/side]
 
     [event]

diff --git a/data/test/scenarios/store_reachable_locations_vision.cfg b/data/test/scenarios/store_reachable_locations_vision.cfg
@@ -55,7 +55,7 @@
         id=alice
         fog=no
         shroud=no
-        share_view=no
+        share_vision=none
     [/side]
     [side]
         side=2
@@ -65,7 +65,7 @@
         id=bob
         fog=no
         shroud=no
-        share_view=no
+        share_vision=none
     [/side]
 
     [event]

diff --git a/data/test/scenarios/test_move.cfg b/data/test/scenarios/test_move.cfg
@@ -19,7 +19,7 @@
             type = Elvish Archer
             id=alice
             fog=yes
-            share_view=no
+            share_vision=none
         [/side]
         [side]
             side=2
@@ -29,7 +29,7 @@
             id=bob
             fog=yes
             team_name=East
-            share_view=no
+            share_vision=none
         [/side]
         [side]
             side=3
@@ -39,7 +39,7 @@
             id=dave
             fog=yes
             team_name=East
-            share_view=no
+            share_vision=none
         [/side]
 
         [event]

diff --git a/data/test/scenarios/test_movetype.cfg b/data/test/scenarios/test_movetype.cfg
@@ -47,7 +47,7 @@
             id=alice
             fog=no
             shroud=no
-            share_view=no
+            share_vision=none
         [/side]
         [side]
             side=2
@@ -57,7 +57,7 @@
             id=bob
             fog=no
             shroud=no
-            share_view=no
+            share_vision=none
         [/side]
 
         [event]
@@ -173,7 +173,7 @@
             id=alice
             fog=yes
             shroud=no
-            share_view=no
+            share_vision=none
         [/side]
         [side]
             side=2
@@ -183,7 +183,7 @@
             id=bob
             fog=yes
             shroud=no
-            share_view=no
+            share_vision=none
         [/side]
 
         [event]

diff --git a/wml_test_schedule b/wml_test_schedule
@@ -94,12 +94,12 @@
 0 test_move_unit
 0 test_move_unit_in_circle
 0 sighted_on_move
-0 move_skip_no_sighted_no_share_view
-0 move_skip_ally_sighted_no_share_view
-0 move_skip_all_sighted_no_share_view
-0 move_skip_no_sighted_yes_share_view
-0 move_skip_ally_sighted_yes_share_view
-0 move_skip_all_sighted_yes_share_view
+0 move_skip_no_sighted_no_share_vision
+0 move_skip_ally_sighted_no_share_vision
+0 move_skip_all_sighted_no_share_vision
+0 move_skip_no_sighted_yes_share_vision
+0 move_skip_ally_sighted_yes_share_vision
+0 move_skip_all_sighted_yes_share_vision
 0 set_gold_in_prestart_one
 0 set_gold_in_prestart_two
 0 modify_turns_one