Merge pull request #604 from Wolfy76700:game/pbrave

PBRAVE: Added Dvesha

.github/workflows/update_assets.yml

@@ -38,6 +38,21 @@ jobs:
         with:
           python-version: "3.9" #install the python needed
 
+      # Update version numbers
+      - name: Update version numbers
+        run: |
+          pip install requests
+          python scripts/update_calver.py
+          git config --global user.name 'Buildbot'
+          git config --global user.email '[email protected]'
+          git add .
+          if ! git diff --cached --quiet; then
+            git commit -m "Update version number of changed packs"
+            git push origin main
+          else
+            echo "No changes to commit"
+          fi
+    
       # Optimize images
       - name: Optimize images
         run: |
@@ -68,21 +83,6 @@ jobs:
             echo "No changes to commit"
           fi
 
-      # Update version numbers
-      - name: Update version numbers
-        run: |
-          pip install requests
-          python scripts/update_calver.py
-          git config --global user.name 'Buildbot'
-          git config --global user.email '[email protected]'
-          git add .
-          if ! git diff --cached --quiet; then
-            git commit -m "Update version number of changed packs"
-            git push origin main
-          else
-            echo "No changes to commit"
-          fi
-      
       # Generate StartGG config insights
       - name: Generate StartGG config insights
         run: |

games/pbrave/base_files/icon/config.json

@@ -109,6 +109,12 @@
                 "x": 1600,
                 "y": 1468
             }
+        },
+        "Dvesha": {
+            "0": {
+                "x": 1616,
+                "y": 2608
+            }
         }
     },
     "average_size": {

games/pbrave/full/config.json

@@ -98,6 +98,12 @@
                 "x": 2892,
                 "y": 1670
             }
+        },
+        "Dvesha": {
+            "0": {
+                "x": 4084,
+                "y": 3168
+            }
         }
     },
     "uncropped_edge": [

scripts/update_calver.py

@@ -35,7 +35,9 @@ def run_linux_command(command: str):
         return -1, '', str(e)
 
 
-_, LATEST_TAG, _ = run_linux_command("git describe --tags --abbrev=0")
+LATEST_TAG = None
+with open(f"{FILE_DIR}/last_tag.txt", "r", encoding="utf-8") as f:
+    LATEST_TAG = f.read().strip()
 _, LIST_CHANGED_FILES, _ = run_linux_command(f"git diff --name-only {LATEST_TAG} head")
 
 list_config_paths = []
@@ -46,6 +48,14 @@ def run_linux_command(command: str):
         if (config_path not in list_config_paths) and (os.path.isfile(config_path)):
             print(f"Detected change in pack {dir_name}")
             list_config_paths.append(config_path)
+        if "base_files" in dir_name:
+            while not dir_name.endswith("base_files"):
+                dir_name = "/".join(dir_name.split("/")[:-1])
+                config_path = f"{dir_name}/config.json"
+                if (config_path not in list_config_paths) and (os.path.isfile(config_path)):
+                    print(f"Detected change in pack {dir_name}")
+                    list_config_paths.append(config_path)
+
 
 for config_path in list_config_paths:
     with open(config_path, "rt", encoding="utf-8") as config_file: