feat: prioritize flash

gf-data-tools · Jun 6, 2024 · 066854d · 066854d
1 parent a4ad71e
commit 066854d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/commander_new/commander.py b/commander_new/commander.py
@@ -271,7 +271,9 @@ def problem_solve(
             resource[k] += lp.LpAffineExpression(v)
         for k, v in resource.items():
             problem += v >= 0, k
-        problem += resource["score"] + 0.001 * resource["upgrade"]
+        problem += (
+            resource["score"] + 0.001 * resource["upgrade"] + 0.001 * resource["e80_10"]
+        )
 
         problem.solve(self.solver)
         u_info, g_info = [], []

diff --git a/main.py b/main.py
@@ -27,7 +27,7 @@
 from gunframe import GunFrame
 
 logger = logging.getLogger(__name__)
-__version__ = "12.0.4"
+__version__ = "12.0.5"
 
 
 def download(url, path, max_retry=3, timeout_sec=5):
@@ -505,7 +505,7 @@ def export(self):
                 gun_codes[j] = (
                     f"{record['idx']}-{pos[j%5]}-{record['eid1']}-{record['eid2']}-{record['eid3']}"
                 )
-            code = "1|" + ";".join(gun_codes) + "|0"
+            code = "1|" + ";".join(gun_codes) + f"|{i//5+1}"
             code = standard_b64encode(code.encode()).decode()
             print(code)
             text.insert("end", code + "\n")