WeeXnes/WeeXnesSuite
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

csgo rpc improvements

Browse source
This commit is contained in:
WeeXnes 2022-06-28 19:29:51 +02:00
parent acf0982632
commit 398eef42bf
2 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
WeeXnes/MainWindow.xaml.cs
View file

@ -177,7 +177,10 @@ namespace WeeXnes
private void Window_Closing(object sender, CancelEventArgs e) private void Window_Closing(object sender, CancelEventArgs e)
{ {
trayIcon.Dispose(); trayIcon.Dispose();
Globals.gameStateListener.Stop(); if (Globals.gameStateListener.Running)
{
Globals.gameStateListener.Stop();
}
} }
} }
} }

37
WeeXnes/RPC/CSGO.cs
View file

@ -37,25 +37,48 @@ namespace WeeXnes.RPC.CSGO
if (gs.Player.Activity == PlayerActivity.Menu) if (gs.Player.Activity == PlayerActivity.Menu)
{ {
this.client.UpdateLargeAsset("menu"); this.client.UpdateLargeAsset("csgo_icon");
this.client.UpdateDetails("In Menu"); this.client.UpdateDetails("In Menu");
this.client.UpdateState(""); this.client.UpdateState("");
this.client.UpdateSmallAsset("");
} }
else if (gs.Player.Activity == PlayerActivity.Playing) else if (gs.Player.Activity == PlayerActivity.Playing)
{ {
if (gs.Map.Mode == MapMode.ScrimComp2v2)
{
this.client.UpdateDetails("Playing Wingman");
}
else if (gs.Map.Mode == MapMode.GunGameProgressive)
{
this.client.UpdateDetails("Playing Gun Game");
}
else if (gs.Map.Mode == MapMode.GunGameTRBomb)
{
this.client.UpdateDetails("Playing Demolition");
}
else
{
this.client.UpdateDetails("Playing " + gs.Map.Mode);
}
this.client.UpdateState("on " + gs.Map.Name);
this.client.UpdateLargeAsset(gs.Map.Name); this.client.UpdateLargeAsset(gs.Map.Name);
this.client.UpdateDetails("Playing on " + gs.Map.Name);
if (gs.Player.Team == PlayerTeam.T) if (gs.Player.Team == PlayerTeam.T)
{ {
this.client.UpdateSmallAsset("t_logo");
this.client.UpdateLargeAsset(gs.Map.Name, "T: " + gs.Map.TeamT.Score + " - CT: " + gs.Map.TeamCT.Score);
this.client.UpdateSmallAsset("t_logo", Convert.ToString("Kills: " + gs.Player.MatchStats.Kills + " | Deaths: " + gs.Player.MatchStats.Deaths));
}else if(gs.Player.Team == PlayerTeam.CT) }else if(gs.Player.Team == PlayerTeam.CT)
{ {
this.client.UpdateSmallAsset("ct_logo"); this.client.UpdateLargeAsset(gs.Map.Name, "CT: " + gs.Map.TeamCT.Score + " - T: " + gs.Map.TeamT.Score);
this.client.UpdateSmallAsset("ct_logo", Convert.ToString("Kills: " + gs.Player.MatchStats.Kills + " | Deaths: " + gs.Player.MatchStats.Deaths));
} }
else else
{ {
this.client.UpdateSmallAsset(""); this.client.UpdateSmallAsset("");
} }
} }
} }
@ -72,11 +95,11 @@ namespace WeeXnes.RPC.CSGO
client.OnPresenceUpdate += ClientOnOnPresenceUpdate; client.OnPresenceUpdate += ClientOnOnPresenceUpdate;
client.SetPresence(new RichPresence() client.SetPresence(new RichPresence()
{ {
Details = "Playing CSGO", Details = "Launching Game...",
State = "Launching Game...", State = "",
Assets = new Assets() Assets = new Assets()
{ {
LargeImageKey = "menu", LargeImageKey = "csgo_icon",
LargeImageText = "", LargeImageText = "",
SmallImageKey = "", SmallImageKey = "",
SmallImageText = "" SmallImageText = ""