Bug fixes and improvements

* Added indicator for unscheduled items in the wardrobe's schedule tab
* Fixed var references
* Fixed characters not displaying in certain events.
* Fixed characters positioning in certain events.
* Fixed Madam Hooch refusing to exit the office.
This commit is contained in:
LoafyLemon 2023-05-15 19:12:15 +01:00
parent 72cf07bbc3
commit 65e4582457
3 changed files with 45 additions and 39 deletions

View File

@ -105,7 +105,7 @@ label hg_pf_blowjob_T4_fail_intro:
her "Suck you...{w=0.3} off?" ("disgust", "wide", "base", "mid") her "Suck you...{w=0.3} off?" ("disgust", "wide", "base", "mid")
her "With my mouth?!" ("disgust", "wide", "base", "stare") her "With my mouth?!" ("disgust", "wide", "base", "stare")
if states.her.ev.suck_it.cock_kiss: if states.her.ev.give_me_a_handy.cock_kiss:
gen "Wouldn't even be the first time you've done it!" ("grin", xpos="far_left", ypos="head") gen "Wouldn't even be the first time you've done it!" ("grin", xpos="far_left", ypos="head")
her "Yes, but..." ("disgust", "narrow", "worried", "down") her "Yes, but..." ("disgust", "narrow", "worried", "down")
her "That was something different entirely..." ("disgust", "happyCl", "worried", "mid") her "That was something different entirely..." ("disgust", "happyCl", "worried", "mid")
@ -143,7 +143,7 @@ label hg_pf_blowjob_T4_fail_repeat:
her "I refuse..." ("open", "closed", "base", "mid") her "I refuse..." ("open", "closed", "base", "mid")
gen "It's only a blowjob, girl..." ("base", xpos="far_left", ypos="head") gen "It's only a blowjob, girl..." ("base", xpos="far_left", ypos="head")
if states.her.ev.suck_it.cock_kiss: if states.her.ev.give_me_a_handy.cock_kiss:
gen "It's not like you haven't done it before..." ("base", xpos="far_left", ypos="head") gen "It's not like you haven't done it before..." ("base", xpos="far_left", ypos="head")
her "Are you talking about the kiss I gave it?" ("open", "base", "angry", "mid") her "Are you talking about the kiss I gave it?" ("open", "base", "angry", "mid")
her "That was something different entirely..." ("open", "closed", "base", "mid") her "That was something different entirely..." ("open", "closed", "base", "mid")

View File

@ -860,6 +860,7 @@ screen wardrobe_outfit_menuitem(xx, yy):
$ is_modded = item.is_modded() $ is_modded = item.is_modded()
$ is_equipped = bool(current_item == item) $ is_equipped = bool(current_item == item)
$ is_inadequate = (current_subcategory in {"save", "load", "schedule"} and not wardrobe_check_equip_outfit(item)) $ is_inadequate = (current_subcategory in {"save", "load", "schedule"} and not wardrobe_check_equip_outfit(item))
$ has_schedule = any(item.schedule.values())
$ warnings = [] $ warnings = []
@ -895,7 +896,11 @@ screen wardrobe_outfit_menuitem(xx, yy):
tooltip warnings tooltip warnings
action action action action
alternate alternate alternate alternate
if is_inadequate: if current_subcategory == "schedule" and not has_schedule:
foreground "#00000040"
hover_foreground "#80808040"
selected_foreground "#80808040"
elif is_inadequate:
foreground "#b2000040" foreground "#b2000040"
hover_foreground "#CD5C5C40" hover_foreground "#CD5C5C40"
selected_foreground "#CD5C5C40" selected_foreground "#CD5C5C40"