Add Sorting Algorythm

ReallifeGamemode.Client/Interaction/factioninteraction.js

@@ -4,6 +4,7 @@ var tasks;
 var initTasks;
 var newTasks;
 var sorting = 0;
+var firstSorting = true;
 var activeTask = false;
 var activeCheckpoint;
 var taskStart;
@@ -11,7 +12,7 @@ var taskFinish;
 var taskRange;
 var ambulanceImagePos;
 var rangeLeft;
-var sortText = "Nach Uhrzeit"
+var sortText;
 
 const NativeUI = require("nativeui");
 const Menu = NativeUI.Menu;
@@ -100,6 +101,9 @@ mp.events.add("showMedicTasks", (type, taskList) => {
     if (sorting === 0) {
         initTasks = tasks;
     }
+
+    mp.events.call("sortFactionTasks", false);
+
     mp.gui.chat.activate(false);
     globalData.Interaction = true;
     switch (type) {
@@ -160,38 +164,44 @@ mp.events.add("showMedicTasks", (type, taskList) => {
     }
 });
 
-mp.events.add("sortFactionTasks", () => {   
-    newTasks = tasks;
-    if (sorting < 4) {
+mp.events.add("sortFactionTasks", (sortByKey) => {   
+    if (firstSorting) {
+        sortText = "Nach Uhrzeit";
+        firstSorting = false;
+        mp.gui.chat.push("Init Sort");
+        return;
+    } else {
+        if (sortByKey) {
+            if (sorting < 1) {
                 sorting++;
             } else {
                 sorting = 0;
             }
+            
             switch (sorting) {
                 case 0: //Standartsortierung
 
                     reviveTaskMenu.Close();
                     factionInteractionMenu.Close();
-            mp.events.call("showMedicTasks", 0, JSON.stringify(initTasks));    
                     sortText = "Nach Uhrzeit";
+                    mp.events.call("showMedicTasks", 0, JSON.stringify(initTasks));              
                     break;
 
                 case 1: //Sortierung nach Metern (aufsteigend)                    
-
-            for (var d = 0; d < newTasks.length; d++) {
-                for (var e = 0; e < newTasks.length - 1; e++) {
+                    for (var d = 0; d < tasks.length; d++) {
+                        for (var e = 0; e < tasks.length - 1; e++) {
                             if (getDistance1(e) > getDistance2(e + 1)) {
-                        var tempTask = newTasks[e];
-                        newTasks[e] = newTasks[e + 1];
-                        newTasks[e + 1] = tempTask;
+                                var tempTask = tasks[e];
+                                tasks[e] = tasks[e + 1];
+                                tasks[e + 1] = tempTask;
                                 mp.gui.chat.push("SWITCH");
                             } 
                         } 
                     } 
-            sortText = "Entfernung aufsteigend";
                     reviveTaskMenu.Close();
                     factionInteractionMenu.Close();
-            mp.events.call("showMedicTasks", 0, JSON.stringify(newTasks));
+                    sortText = "Entfernung aufsteigend";                   
+                    mp.events.call("showMedicTasks", 0, JSON.stringify(tasks));
                     break;
 
                 //case 2: //Sortierung nach Metern (absteigend)   
@@ -207,6 +217,8 @@ mp.events.add("sortFactionTasks", () => {
                 //    sortText = "Restzeit absteigend";
                 //    break;
             }
+        }
+    }
 });
 
 function getDistance1(index) {

ReallifeGamemode.Client/Player/keys.js

@@ -66,8 +66,8 @@ mp.keys.bind(0x62, false, function () {
 
 //NUM5 //Fraktionsinteraktion (Tasks sortieren)
 mp.keys.bind(0x65, false, function () {
-    if (!globalData.InChat) {
-        mp.events.call("sortFactionTasks");
+    if (!globalData.InChat && globalData.Interaction) {
+        mp.events.call("sortFactionTasks", true);
     }
 });
 

ReallifeGamemode.Server/Properties/launchSettings.json

@@ -2,8 +2,8 @@
   "profiles": {
     "ReallifeGamemode.Server": {
       "commandName": "Executable",
-      "executablePath": "S:\\RAGEMP\\server-files\\server.exe",
-      "workingDirectory": "S:\\RAGEMP\\server-files\\"
+      "executablePath": "C:\\Users\\manue\\Desktop\\RageMP\\server-files\\server.exe",
+      "workingDirectory": "C:\\Users\\manue\\Desktop\\RageMP\\server-files"
     }
   }
 }