Merge pull request #423 from IUrreta/main

Main

back/scripts/edit_stats.py

@@ -26,9 +26,9 @@
 
 mentaility_overall = {
     0: 95,
-    1: 75,
-    2: 55,
-    3: 35,
+    1: 79,
+    2: 59,
+    3: 24,
     4: 5
 }
 

back/utils.py

@@ -685,14 +685,19 @@ async def get_custom_engines_list(self, saveName):
     def manage_difficulty_triggers(self, triggerList):
         conn = sqlite3.connect("../result/main.db")
         cursor = conn.cursor()
-
 
-        self.manage_design_boost_triggers(cursor, triggerList["statDif"])
-        self.manage_design_time_triggers(cursor, triggerList["designTimeDif"])
-        self.manage_weight_trigger(cursor, triggerList["lightDif"])
-        self.manage__instant_build_triggers(cursor, triggerList["buildDif"])
-        self.manage_research_triggers(cursor, triggerList["researchDif"])
-        self.upgrade_factories(cursor, triggerList["factoryDif"])
+        if triggerList.get("statDif"):
+            self.manage_design_boost_triggers(cursor, triggerList["statDif"])
+        if triggerList.get("designTimeDif"):
+            self.manage_design_time_triggers(cursor, triggerList["designTimeDif"])
+        if triggerList.get("lightDif"):
+            self.manage_weight_trigger(cursor, triggerList["lightDif"])
+        if triggerList.get("buildDif"):
+            self.manage__instant_build_triggers(cursor, triggerList["buildDif"])
+        if triggerList.get("researchDif"):
+            self.manage_research_triggers(cursor, triggerList["researchDif"])
+        if triggerList.get("factoryDif"):
+            self.upgrade_factories(cursor, triggerList["factoryDif"])
 
         conn.commit()
         conn.close()

front/js/config.js

@@ -184,6 +184,13 @@ const mentalityModifiers = {
     96: 7,
     100: 8
 };
+const mentality_to_global_menatality = {
+    0: 95,
+    1: 79,
+    2: 59,
+    3: 24,
+    4: 5,
+}
 
 //transfers
 const f1_teams = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 32]

front/js/renderer.js

@@ -12,10 +12,6 @@ let firstShow = false;
 let configCopy;
 
 
-const batFilePath = path.join(__dirname,'../back/startBack.bat');
-
-
-
 const socket = new WebSocket('ws://localhost:8765/');
 /**
  * When the socket is opened sends a connect message to the backend
@@ -194,7 +190,7 @@ function editModeHandler() {
         globalMentality = Math.floor(globalMentality / 3)
     }
     document.querySelector(".clicked").dataset.globalMentality = globalMentality
-    let new_ovr = calculateOverall(stats,typeOverall, globalMentality);
+    let new_ovr = calculateOverall(stats,typeOverall, mentality_to_global_menatality[globalMentality]);
     document.querySelector(".clicked").childNodes[1].childNodes[0].textContent = ""
     if (new_ovr[1] !== new_ovr[0]) {
         document.querySelector(".clicked").childNodes[1].childNodes[0].textContent = new_ovr[1];
@@ -208,7 +204,7 @@ function editModeHandler() {
     }
     let inputArray = document.querySelectorAll(".elegible")
     inputArray.forEach(function (input, index) {
-        manage_mentality_modifiers(input, globalMentality)
+        manage_mentality_modifiers(input, mentality_to_global_menatality[globalMentality])
     })
     let diff = parseInt(new_ovr[1]) - parseInt(new_ovr[0])
     let mentalitydiff = document.querySelector(".mentality-change-ovr")

front/js/seasonViewer.js

@@ -920,15 +920,15 @@ function hoverListeners() {
 function generateYearsMenu(actualYear) {
     document.querySelector("#yearInput").min = actualYear
     currentSeason = actualYear
-    var yearMenu = document.querySelector("#yearMenu");
-    var yearH2H = document.querySelector("#yearMenuH2H");
-    var yearPrediction = document.querySelector("#yearPredictionMenu");
-    var yearPredictionModal = document.querySelector("#yearPredictionModalMenu");
+    let yearMenu = document.querySelector("#yearMenu");
+    let yearH2H = document.querySelector("#yearMenuH2H");
+    let yearPrediction = document.querySelector("#yearPredictionMenu");
+    let yearPredictionModal = document.querySelector("#yearPredictionModalMenu");
     yearMenu.innerHTML = ""
     yearH2H.innerHTML = ""
     yearPrediction.innerHTML = ""
     yearPredictionModal.innerHTML = ""
-    for (let year = actualYear; year >= game_version; year--) {
+    for (let year = actualYear; year >= actualYear; year--) {
         let a = document.createElement("a");
         a.textContent = year.toString();
         a.classList = "dropdown-item"

launch.sh

@@ -11,10 +11,28 @@ echo "Version: $version"
 cd ..
 
 cd back
-pip install websockets
-pip install numpy
-pip install pandas
-pip install scikit-learn
+
+# Crear entorno virtual si no existe
+if [ ! -d "DBEditor" ]; then
+    echo "No virtual environment found, creating one..."
+    python3 -m venv DBEditor
+    echo "Virtual environment created."
+else
+    echo "Virtual environment found."
+fi
+
+# Activar el entorno virtual
+source DBEditor/bin/activate
+
+# Instalar dependencias si existe requirements.txt
+if [ -f "requirements.txt" ]; then
+    echo "Installing requirements..."
+    pip install -r requirements.txt
+else
+    echo "requirements.txt not found."
+fi
+
+# Ejecutar el script back.py en segundo plano
 python3 back.py &
 cd ..
 
@@ -23,4 +41,4 @@ npm install --no-audit
 npm start
 
 # Matar el proceso python
-pkill -f python3
+pkill -f back.py

launcher/version.conf

@@ -1 +1 @@
-2.3.3
+2.3.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Database Editor F1 Manager",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "A tool that will let you edit your save file from F1 Manager games",
   "main": "main.js",
   "scripts": {