ZS: Move pledged state to ZSData rather than GameProps

ClassiCube · Dec 13, 2022 · 566ca7e · 566ca7e
1 parent 56e8d45
commit 566ca7e
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 34 deletions.
diff --git a/MCGalaxy/Commands/Fun/ZombieSurvival/CmdHuman.cs b/MCGalaxy/Commands/Fun/ZombieSurvival/CmdHuman.cs
@@ -26,8 +26,9 @@ public sealed class CmdHuman : Command2 {
         public override CommandEnable Enabled { get { return CommandEnable.Zombie; } }
         public override bool SuperUseable { get { return false; } }
 
-        public override void Use(Player p, string message, CommandData data) {
-            if (p.Game.PledgeSurvive) {
+        public override void Use(Player p, string message, CommandData data_) {
+            ZSData data = ZSGame.Get(p);
+            if (data.PledgeSurvive) {
                 p.Message("You cannot un-pledge that you will be infected."); return;
             }
             if (ZSGame.IsInfected(p)) {
@@ -45,9 +46,9 @@ public sealed class CmdHuman : Command2 {
             TimeSpan delta = ZSGame.Instance.RoundEnd - DateTime.UtcNow;
             if (delta < TimeSpan.FromMinutes(3)) {
                 p.Message("Cannot use &T/human &Sin last three minutes of a round."); return;
-            }
-            
-            p.Game.PledgeSurvive = true;
+            }
+
+            data.PledgeSurvive = true;
             ZSGame.Instance.Map
                 .Message(p.ColoredName + " &Spledges that they will not succumb to the infection!");
         }

diff --git a/MCGalaxy/CorePlugin/CorePlugin.cs b/MCGalaxy/CorePlugin/CorePlugin.cs
@@ -18,16 +18,13 @@
 using System;
 using MCGalaxy.Events;
 using MCGalaxy.Events.EconomyEvents;
-using MCGalaxy.Events.GroupEvents;
 using MCGalaxy.Events.PlayerEvents;
 using MCGalaxy.Events.ServerEvents;
-using MCGalaxy.Tasks;
 
 namespace MCGalaxy.Core {
 
     public sealed class CorePlugin : Plugin {
-        public override string creator { get { return Server.SoftwareName + " team"; } }
-        public override string MCGalaxy_Version { get { return Server.Version; } }
+        public override string MCGalaxy_Version { get { return null; } }
         public override string name { get { return "CorePlugin"; } }
 
         public override void Load(bool startup) {

diff --git a/MCGalaxy/Games/GameProps.cs b/MCGalaxy/Games/GameProps.cs
@@ -30,9 +30,6 @@ public class GameProps {
 
         /// <summary> Whether the player has liked or disliked the map in this round. </summary>
         internal bool RatedMap = false, LikedMap = false;
-
-        /// <summary> Whether the player has pledged that they will survive/win in this round. </summary>
-        internal bool PledgeSurvive = false;
 
         //Zombie
         public bool Referee = false;

diff --git a/MCGalaxy/Games/RoundsGame/RoundsGame.cs b/MCGalaxy/Games/RoundsGame/RoundsGame.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using MCGalaxy.Commands.World;
 using MCGalaxy.Events.GameEvents;
 
-namespace MCGalaxy.Games {
-
-    public abstract partial class RoundsGame : IGame {
+namespace MCGalaxy.Games 
+{    
+    public abstract partial class RoundsGame : IGame 
+    {
         public int RoundsLeft;
         public bool RoundInProgress;
         public DateTime RoundStart;
@@ -217,7 +217,6 @@ public abstract partial class RoundsGame : IGame {
 
             foreach (Player pl in online) {
                 pl.Game.RatedMap = false;
-                pl.Game.PledgeSurvive = false;
                 if (pl.level != Map && pl.level == lastMap) transfers.Add(pl);
             }
 
@@ -254,7 +253,6 @@ public abstract partial class RoundsGame : IGame {
             foreach (Player pl in players) {
                 if (pl.level != Map) continue;
                 pl.Game.RatedMap = false;
-                pl.Game.PledgeSurvive = false;
                 PlayerLeftGame(pl);
 
                 TabList.Update(pl, true);

diff --git a/MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs b/MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs
@@ -141,8 +141,9 @@ public sealed partial class ZSGame : RoundsGame {
             HandleJoinedCommon(p, prevLevel, level, ref announce);
             p.SetPrefix(); // TODO: Kinda hacky, not sure if needed 
             if (level != Map) return;
-            
+
             ZSData data = Get(p);
+            data.PledgeSurvive = false;
             p.SetPrefix();
 
             if (RoundInProgress) {

diff --git a/MCGalaxy/Games/ZombieSurvival/ZSGame.Round.cs b/MCGalaxy/Games/ZombieSurvival/ZSGame.Round.cs
@@ -29,6 +29,8 @@ public sealed partial class ZSGame : RoundsGame
 
         protected override void DoRound() {
             if (!Running) return;
+
+            ResetPledges();
             List<Player> players = DoRoundCountdown(Config.InfectionCountdown);
             if (players == null) return;
 
@@ -39,6 +41,13 @@ public sealed partial class ZSGame : RoundsGame
             if (!Running) return;
             DoCoreGame();
         }
+
+        void ResetPledges() {
+            foreach (Player pl in GetPlayers())
+            {
+                Get(pl).PledgeSurvive = false;
+            }
+        }
 
         void StartRound(List<Player> players) {
             TimeSpan duration = Map.Config.RoundTime;
@@ -53,7 +62,7 @@ public sealed partial class ZSGame : RoundsGame
             Infected.Clear();
 
             Random rnd = new Random();
-            Player first = null;
+            Player first;
             do {
                 first = QueuedZombie != null ? PlayerInfo.FindExact(QueuedZombie) : players[rnd.Next(players.Count)];
                 QueuedZombie = null;
@@ -170,8 +179,9 @@ public sealed partial class ZSGame : RoundsGame
         }
 
         void CheckHumanPledge(Player p, Player killer) {
-            if (!p.Game.PledgeSurvive) return;
-            p.Game.PledgeSurvive = false;
+            ZSData data = Get(p);
+            if (!data.PledgeSurvive) return;
+            data.PledgeSurvive = false;
             Map.Message("&c" + p.DisplayName + " &Sbroke their pledge of not being infected.");
 
             if (killer == null) {
@@ -264,13 +274,14 @@ public sealed partial class ZSGame : RoundsGame
         }
 
         void IncreaseAliveStats(Player p) {
-            if (p.Game.PledgeSurvive) {
+            ZSData data = Get(p);
+
+            if (data.PledgeSurvive) {
                 p.Message("You received &a5 &3" + Server.Config.Currency +
                                " &Sfor successfully pledging that you would survive.");
                 p.SetMoney(p.money + 5);
             }
 
-            ZSData data = Get(p);
             data.CurrentRoundsSurvived++;
             data.TotalRoundsSurvived++;
             data.MaxRoundsSurvived = Math.Max(data.CurrentRoundsSurvived, data.MaxRoundsSurvived);
@@ -296,7 +307,7 @@ public sealed partial class ZSGame : RoundsGame
 
                 pl.SetMoney(pl.money + reward);
                 ResetRoundState(pl, data);
-                pl.Game.PledgeSurvive = false;
+                data.PledgeSurvive = false;
 
                 if (pl.Game.Referee) {
                     pl.Message("You gained one " + Server.Config.Currency + " because you're a ref. Would you like a medal as well?");

diff --git a/MCGalaxy/Games/ZombieSurvival/ZSGame.cs b/MCGalaxy/Games/ZombieSurvival/ZSGame.cs
@@ -47,6 +47,8 @@ internal sealed class ZSData
 
         public DateTime LastPillarWarn;
         public bool PillarFined;
+        /// <summary> Whether the player has pledged that they will survive this round. </summary>
+        public bool PledgeSurvive;
 
         public void ResetInvisibility() {
             Invisible = false;
@@ -78,6 +80,7 @@ public sealed partial class ZSGame : RoundsGame
             data = new ZSData();
 
             // TODO: Is this even thread-safe
+            // TODO don't load here, add a LoadInfectMessages method
             data.InfectMessages = ZSConfig.LoadPlayerInfectMessages(p.name);
             ZombieStats s = LoadStats(p.name);
             data.MaxInfected = s.MaxInfected;     data.TotalInfected = s.TotalInfected;

diff --git a/MCGalaxy/MCGalaxy_.csproj b/MCGalaxy/MCGalaxy_.csproj
@@ -692,7 +692,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Modules\Games\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/MCGalaxy/Modules/Moderation/Notes/NotesPlugin.cs b/MCGalaxy/Modules/Moderation/Notes/NotesPlugin.cs
@@ -22,8 +22,7 @@ namespace MCGalaxy.Modules.Moderation.Notes
 {
     public sealed class NotesPlugin : Plugin 
     {
-        public override string creator { get { return Server.SoftwareName + " team"; } }
-        public override string MCGalaxy_Version { get { return Server.Version; } }
+        public override string MCGalaxy_Version { get { return null; } }
         public override string name { get { return "Core_NotesPlugin"; } }
 
         Command notesCmd   = new CmdNotes();

diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordPlugin.cs b/MCGalaxy/Modules/Relay/Discord/DiscordPlugin.cs
@@ -85,8 +85,7 @@ public enum PresenceActivity { Playing = 0, Listening = 2, Watching = 3, Competi
 
     public sealed class DiscordPlugin : Plugin 
     {
-        public override string creator { get { return Server.SoftwareName + " team"; } }
-        public override string MCGalaxy_Version { get { return Server.Version; } }
+        public override string MCGalaxy_Version { get { return null; } }
         public override string name { get { return "DiscordRelay"; } }
 
         public static DiscordConfig Config = new DiscordConfig();

diff --git a/MCGalaxy/Modules/Relay/IRC/IRCPlugin.cs b/MCGalaxy/Modules/Relay/IRC/IRCPlugin.cs
@@ -23,8 +23,7 @@ namespace MCGalaxy.Modules.Relay.IRC
 {   
     public sealed class IRCPlugin : Plugin 
     {
-        public override string creator { get { return Server.SoftwareName + " team"; } }
-        public override string MCGalaxy_Version { get { return Server.Version; } }
+        public override string MCGalaxy_Version { get { return null; } }
         public override string name { get { return "IRCRelay"; } }
 
         public static IRCBot Bot = new IRCBot();

diff --git a/MCGalaxy/Modules/Security/IPThrottler.cs b/MCGalaxy/Modules/Security/IPThrottler.cs
@@ -29,8 +29,7 @@ namespace MCGalaxy.Modules.Security
 {
     public sealed class IPThrottler : Plugin 
     {
-        public override string creator { get { return Server.SoftwareName + " team"; } }
-        public override string MCGalaxy_Version { get { return Server.Version; } }
+        public override string MCGalaxy_Version { get { return null; } }
         public override string name { get { return "IPThrottler"; } }
 
         SchedulerTask clearTask;