forked from SilverStudioGames/WTS
Save compatibility
* Added dequeue method for event objects * Updated save compatibility patch
This commit is contained in:
parent
4e7b4ac1bb
commit
b21dbb6cbf
@ -200,6 +200,25 @@ init -1 python:
|
|||||||
queue.append(self)
|
queue.append(self)
|
||||||
self.queued = True
|
self.queued = True
|
||||||
|
|
||||||
|
def dequeue(self, queue=None):
|
||||||
|
if queue:
|
||||||
|
queue = getattr(store, queue).queue
|
||||||
|
else:
|
||||||
|
queue = self.queue
|
||||||
|
|
||||||
|
if self in queue:
|
||||||
|
if config.developer:
|
||||||
|
rollback = f"{stdcol.UNDERLINE}(Rollback){stdcol.END} " if renpy.in_rollback() else ""
|
||||||
|
name = getattr(store, self._queue).id
|
||||||
|
caller_id = renpy.get_filename_line()
|
||||||
|
|
||||||
|
if not "/00start.rpy" in caller_id[0]:
|
||||||
|
print(f"{rollback}Dequeued '{stdcol.GREEN}{self.id}{stdcol.END}' from '{stdcol.BLUE}{name}{stdcol.END}' ...")
|
||||||
|
|
||||||
|
queue.remove(self)
|
||||||
|
|
||||||
|
self.queued = False
|
||||||
|
|
||||||
def requirements_met(self):
|
def requirements_met(self):
|
||||||
if self.req:
|
if self.req:
|
||||||
return eval(self.req)
|
return eval(self.req)
|
||||||
|
@ -121,6 +121,16 @@ init python:
|
|||||||
j.group = objects
|
j.group = objects
|
||||||
j.is_stale()
|
j.is_stale()
|
||||||
|
|
||||||
|
# Patch removed events
|
||||||
|
events = ["her_ev_handjob_t1_to_t3_e1", "her_ev_titjob_t1_to_t4_e1", "her_ev_sex_t1_to_t5_e1", "her_ev_panty_thief_t1_to_t3"]
|
||||||
|
|
||||||
|
for i in events:
|
||||||
|
ev = getattr(store, i, None)
|
||||||
|
|
||||||
|
if ev:
|
||||||
|
ev.dequeue()
|
||||||
|
delattr(store, i)
|
||||||
|
|
||||||
# Fix cardgame events
|
# Fix cardgame events
|
||||||
delattr(states.twi.ev.cardgame, "delay")
|
delattr(states.twi.ev.cardgame, "delay")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user