monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix that hints print already collected items again

This commit is contained in:
Fabian Dill 2020-06-09 05:22:48 +02:00
parent 030fa9c10b
commit 27901008bc
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MultiServer.py
View File

@ -719,22 +719,24 @@ class ClientMessageProcessor(CommandProcessor):
if not new_hints: if not new_hints:
self.output("Hint was previously used, no points deducted.") self.output("Hint was previously used, no points deducted.")
if new_hints: if new_hints:
found_hints = sum(not hint.found for hint in new_hints) found_hints = [hint for hint in new_hints if hint.found]
if not found_hints: # everything's been found, no need to pay not_found_hints = [hint for hint in new_hints if not hint.found]
if not not_found_hints: # everything's been found, no need to pay
can_pay = 1000 can_pay = 1000
elif self.ctx.hint_cost: elif self.ctx.hint_cost:
can_pay = points_available // self.ctx.hint_cost can_pay = points_available // self.ctx.hint_cost
else: else:
can_pay = 1000 can_pay = 1000
import random import random
new_hints = [hint for hint in new_hints if not hint.found]
random.shuffle(new_hints) random.shuffle(not_found_hints)
if can_pay: if can_pay:
hints = [] hints = []
while can_pay > 0: while can_pay > 0:
if not new_hints: if not not_found_hints:
break break
hint = new_hints.pop() hint = not_found_hints.pop()
hints.append(hint) hints.append(hint)
can_pay -= 1 can_pay -= 1
self.ctx.hints_used[self.client.team, self.client.slot] += 1 self.ctx.hints_used[self.client.team, self.client.slot] += 1
@ -746,7 +748,7 @@ class ClientMessageProcessor(CommandProcessor):
else: else:
self.output( self.output(
"Could not pay for everything. Rerun the hint later with more points to get the remaining hints.") "Could not pay for everything. Rerun the hint later with more points to get the remaining hints.")
notify_hints(self.ctx, self.client.team, hints) notify_hints(self.ctx, self.client.team, found_hints + hints)
save(self.ctx) save(self.ctx)
return True return True