Greenfoot5 · Greenfoot5 · Sep 28, 2023 · May 7, 2023 · May 7, 2023 · May 7, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,41 +10,48 @@ on:
 jobs:
   buildForAllSupportedPlatforms:
     name: Build for ${{ matrix.targetPlatform }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.jobOS }}
     strategy:
       fail-fast: false
-      max-parallel: 3
+      max-parallel: 1
       matrix:
-        targetPlatform:
-          #- StandaloneOSX # Build a macOS standalone (Intel 64-bit).
-          - StandaloneWindows # Build a Windows standalone.
-          - StandaloneWindows64 # Build a Windows 64-bit standalone.
-          - StandaloneLinux64 # Build a Linux 64-bit standalone.
-          #- iOS # Build an iOS player.
-          #- Android # Build an Android .apk standalone app.
-          #- WebGL # WebGL.
+        include:
+          - targetPlatform: StandaloneOSX # Build a macOS standalone (Intel 64-bit).
+            jobOS: macos-latest
+          - targetPlatform: StandaloneWindows # Build a Windows standalone.
+            jobOS: ubuntu-latest
+          - targetPlatform: StandaloneWindows64 # Build a Windows 64-bit standalone.
+            jobOS: ubuntu-latest
+          - targetPlatform: StandaloneLinux64 # Build a Linux 64-bit standalone.
+            jobOS: ubuntu-latest
+#          - targetPlatform: iOS # Build an iOS player.
+#            jobOS: ubuntu-latest
+#          - targetPlatform: Android # Build an Android .apk standalone app.
+#            jobOS: ubuntu-latest
+#          - targetPlatform: WebGL # WebGL.
+#            jobOS: ubuntu-latest
+
     outputs:
-      #StandaloneOSX: ${{ steps.outputResult.outputs.StandaloneOSX }}
+      StandaloneOSX: ${{ steps.outputResult.outputs.StandaloneOSX }}
       StandaloneWindows: ${{ steps.outputResult.outputs.StandaloneWindows }}
       StandaloneWindows64: ${{ steps.outputResult.outputs.StandaloneWindows64 }}
       StandaloneLinux64: ${{ steps.outputResult.outputs.StandaloneLinux64 }}
       #iOS: ${{ steps.outputResult.outputs.iOS }}
-      #Android: ${{ steps.outputResult.outputs.Android }}
+      Android: ${{ steps.outputResult.outputs.Android }}
       #WebGL: ${{ steps.outputResult.outputs.WebGL }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
           lfs: true
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: Library
           key: Library-${{ matrix.targetPlatform }}
-          restore-keys: Library-
 
-      - uses: game-ci/unity-builder@v2
+      - uses: game-ci/unity-builder@v3
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -57,40 +64,42 @@ jobs:
         with:
           projectPath: 'Tower Defence'
           targetPlatform: ${{ matrix.targetPlatform }}
+        if: ${{ matrix.targetPlatform != 'Android' }}
+
+      - uses: game-ci/unity-builder@v3
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+
+          # Use for paid version:
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
 
-      - uses: actions/upload-artifact@v2
+          # Use for free version:
+          #UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+        with:
+          projectPath: 'Tower Defence'
+          targetPlatform: ${{ matrix.targetPlatform }}
+          androidKeystoreName: user # This file won't exist, but this property needs to exist.
+          androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+          androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME }}
+          androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }}
+          androidTargetSdkVersion: AndroidApiLevel31
+        if: ${{ matrix.targetPlatform == 'Android' }}
+
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.targetPlatform }}
-          path: 'build'
+          path: |
+            build/
+            !*DoNotShip/
 
-      # ERROR - Causes errors for some reason.
       # Return License
-#      - uses: game-ci/unity-return-license@v1
+#      - uses: game-ci/unity-return-license@v2.0.0
 #        if: always()
 
-      # NOT NEEDED - We don't currently make use of this, instead opting for manual builds for new versions
-#      - uses: paulhatch/semantic-version@v4.0.2
-#        with:
-#          tag_prefix: "v"
-#          # A string which, if present in a git commit, indicates that a change represents a
-#          # major (breaking) change, supports regular expressions wrapped with '/'
-#          major_pattern: "(MAJOR)"
-#          # Same as above except indicating a minor change, supports regular expressions wrapped with '/'
-#          minor_pattern: "(MINOR)"
-#          # A string to determine the format of the version output
-#          format: "${major}.${minor}.${patch}"
-#          # Optional path to check for changes. If any changes are detected in the path the
-#          # 'changed' output will true. Enter multiple paths separated by spaces.
-#          change_path: "Tower Defence"
-#          # Named version, will be used as suffix for name version tag
-#          namespace: Bestagone-Defence
-#          # Indicate whether short tags like 'v1' should be supported. If false only full
-#          # tags like 'v1.0.0' will be recognized.
-#          short_tags: false
-#          # If this is set to true, *every* commit will be treated as a new version.
-#          bump_each_commit: false
       - id: outputResult
-        run: echo "${{ matrix.targetPlatform }}=${{ job.status }}" >> $GITHUB_OUTPUT
+        run: echo "${{ matrix.targetPlatform }}Result=${{ job.status }}" >> $GITHUB_ENV
 
   sendSuccessNotification:
     runs-on: ubuntu-latest
@@ -104,20 +113,20 @@ jobs:
           content: "Build Success"
           embed-title: "New Nightly Build Available!"
           embed-description: "[You can get the new builds here](https://github.com/Greenfoot5/Bestagon-Defence/actions/runs/${{ github.run_id }})
-          \n\n*You may need to scroll down to the bottom*"
+          \n${{ env.StandaloneWindowsResult }}\n*You may need to scroll down to the bottom*"
           embed-color: 1546855
 
   sendFailureNotification:
     runs-on: ubuntu-latest
     needs: 
-    - buildForAllSupportedPlatforms
+      - buildForAllSupportedPlatforms
     if: ${{ failure() }}
     steps:
       - uses: tsickert/discord-webhook@v5.3.0
         with:
           webhook-url: ${{ secrets.NIGHTLY_WEBHOOK_URL }}
           content: "Build Failure"
           embed-title: "New Nightly Build Failed!"
-          embed-description: "[You can find the results here](https://github.com/Greenfoot5/Bestagon-Defence/actions/runs/${{ github.run_id }})"
+          embed-description: "[You can find the results here](https://github.com/Greenfoot5/Bestagon-Defence/actions/runs/${{ github.run_id }})\n${{ env.StandaloneWindowsResult }}"
           embed-color: 10949957
 
diff --git a/LICENSE b/LICENSE
@@ -1,2 +1,20 @@
-This work is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit
-http://creativecommons.org/licenses/by/4.0/.
+# Source Code
+
+Copyright 2023 Harvey Ford
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use any source code from this project except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+# Everything Else
+
+All other assets are licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by/4.0/
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
-![License: Attribution 4.0 International](https://img.shields.io/badge/license-Attribution%204.0%20International-lightgrey)
+![Asset License: Attribution 4.0 International](https://img.shields.io/badge/Asset%20License-CC%20BY%204.0-lightgrey)
+![Code License: Apache 2.0](https://img.shields.io/badge/Code%20License-Apache%202.0-lightgrey)
 ![Support Platforms: Android | MacOS/OS X | Windows](https://img.shields.io/badge/platform-Android_|_MacOS/OSX_|_Windows-lightgrey)
-![Unity Version: 2022.2.16f1](https://img.shields.io/static/v1?logo=unity&label=Unity%20Version&message=2022.2.16f1&color=blue)
+![Unity Version: 2022.3.10f1](https://img.shields.io/static/v1?logo=unity&label=Unity%20Version&message=2022.3.10f1&color=blue)
 
 ![Bestagon Defence](Tower%20Defence/Assets/UI/Branding/Bestagon_Wordmark.png)
 
@@ -17,7 +18,7 @@ If it doesn't work, join the support server and ask or open an issue!
 
 ## Links
 
-[![Website link](https://img.shields.io/badge/Website-Bestagon.Alchemix.dev-blueviolet)](https://bestagon.alchemix.dev/)
+[![Website link](https://img.shields.io/badge/Website-bestagon.alchemix.dev-blueviolet)](https://bestagon.alchemix.dev/)
 [![Support on Ko-Fi](https://img.shields.io/static/v1?logo=ko-fi&label=Ko-Fi&message=Support&color=13C3FF&logoColor=13C3FF)](https://ko-fi.com/bestagondefence)
 [![Notion.so link for documentation](https://img.shields.io/static/v1?logo=notion&label=Notion.so&message=Documentation&color=blue)](https://chambray-comb-aa7.notion.site/Bestagon-Defence-3af38b2be320481580979110f3c373ef)
 [![itch.io link for downloading](https://img.shields.io/static/v1?logo=itchdotio&label=itch.io&message=Download&color=success)](https://greenfoot5.itch.io/bestagon-defence)

diff --git a/Tower Defence/Assets/Abstract/Data/ModuleChainHandler.cs b/Tower Defence/Assets/Abstract/Data/ModuleChainHandler.cs
@@ -37,11 +37,21 @@ public bool Upgrade(ModuleChainHandler sibling)
             // If the upgrade is of a different type,
             if (sibling.GetModule().GetType() != GetModule().GetType()) return false;
             // If the upgrade is of a different tier, 
-            if (sibling.tier != tier || !chain.CanUpgrade(tier)) return false;
+            if (!CanUpgrade(sibling.GetTier())) return false;
 
             tier += 1;
             return true;
         }
+
+        /// <summary>
+        /// Checks if the module can be upgraded from it's current tier
+        /// </summary>
+        /// <param name="otherTier">The tier of the other module this module is trying to upgrade with</param>
+        /// <returns></returns>
+        public bool CanUpgrade(int otherTier)
+        {
+            return otherTier == tier && chain.CanUpgrade(otherTier);
+        }
 
         /// <summary>
         /// Gets the module in the chain of the current tier

diff --git a/Tower Defence/Assets/Abstract/Saving/SaveLevel.cs b/Tower Defence/Assets/Abstract/Saving/SaveLevel.cs
@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using Abstract.Data;
 using Turrets;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
 namespace Abstract.Saving
 {
@@ -10,7 +12,7 @@ namespace Abstract.Saving
     /// </summary>
     public class SaveLevel
     {
-        [System.Serializable]
+        [Serializable]
         public struct NodeData
         {
             public string uuid;
@@ -22,6 +24,7 @@ public struct NodeData
 
 
         public int money;
+        public int powercells;
         public int lives;
         public int waveIndex;
         public Random.State random;

diff --git a/Tower Defence/Assets/Abstract/Saving/SaveManager.cs b/Tower Defence/Assets/Abstract/Saving/SaveManager.cs
@@ -82,7 +82,7 @@ public static void SaveLevel(ISaveableLevel saveable, string sceneName)
                 // Tell our leaderboard API to add the player
                 string leaderboardData =
                     Environment.GetEnvironmentVariable(SceneManager.GetActiveScene().name + "Leaderboard");
-                if (leaderboardData != null)
+                if (leaderboardData != null && _bridge != null)
                 {
                     string[] splitData = leaderboardData.Split(';');
                     _bridge.SendPlayerValue(PlayerPrefs.GetString("Username"), GameStats.Rounds, splitData[0],
@@ -120,18 +120,13 @@ public static void LoadLevel(ISaveableLevel saveable, string sceneName)
 
         public static bool SaveExists(string sceneName)
         {
-            if (FileManager.FileExists(sceneName + "Save.dat"))
-            {
-                FileManager.LoadFromFile(sceneName + "Save.dat", out string json);
-                var sd = new SaveLevel();
-                sd.LoadFromJson(json);
+            if (!FileManager.FileExists(sceneName + "Save.dat")) return false;
+
+            FileManager.LoadFromFile(sceneName + "Save.dat", out string json);
+            var sd = new SaveLevel();
+            sd.LoadFromJson(json);
 
-                if (sd.version == Application.version)
-                {
-                    return true;
-                }
-            }
-            return false;
+            return sd.version == Application.version;
         }
 
         public static void ClearSave(string sceneName)

diff --git a/Tower Defence/Assets/Abstract/TypeSpriteLookup.cs b/Tower Defence/Assets/Abstract/TypeSpriteLookup.cs
@@ -16,7 +16,7 @@ namespace Abstract
     [Serializable]
     public class TypeSpriteLookup
     {
-        private static readonly List<Type> Types = new List<Type>
+        private static readonly List<Type> Types = new()
         {
             null, // Represents no specific turret type
             typeof(Shooter),

diff --git a/Tower Defence/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Tower Defence/Assets/AddressableAssetsData/Android/addressables_content_state.bin
diff --git a/Tower Defence/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Tower Defence/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
@@ -17,11 +17,6 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: 2f149c34a50f148c5b968ec55cd20563
   m_SerializeEntries:
-  - m_GUID: 8e2f78ef9583e4be18ba8f1d9427e930
-    m_Address: Assets/UI/Localization/Tables/Strings/MainMenu Shared Data.asset
-    m_ReadOnly: 1
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: a4bbea44c52ee4ec1ada344d809c9849
     m_Address: Assets/UI/Localization/Tables/Assets/Modules Shared Data.asset
     m_ReadOnly: 1
@@ -32,23 +27,13 @@ MonoBehaviour:
     m_ReadOnly: 1
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: d8dba3f1b6d9b49129d3bfaa66176bdb
-    m_Address: Assets/Levels/Generic/Tutorial/Tutorial Shared Data.asset
-    m_ReadOnly: 1
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 01db83deda24d4c42a2c290e89405b6a
-    m_Address: Assets/Levels/Generic/LevelSelect/LevelSelect Shared Data.asset
-    m_ReadOnly: 1
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 7c2fd8aac1d4a4e3e9098ede69f277bd
     m_Address: Assets/Turrets/Turrets Shared Data.asset
     m_ReadOnly: 1
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: de5ebaefc712f433e8c91b70ace4b38e
-    m_Address: Assets/Levels/Generic/Settings/Settings Shared Data.asset
+  - m_GUID: a6170bad920ce47ac8d85f7255dd7a10
+    m_Address: Assets/UI/Localization/GUI Shared Data.asset
     m_ReadOnly: 1
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0

diff --git a/...eAssetsData/AssetGroups/Localization-String-Tables-English (United Kingdom) (en-GB).asset b/...eAssetsData/AssetGroups/Localization-String-Tables-English (United Kingdom) (en-GB).asset
@@ -17,13 +17,6 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: 3715befcbc1184c71a07a7657095ef2f
   m_SerializeEntries:
-  - m_GUID: a2509145f19cd49e8893d905bdbd3618
-    m_Address: MainMenu_en-GB
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en-GB
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 6dfeb8d5a453b4cd9bd33b00ec262319
     m_Address: Modules_en-GB
     m_ReadOnly: 1
@@ -38,32 +31,17 @@ MonoBehaviour:
     - Locale-en-GB
     - Preload
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: d8c982dee487644f9ab5c3e516287f72
-    m_Address: Tutorial_en-GB
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en-GB
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 69ac90c680dde4db686a529636110b77
-    m_Address: LevelSelect_en-GB
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en-GB
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: e5de750e69e374891b56c01bb6bd3ce4
     m_Address: Turrets_en-GB
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en-GB
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 0dfd305ecbb3344ad9bfd240ced7d43b
-    m_Address: Settings_en-GB
+  - m_GUID: 906121f49d77b4dc78bd63a4c9e104d7
+    m_Address: GUI_en-GB
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale-en-GB
-    - Preload
     FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6e9e55f6df8a74e608f92b8e3a1f0b77, type: 2}