glax/OpenCS2hock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Compare commits

base: glax:281d73eb6bbe83421a93687b07725cb61dd8adc7
Branches Tags
glax:master
glax:3.3
glax:3.2
glax:3.1
glax:3.0.1
glax:3.0
glax:2.0.1
glax:2.0
glax:1.2
glax:1.1
glax:1.0
..
compare: glax:c82ce4b465505eb5f5cd2c5d2cdd7b71a0a4d457
Branches Tags
glax:master
glax:3.3
glax:3.2
glax:3.1
glax:3.0.1
glax:3.0
glax:2.0.1
glax:2.0
glax:1.2
glax:1.1
glax:1.0

No commits in common. "281d73eb6bbe83421a93687b07725cb61dd8adc7" and "c82ce4b465505eb5f5cd2c5d2cdd7b71a0a4d457" have entirely different histories.
281d73eb6b ... c82ce4b465

2 changed files with 9 additions and 6 deletions
Show Stats Expand all files Collapse all files

3
OpenCS2hock.sln.DotSettings
View File

@ -4,5 +4,4 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=appmanifest/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=appmanifest/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=freezetime/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=freezetime/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=libraryfolders/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=libraryfolders/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=steamapps/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=steamapps/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=steamid/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

12
OpenCS2hock/CS2MessageHandler.cs
View File

@ -29,20 +29,24 @@ internal class CS2MessageHandler
Team playerTeam = ParseTeamFromString(messageJson.SelectToken("player.team", false)?.Value<string>()); Team playerTeam = ParseTeamFromString(messageJson.SelectToken("player.team", false)?.Value<string>());
Team winnerTeam = ParseTeamFromString(messageJson.SelectToken("round.win_team", false)?.Value<string>()); Team winnerTeam = ParseTeamFromString(messageJson.SelectToken("round.win_team", false)?.Value<string>());
if(winnerTeam != Team.None && playerTeam != Team.None && playerTeam == winnerTeam) if(winnerTeam != Team.None && playerTeam == winnerTeam)
OnRoundWin?.Invoke(); OnRoundWin?.Invoke();
else if(winnerTeam != Team.None && playerTeam != Team.None && playerTeam != winnerTeam) else if(winnerTeam != Team.None && playerTeam != winnerTeam)
OnRoundLoss?.Invoke(); OnRoundLoss?.Invoke();
int? previousDeaths = messageJson.SelectToken("previously.player.match_stats.deaths", false)?.Value<int>(); int? previousDeaths = messageJson.SelectToken("previously.player.match_stats.deaths", false)?.Value<int>();
int? currentDeaths = messageJson.SelectToken("player.match_stats.deaths", false)?.Value<int>(); int? currentDeaths = messageJson.SelectToken("player.match_stats.deaths", false)?.Value<int>();
if(previousSteamId is null && currentSteamId == mySteamId && currentDeaths > previousDeaths) if(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentDeaths > previousDeaths)
OnDeath?.Invoke(); OnDeath?.Invoke();
else if(currentSteamId != mySteamId)
Console.WriteLine("Not my SteamId");
int? previousKills = messageJson.SelectToken("previously.player.match_stats.kills", false)?.Value<int>(); int? previousKills = messageJson.SelectToken("previously.player.match_stats.kills", false)?.Value<int>();
int? currentKills = messageJson.SelectToken("player.match_stats.kills", false)?.Value<int>(); int? currentKills = messageJson.SelectToken("player.match_stats.kills", false)?.Value<int>();
if(previousSteamId is null && currentSteamId == mySteamId && currentKills > previousKills) if(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentKills > previousKills)
OnKill?.Invoke(); OnKill?.Invoke();
else if(currentSteamId != mySteamId)
Console.WriteLine("Not my SteamId");
} }
private RoundState ParseRoundStateFromString(string? str) private RoundState ParseRoundStateFromString(string? str)