rpc range addition

zayKenyon · Aug 26, 2022 · 99990b3 · 99990b3
1 parent 1cc7861
commit 99990b3
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/main.py b/main.py
@@ -292,6 +292,9 @@ def program_exit(status: int):  # so we don't need to import the entire sys modu
                                     # PARTY_ICON
                                     party_icon = partyIcons[party]
                         playerRank = rank.get_rank(player["Subject"], seasonID)
+                        if player["Subject"] == Requests.puuid:
+                            if cfg.get_feature_flag("discord_rpc"):
+                                rpc.set_data({"rank": playerRank["rank"], "rank_name": colors.escape_ansi(NUMBERTORANKS[playerRank["rank"]]) + " | " + str(playerRank["rr"]) + "rr"})
                         # rankStatus = playerRank[1]
                         #useless code since rate limit is handled in the requestsV
                         # while not rankStatus:
@@ -348,7 +351,7 @@ def program_exit(status: int):  # so we don't need to import the entire sys modu
                         rr = playerRank["rr"]
 
                         #short peak rank string
-                        peakRankAct = f" e({playerRank['peakrankep']}a{playerRank['peakrankact']})"
+                        peakRankAct = f" (e{playerRank['peakrankep']}a{playerRank['peakrankact']})"
                         if not cfg.get_feature_flag("peak_rank_act"):
                             peakRankAct = ""
 
@@ -495,7 +498,7 @@ def program_exit(status: int):  # so we don't need to import the entire sys modu
                         rr = playerRank["rr"]
 
                         #short peak rank string
-                        peakRankAct = f" e({playerRank['peakrankep']}a{playerRank['peakrankact']})"
+                        peakRankAct = f" (e{playerRank['peakrankep']}a{playerRank['peakrankact']})"
                         if not cfg.get_feature_flag("peak_rank_act"):
                             peakRankAct = ""
                         # PEAK RANK
@@ -575,7 +578,7 @@ def program_exit(status: int):  # so we don't need to import the entire sys modu
                             rr = playerRank["rr"]
 
                             #short peak rank string
-                            peakRankAct = f" e({playerRank['peakrankep']}a{playerRank['peakrankact']})"
+                            peakRankAct = f" (e{playerRank['peakrankep']}a{playerRank['peakrankact']})"
                             if not cfg.get_feature_flag("peak_rank_act"):
                                 peakRankAct = ""
 

diff --git a/src/constants.py b/src/constants.py
@@ -1,7 +1,7 @@
 import requests
 from colr import color
 
-version = "2.41"
+version = "2.42"
 enablePrivateLogging = True
 hide_names = True
 hide_levels = True

diff --git a/src/rpc.py b/src/rpc.py
@@ -30,7 +30,7 @@ def set_rpc(self, presence):
             try:
                 if presence["isValid"]:
                     if presence["sessionLoopState"] == "INGAME":
-                        if self.data.get("agent") is None:
+                        if self.data.get("agent") is None or self.data.get("agent") is "":
                             agent_img = None
                             agent = None
                         else:
@@ -41,11 +41,25 @@ def set_rpc(self, presence):
                             gamemode = "Custom Game"
                         else:
                             gamemode = self.gamemodes.get(presence['queueId'])
+
+                        details = f"{gamemode} // {presence['partyOwnerMatchScoreAllyTeam']} - {presence['partyOwnerMatchScoreEnemyTeam']}"
+
+                        mapText = self.map_dict.get(presence["matchMap"].lower())
+                        if mapText == "The Range":
+                            mapImage = "splash_range_square"
+                            details = "in Range"
+                            agent_img = str(self.data.get("rank"))
+                            agent = self.data.get("rank_name")
+                        else:
+                            mapImage = f"splash_{self.map_dict.get(presence['matchMap'].lower())}_square"
+                        if mapText is None or mapText is "":
+                            mapText = None
+                            mapImage = None
                         self.rpc.update(
                             state=f"In a Party ({presence['partySize']} of {presence['maxPartySize']})",
-                            details=f"{gamemode} // {presence['partyOwnerMatchScoreAllyTeam']} - {presence['partyOwnerMatchScoreEnemyTeam']}",
-                            large_image=f"splash_{self.map_dict.get(presence['matchMap'].lower())}_square",
-                            large_text=self.map_dict.get(presence["matchMap"].lower()),
+                            details=details,
+                            large_image=mapImage,
+                            large_text=mapText,
                             small_image=agent_img,
                             small_text=agent
                         )
@@ -76,12 +90,18 @@ def set_rpc(self, presence):
                         else:
                             gamemode = self.gamemodes.get(presence['queueId'])
 
-
+                        mapText = self.map_dict.get(presence["matchMap"].lower())
+                        mapImage = f"splash_{self.map_dict.get(presence['matchMap'].lower())}_square"
+                        if mapText is None or mapText is "":
+                            mapText = None
+                            mapImage = None
+
+
                         self.rpc.update(
                             state=f"In a Party ({presence['partySize']} of {presence['maxPartySize']})",
                             details=f"Agent Select - {gamemode}",
-                            large_image=f"splash_{self.map_dict.get(presence['matchMap'].lower())}_square",
-                            large_text=self.map_dict.get(presence["matchMap"].lower()),
+                            large_image=mapImage,
+                            large_text=mapText,
                             small_image=str(self.data.get("rank")),
                             small_text=self.data.get("rank_name")
                         )