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

Compare commits

base: glax:1.1
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:1.2
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

2 Commits
1.1 ... 1.2

Author SHA1 Message Date
glax
281d73eb6b Fix wrong OnDeath trigger actually 2024-01-15 02:48:08 +01:00
glax
0367d079c6 Dictionary 2024-01-15 02:23:36 +01:00
2 changed files with 6 additions and 9 deletions
Expand all files Collapse all files

3
OpenCS2hock.sln.DotSettings
View File

@ -4,4 +4,5 @@
<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></wpf:ResourceDictionary> <s:Boolean x:Key="/Default/UserDictionary/Words/=steamapps/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=steamid/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

12
OpenCS2hock/CS2MessageHandler.cs
View File

@ -29,24 +29,20 @@ 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 == winnerTeam) if(winnerTeam != Team.None && playerTeam != Team.None && playerTeam == winnerTeam)
OnRoundWin?.Invoke(); OnRoundWin?.Invoke();
else if(winnerTeam != Team.None && playerTeam != winnerTeam) else if(winnerTeam != Team.None && playerTeam != 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(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentDeaths > previousDeaths) if(previousSteamId is null && currentSteamId == mySteamId && 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(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentKills > previousKills) if(previousSteamId is null && currentSteamId == mySteamId && 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)