diff options
Diffstat (limited to 'autoschedule')
| -rw-r--r-- | autoschedule/main.php | 13 | ||||
| -rw-r--r-- | autoschedule/ponies.php | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/autoschedule/main.php b/autoschedule/main.php index 892ea02..e3ae2bf 100644 --- a/autoschedule/main.php +++ b/autoschedule/main.php @@ -2,9 +2,9 @@ $_SERVER['DOCUMENT_ROOT'] = ".."; -require_once "../includes/score.php"; -require_once "../includes/bitset.php"; -require_once "../includes/functions.php"; +require_once "../includes/score.inc"; +require_once "../includes/bitset.inc"; +require_once "../includes/functions.inc"; $days = []; $today_date = date('Y-m-d', time() + 86400); @@ -172,6 +172,7 @@ foreach (scoreOrderGlobal() as $pony) { ]; } +$runs = 0; while (!$correct) { $ponies = []; $fixed = false; @@ -270,6 +271,12 @@ while (!$correct) { } if (!$fixed) $correct = true; + + if ($runs > 8) { + $correct = true; + } + + $runs++; } echo("--------------\n"); diff --git a/autoschedule/ponies.php b/autoschedule/ponies.php index 3346452..d16e701 100644 --- a/autoschedule/ponies.php +++ b/autoschedule/ponies.php @@ -4,14 +4,14 @@ global $ponies_raindrops; global $ponies_cloudburst; global $weekend; -$travelling = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/travelling.json"), true); +$travelling = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/travelling/travelling.json"), true); function ponies(string $system): array { global $travelling; global $weekend; return array_map(function ($i) use ($system, $weekend) { - $switches = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system-switches.json"), true); + $switches = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/switches.json"), true); $memberData = $i; $i["_lastFronted"] = -1; @@ -53,7 +53,7 @@ function ponies(string $system): array { $fronters = array_map(function ($item) { return $item["id"]; - }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system-fronters.json"), true)["members"]); + }, json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$system/fronters.json"), true)["members"]); if (in_array($id, $fronters)) { $i["_lastFronted"] = time(); |