TS: Restore 2 of the "specialist" letters
authorWuzzy <Wuzzy2@mail.ru>
Sat, 12 Jan 2019 06:19:16 +0100
changeset 14563 90c215f83273
parent 14562 3be619402d6b
child 14564 da2094316dd7
TS: Restore 2 of the "specialist" letters
QTfrontend/model/gameSchemeModel.cpp
share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua
--- a/QTfrontend/model/gameSchemeModel.cpp	Fri Jan 11 08:51:11 2019 -0500
+++ b/QTfrontend/model/gameSchemeModel.cpp	Sat Jan 12 06:19:16 2019 +0100
@@ -718,7 +718,7 @@
             << QVariant(100)           // get away time  41
             << QVariant(0)             // world edge     42
             // NOTE: If you change this, also change the defaults in the The Specialists script
-            << QVariant("t=SENDIAPL")  // scriptparam    43
+            << QVariant("t=SENDXHPL")  // scriptparam    43
             ;
 
     QList<QVariant> spaceinvasion;
--- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua	Fri Jan 11 08:51:11 2019 -0500
+++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua	Sat Jan 12 06:19:16 2019 +0100
@@ -26,8 +26,8 @@
   E = Engineer
   N = Ninja
   D = Demo
-  I = Sniper
-  A = Saint
+  X = Sniper
+  H = Saint
   P = Pyro
   L = Loon
 
@@ -40,7 +40,7 @@
 
 Example 2:
 
-    t1=LPAIDNES,t2=NNNNNNNN
+    t1=LPHXDNES,t2=NNNNNNNN
 
 Team 1: Loon, Pyro, Saint, Sniper, Demo, Ninja, Engineer, Soldier.
 Team 2: All-ninja team.
@@ -61,14 +61,14 @@
 -- default team values
 local currTeamIdx = 0;
 local teamRoles = {
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'},
-	{'S','E','N','D','I','A','P','L'}
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'},
+	{'S','E','N','D','X','H','P','L'}
 };
 
 local numhhs = 0
@@ -122,11 +122,11 @@
 		SetAmmo(amDynamite, 1, 0, 0, 0)
 		SetAmmo(amMine, 1, 0, 0, 0)
 		SetAmmo(amDrill, 1, 0, 0, 0)
-	elseif teamRoles[groupIndex][hogIndex] == 'I' then
+	elseif teamRoles[groupIndex][hogIndex] == 'X' then
 		SetAmmo(amSniperRifle, 1, 0, 0, 0)
 		SetAmmo(amDEagle, 1, 0, 0, 0)
 		SetAmmo(amPortalGun, 2, 0, 0, 0)
-	elseif teamRoles[groupIndex][hogIndex] == 'A' then
+	elseif teamRoles[groupIndex][hogIndex] == 'H' then
 		SetAmmo(amSeduction, 9, 0, 0, 0)
 		SetAmmo(amResurrector, 1, 0, 0, 0)
 		SetAmmo(amInvulnerable, 1, 0, 0, 0)
@@ -197,13 +197,13 @@
 			SetHogHat(hhs[i], "Skull")
 			SetHealth(hhs[i], scaleHealth(200))
 
-		elseif teamRoles[currTeamIdx][z] == 'I' then
+		elseif teamRoles[currTeamIdx][z] == 'X' then
 
 			SetHogName(hhs[i],loc("Sniper"))
 			SetHogHat(hhs[i], "Sniper")
 			SetHealth(hhs[i], scaleHealth(120))
 
-		elseif teamRoles[currTeamIdx][z] == 'A' then
+		elseif teamRoles[currTeamIdx][z] == 'H' then
 
 			SetHogName(hhs[i],loc("Saint"))
 			SetHogHat(hhs[i], "angel")