Merge branch 'master' into feat/action-deploy-update

FAForever · Jun 1, 2024 · 1037658 · 1037658
2 parents 713ac9b + c4ab17c
commit 1037658
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 26 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -36,6 +36,7 @@ jobs:
             - name: Checkout spooky db code
               uses: actions/checkout@v4
               with: 
+                  repository: FAForever/spooky-db
                   ref: master
 
             - name: Remove existing unit information

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -21,6 +21,7 @@
 name: deploy
 
 on:
+    workflow_call:
     workflow_dispatch:
 
 jobs:
@@ -30,25 +31,21 @@ jobs:
     deploy:
         needs: [call-workflow-build-in-local-repo]
         name: deploy
+        needs: [update]
         runs-on: ubuntu-latest
+        permissions: write-all
         steps:
-            - uses: actions/download-artifact@v4
               with:
                 name: spookydb-dist
 
             # https://github.com/actions/checkout/tree/v4/
             - name: Checkout spooky db code
               uses: actions/checkout@v4
               with:
+                  repository: FAForever/spooky-db
                   path: gh-pages
                   ref: gh-pages
 
-            - name: Format commit message
-              id: commit
-              run: |
-                  message=`git log -1 --pretty=format:%B`
-                  echo "message=$message" >> $GITHUB_OUTPUT
-
             - name: Copy
               run: |
                   # remove old files that have a hash in the name

diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml
@@ -34,6 +34,7 @@ jobs:
             - name: Checkout spooky db code
               uses: actions/checkout@v4
               with:
+                  repository: FAForever/spooky-db
                   ref: master
 
             - name: Checkout FAForever blueprints and lua files

diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml
@@ -32,7 +32,10 @@ jobs:
         steps:
             - name: Checkout spooky db code
               uses: actions/checkout@v4
-
+              with:
+                repository: FAForever/spooky-db
+                ref: master
+
             - name: Checkout FAForever blueprints and lua files
               uses: actions/checkout@v4
               with:

diff --git a/app/data/index.fat.json b/app/data/index.fat.json
@@ -12152,7 +12152,6 @@
       "AI": {
         "AttackAngle": 90,
         "GuardReturnRadius": 30,
-        "InitialAutoMode": true,
         "TargetBones": [
           "UES0202",
           "Back_Wake",
@@ -15914,9 +15913,7 @@
         "TransportClass": 2,
         "CanFireFromTransport": false
       },
-      "AI": {
-        "InitialAutoMode": true
-      },
+      "AI": [],
       "StrategicIconName": "icon_land2_missile",
       "LifeBarOffset": 0.45,
       "BuildIconSortPriority": 100,
@@ -23875,9 +23872,7 @@
         "CanFireFromTransport": false
       },
       "LifeBarOffset": 1,
-      "AI": {
-        "InitialAutoMode": true
-      },
+      "AI": [],
       "LifeBarSize": 1.2,
       "BuildIconSortPriority": 30,
       "StrategicIconName": "icon_land3_missile",
@@ -46344,7 +46339,6 @@
         "TeleportEnergyMod": 0.15
       },
       "AI": {
-        "InitialAutoMode": true,
         "TargetBones": [
           "Launcher"
         ]
@@ -77466,9 +77460,7 @@
         "CanFireFromTransport": false
       },
       "LifeBarOffset": 0.45,
-      "AI": {
-        "InitialAutoMode": true
-      },
+      "AI": [],
       "StrategicIconName": "icon_land2_missile",
       "BuildIconSortPriority": 30,
       "LifeBarSize": 0.75,
@@ -109475,9 +109467,7 @@
         "TransportClass": 2,
         "CanFireFromTransport": false
       },
-      "AI": {
-        "InitialAutoMode": true
-      },
+      "AI": [],
       "StrategicIconName": "icon_land2_missile",
       "LifeBarOffset": 0.55,
       "BuildIconSortPriority": 40,
@@ -119125,7 +119115,7 @@
           },
           "TurretPitch": 0,
           "AutoInitiateAttackCommand": false,
-          "DisplayName": "Unstable Phason Laser 2",
+          "DisplayName": "Lightning Surface Projector",
           "TurretPitchSpeed": 1000,
           "TurretBoneYaw": "muzzle02",
           "ContinuousBeam": false,
@@ -119203,7 +119193,7 @@
           "TurretPitch": 30,
           "CannotAttackGround": true,
           "TurretPitchRange": 180,
-          "DisplayName": "Unstable Phason Laser",
+          "DisplayName": "Lightning Projector",
           "TurretPitchSpeed": 1000,
           "TurretBoneYaw": "muzzle01",
           "ContinuousBeam": false,

diff --git a/app/data/index.json b/app/data/index.json
@@ -36807,7 +36807,7 @@
           "BeamCollisionDelay": 0.05,
           "DamageType": "Normal",
           "TurretPitch": 0,
-          "DisplayName": "Unstable Phason Laser 2",
+          "DisplayName": "Lightning Surface Projector",
           "TurretPitchSpeed": 1000,
           "ContinuousBeam": false,
           "MinRadius": 0,
@@ -36840,7 +36840,7 @@
           "DamageType": "Normal",
           "TurretPitch": 30,
           "TurretPitchRange": 180,
-          "DisplayName": "Unstable Phason Laser",
+          "DisplayName": "Lightning Projector",
           "TurretPitchSpeed": 1000,
           "ContinuousBeam": false,
           "TurretYawRange": 180,