LoW: disallow shuffling sides for MP

wesnoth · Mar 9, 2019 · 570e1b2 · 570e1b2
1 parent f38fa3d
commit 570e1b2
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 15 deletions.
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
@@ -107,6 +107,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         [/unit]
         {SINGLEPLAYER_GOLD}
 #else
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
 #endif
         [unit]
@@ -148,6 +149,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         save_id=Landar
         x=18
         y=15
+        disallow_shuffle=yes
 
         {MULTIPLAYER_GOLD}
 

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
@@ -48,6 +48,7 @@
         {PLAYABLE}
         {KALENZ_YOUNG}
         {PLAYER_GOLD}
+        disallow_shuffle=yes
 #ifndef MULTIPLAYER
         [unit]
             {LANDAR_YOUNG}
@@ -77,6 +78,7 @@
         x=20
         y=4
         save_id=Landar
+        disallow_shuffle=yes
         {LANDAR_YOUNG}
         {PLAYABLE}
         {PLAYER_GOLD}

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
@@ -76,6 +76,7 @@
         no_leader=yes
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
         fog=yes
         {PLAYER_GOLD}
     [/side]
@@ -85,6 +86,7 @@
         no_leader=yes
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         fog=yes
         {PLAYER_GOLD}
     )}
@@ -96,6 +98,7 @@
         no_leader=yes
         previous_save_id=Kalenz
         save_id=Galtrid
+        disallow_shuffle=yes
         {GOLD 300 200 100}
         income=-2
         village_gold=1
@@ -142,6 +145,7 @@
         previous_save_id=Landar
         {PLAYABLE}
         save_id=El_Isomithir
+        disallow_shuffle=yes
         fog=yes
         {GOLD 300 200 100}
         income=-2
@@ -181,21 +185,21 @@
             [engine]
                 name=lua
                 code=<<
-				local my_ai = { }
-
-				function my_ai:retreat()
-					local urudin = wesnoth.get_units({id="Urudin"})[1]
-					if urudin and urudin.valid then
-						local mhp, hp = urudin.max_hitpoints, urudin.hitpoints
-						local turn = wesnoth.current.turn
-						if turn >= 3 or hp < mhp / 2 then
-							ai.move_full(urudin, 20, 6)
-						end
-					end
-				end
-
-				return my_ai
-			>>
+                local my_ai = { }
+
+                function my_ai:retreat()
+                    local urudin = wesnoth.get_units({id="Urudin"})[1]
+                    if urudin and urudin.valid then
+                        local mhp, hp = urudin.max_hitpoints, urudin.hitpoints
+                        local turn = wesnoth.current.turn
+                        if turn >= 3 or hp < mhp / 2 then
+                            ai.move_full(urudin, 20, 6)
+                        end
+                    end
+                end
+
+                return my_ai
+            >>
             [/engine]
             [stage]
                 id=leader_retreat

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
@@ -65,6 +65,7 @@ Chapter Two"
         {KALENZ}
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
         {PLAYER_GOLD}
 #ifndef MULTIPLAYER
         [unit]
@@ -84,6 +85,7 @@ Chapter Two"
     {MP_SIDE 2 (
         {LANDAR}
         save_id=Landar
+        disallow_shuffle=yes
         {PLAYABLE}
         {PLAYER_GOLD}
     )}
@@ -92,6 +94,7 @@ Chapter Two"
     {MP_SIDE 3 (
         no_leader=yes
         save_id=Cleodil
+        disallow_shuffle=yes
         {PLAYABLE}
         {PLAYER_GOLD}
     )}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
@@ -63,6 +63,7 @@
         side=1
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
 
         no_leader=yes
         [unit]
@@ -91,6 +92,7 @@
         no_leader=yes
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         {PLAYER_GOLD}
         [unit]
             {LANDAR}
@@ -104,6 +106,7 @@
         no_leader=yes
         {PLAYABLE}
         save_id=Cleodil
+        disallow_shuffle=yes
         {PLAYER_GOLD}
         [unit]
             {CLEODIL}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
@@ -41,6 +41,7 @@
         side=1
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
 
         {KALENZ}
         x=17
@@ -71,6 +72,7 @@
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
 
         no_leader=yes
@@ -83,6 +85,7 @@
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Cleodil
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
 
         no_leader=yes

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
@@ -61,6 +61,7 @@
         side=1
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
 
         {KALENZ}
         x=46
@@ -103,6 +104,7 @@
         no_leader=yes
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
 
         [unit]
@@ -117,6 +119,7 @@
         no_leader=yes
         {PLAYABLE}
         save_id=Cleodil
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
 
         [unit]
@@ -132,6 +135,7 @@
         {PLAYABLE}
         no_leader=yes
         save_id=Galtrid
+        disallow_shuffle=yes
 #ifndef MULTIPLAYER
         {GOLD 400 300 200}
 #else
@@ -167,6 +171,7 @@
         {PLAYABLE}
         {EL_ISOMITHIR}
         save_id=El_Isomithir
+        disallow_shuffle=yes
         previous_save_id=Landar
         x=29
         y=32
@@ -178,6 +183,7 @@
         {PLAYABLE}
         {ERADION}
         save_id=Eradion
+        disallow_shuffle=yes
         previous_save_id=Cleodil
         x=7
         y=36

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
@@ -20,6 +20,7 @@
         controller=human
         allow_player=yes
         previous_save_id=Kalenz
+        disallow_shuffle=yes
         save_id=temp1234
         persistent=no
         {KALENZ}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
@@ -53,6 +53,7 @@ Chapter Three"
     [side]
         side=1
         save_id=Kalenz
+        disallow_shuffle=yes
         {PLAYABLE}
         {KALENZ}
 #ifndef MULTIPLAYER
@@ -83,6 +84,7 @@ Chapter Three"
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
         no_leader=yes
         [unit]
@@ -97,6 +99,7 @@ Chapter Three"
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Olurf
+        disallow_shuffle=yes
         #TODO give Olurf more gold?
         {MULTIPLAYER_GOLD}
         no_leader=yes
@@ -113,6 +116,7 @@ Chapter Three"
     {MP_SIDE 4 (
         {PLAYABLE}
         save_id=Cleodil
+        disallow_shuffle=yes
         {MULTIPLAYER_GOLD}
         no_leader=yes
         [unit]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
@@ -42,6 +42,7 @@
         fog=yes
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
 
         {KALENZ}
         x=18
@@ -72,6 +73,7 @@
         {MULTIPLAYER_GOLD}
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         fog=yes
         [unit]
             {LANDAR}
@@ -84,6 +86,7 @@
         {MULTIPLAYER_GOLD}
         {PLAYABLE}
         save_id=Olurf
+        disallow_shuffle=yes
         fog=yes
         [unit]
             {OLURF}
@@ -96,6 +99,7 @@
         {MULTIPLAYER_GOLD}
         {PLAYABLE}
         save_id=Cleodil
+        disallow_shuffle=yes
         fog=yes
         [unit]
             {CLEODIL}

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
@@ -42,6 +42,7 @@
         fog=yes
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
 
         {KALENZ}
         x=20
@@ -73,6 +74,7 @@
     {MP_SIDE 2 (
         {PLAYABLE}
         save_id=Landar
+        disallow_shuffle=yes
         fog=yes
         no_leader=yes
         [unit]
@@ -84,6 +86,7 @@
     {MP_SIDE 3 (
         {PLAYABLE}
         save_id=Olurf
+        disallow_shuffle=yes
         fog=yes
         no_leader=yes
         [unit]
@@ -95,6 +98,7 @@
     {MP_SIDE 4 (
         {PLAYABLE}
         save_id=Cleodil
+        disallow_shuffle=yes
         fog=yes
         no_leader=yes
         [unit]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
@@ -263,24 +263,28 @@
 #ifdef MULTIPLAYER
     [side]
         side=1
+        disallow_shuffle=yes
         {PLAYABLE}
         {KALENZ}
     [/side]
 
     [side]
         side=2
+        disallow_shuffle=yes
         {PLAYABLE}
         {LANDAR}
     [/side]
 
     [side]
         side=3
+        disallow_shuffle=yes
         {PLAYABLE}
         {OLURF}
     [/side]
 
     [side]
         side=4
+        disallow_shuffle=yes
         {PLAYABLE}
         {CLEODIL}
     [/side]

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
@@ -38,6 +38,7 @@
         share_view=yes
         {PLAYABLE}
         save_id=Kalenz
+        disallow_shuffle=yes
         {KALENZ}
         x=12
         y=1
@@ -62,6 +63,7 @@
         side=2
         no_leader=yes
         save_id=Landar
+        disallow_shuffle=yes
         {PLAYABLE}
         [unit]
             {LANDAR}
@@ -75,6 +77,7 @@
         side=3
         no_leader=yes
         save_id=Olurf
+        disallow_shuffle=yes
         {PLAYABLE}
         [unit]
             {OLURF}
@@ -88,6 +91,7 @@
         side=4
         no_leader=yes
         save_id=Cleodil
+        disallow_shuffle=yes
         {PLAYABLE}
         [unit]
             {CLEODIL}