Bug fixes and improvements

* Simplified and restructured plug events for Hermione
* Fixed Snape's sprite flickering
* Fixed requirements check for EventQueue class
* Adjusted label names for item-related quests
This commit is contained in:
LoafyLemon 2022-05-19 16:44:36 +01:00
parent b09157538d
commit 914f03fa73
5 changed files with 285 additions and 266 deletions

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
default her_magic_collar_worn = False default her_magic_collar_worn = False
label collar_scene: label hg_collars:
# Setup # Setup
$ her_outfit_last.save() #Saves current clothing $ her_outfit_last.save() #Saves current clothing

View File

@ -64,7 +64,7 @@ init python:
if what: if what:
character.snape_say(what, **kwargs) character.snape_say(what, **kwargs)
if head_ypos: if head_only:
renpy.hide(name=tag, layer=layer) renpy.hide(name=tag, layer=layer)
screen snape_picture_frame(): screen snape_picture_frame():

View File

@ -28,15 +28,15 @@ init -1 python:
def start(self): def start(self):
queue = self.queue queue = self.queue
queue = filter(lambda x: (x.wait > 0) or (not x.daytime == game.daytime), queue) queue = filter(lambda x: (x.wait <= 0) and (x.daytime == game.daytime), queue)
queue.sort(key=lambda x: x.priority) queue.sort(key=lambda x: x.priority)
for ev in queue: for ev in queue:
ev.start()
if not ev.requirements_met(): if not ev.requirements_met():
continue continue
ev.start()
if ev.label: if ev.label:
break break
@ -64,7 +64,7 @@ init -1 python:
if not renpy.has_label(self.label): if not renpy.has_label(self.label):
raise Exception("Supplied label does not exist.") raise Exception("Supplied label does not exist.")
def enlist(self): def enqueue(self):
self.queued = True self.queued = True
if not self in self.queue: if not self in self.queue:
@ -85,4 +85,6 @@ init -1 python:
if self.label: if self.label:
renpy.jump(self.label) renpy.jump(self.label)
init offset = -5
default eventqueue = EventQueue() default eventqueue = EventQueue()

View File

@ -1,7 +1,7 @@
default puzzle_box_ITEM = Item("puzzle_box", "quest", "Puzzle Box", 0, "A wooden box with a slide puzzle located on top of it. It was found hidden behind one of the loose bricks in the fireplace. Who knows what's inside.", limit=1, label="puzzle_minigame", unlocked=False, caption="Open") default puzzle_box_ITEM = Item("puzzle_box", "quest", "Puzzle Box", 0, "A wooden box with a slide puzzle located on top of it. It was found hidden behind one of the loose bricks in the fireplace. Who knows what's inside.", limit=1, label="puzzle_minigame", unlocked=False, caption="Open")
default collar_ITEM = Item("collar", "quest", "Magic Collar", 500, "{size=-2}A collar made out of metal. It has an inscription on the back.\n\n{/size}{size=-2}{i}\"Transforms to show the wearers true self.\n WARNING: May cause harm to adjacent clothing during transformation.\"{/i}{/size}", givable=True, give_label="collar_scene", usable_on=["hermione"], caption="Give") default collar_ITEM = Item("collar", "quest", "Magic Collar", 500, "{size=-2}A collar made out of metal. It has an inscription on the back.\n\n{/size}{size=-2}{i}\"Transforms to show the wearers true self.\n WARNING: May cause harm to adjacent clothing during transformation.\"{/i}{/size}", givable=True, give_label="hg_collars", usable_on=["hermione"], caption="Give")
default buttplugs_ITEM = Item("buttplugs", "quest", "Set of Butt Plugs", 500, "An assortment of butt plugs in various themes and sizes.", limit=1, infinite=True, givable=True, give_label="hg_ps_buttplug", usable_on=["hermione"], caption="Give") default buttplugs_ITEM = Item("buttplugs", "quest", "Set of Butt Plugs", 500, "An assortment of butt plugs in various themes and sizes.", limit=1, infinite=True, givable=True, give_label="hg_butt_plugs", usable_on=["hermione"], caption="Give")
default lootbox_ITEM = Item("cards", "quest", "Pack of Cards", 50, "A pack of wizard cards. You won't know what's inside until you open it.", label="card_lootbox", unlocked=False, caption="Open") default lootbox_ITEM = Item("cards", "quest", "Pack of Cards", 50, "A pack of wizard cards. You won't know what's inside until you open it.", label="card_lootbox", unlocked=False, caption="Open")
default sealed_scroll_ITEM = Item("sealed_scroll", "quest", "Sealed Scroll", 500, "The scroll can be used to transmute one-self into.. something.\n{size=-4}Hint: The user can't be a virgin.{/size}", limit=1, label="tentacle_scene_intro", caption="Read") default sealed_scroll_ITEM = Item("sealed_scroll", "quest", "Sealed Scroll", 500, "The scroll can be used to transmute one-self into.. something.\n{size=-4}Hint: The user can't be a virgin.{/size}", limit=1, label="tentacle_scene_intro", caption="Read")
default quidditchguide_ITEM = Item("quidditch_book", "quest", "Quidditch Guide", 100, "This book contains the basic knowledge of Quidditch.", label="quidditch_guide_book", limit=1, image="interface/icons/generic_book.webp", unlocked=False, caption="Read") default quidditchguide_ITEM = Item("quidditch_book", "quest", "Quidditch Guide", 100, "This book contains the basic knowledge of Quidditch.", label="quidditch_guide_book", limit=1, image="interface/icons/generic_book.webp", unlocked=False, caption="Read")