GH-230 Move colonization task handling to an util

mdziekon · Jul 6, 2022 · 97b485b · 97b485b
1 parent ccf1db0
commit 97b485b
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 19 deletions.
diff --git a/modules/overview/_includes.php b/modules/overview/_includes.php
@@ -6,6 +6,8 @@
 
     $includePath = $_EnginePath . 'modules/overview/';
 
+    include($includePath . './screens/AbandonPlanet/utils/effects/triggerUserTasksUpdates.effect.php');
+
     include($includePath . './screens/FirstLogin/FirstLogin.screen.php');
     include($includePath . './screens/FirstLogin/FirstLogin.utils.php');
     include($includePath . './screens/FirstLogin/utils/effects/createUserDevLogDump.effect.php');

diff --git a/modules/overview/screens/AbandonPlanet/index.php b/modules/overview/screens/AbandonPlanet/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/overview/screens/AbandonPlanet/utils/effects/index.php b/modules/overview/screens/AbandonPlanet/utils/effects/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/overview/screens/AbandonPlanet/utils/effects/triggerUserTasksUpdates.effect.php b/modules/overview/screens/AbandonPlanet/utils/effects/triggerUserTasksUpdates.effect.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Overview\Screens\AbandonPlanet\Utils\Effects;
+
+/**
+ * @param array $params
+ * @param arrayRef $params['user']
+ */
+function triggerUserTasksUpdates($props) {
+    $user = &$props['user'];
+
+    // Prevent abandoning Planet to make mission faster
+    Tasks_TriggerTask(
+        $user,
+        'COLONIZE_PLANET',
+        [
+            'mainCheck' => function ($JobArray, $ThisCat, $TaskID, $JobID) use ($user) {
+                global $UserTasksUpdate;
+
+                $userId = $user['id'];
+
+                if (!empty($UserTasksUpdate[$userId]['status'][$ThisCat][$TaskID][$JobID])) {
+                    $user['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID] = $UserTasksUpdate[$userId]['status'][$ThisCat][$TaskID][$JobID];
+                }
+                if ($user['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID] <= 0) {
+                    return true;
+                }
+
+                $user['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID] -= 1;
+                $UserTasksUpdate[$userId]['status'][$ThisCat][$TaskID][$JobID] = $user['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID];
+
+                return true;
+            }
+        ]
+    );
+}
+
+?>
diff --git a/modules/overview/screens/AbandonPlanet/utils/index.php b/modules/overview/screens/AbandonPlanet/utils/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/overview.php b/overview.php
@@ -77,25 +77,9 @@
                             $DeleteResult = DeleteSelectedPlanetorMoon();
                             if($DeleteResult['result'] === true)
                             {
-                                // Prevent abandoning Planet to make mission faster
-                                Tasks_TriggerTask($_User, 'COLONIZE_PLANET', array
-                                (
-                                    'mainCheck' => function($JobArray, $ThisCat, $TaskID, $JobID) use ($_User)
-                                    {
-                                        global $UserTasksUpdate;
-                                        if(!empty($UserTasksUpdate[$_User['id']]['status'][$ThisCat][$TaskID][$JobID]))
-                                        {
-                                            $_User['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID] = $UserTasksUpdate[$_User['id']]['status'][$ThisCat][$TaskID][$JobID];
-                                        }
-                                        if($_User['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID] <= 0)
-                                        {
-                                            return true;
-                                        }
-                                        $_User['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID] -= 1;
-                                        $UserTasksUpdate[$_User['id']]['status'][$ThisCat][$TaskID][$JobID] = $_User['tasks_done_parsed']['status'][$ThisCat][$TaskID][$JobID];
-                                        return true;
-                                    }
-                                ));
+                                Overview\Screens\AbandonPlanet\Utils\Effects\triggerUserTasksUpdates([
+                                    'user' => &$_User,
+                                ]);
 
                                 // User Development Log
                                 $UserDev_Log[] = array('PlanetID' => $_Planet['id'], 'Date' => $Now, 'Place' => 25, 'Code' => '0', 'ElementID' => '0');