Ticket #2019: cheatMod.patch

binaries/data/mods/public/gui/session/messages.js

@@ -9 +9 @@
 const MAX_NUM_NOTIFICATION_LINES = 3;
 var notifications = [];
 var notificationsTimers = [];
-var cheatList = parseJSONData("simulation/data/cheats.json").Cheats;
+var cheats = getCheatsData();
 
+// Gets cheats from the cheats folder
+function getCheatsData()
+{
+    var cheats = new Object();
+    var cheatFileList = getJSONFileList("simulation/data/cheats/");
+    for each (var fileName in cheatFileList)
+    {
+        var currentCheat = parseJSONData("simulation/data/cheats/"+fileName+".json");
+        if (Object.keys(cheats).indexOf(currentCheat.Name) !== -1)
+            warn("Cheat name '"+currentCheat.Name+"' is already present");
+        else {
+            cheats[currentCheat.Name] = currentCheat.Data;
+        }
+    }
+    return cheats;
+}
+    
 // Notifications
 function handleNotifications()
 {
@@ -219 +236 @@
     var isCheat = false;
     if (text.length)
     {
-        for (var i = 0; i < cheatList.length; i++)
+        if (g_Players[Engine.GetPlayerID()].cheatsEnabled)
         {
-            var cheat = cheatList[i];
+            for each (var cheat in Object.keys(cheats))
+            {
 
-            // Line must start with the cheat.
-            if (text.indexOf(cheat.Name) == 0)
-            {
-                var number;
-                if (cheat.IsNumeric)
+                // Line must start with the cheat.
+                if (text.indexOf(cheat) == 0)
                 {
-                    // Match the first word in the substring.
-                    var match = text.substr(cheat.Name.length).match(/\S+/);
-                    if (match && match[0])
-                        number = Math.floor(match[0]);
+                    var number;
+                    if (cheats[cheat].DefaultNumber !== undefined)
+                    {
+                        // Match the first word in the substring.
+                        var match = text.substr(cheat.length).match(/\S+/);
+                        if (match && match[0])
+                            number = Math.floor(match[0]);
 
-                    if (number <= 0 || isNaN(number))
-                        number = cheat.DefaultNumber;
+                        if (number <= 0 || isNaN(number))
+                            number = cheats[cheat].DefaultNumber;
+                    }
+
+                    Engine.PostNetworkCommand({
+                        "type": "cheat",
+                        "action": cheats[cheat].Action,
+                        "number": number,
+                        "text": cheats[cheat].Type,
+                        "selected": g_Selection.toList(),
+                        "templates": cheats[cheat].Templates,
+                        "player": Engine.GetPlayerID()});
+                    isCheat = true;
+                    break;
                 }
-
-                Engine.PostNetworkCommand({
-                    "type": "cheat",
-                    "action": cheat.Action,
-                    "number": number,
-                    "text": cheat.Type,
-                    "selected": g_Selection.toList(),
-                    "templates": cheat.Templates,
-                    "player": Engine.GetPlayerID()});
-                isCheat = true;
-                break;
             }
         }
 
@@ -427 +446 @@
             recurse = true;
             break;
         case "/team":
-            var playerData = getPlayerData();
             if (hasAllies(sender, playerData))
             {
-                if (playerData[Engine.GetPlayerID()].team != playerData[sender].team)
+                if (g_Players[Engine.GetPlayerID()].team != g_Players[sender].team)
                     msg.hide = true;
                 else
                     msg.prefix = "(Team) ";
@@ -440 +458 @@
             recurse = true;
             break;
         case "/enemy":
-            var playerData = getPlayerData();
-            if (hasAllies(sender, playerData))
+            if (hasAllies(sender, g_Players))
             {
-                if (playerData[Engine.GetPlayerID()].team == playerData[sender].team && sender != Engine.GetPlayerID())
+                if (g_Players[Engine.GetPlayerID()].team == g_Players[sender].team && sender != Engine.GetPlayerID())
                     msg.hide = true;
                 else
                     msg.prefix = "(Enemy) ";

binaries/data/mods/public/gui/session/utility_functions.js

@@ -60 +60 @@
             "color": color,
             "team": playerState.team,
             "teamsLocked": playerState.teamsLocked,
+            "cheatsEnabled": playerState.cheatsEnabled,
             "state": playerState.state,
             "isAlly": playerState.isAlly,
             "isMutualAlly": playerState.isMutualAlly,

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -87 +87 @@
             "state": cmpPlayer.GetState(),
             "team": cmpPlayer.GetTeam(),
             "teamsLocked": cmpPlayer.GetLockTeams(),
+            "cheatsEnabled": cmpPlayer.GetCheatsEnabled(),
             "phase": phase,
             "isAlly": allies,
             "isMutualAlly": mutualAllies,

binaries/data/mods/public/simulation/components/Player.js

@@ -31 +31 @@
     this.controlAllUnits = false;
     this.isAI = false;
     this.gatherRateMultiplier = 1;
-    this.cheatsEnabled = true;
+    this.cheatsEnabled = false;
     this.cheatTimeMultiplier = 1;
     this.heroes = [];
 };
@@ -550 +550 @@
     this.UpdateSharedLos();
 };
 
-Player.prototype.SetCheatEnabled = function(flag)
+Player.prototype.SetCheatsEnabled = function(flag)
 {
     this.cheatsEnabled = flag;
 };
 
-Player.prototype.GetCheatEnabled = function()
+Player.prototype.GetCheatsEnabled = function()
 {
     return this.cheatsEnabled;
 };

binaries/data/mods/public/simulation/data/cheats/changeMaxPopulation.json

@@ +1 @@
+{
+    "Name": "TARDIS",
+    "Data": {
+        "Action": "changemaxpopulation"
+    }
+}

binaries/data/mods/public/simulation/data/cheats/convertUnit.json

@@ +1 @@
+{
+    "Name": "wololo",
+    "Data": {
+        "Action": "convertunit"
+    }
+}

binaries/data/mods/public/simulation/data/cheats/createHeros.json

@@ +1 @@
+{
+    "Name": "iwanttopwnthem",
+    "Data": {
+        "Action": "createunits",
+        "DefaultNumber": 1,
+        "Templates": ["units/cart_hero_hamilcar", "units/cart_hero_hannibal", "units/cart_hero_maharbal", "units/rome_hero_marcellus", "units/rome_hero_maximus", "units/rome_hero_scipio", "units/pers_hero_cyrus", "units/pers_hero_darius", "units/pers_hero_xerxes"]
+    }
+}

binaries/data/mods/public/simulation/data/cheats/createPlane.json

@@ +1 @@
+{
+    "Name": "how do you turn this on?",
+    "Data": {
+        "Action": "createunits",
+        "DefaultNumber": 1,
+        "Templates": ["other/plane"]
+    }
+}

binaries/data/mods/public/simulation/data/cheats/createUnits.json

@@ +1 @@
+{
+    "Name": "salad bowl",
+    "Data": {
+        "Action": "createunits",
+        "DefaultNumber": 10,
+        "Templates": ["units/athen_infantry_spearman_b", "units/brit_infantry_spearman_b", "units/cart_infantry_spearman_b", "units/gaul_infantry_spearman_b", "units/iber_infantry_spearman_b",
+        "units/mace_infantry_spearman_b", "units/maur_infantry_spearman_b", "units/pers_infantry_spearman_b", "units/rome_infantry_spearman_b", "units/spart_infantry_spearman_b"]
+    }
+}

binaries/data/mods/public/simulation/data/cheats/defeatPlayer.json

@@ +1 @@
+{
+    "Name": "exodia",
+    "Data": {
+        "Action": "defeatplayer",
+        "DefaultNumber": 2
+    }
+}

binaries/data/mods/public/simulation/data/cheats/fastActions.json

@@ +1 @@
+{
+    "Name": "i am too busy",
+    "Data": {
+        "Action": "fastactions"
+    }
+}

binaries/data/mods/public/simulation/data/cheats/food.json

@@ +1 @@
+{
+    "Name": "i want pizza",
+    "Data": {
+        "Action": "addresource",
+        "Type": "food",
+        "DefaultNumber": 1000
+    }
+}

binaries/data/mods/public/simulation/data/cheats/killUnits.json

@@ +1 @@
+{
+    "Name": "black death",
+    "Data": {
+        "Action": "killunits"
+    }
+}

binaries/data/mods/public/simulation/data/cheats/maxPopulation.json

@@ +1 @@
+{
+    "Name": "the hive master",
+    "Data": {
+        "Action": "maxpopulation"
+    }
+}

binaries/data/mods/public/simulation/data/cheats/metal.json

@@ +1 @@
+{
+    "Name": "your money or your life",
+    "Data": {
+        "Action": "addresource",
+        "Type": "metal",
+        "DefaultNumber": 1000
+    }
+}

binaries/data/mods/public/simulation/data/cheats/revealMap.json

@@ +1 @@
+{
+    "Name": "jame jam",
+    "Data": {
+        "Action": "revealmap"
+    }
+}

binaries/data/mods/public/simulation/data/cheats/stone.json

@@ +1 @@
+{
+    "Name": "i see a mountain here",
+    "Data": {
+        "Action": "addresource",
+        "Type": "stone",
+        "DefaultNumber": 1000
+    }
+}

binaries/data/mods/public/simulation/data/cheats/wood.json

@@ +1 @@
+{
+    "Name": "bring me my axe",
+    "Data": {
+        "Action": "addresource",
+        "Type": "wood",
+        "DefaultNumber": 1000
+    }
+}