Fixes to sunwell and minor improvements

2024-04-15 15:50:41 +02:00
parent 87a4da5882
commit 79ca60d136
46 changed files with 1507 additions and 716 deletions
@@ -457,12 +457,11 @@ class deck:
                elif(i[0] == '__name'):
                    names.append(i[1])
                elif(i[0] == '__code'):
-                    if(i[1].find("\"enabled") > -1):
+                    enabled_pattern = r'enabled:(\d+)'
+                    enabled_match = re.search(enabled_pattern, i[1])
+                    if(enabled_match):
                        enabled = 1
-                        if(i[1].find("\"enabled:2\"") > -1):
-                            names.append(2)
-                        else:
-                            names.append(1)
+                        names.append(int(enabled_match.group(1)))
                    if(i[1].find("\"boss\"") > -1):
                        names.append('boss')
                    else: