Skip to content

Fixed startup crash when no planet selected #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
greenfrogs wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −10
Open

Fixed startup crash when no planet selected #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions saliens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@

import argparse
import json
import urllib.request
import urllib.parse
import urllib.error
import webbrowser
import random
import time
import urllib.error
import urllib.parse
import urllib.request
import webbrowser


def main(token, planet=None, clan=None):
serverCtx = CServerInterface(token)
Expand All @@ -42,12 +43,23 @@ def main(token, planet=None, clan=None):
if "clan_info" in pinfo["response"]:
if "name" in pinfo["response"]["clan_info"]: #Because I cannot remember if clan_info is {} when undefined
print("Representing clan \"{}\"".format(pinfo["response"]["clan_info"]["name"]))

if not planet:
planet = pinfo['response']["active_planet"]
elif pinfo['response']["active_planet"] != planet:
print("Leaving planet {}".format(pinfo['response']["active_planet"]))
serverCtx.LeaveGameInstance(planet)

if "active_planet" in pinfo['response']:
if not planet:
planet = pinfo['response']["active_planet"]
elif pinfo['response']["active_planet"] != planet:
print("Leaving planet {}".format(pinfo['response']["active_planet"]))
serverCtx.LeaveGameInstance(planet)
else:
planets = serverCtx.GetPlanets()
for Planet in planets["response"]["planets"]:
if Planet["state"]["captured"] == False:
print("Planet #{} - {} ({}%) seems nice, joining there!".format(
Planet["id"],
Planet["state"]["name"],
int(Planet["state"]["capture_progress"] * 100)
))
planet = Planet["id"]

serverCtx.JoinPlanet(planet)
print("Joined planet {}".format(planet))
Expand Down