katsup

.github/workflows/Aristeas NewUniversalUpload.yml

@@ -14,12 +14,6 @@ jobs:
       - uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v44
-        with:
-            separator: ','
 
       #- name: List all changed files
       #  env:
@@ -30,6 +24,6 @@ jobs:
       #    done
       - id: test_SEWT
         run: |
-          & "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" --repo "${{ github.workspace }}" --changes "${{ steps.changed-files.outputs.all_changed_and_modified_files }}" --changelog "${{ github.event.head_commit.message }}"
+          & "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" --repo "${{ github.workspace }}" --changelog "${{ github.event.head_commit.message }}"
 
       - uses: EndBug/add-and-commit@v9

.github/workflows/Aristeas_BuildScripts.yml

@@ -13,12 +13,6 @@ jobs:
       - uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v44
-        with:
-            separator: ','
 
       #- name: List all changed files
       #  env:
@@ -29,4 +23,4 @@ jobs:
       #    done
       - id: build-mods
         run: |
-          & "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" "build" --repo "${{ github.workspace }}" --changes "${{ steps.changed-files.outputs.all_changed_and_modified_files }}"
+          & "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" "build" --repo "${{ github.workspace }}"

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+### Prerequsites:
+- (extremely recommended) github Desktop, GitExtentions, or something similar
+- knowing the layout of SE mod files
+- enough space to download the entire git repo (~5gb)?
+
+### Step 1:
+- ``Fork`` this repository to a folder on your computer. Name it something like SCModRepository-Yourname. This is where your edits can be made, and is apparently how actual projects do it.
+
+### Step 2:
+- ``Make a branch`` for the changes you want to do on ``your local repository``. (i.e. SCModRepository-Yourname/BuffMyFavoriteGunPlease) Use your local repository's ``Main`` branch to keep in sync with starcore's ``Main`` branch, it makes edits much easier. You just click the button on github to sync it.
+
+### Step 3:
+- To test your changes ingame, Copy the mod you want to edit to your ``%Appdata%/SpaceEngineers/Mods`` folder.
+
+### Step 4:
+- Make your edits and throw it back in the repository folder. you can use the ``.bat file`` included in the repository to link your local Space Engineers mods with the ones in the repository.
+
+### Step 5:
+- Submit a pull request so that the branch can be merged into the SCModRepository/Main one.
+- You can merge your PR yourself if you're confident, or ask for review. Once merged, the development version of the mod will automatically be updated.
+
+Note - the `Main` branch is for the ModDev world, and `Stable` is for the primary combat and build worlds. `Stable` pushes are done in bulk after Test Tournaments.
+
+
+***
+
+
+## How does this work?
+The repository contains a .github folder, Space Engineers mod folders, and a .gitignore file.
+### .github folder:
+- contains the instructions to the bot what to do after a "push", currently set to upload to the steam workshop after [SCUniversalUpload](https://github.com/StarCoreSE/SCModRepository/blob/main/.github/workflows/Aristeas%20NewUniversalUpload.yml) detects a change in a folder with a `modinfo_BRANCHNAME.sbmi` file.
+### SE Mod folders:
+- contains all the data that would load normally as an SE mod
+### .gitignore file
+- tells git what to exclude during a push (like .sln files in visual studio)

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Commands/CommandMethods.cs

@@ -17,7 +17,8 @@ public static void Start(string[] args)
             if (args.Length < 2)
             {
                 MyAPIGateway.Utilities.ShowMessage("SUGMA",
-                    $"Unrecognized gamemode \"null\". Available gamemodes:{SUGMA_SessionComponent.ListGamemodes()}");
+                    $"Unrecognized gamemode \"null\". Available gamemodes:");
+                SUGMA_SessionComponent.ListGamemodes();
                 return;
             }
 
@@ -33,7 +34,8 @@ public static void Start(string[] args)
             if (!SUGMA_SessionComponent.I.StartGamemode(args[1].ToLower(), startArgs, true))
             {
                 MyAPIGateway.Utilities.ShowMessage("SUGMA",
-                    $"Unrecognized gamemode \"{args[1].ToLower()}\". Available gamemodes:{SUGMA_SessionComponent.ListGamemodes()}");
+                    $"Unrecognized gamemode \"{args[1].ToLower()}\". Available gamemodes:");
+                SUGMA_SessionComponent.ListGamemodes();
                 return;
             }
 

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Domination/DominationHud.cs

@@ -66,7 +66,7 @@ internal class DominationHud_Window : WindowBase
         private readonly TexturedBox[] _captureIndicators;
 
         private readonly DominationGamemode _gamemode;
-        private readonly elmHud_Window _windowBase;
+        private readonly ElmHud_Window _windowBase;
 
         public DominationHud_Window(HudParentBase parent, DominationGamemode gamemode) : base(parent)
         {

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs

@@ -122,6 +122,7 @@ private void RemoveBlockers(float maxDistanceFromCenter)
 
         public override void StartRound(string[] arguments = null)
         {
+            _winningFaction = null;
             PointTracker = new PointTracker(3, 0);
             SUGMA_SessionComponent.I.UnregisterComponent("ELMPointTracker");
             if (!MyAPIGateway.Utilities.IsDedicated)
@@ -222,7 +223,6 @@ public override void StopRound()
             ShareTrackApi.UnregisterOnTrack(OnGridTrackChanged);
 
             base.StopRound();
-            _winningFaction = null;
             TrackedFactions.Clear();
             PointTracker = null;
         }

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationHud.cs

@@ -14,7 +14,7 @@ internal class EliminationHud : ComponentBase
         private int _closeTime = -1;
         private readonly EliminationGamemode _gamemode;
 
-        public elmHud_Window Window;
+        public ElmHud_Window Window;
 
         public EliminationHud(EliminationGamemode gamemode)
         {
@@ -28,7 +28,7 @@ public override void Init(string id)
             if (!RichHudClient.Registered)
                 throw new Exception("RichHudAPI was not initialized in time!");
 
-            Window = new elmHud_Window(HudMain.HighDpiRoot, _gamemode);
+            Window = new ElmHud_Window(HudMain.HighDpiRoot, _gamemode);
         }
 
         public override void Close()
@@ -52,7 +52,7 @@ public void MatchEnded(IMyFaction winner)
         }
     }
 
-    internal class elmHud_Window : HudElementBase
+    internal class ElmHud_Window : HudElementBase
     {
         private readonly EliminationGamemode _gamemode;
 
@@ -63,7 +63,7 @@ internal class elmHud_Window : HudElementBase
         internal LabelBox _winnerLabel;
         public EliminationHud_TeamBanner[] Banners;
 
-        public elmHud_Window(HudParentBase parent, EliminationGamemode gamemode) : base(parent)
+        public ElmHud_Window(HudParentBase parent, EliminationGamemode gamemode) : base(parent)
         {
             _gamemode = gamemode;
             _timer = gamemode._matchTimer;

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Sandbox.ModAPI;
 using SC.SUGMA.GameModes.Elimination;
 using SC.SUGMA.GameState;
@@ -49,6 +50,16 @@ public override void StartRound(string[] arguments = null)
             if (TrackedFactions.Count <= 1)
                 return;
 
+            foreach (var faction in TrackedFactions.Keys.ToArray())
+                TrackedFactions[faction] = 0;
+
+            foreach (var grid in ShareTrackApi.GetTrackedGrids())
+            {
+                var faction = grid.GetFaction();
+                if (TrackedFactions.ContainsKey(faction))
+                    TrackedFactions[faction]++;
+            }
+
             ActivationTimeCounter = ActivationTime;
             ControlPoint = null;
 
@@ -58,7 +69,8 @@ public override void StartRound(string[] arguments = null)
 
         public override void StopRound()
         {
-            _winningFaction = ControlPoint?._zoneOwner;
+            if (ControlPoint != null)
+                _winningFaction = ControlPoint._zoneOwner;
             base.StopRound();
 
             SUGMA_SessionComponent.I.GetComponent<KOTHHud>("KOTHHud")?.MatchEnded(_winningFaction);
@@ -103,5 +115,49 @@ public override void UpdateActive()
                 StopRound();
             }
         }
+
+        internal override void OnGridTrackChanged(IMyCubeGrid grid, bool isTracked)
+        {
+            if (!isTracked)
+                OnAliveChanged(grid, false);
+        }
+
+        internal override void OnAliveChanged(IMyCubeGrid grid, bool isAlive)
+        {
+            var gridFaction = PlayerTracker.I.GetGridFaction(grid);
+            if (gridFaction == null || !TrackedFactions.ContainsKey(gridFaction))
+                return;
+            if (!isAlive)
+            {
+                TrackedFactions[gridFaction]--;
+                if (TrackedFactions[gridFaction] <= 0)
+                {
+                    IMyFaction winningFaction = null;
+                    foreach (var factionKvp in TrackedFactions)
+                    {
+                        if (factionKvp.Value <= 0)
+                            continue;
+                        if (winningFaction != null)
+                        {
+                            winningFaction = null;
+                            break;
+                        }
+                        winningFaction = factionKvp.Key;
+                    }
+
+                    if (winningFaction != null)
+                    {
+                        if (ControlPoint != null)
+                            ControlPoint._zoneOwner = winningFaction;
+                        _winningFaction = winningFaction;
+                        StopRound();
+                    }
+                }
+            }
+            else
+            {
+                TrackedFactions[gridFaction]++;
+            }
+        }
     }
-}
+}

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHHud.cs

@@ -57,7 +57,7 @@ internal class KOTHHud_Window : WindowBase
             new Material(MyStringId.GetOrCompute("SugmaCircle"), new Vector2(32, 32));
 
         private readonly KOTHGamemode _gamemode;
-        private readonly elmHud_Window _windowBase;
+        private readonly ElmHud_Window _windowBase;
 
         private TexturedBox _captureIndicator;
 
@@ -130,7 +130,6 @@ public void Update()
 
         public void MatchEnded(IMyFaction winner)
         {
-            Log.Info("KOTHHud.cs:133 MatchEnded (" + winner?.Name + ")");
             _captureIndicator.Visible = false;
             _captureLabel.Visible = false;
 

Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/SUGMA_SessionComponent.cs

@@ -16,6 +16,9 @@
 using SC.SUGMA.HeartNetworking.Custom;
 using SC.SUGMA.Utilities;
 using VRage.Game.Components;
+using VRage.Scripting;
+using Sandbox.Game;
+using VRageMath;
 
 namespace SC.SUGMA
 {
@@ -102,7 +105,7 @@ public bool StartGamemode(string id, string[] arguments, bool notifyNetwork = fa
             CurrentGamemode = (GamemodeBase)_components[id];
             CurrentGamemode.StartRound(arguments);
 
-            if (!CurrentGamemode.IsStarted)
+            if (!(CurrentGamemode?.IsStarted ?? false))
             {
                 CurrentGamemode = null;
                 return false;
@@ -134,18 +137,15 @@ public bool StopGamemode(bool notifyNetwork = false)
             return true;
         }
 
-        public static string ListGamemodes()
+        public static void ListGamemodes()
         {
             var availableGamemodes = new StringBuilder();
 
             foreach (var gamemode in I.GetGamemodes())
             {
                 var gamemodeObject = I.GetComponent<GamemodeBase>(gamemode);
-                availableGamemodes.Append(
-                    $"\n-  {gamemode} ({gamemodeObject.ReadableName})\n  *  {gamemodeObject.ArgumentParser.HelpText.Replace("\n", "\n  *  ")}");
+                MyAPIGateway.Utilities.ShowMessage($"{gamemode} ({gamemodeObject.ReadableName})", $"\n-  {gamemodeObject.ArgumentParser.HelpText.Replace("\n", "\n-  ")}");
             }
-
-            return availableGamemodes.ToString();
         }
 
         #region Base Methods
@@ -238,4 +238,4 @@ protected override void UnloadData()
 
         #endregion
     }
-}
+}