Better implementation of league stuff

PennyDreadfulMTG · Jan 10, 2024 · 1e3a20f · 1e3a20f
1 parent e4b1060
commit 1e3a20f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/gatherling/models/Event.php b/gatherling/models/Event.php
@@ -1183,6 +1183,11 @@ public function isLeague()
         return false;
     }
 
+    public function leagueLength()
+    {
+        return 6; // TODO: This should be customizable.
+    }
+
     // All this should probably go somewhere else
     // Pairs the round which is currently running.
     // This should probably be in Standings?

diff --git a/gatherling/models/Standings.php b/gatherling/models/Standings.php
@@ -277,7 +277,7 @@ public function getOpponents($eventname, $subevent, $round)
      *
      * @return void|array
      */
-    public function League_getAvailable_Opponents($subevent, $round)
+    public function League_getAvailable_Opponents($subevent, $round, $league_length)
     {
         $opponentsAlreadyFaced = [];
         $allPlayers = [];
@@ -310,7 +310,7 @@ public function League_getAvailable_Opponents($subevent, $round)
         if ($structure == 'League Match' && count($opponentsAlreadyFaced) >= 1) {
             return [];
         }
-        if (count($opponentsAlreadyFaced) >= 5) {
+        if (count($opponentsAlreadyFaced) >= $league_length) {
             return [];
         }
         // Get all opponents who haven't dropped from event and exclude myself

diff --git a/gatherling/player.php b/gatherling/player.php
@@ -607,7 +607,7 @@ function print_ActiveEvents()
                 echo '<td>'.$entry->createDeckLink().'</td>';
             } elseif ($structure == 'League') {
                 $count = $event->getPlayerLeagueMatchCount($player->name) + 1;
-                if ($count < 7) {
+                if ($count <= $event->leagueLength()) {
                     $Leagues[] = "<tr><td>{$event->name} Match: {$count}</td><td><a href=\"report.php?mode=submit_league_result&event={$event->name}&round={$event->current_round}&subevent={$subevent_id}\">Report League Game</a></td></tr>";
                 }
             } elseif ($structure == 'League Match') {