Merge branch 'frozenpandaman:master' into master

iksm.py

@@ -320,7 +320,8 @@ def get_bullet(web_service_token, web_view_ver, app_user_agent, user_lang, user_
 		bullet_resp = json.loads(r.text)
 		bullet_token = bullet_resp["bulletToken"]
 	except (json.decoder.JSONDecodeError, TypeError):
-		print("Got non-JSON response from Nintendo.")
+		print("Got non-JSON response from Nintendo (in api/bullet_tokens step:")
+		print(bullet_resp)
 		sys.exit(1)
 	except:
 		print("Error from Nintendo (in api/bullet_tokens step):")

requirements.txt

@@ -1,5 +1,4 @@
 beautifulsoup4
 msgpack_python
 packaging
-Pillow
 requests

s3s.py

@@ -344,7 +344,7 @@ def set_scoreboard(battle):
 		p_dict["me"]              = "yes" if player["isMyself"] else "no"
 		p_dict["name"]            = player["name"]
 		try:
-			p_dict["number"]      = player["nameId"] # splashtag number
+			p_dict["number"]      = str(player["nameId"]) # splashtag # - can contain alpha chars too... (why!!!)
 		except KeyError: # may not be present if first battle as "Player"
 			pass
 		p_dict["splashtag_title"] = player["byname"] # splashtag title
@@ -367,7 +367,7 @@ def set_scoreboard(battle):
 		p_dict["me"]              = "no"
 		p_dict["name"]            = player["name"]
 		try:
-			p_dict["number"]      = player["nameId"]
+			p_dict["number"]      = str(player["nameId"])
 		except:
 			pass
 		p_dict["splashtag_title"] = player["byname"]