Leahnaya/s3s
1
0
Fork 0
mirror of https://github.com/frozenpandaman/s3s.git synced 2026-09-28 12:16:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

skip uploading splatfest battles & code cleanup

Browse Source
This commit is contained in:
eli fessler
2022-09-25 15:08:38 -10:00
parent 01996ba2a4
commit fca80c71ee
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
s3s.py
View File

@@ -11,7 +11,7 @@ from PIL import Image
from io import BytesIO
import iksm, utils#, utils_ss
A_VERSION = "0.1.0"
A_VERSION = "0.1.1"
DEBUG = False
@@ -405,12 +405,12 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
elif mode == "PRIVATE":
payload["lobby"] = "private"
elif mode == "FEST":
if utils.b64d(battle["vsMode"]["id"]) == 6:
payload["lobby"] = "fest_open"
elif utils.b64d(battle["vsMode"]["id"]) == 7:
payload["lobby"] = "fest_pro"
print("Splatfest battles are not yet supported. ")
return payload
# if utils.b64d(battle["vsMode"]["id"]) == 6:
# payload["lobby"] = "fest_open"
# elif utils.b64d(battle["vsMode"]["id"]) == 7:
# payload["lobby"] = "fest_pro"
print("Splatfest battles are not yet supported - skipping. ")
return {}
## RULE ##
##########
@@ -497,10 +497,12 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
## SPLATFEST ##
###############
# if mode == "FEST":
# battle["festMatch"]["dragonMatchType"] - 10x, 100x, 333x
# battle["festMatch"]["dragonMatchType"] - NORMAL (1x), DECUPLE (10x), DRAGON (100x), probably DOUBLE_DRAGON (333x)
# battle["festMatch"]["contribution"] # clout
# battle["festMatch"]["jewel"]
# battle["festMatch"]["myFestPower"]
# battle["festMatch"]["myFestPower"] # pro only
# if rule == "TRI_COLOR":
# ...
# Turf War only (NOT TRICOLOR)
if mode == "REGULAR":
@@ -566,7 +568,6 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
else:
payload["rank_up_battle"] = "no"
if parent["bankaraMatchChallenge"]["udemaeAfter"] == None:
payload["rank_after"] = payload["rank_before"]
else:
@@ -609,7 +610,6 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
## SCREENSHOTS ##
#################
# TODO - change to require -ss option?
# im = utils_ss.screenshot(battle["id"])
@@ -667,6 +667,9 @@ def post_result(data, ismonitoring, isblackout, istestrun, overview_data=None):
print(results[i]["data"])
sys.exit(1)
if len(payload) == 0: # received blank payload from prepare_job_result() - skip unsupported battle
continue
# should have been taken care of in fetch_json() but just in case...
if payload["lobby"] == "private" and utils.custom_key_exists("ignore_private", CONFIG_DATA): # TODO - also check SR?
continue
@@ -913,7 +916,6 @@ def monitor_battles(which, secs, isblackout, istestrun):
outcome = "Defeat"
else:
outcome = "Draw"
# OLD CODE
splatfest_match = True if result["vsMode"]["mode"] == "FEST" else False
if splatfest_match: # keys will exist
our_team_name = result["myTeam"]["festTeamName"]