Simplified data functions

Data functions (i.e. `SaveData`, `HasData`, `GetData`, `GetAllData`) have been simplified. The last one has been removed and replaced by a parameterless signature of `GetData`. Furthermore, all these functions will only have an effect on the first entity in the array.

Author: VulcanShot

QueryArray.nut

@@ -105,52 +105,42 @@ class csQuery.QueryArray {
     }
 
     function SaveData(key, value) {
-        this.Each(function (ent) : (key, value) {
-            ent.ValidateScriptScope();
-            local scope = ent.GetScriptScope();
-            if (!("customData" in scope))
-                scope.customData <- {};
-            scope.customData[key] <- value;
-        });
+        local ent = this.Eq(0);
+        ent.ValidateScriptScope();
+        local scope = ent.GetScriptScope();
+        if (!("customData" in scope))
+            scope.customData <- {};
+        scope.customData[key] <- value;
         return this;
     }
 
     function HasData(key) {
-        local env = { key = key, hasData = false }
-        this.Each(function (ent) {
-            ent.ValidateScriptScope();
-            local scope = ent.GetScriptScope();
-            if (!("customData" in scope))
-                return;
+        local hasData = false;
+        local ent = this.Eq(0);
+        ent.ValidateScriptScope();
+        local scope = ent.GetScriptScope();
 
-            if (key in scope.customData)
-                hasData = true;
-        }.bindenv(env));
-        return env.hasData;
-    }
+        if (!("customData" in scope))
+            return;
 
-    function GetData(key) {
-        return getData(false, key)
-    }
+        if (key in scope.customData)
+            hasData = true;
 
-    function GetAllData() {
-        return getData(true);
+        return hasData;
     }
 
-    function getData(returnAll, key = null) {
-        local env = { key = key, returnAll = returnAll, data = [] }
-        this.Each(function (ent) {
-            ent.ValidateScriptScope();
-            local scope = ent.GetScriptScope();
-            if (!("customData" in scope))
-                throw "Data table has not been created";
-
-            if (returnAll == true)
-                data.push(scope.customData);
-            else 
-                data.push(scope.customData[key]);
-        }.bindenv(env));
-        return env.data;
+    function GetData(key = null) {
+        local ent = this.Eq(0);
+        ent.ValidateScriptScope();
+        local scope = ent.GetScriptScope();
+
+        if (!("customData" in scope))
+            throw "Data table has not been created";
+
+        if (key)
+            return scope.customData[key];
+        else 
+            return scope.customData;
     }
 
     function PrecacheModels(models) {

README.md

@@ -58,15 +58,14 @@ QueryArray On(string output, function callback, string id);
 // Stops listening to the given output. The callback removed is the one identified with the id
 QueryArray Off(string output, string id);
 
-// Data functions not recommended when dealing with multiple entities
-// Saves the given value with the given identification (key). IMPORTANT: Data saved will 'live' throughout all rounds.
+// Saves the given value with the given identification (key) in the first entity's scope. IMPORTANT: Data saved will 'live' throughout all rounds.
 QueryArray SaveData(string key, object value);
-// Returns Whether data under the given key has already been stored. Will not throw an exception if SaveData() has never been used before.
+// Returns whether data under the given key has already been stored in the first entity's scope. Will not throw an exception if SaveData() has never been used before.
 bool HasData(string key);
-// Returns an array of objects which match with the given key. Will throw an exception if SaveData() has never been used before.
+// Returns an array of objects which match with the given key in the first entity's scoep. Will throw an exception if SaveData() has not been used with the first entity.
 object[] GetData(string key);
-// Returns an array of tables which contain all data stored through SaveData(). Will throw an exception if SaveData() has never been used before.
-table[] GetAllData();
+// Returns a table which contains all data stored in the first entity's scope through SaveData(string key, object value). Will throw an exception if SaveData() has not been used with the first entity.
+table GetData();
 
 // Precaches each model in the array. Don't worry, each model is precached only once
 QueryArray PrecacheModels(string[] models);