Ticket #3102: t3102_survival_8a.diff

binaries/data/mods/public/globalscripts/random.js

@@ +1 @@
+/*
+ * Return a random floating point number using Math.random library
+ *
+ * If no parameter given, the returned float is in the interval [0, 1)
+ * If one parameter given, it's maxval, and the returned float is in the interval [0, maxval)
+ * If two parameters are given, they are minval and maxval, and the returned float is in the interval [minval, maxval)
+ */
+function randFloat()
+{
+    if (!arguments.length)
+        return Math.random();
+    else if (arguments.length == 1)
+        return randFloat() * arguments[0];
+    else if (arguments.length == 2)
+        return arguments[0] + randFloat() * (arguments[1] - arguments[0]);
+    else
+    {
+        error("randFloat: invalid number of arguments: "+arguments.length);
+        return undefined;
+    }
+}
+
+/*
+ * Return a random integer using Math.random library
+ *
+ * If no parameter given, the returned integer is in the interval [0, 1]
+ * If one parameter given, it's maxval, and the returned integer is in the interval [0, maxval)
+ * If two parameters are given, they are minval and maxval, and the returned integer is in the interval [minval, maxval]
+ */
+function randInt()
+{
+    if (!arguments.length)
+        return Math.round(randFloat());
+    else if (arguments.length == 1)
+        return Math.floor(randFloat(arguments[0]));
+    else if (arguments.length == 2)
+        return Math.floor(randFloat(arguments[0], arguments[1] + 1));
+    else
+    {
+        error("randInt: invalid number of arguments: "+arguments.length);
+        return undefined;
+    }
+}

binaries/data/mods/public/globalscripts/utility.js

@@ -28 +28 @@
     let result = [source[0]];
     for (let i = 1; i < source.length; ++i)
     {
-        let j = Math.floor(Math.random() * (i+1));
+        let j = randInt(i+1);
         result[i] = result[j];
         result[j] = source[i];
     }
     return result;
 }
+
+function pickRandomElement(source)
+{
+    return source.length ? source[randInt(source.length)] : undefined;
+}

binaries/data/mods/public/gui/common/functions_utility.js

@@ -3 +3 @@
  */
 var g_LastNickNotification = -1;
 
-function getRandom(randomMin, randomMax)
-{
-    // Returns a random whole number in a min..max range.
-    // NOTE: There should probably be an engine function for this,
-    // since we'd need to keep track of random seeds for replays.
-
-    var randomNum = randomMin + (randomMax-randomMin)*Math.random();  // num is random, from A to B
-    return Math.round(randomNum);
-}
-
 // Get list of XML files in pathname with recursion, excepting those starting with _
 function getXMLFileList(pathname)
 {

binaries/data/mods/public/gui/common/music.js

@@ -132 +132 @@
 
 Music.prototype.getRandomTrack = function(tracks)
 {
-    return tracks[getRandom(0, tracks.length-1)];
+    return pickRandomElement(tracks);
 };
 
 Music.prototype.startPlayList = function(tracks, fadeInPeriod, isLooping)

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -1229 +1229 @@
     {
         let victoryScriptsSelected = g_GameAttributes.settings.VictoryScripts;
         let gameTypeSelected = g_GameAttributes.settings.GameType;
-        selectMap(Engine.GetGUIObjectByName("mapSelection").list_data[Math.floor(Math.random() *
-            (Engine.GetGUIObjectByName("mapSelection").list.length - 1)) + 1]);
+        selectMap(pickRandomElement(Engine.GetGUIObjectByName("mapSelection").list_data));
         g_GameAttributes.settings.VictoryScripts = victoryScriptsSelected;
         g_GameAttributes.settings.GameType = gameTypeSelected;
     }
@@ -1253 +1252 @@
         let chosenCiv = g_GameAttributes.settings.PlayerData[i].Civ || "random";
         if (chosenCiv == "random")
         {
-            let culture = cultures[Math.floor(Math.random() * cultures.length)];
+            let culture = pickRandomElement(cultures);
             let civs = Object.keys(g_CivData).filter(civ => g_CivData[civ].Culture == culture);
-            chosenCiv = civs[Math.floor(Math.random() * civs.length)];
+            chosenCiv = pickRandomElement(civs);
         }
         g_GameAttributes.settings.PlayerData[i].Civ = chosenCiv;
 
@@ -1263 +1262 @@
         if (g_GameAttributes.mapType === "scenario" || !g_GameAttributes.settings.PlayerData[i].AI)
             continue;
 
-        let chosenName = g_CivData[chosenCiv].AINames[Math.floor(Math.random() * g_CivData[chosenCiv].AINames.length)];
+        let chosenName = pickRandomElement(g_CivData[chosenCiv].AINames);
 
         if (!g_IsNetworked)
             chosenName = translate(chosenName);

binaries/data/mods/public/gui/loading/loading.js

@@ -14 +14 @@
     if (tipTextLoadingArray.length > 0)
     {
         // Set tip text
-        let tipTextFilePath = tipTextLoadingArray[getRandom(0, tipTextLoadingArray.length-1)];
+        let tipTextFilePath = pickRandomElement(tipTextLoadingArray);
         let tipText = Engine.TranslateLines(Engine.ReadFile(tipTextFilePath));
 
         if (tipText)
@@ -63 +63 @@
 
     // Pick a random quote of the day (each line is a separate tip).
     let quoteArray = Engine.ReadFileLines("gui/text/quotes.txt");
-    Engine.GetGUIObjectByName("quoteText").caption = translate(quoteArray[getRandom(0, quoteArray.length-1)]);
+    Engine.GetGUIObjectByName("quoteText").caption = translate(pickRandomElement(quoteArray));
 }
 
 function displayProgress()

binaries/data/mods/public/maps/random/flood.js

@@ -445 +445 @@
     planetm * scaleByMapSize(13, 200)
 );
 
-setSkySet(shuffleArray(["cloudless", "cumulus", "overcast"])[0]);
+setSkySet(pickRandomElement(["cloudless", "cumulus", "overcast"]));
 setWaterMurkiness(0.4);
 
 ExportMap();

binaries/data/mods/public/maps/random/island_stronghold.js

@@ -577 +577 @@
 paintTerrainBasedOnHeight(1, 2, 0, tShore);
 paintTerrainBasedOnHeight(getMapBaseHeight(), 1, 3, tWater);
 
-setSkySet(shuffleArray(["cloudless", "cumulus", "overcast"])[0]);
+setSkySet(pickRandomElement(["cloudless", "cumulus", "overcast"]));
 
 setSunRotation(randFloat(0, TWO_PI));
 setSunElevation(randFloat(PI/5, PI/3));

binaries/data/mods/public/maps/random/rmgen/random.js

@@ -1 @@
-// TODO: rename/change these functions, so the bounds are more clear
-
-/*
- * Return a random floating point number using Math.random library
- *
- * If no parameter given, the returned float is in the interval [0, 1)
- * If two parameters are given, they are minval and maxval, and the returned float is in the interval [minval, maxval)
- */
-function randFloat()
-{
-    if (arguments.length == 0)
-    {
-        return Math.random();
-    }
-    else if (arguments.length == 2)
-    {
-        var minVal = arguments[0]; 
-        var maxVal = arguments[1];
-        
-        return minVal + randFloat() * (maxVal - minVal);
-    }
-    else
-    {
-        error("randFloat: invalid number of arguments: "+arguments.length);
-        return undefined;
-    }
-}
-
-/*
- * Return a random integer using Math.random library
- *
- * If one parameter given, it's maxval, and the returned integer is in the interval [0, maxval)
- * If two parameters are given, they are minval and maxval, and the returned integer is in the interval [minval, maxval]
- */
-function randInt()
-{   
-    if (arguments.length == 1)
-    {
-        var maxVal = arguments[0]; 
-        return Math.floor(Math.random() * maxVal);
-    }
-    else if (arguments.length == 2)
-    {
-        var minVal = arguments[0];
-        var maxVal = arguments[1];
-        
-        return minVal + randInt(maxVal - minVal + 1);
-    }
-    else
-    {
-        error("randInt: invalid number of arguments: "+arguments.length);
-        return undefined;
-    }
-}

binaries/data/mods/public/simulation/ai/common-api/utils.js

@@ -54 +54 @@
     return endArray;
 };
 
-/** Picks a random element from an array */
-m.PickRandom = function(list)
-{
-    return list.length ? list[Math.floor(Math.random()*list.length)] : undefined;
-};
-
-
 /** Utility functions for conversions of maps of different sizes */
 
 /**

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

@@ -3115 +3115 @@
                 this.SelectAnimation("walk", false, this.GetWalkSpeed());
                 this.MoveRandomly(+this.template.RoamDistance);
                 // Set a random timer to switch to feeding state
-                this.StartTimer(RandomInt(+this.template.RoamTimeMin, +this.template.RoamTimeMax));
+                this.StartTimer(randInt(+this.template.RoamTimeMin, +this.template.RoamTimeMax));
                 this.SetFacePointAfterMove(false);
             },
 
@@ -3160 +3160 @@
                 // Stop and eat for a while
                 this.SelectAnimation("feeding");
                 this.StopMoving();
-                this.StartTimer(RandomInt(+this.template.FeedTimeMin, +this.template.FeedTimeMax));
+                this.StartTimer(randInt(+this.template.FeedTimeMin, +this.template.FeedTimeMax));
             },
 
             "leave": function() {

binaries/data/mods/public/simulation/helpers/Random.js

@@ -1 @@
-/**
- * Returns a random integer from min (inclusive) to max (exclusive)
- */
-function RandomInt(min, max)
-{
-    return Math.floor(min + Math.random() * (max-min));
-}
-
-Engine.RegisterGlobal("RandomInt", RandomInt);