glax/CS2GSI
1
0
Fork 0
Code Releases 3 Activity

Compare commits

base: glax:386c211de5baf32669564d87b5a9c9cc63063702
Branches Tags
glax:master
glax:1.0.4
glax:1.0.3
glax:1.0
..
compare: glax:04be9d6fab96ea9c64a795e06412800ac6f6360c
Branches Tags
glax:master
glax:1.0.4
glax:1.0.3
glax:1.0

No commits in common. "386c211de5baf32669564d87b5a9c9cc63063702" and "04be9d6fab96ea9c64a795e06412800ac6f6360c" have entirely different histories.
386c211de5 ... 04be9d6fab

3 changed files with 1 additions and 15 deletions
Show Stats Expand all files Collapse all files

1
CS2GSI/CS2Event.cs
View File

@ -28,5 +28,4 @@ public enum CS2Event : byte {
OnBombExploded = 24, OnBombExploded = 24,
AnyEvent = 25, AnyEvent = 25,
AnyMessage = 26, AnyMessage = 26,
OnActivityChange = 27
} }

3
CS2GSI/CS2EventGenerator.cs
View File

@ -15,9 +15,6 @@ internal static class CS2EventGenerator
if(events.Count > 0) if(events.Count > 0)
events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyEvent, new CS2EventArgs(events.Count))); events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyEvent, new CS2EventArgs(events.Count)));
if (lastGameState.Player?.Activity != newGameState.Player?.Activity)
events.Add(new(CS2Event.OnActivityChange, new CS2EventArgs(newGameState.Player?.Activity)));
events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyMessage, new CS2EventArgs())); events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyMessage, new CS2EventArgs()));
return events; return events;

12
CS2GSI/CS2GSI.cs
View File

@ -1,6 +1,5 @@
using CS2GSI.GameState; using CS2GSI.GameState;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace CS2GSI; namespace CS2GSI;
@ -37,13 +36,6 @@ public class CS2GSI
JObject jsonObject = JObject.Parse(messageJson); JObject jsonObject = JObject.Parse(messageJson);
CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject); CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject);
this._logger?.Log(LogLevel.Debug, $"{Resources.Received_State}:\n{newState.ToString()}"); this._logger?.Log(LogLevel.Debug, $"{Resources.Received_State}:\n{newState.ToString()}");
#if DEBUG
long time = DateTime.Now.ToFileTime();
Directory.CreateDirectory("states");
File.WriteAllText(Path.Join("states", $"{time}.json"), JsonConvert.SerializeObject(newState, Formatting.Indented, new Newtonsoft.Json.Converters.StringEnumConverter()));
Directory.CreateDirectory("messages");
File.WriteAllText(Path.Join("messages", $"{time}.json"), messageJson);
#endif
if (_lastLocalGameState is not null && _allGameStates.Count > 0) if (_lastLocalGameState is not null && _allGameStates.Count > 0)
{ {
@ -99,7 +91,6 @@ public class CS2GSI
CS2Event.OnBombExploded => this.OnBombExploded, CS2Event.OnBombExploded => this.OnBombExploded,
CS2Event.AnyEvent => this.AnyEvent, CS2Event.AnyEvent => this.AnyEvent,
CS2Event.AnyMessage => this.AnyMessage, CS2Event.AnyMessage => this.AnyMessage,
CS2Event.OnActivityChange => this.OnActivityChange,
_ => throw new ArgumentException(Resources.Unknown_Event, nameof(cs2Event)) _ => throw new ArgumentException(Resources.Unknown_Event, nameof(cs2Event))
}; };
} }
@ -134,7 +125,6 @@ public class CS2GSI
OnBombDefused, OnBombDefused,
OnBombExploded, OnBombExploded,
AnyEvent, AnyEvent,
AnyMessage, AnyMessage;
OnActivityChange;
} }