initial change

README.md

@@ -12,6 +12,23 @@ If you want sPeCiAl SuPpOrT feel free to contact me:
 [My Dev Discord Server](https://discord.gg/JF3kg77)
 
 ---
+## Fork info
+Done by SandPoot, this is an attempt of making this work better.
+
+## Compiling for testing
+Requirements:
+Python 3.6+?
+and doing all those:
+```
+get-pip.py
+pip install pypresence
+pip install wheel
+pip install pywin32
+pip install psutil
+pip install requests
+```
+
+Afterwards you can just run main.py
 
 ## Installation
 

config.py

@@ -21,10 +21,15 @@
     "Paradise Station 13": ["Paradise Station", "paradise", "byond.nanotrasen.se", 6666, "fetch"],
     "Aurora Station": ["Aurora Station", "ss13"],
     "VOREStation": ["VOREStation", "citadel", "citadel-station.net", 44150, "fetch"],
-    "Citadel Station 13": ["Citadel Station", "citadel", "citadel-station.net", 44130, "fetch"],
+    "Citadel Station": ["Citadel Station", "citadel", "citadel-station.net", 44130, "fetch"],
     "CM-SS13": ["Colonial Marines", "cm", "play.cm-ss13.com", 1400, "fetch"],
+    "T.E. station, 18+": ["Transcendent Enemy", "citadel", "102.165.213.19", 3260, "fetch"],
+    "(MRP-HRP) Sandstorm Station 13": ["Sandstorm Station 13", "sandstorm", "179.214.120.49", 8100, "fetch"],
+    "Hyper Station 13": ["Hyper Station 13", "hyper", "172.93.98.2", 8058, "fetch"],
+    "Nostra-13": ["Nostra-13", "nostra", "31.135.174.235", 1337, "fetch"],
+    "Nebula 13 Brasil": ["Nebula Station 13", "nebula", "20.206.65.244", 2030, "fetch"],
     "ss13": ["Unknown Server", "ss13"]
 }
 
 # formula: "Server Name": ["Big text name", "icon", "ip", port]
-client_id = "440289271580983308"
+client_id = "888067353458380821"

install.spec

@@ -1,32 +1,45 @@
-# -*- mode: python -*-
-
-block_cipher = None
-
-
-a = Analysis(['install.py'],
-             pathex=['C:\\Users\\Isaac\\Desktop\\programs\\ss13rp'],
-             binaries=[],
-             datas=[],
-             hiddenimports=[],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          [],
-          name='install',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          runtime_tmpdir=None,
-          console=True , icon='icon.ico')
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['install.py'],
+             pathex=['D:\\SS13-Codes\\ss13rp'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             hooksconfig={},
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts, 
+          [],
+          exclude_binaries=True,
+          name='install',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          console=True,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas, 
+               strip=False,
+               upx=True,
+               upx_exclude=[],
+               name='install',
+               icon='icon.ico')

main.py

@@ -70,11 +70,20 @@ def get_server():
 
                     print(status)
 
-                    if server[0] in ["Hippie Station", "Yogstation 13", "BeeStation", "Bagil Station", "Terry Station", "Sybil Station", "Citadel Station", "FTL13"]:
+                    if server[0] in ["Hippie Station", "Yogstation 13", "BeeStation", "Bagil Station", "Terry Station", "Sybil Station", "Citadel Station", "FTL13", "T.E. station, 18+", "Sandstorm Station 13", "Hyper Station 13", "Nostra-13", "Nebula Station 13"]:
                         activity["start"] = int(time.time())-int(status["round_duration"])
                         activity["party_id"] = str(status["round_id"]) + " " + status["map_name"] #apparently terry has NO revision
 
-                        activity["state"] = status["map_name"]#+", "+status["mode"]
+                        if "mode" in status and status["mode"]:
+                            activity["state"] = status["map_name"] + ", " + status["mode"]
+                        else:
+                            activity["state"] = status["map_name"] + ", " + "dynamic" #probably tg fork
+                        activity["buttons"] = [{"label": "Join", "url": "byond://" + server[2] + ":" + str(server[3])}]
+
+                        if "popcap" in status and status["popcap"]: #fetch popcap
+                            activity["party_size"] = [int(status["players"])] + [int(status["popcap"])]
+                        else: #best guess maxcap
+                            activity["party_size"] = [int(status["players"])] + [120]
 
                         if "popcap" in status and status["popcap"]: #fetch popcap
                             activity["party_size"] = [int(status["players"])] + [int(status["popcap"])]

main.spec

@@ -1,32 +1,45 @@
-# -*- mode: python -*-
-
-block_cipher = None
-
-
-a = Analysis(['main.py'],
-             pathex=['C:\\Users\\Isaac\\Desktop\\programs\\ss13rp'],
-             binaries=[],
-             datas=[],
-             hiddenimports=[],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          [],
-          name='main',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          runtime_tmpdir=None,
-          console=False , icon='icon.ico')
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['main.py'],
+             pathex=['D:\\SS13-Codes\\ss13rp'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             hooksconfig={},
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts, 
+          [],
+          exclude_binaries=True,
+          name='main',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          console=True,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas, 
+               strip=False,
+               upx=True,
+               upx_exclude=[],
+               name='main',
+               icon='icon.ico')