Skip to content

Commit

Permalink
update + removals
Browse files Browse the repository at this point in the history
  • Loading branch information
@SandPoot
SandPoot committed Nov 20, 2022
1 parent 4739dbb commit b1d3e4e
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 116 deletions.
27 changes: 2 additions & 25 deletions config.py
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,13 @@
servers = {
"Goonstation #5": ["Goonstation #5", "goonhub", "goon2.goonhub.com", 26500, "fetch"],
"Goonstation #4": ["Goonstation #4", "goonhub", "goon2.goonhub.com", 26400, "fetch"],
"Goonstation #3": ["Goonstation #3", "goonhub", "goon2.goonhub.com", 26300, "fetch"],
"Goonstation #2": ["Goonstation #2", "goonhub", "goon2.goonhub.com", 26200, "fetch"],
"Goonstation RP #1": ["Goonstation RP #1", "goonhub", "goon1.goonhub.com", 26100, "fetch"],
"Yogstation 13": ["Yogstation 13", "yogstation", "game.yogstation.net", 4133, "fetch"],
"BeeStation": ["BeeStation", "beestation", "http://beestation13.com/api/stats", 80, "http"],
"Oracle Station | Medium RP": ["Oracle Station", "oraclestation"], #"byond.oraclestation.com", 5000
"Hippie Station": ["Hippie Station", "hippiestation", "hippiestation.com", 9999, "fetch"],
"/tg/Station Bagil": ["Bagil Station", "tgstation", "bagil.tgstation13.org", 2337, "fetch"],
"/tg/Station Sybil": ["Sybil Station", "tgstation", "sybil.tgstation13.org", 1337, "fetch"],
"/tg/Station Terry": ["Terry Station", "tgstation", "terry.tgstation13.org", 3337, "fetch"],
"TerraGov Marine Corps": ["TGMC", "tgmc", "tgmc.tgstation13.org", 5337, "fetch"],
"Persistence Station 13": ["Persistence Station", "persistence"],
"Baystation 12": ["Baystation 12", "bs12", "play.baystation12.net", 8000, "fetch"],
"FTL13": ["FTL13", "ftl13", "stable.ftl13.com", 7777, "fetch"],
"Tool Box Station": ["Toolbox Station", "toolbox"],
"StarTrek13": ["Star Trek 13", "startrek"],
"Polaris Station 13": ["Polaris Station", "polaris"],
"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": ["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.212.119", 3260, "fetch"],
"(MRP-HRP) Sandstorm Station 13": ["Sandstorm Station 13", "sandstorm", "51.81.48.185", 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"],
"Sierra Station 13": ["Sierra Station 13", "sierra", "47.208.93.81", 25565, "fetch"],
"Maconha Station 13": ["Maconha Station 13", "maconha", "20.197.224.192", 1337, "fetch"],
"Shiptest": ["Shiptest", "shiptest", "join.shiptest.net", 41372, "fetch"],
"ss13": ["Unknown Server", "ss13"]
}

# formula: "Server Name": ["Big text name", "icon", "ip", port]
# formula: "Server Name": ["Big text name", "icon", "ip", port, "method(fetch/http)""]
client_id = "888067353458380821"
Binary file modified dist/install.exe
View file
Binary file not shown.
Binary file modified dist/ss13rp.exe
View file
Binary file not shown.
71 changes: 38 additions & 33 deletions install.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,42 @@
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)
a = Analysis(
['install.py'],
pathex=[],
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,
a.binaries,
a.zipfiles,
a.datas,
[],
name='install',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=True,
disable_windowed_traceback=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None , icon='icon.ico')
exe = EXE(
pyz,
a.scripts,
a.binaries,
a.zipfiles,
a.datas,
[],
name='install',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=True,
disable_windowed_traceback=False,
argv_emulation=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None,
icon=['icon.ico'],
)
47 changes: 22 additions & 25 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ def get_server():
server = "ss13"
return servers[server]

def get_content(entry):
def get_content(entry, else_value):
if entry in status and status[entry]:
return status[entry]
else:
return ""
return else_value if else_value else ""

while True:
try:
Expand All @@ -76,43 +76,40 @@ def get_content(entry):

print(status)

if server[0] in ["Hippie Station", "Yogstation 13", "BeeStation", "Bagil Station", "Terry Station", "Sybil Station", "Citadel Station", "FTL13", "Transcendent Enemy", "Sandstorm Station 13", "Hyper Station 13", "Nostra-13", "Sierra Station 13", "Shiptest"]:
if server[0] in ["Citadel Station", "Transcendent Enemy", "Sandstorm Station 13", "Hyper Station 13", "Nostra-13", "Maconha Station 13", "Shiptest"]:
activity["start"] = int(time.time())-int(status["round_duration"])

map_name = get_content("map_name")
map = map_name if map_name else "No Map"
map = get_content("map_name", "No Map")
activity["party_id"] = str(get_content("round_id")) + " " + map #apparently terry has NO revision

gamemode = get_content("mode")
mode = gamemode if gamemode else "dynamic"
mode = get_content("mode", "dynamic")
activity["state"] = map + ", " + mode
activity["buttons"] = [{"label": "Join", "url": "byond://" + server[2] + ":" + str(server[3])}]

playercap = get_content("popcap")
popcap = playercap if playercap else "120"
popcap = get_content("popcap", "120")
activity["party_size"] = [int(get_content("players"))] + [int(popcap)]

if server[0] in ["Colonial Marines"]:
activity["state"] = status["mode"]
activity["party_size"] = [int(status["players"])]+[300]
activity["start"] = int(time.time())-util.get_sec(*status["stationtime"].split(":"))
#if server[0] in ["Colonial Marines"]:
# activity["state"] = status["mode"]
# activity["party_size"] = [int(status["players"])]+[300]
# activity["start"] = int(time.time())-util.get_sec(*status["stationtime"].split(":"))


if server[0] in ["Baystation 12"]:
activity["state"] = status["map"]
activity["party_size"] = [int(status["players"])]+[100]
activity["start"] = int(time.time())-util.get_sec(*status["roundduration"].split(":"))
#if server[0] in ["Baystation 12"]:
# activity["state"] = status["map"]
# activity["party_size"] = [int(status["players"])]+[100]
# activity["start"] = int(time.time())-util.get_sec(*status["roundduration"].split(":"))

if server[0] in ["Paradise Station"]:
activity["state"] = status["map_name"]
activity["party_size"] = [int(status["players"])]+[250]
activity["start"] = int(time.time())-util.get_sec(*status["roundtime"].split(":"))
#if server[0] in ["Paradise Station"]:
# activity["state"] = status["map_name"]
# activity["party_size"] = [int(status["players"])]+[250]
# activity["start"] = int(time.time())-util.get_sec(*status["roundtime"].split(":"))


if server[0].startswith("Goonstation"):
activity["state"] = status["map_name"]#+", "+status["mode"]
activity["party_size"] = [int(status["players"])]+[200]
activity["start"] = int(time.time())-int(status["elapsed"])
#if server[0].startswith("Goonstation"):
# activity["state"] = status["map_name"]#+", "+status["mode"]
# activity["party_size"] = [int(status["players"])]+[200]
# activity["start"] = int(time.time())-int(status["elapsed"])

except Exception as E:
print(E)
Expand Down
71 changes: 38 additions & 33 deletions ss13rp.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,42 @@
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)
a = Analysis(
['main.py'],
pathex=[],
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,
a.binaries,
a.zipfiles,
a.datas,
[],
name='ss13rp',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=False,
disable_windowed_traceback=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None , icon='icon.ico')
exe = EXE(
pyz,
a.scripts,
a.binaries,
a.zipfiles,
a.datas,
[],
name='ss13rp',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=False,
disable_windowed_traceback=False,
argv_emulation=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None,
icon=['icon.ico'],
)

0 comments on commit b1d3e4e

Please sign in to comment.