|
|
@@ -126,11 +126,11 @@ class Plot: |
|
|
|
self.locart = 1 |
|
|
|
else: |
|
|
|
self.locart = 0 |
|
|
|
self.missIndex = r.randint(0, len(Plot.miss)-1) |
|
|
|
self.missIndex = missIndex if missIndex != None else r.randint(0, len(Plot.miss)-1) |
|
|
|
self.oops = int(oops) if oops != None else r.randint(1,12) |
|
|
|
if self.oops != 1: |
|
|
|
self.oops = 0 |
|
|
|
self.mission = Plot.miss[r.randint(0, len(Plot.miss)-1)] |
|
|
|
self.mission = Plot.miss[missIndex] |
|
|
|
self.probIndex = probIndex if probIndex != None else r.randint(0, len(Plot.prob)-1) |
|
|
|
self.problem = Plot.prob[self.probIndex] |
|
|
|
self.secProblem = [x for x in Plot.prob if x["id"] == secProblem][0] if (secProblem != None and secProblem in list(filter(lambda x:x["id"], Plot.prob))) else None |