Merge branch 'master' into tests
* master: Update citizen.py Update citizen.py
This commit is contained in:
commit
60543e02c8
@ -804,6 +804,8 @@ class Citizen(classes.CitizenAPI):
|
||||
self.resign()
|
||||
self.find_new_job()
|
||||
else:
|
||||
if r.json().get('message') == 'employee':
|
||||
self.find_new_job()
|
||||
self.reporter.report_action("WORK_OT", r.json())
|
||||
elif self.energy.food_fights < 1 and self.ot_points >= 24:
|
||||
self._eat("blue")
|
||||
@ -821,6 +823,8 @@ class Citizen(classes.CitizenAPI):
|
||||
js = response.json()
|
||||
good_msg = ["already_worked", "captcha"]
|
||||
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.work()
|
||||
else:
|
||||
@ -1610,7 +1614,7 @@ class Citizen(classes.CitizenAPI):
|
||||
jobs = r.json().get("jobs")
|
||||
data = dict(citizen=0, salary=10)
|
||||
for posting in jobs:
|
||||
salary = posting.get("netSalary")
|
||||
salary = posting.get("salary")
|
||||
limit = posting.get("salaryLimit", 0)
|
||||
userid = posting.get("citizen").get("id")
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user