From 2da216bbf37931ff44a265791922ab50a3458cc9 Mon Sep 17 00:00:00 2001
From: "sigonasr2, Sig, Sigo" <sigonasr2@gmail.com>
Date: Fri, 22 Sep 2023 18:37:34 +0000
Subject: [PATCH] All done!

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 .../ChampionsLeaguePointSolver.cpp            |  18 +++++++++++++-----
 .../ChampionsLeaguePointSolver.wasm           | Bin 357282 -> 357513 bytes
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp b/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp
index 8507a1d..91172b2 100644
--- a/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp
+++ b/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp
@@ -288,12 +288,12 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
 
             for(int i=0;i<inputButtons.size();i++){
                 if(i==0){
-                    inputButtons[i]=new QuickGUI::Button(gui,std::to_string(i),{2.f+(1%3)*50,ScreenHeight()-(4-9/3)*26.f},{48,24});
+                    inputButtons[i]=new QuickGUI::Button(gui,std::to_string(i),{2.f+(1%3)*50,ScreenHeight()-(4-9/3)*26.f},{49,25});
                 }else
                 if(i==10){
-                    inputButtons[i]=new QuickGUI::Button(gui,"<--",{2.f+(2%3)*50,ScreenHeight()-(4-9/3)*26.f},{48,24});
+                    inputButtons[i]=new QuickGUI::Button(gui,"<--",{2.f+(2%3)*50,ScreenHeight()-(4-9/3)*26.f},{49,25});
                 }else{
-                    inputButtons[i]=new QuickGUI::Button(gui,std::to_string(i),{2.f+((i-1)%3)*50,ScreenHeight()-(4-(i-1)/3)*26.f},{48,24});
+                    inputButtons[i]=new QuickGUI::Button(gui,std::to_string(i),{2.f+((i-1)%3)*50,ScreenHeight()-(4-(i-1)/3)*26.f},{49,25});
                 }
                 inputButtons[i]->bVisible=false;
                 inputButtons[i]->Enable(false);
@@ -344,6 +344,10 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
                 bestComboB={};
             }
             QuickGUI::TextBox*prevActiveBox=activeBox;
+            if(GetMouse(0).bPressed&&(GetMouseY()<ScreenHeight()-(4-(0-1)/3)*26+2||GetMouseX()>2+((10-1)/3)*50+2)){
+                prevActiveBox=nullptr;
+                activeBox=nullptr;
+            }
             gui.Update(this);
             gui.Draw(this);
 
@@ -368,9 +372,13 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
                             TextEntryEnable(true,prevActiveBox->sText);
                         }
                     }
+                }else{
+                    for(int i=0;i<inputButtons.size();i++){
+                        inputButtons[i]->bVisible=false;
+                        inputButtons[i]->Enable(false);
+                    }
                 }
             }
-
             if(calculating){
                 activeBox=nullptr;
                 if(calculationStep<cases.size()){
@@ -388,7 +396,7 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
                     SongCombinations picked1,picked2;
                     for(SongCombinations&A:bestComboA){
                         for(SongCombinations&B:bestComboB){
-                            if(A.totalEX+B.totalEX>highestEX&&A.p1Picked.size()+B.p1Picked.size()==4&&A.p2Picked.size()+B.p2Picked.size()==4&&A.p3Picked.size()+B.p3Picked.size()==4){
+                            if(A.totalEX+B.totalEX>highestEX&&A.p1Picked.size()+B.p1Picked.size()<=4&&A.p2Picked.size()+B.p2Picked.size()<=4&&A.p3Picked.size()+B.p3Picked.size()<=4){
                                 highestEX=A.totalEX+B.totalEX;
                                 picked1=A;
                                 picked2=B;
diff --git a/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.wasm b/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.wasm
index 3d1221e99fe8a6ea9b34568651cf82f0f0543713..f6acbdbb2c8d8538dc563ac863465844e841a25c 100755
GIT binary patch
delta 2846
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

delta 2627
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
Bz+nIY