Discord RPC tweaks (from nightly feedback) #3205

Lpsd · 2023-10-12T02:10:14Z

Added server name to the default presence details
Fixed a couple of cases where the presence wouldn't display properly (or at all)
- When disconnecting from a server
- When enabling rich presence in MTA settings
Added the following functions:
- bool setDiscordRichPresenceStartTime(int seconds)
- bool setDiscordRichPresenceEndTime(int seconds)
- bool setDiscordRichPresencePartySize(int size, int max)

Added some default states when roaming around San Andreas. These are updated every 15 seconds:

On foot: Walking around <zone name>
In vehicle (prefixes): <prefix> <zone name> - e.g: Flying around Los Santos
Dead: In a ditch, En-route to hospital, Meeting their maker, Regretting their decisions, Wasted

Many more states based on player task, see

mtasa-blue/Client/mods/deathmatch/logic/CClientTask.h

Lines 36 to 54 in a5e70f5

    
           static const std::multimap<eTaskType, STaskState> g_playerTaskStates{ 
        
               {TASK_COMPLEX_JUMP, {true, "Climbing around in", TASK_SIMPLE_CLIMB}}, 
        
               {TASK_SIMPLE_GANG_DRIVEBY, {true, "Doing a drive-by in"}}, 
        
               {TASK_SIMPLE_DRIVEBY_SHOOT, {true, "Doing a drive-by in"}}, 
        
               {TASK_SIMPLE_DIE, {false, "Blub blub...", TASK_SIMPLE_DROWN}}, 
        
               {TASK_SIMPLE_DIE, {false, "Breathing water", TASK_SIMPLE_DROWN}}, 
        
               {TASK_SIMPLE_DIE, {true, "Drowning in", TASK_SIMPLE_DROWN}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Ducking for cover in", {}, TASK_SIMPLE_DUCK, TASK_SECONDARY_DUCK}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Fighting in", {}, TASK_SIMPLE_FIGHT, TASK_SECONDARY_ATTACK}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Throwing fists in", {}, TASK_SIMPLE_FIGHT, TASK_SECONDARY_ATTACK}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Blastin' fools in", {}, TASK_SIMPLE_USE_GUN, TASK_SECONDARY_ATTACK}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Shooting up", {}, TASK_SIMPLE_USE_GUN, TASK_SECONDARY_ATTACK}}, 
        
               {TASK_SIMPLE_JETPACK, {true, "Jetpacking in"}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Literally on fire in", {}, TASK_SIMPLE_PLAYER_ON_FIRE, TASK_SECONDARY_PARTIAL_ANIM}}, 
        
               {TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Burning up in", {}, TASK_SIMPLE_PLAYER_ON_FIRE, TASK_SECONDARY_PARTIAL_ANIM}}, 
        
               {TASK_COMPLEX_IN_WATER, {true, "Swimming in", TASK_SIMPLE_SWIM}}, 
        
               {TASK_COMPLEX_IN_WATER, {true, "Floating around in", TASK_SIMPLE_SWIM}}, 
        
               {TASK_COMPLEX_IN_WATER, {false, "Being chased by a shark", TASK_SIMPLE_SWIM}}, 
        
               {TASK_SIMPLE_CHOKING, {true, "Choking to death in"}},

Allow state, details, assets and button functions to be passed an empty string in order to reset to defaults.

Easter egg: when zone name is "Unknown" (out of normal SA bounds) it will show as Area 51 👽

Also fixes some edge cases where the rich presence won't be displayed properly (after enabling it for the first time, or when disconnecting from a server)

Probably should refactor all this Discord code to not use Hungarian notation tbh

This will allow servers to revert to using the built-in/default states

Fernando-A-Rocha · 2023-10-12T22:12:32Z

Very creative with the unique default states! Good job

We handle presence state updates primarily in CClientGame::DoPulsePostFrame() now

Requires moving to Client Deathmatch due to Game SA not supporting C++17

Client/core/CCore.h

Client/core/CDiscordRichPresence.cpp

Client/mods/deathmatch/logic/CClientGame.cpp

Client/mods/deathmatch/logic/CClientVehicle.h

tederis · 2023-10-21T13:36:26Z

Client/mods/deathmatch/logic/CClientGame.cpp

+                        }
+
+                        zoneName = (zoneName == "Unknown") ? "Area 51" : zoneName;
+                        discordState = useZoneName ? SString(std::string(discordState + " %s").c_str(), zoneName.c_str()) : discordState;


I would suggest to append a zone name

if (useZoneName) discordState.append(" " + zoneName);

tederis · 2023-10-21T13:38:57Z

Client/mods/deathmatch/logic/CClientGame.cpp

+                        {
+                            std::srand(GetTickCount64_());
+                            int  index = (std::rand() % stateCount);
+                            auto taskState = taskStates[index];


I'd use a reference here to avoid unnecessary STaskState struct copy.

tederis · 2023-10-23T07:02:39Z

This PR is no more relevant due to #3216.

The changelog of this can be found in #3205 (as #3216 is the successor of #3205 and a near-copy). It was done this way because the #3205's author is on vacation, and we had pending code review changes to make.

Dutchman101 · 2023-10-24T02:28:49Z

Closed by ef26810

Lpsd added 15 commits October 12, 2023 03:08

Add server name to presence state

bf80916

Also fixes some edge cases where the rich presence won't be displayed properly (after enabling it for the first time, or when disconnecting from a server)

Remove unused method in CDiscordRichPresence

55d6b76

Modify state formatting

061ef41

Move CCore::GetLastConnectedServerName definition to header

8240c85

Allow setting start time & party size via Lua

8371339

Remove unnecessary check

c72f014

Change logic of SetStartTime

3317800

Rename variable

fb1250e

Probably should refactor all this Discord code to not use Hungarian notation tbh

Swap CCore::GetSingleton usage for g_pCore

249e65b

Use details instead of state for server name

488e7a1

Add some more default states (walking, driving, dead)

fc9a35b

Allow custom state to be empty in order to reset it

233211b

This will allow servers to revert to using the built-in/default states

Add setDiscordRichPresenceEndTime

1fa482e

Add missing OOP method for setDiscordRichPresenceEndTime

a872851

Allow all string values to be empty/reset

148fb34

Lpsd added 7 commits October 13, 2023 17:48

Remove unnecessary presence updates

b67d252

We handle presence state updates primarily in CClientGame::DoPulsePostFrame() now

Set Discord state update rate to 15

a31499e

Add new default states based on player tasks

d6a27b2

Use std::optional in STaskState

a5e70f5

Requires moving to Client Deathmatch due to Game SA not supporting C++17

Update CDiscordRichPresence.cpp

f63066c

Update BitStream check in CPacketHandler::Packet_ServerJoined

02b1f7e

Use unordered_multimap

1c2c215

tederis reviewed Oct 16, 2023

View reviewed changes

Client/mods/deathmatch/logic/CClientVehicle.h Outdated Show resolved Hide resolved

Lpsd added 4 commits October 16, 2023 15:11

Address code review

bff9390

Revert GetTickCount64_ usage where unix epoch necessary

65bc6d1

Addendum to previous commit

2c79323

Update g_vehicleTypePrefixes order

98bd54c

tederis reviewed Oct 21, 2023

View reviewed changes

tederis mentioned this pull request Oct 23, 2023

Discord rpc tweaks (3205 successor) #3216

Merged

Dutchman101 closed this Oct 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Discord RPC tweaks (from nightly feedback) #3205

Discord RPC tweaks (from nightly feedback) #3205

Lpsd commented Oct 12, 2023 •

edited

Fernando-A-Rocha commented Oct 12, 2023

tederis Oct 21, 2023

tederis Oct 21, 2023

tederis commented Oct 23, 2023

Dutchman101 commented Oct 24, 2023

	static const std::multimap<eTaskType, STaskState> g_playerTaskStates{
	{TASK_COMPLEX_JUMP, {true, "Climbing around in", TASK_SIMPLE_CLIMB}},
	{TASK_SIMPLE_GANG_DRIVEBY, {true, "Doing a drive-by in"}},
	{TASK_SIMPLE_DRIVEBY_SHOOT, {true, "Doing a drive-by in"}},
	{TASK_SIMPLE_DIE, {false, "Blub blub...", TASK_SIMPLE_DROWN}},
	{TASK_SIMPLE_DIE, {false, "Breathing water", TASK_SIMPLE_DROWN}},
	{TASK_SIMPLE_DIE, {true, "Drowning in", TASK_SIMPLE_DROWN}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Ducking for cover in", {}, TASK_SIMPLE_DUCK, TASK_SECONDARY_DUCK}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Fighting in", {}, TASK_SIMPLE_FIGHT, TASK_SECONDARY_ATTACK}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Throwing fists in", {}, TASK_SIMPLE_FIGHT, TASK_SECONDARY_ATTACK}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Blastin' fools in", {}, TASK_SIMPLE_USE_GUN, TASK_SECONDARY_ATTACK}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Shooting up", {}, TASK_SIMPLE_USE_GUN, TASK_SECONDARY_ATTACK}},
	{TASK_SIMPLE_JETPACK, {true, "Jetpacking in"}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Literally on fire in", {}, TASK_SIMPLE_PLAYER_ON_FIRE, TASK_SECONDARY_PARTIAL_ANIM}},
	{TASK_SIMPLE_PLAYER_ON_FOOT, {true, "Burning up in", {}, TASK_SIMPLE_PLAYER_ON_FIRE, TASK_SECONDARY_PARTIAL_ANIM}},
	{TASK_COMPLEX_IN_WATER, {true, "Swimming in", TASK_SIMPLE_SWIM}},
	{TASK_COMPLEX_IN_WATER, {true, "Floating around in", TASK_SIMPLE_SWIM}},
	{TASK_COMPLEX_IN_WATER, {false, "Being chased by a shark", TASK_SIMPLE_SWIM}},
	{TASK_SIMPLE_CHOKING, {true, "Choking to death in"}},

Discord RPC tweaks (from nightly feedback) #3205

Discord RPC tweaks (from nightly feedback) #3205

Conversation

Lpsd commented Oct 12, 2023 • edited

Fernando-A-Rocha commented Oct 12, 2023

tederis Oct 21, 2023

Choose a reason for hiding this comment

tederis Oct 21, 2023

Choose a reason for hiding this comment

tederis commented Oct 23, 2023

Dutchman101 commented Oct 24, 2023

Lpsd commented Oct 12, 2023 •

edited