eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tests

Browse Source 
* master:
  Update citizen.py
  Update citizen.py
This commit is contained in:
Eriks Karls 2019-09-03 11:56:00 +03:00
commit 60543e02c8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erepublik/citizen.py
View File

@ -804,6 +804,8 @@ class Citizen(classes.CitizenAPI):
self.resign() self.resign()
self.find_new_job() self.find_new_job()
else: else:
if r.json().get('message') == 'employee':
self.find_new_job()
self.reporter.report_action("WORK_OT", r.json()) self.reporter.report_action("WORK_OT", r.json())
elif self.energy.food_fights < 1 and self.ot_points >= 24: elif self.energy.food_fights < 1 and self.ot_points >= 24:
self._eat("blue") self._eat("blue")
@ -821,6 +823,8 @@ class Citizen(classes.CitizenAPI):
js = response.json() js = response.json()
good_msg = ["already_worked", "captcha"] good_msg = ["already_worked", "captcha"]
if not js.get("status") and not js.get("message") in good_msg: if not js.get("status") and not js.get("message") in good_msg:
if js.get('message') == 'employee':
self.find_new_job()
self.update_citizen_info() self.update_citizen_info()
self.work() self.work()
else: else:
@ -1610,7 +1614,7 @@ class Citizen(classes.CitizenAPI):
jobs = r.json().get("jobs") jobs = r.json().get("jobs")
data = dict(citizen=0, salary=10) data = dict(citizen=0, salary=10)
for posting in jobs: for posting in jobs:
salary = posting.get("netSalary") salary = posting.get("salary")
limit = posting.get("salaryLimit", 0) limit = posting.get("salaryLimit", 0)
userid = posting.get("citizen").get("id") userid = posting.get("citizen").get("id")