diff --git a/game/scripts/wardrobe/reactions.rpy b/game/scripts/wardrobe/reactions.rpy index bc8dad51..c525b020 100644 --- a/game/scripts/wardrobe/reactions.rpy +++ b/game/scripts/wardrobe/reactions.rpy @@ -5,12 +5,6 @@ init python in wardrobe: return (flag >= req) - def wardrobe_check_touch(what): - req = renpy.store.get_character_requirement(renpy.store.states.active_girl, f"touch {what}") - flag = renpy.store.get_character_progression(renpy.store.states.active_girl) - - return (flag >= req) - def wardrobe_check_equip(item): req = item.level flag = renpy.store.get_character_progression(renpy.store.states.active_girl) diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index 3e28b038..df3b760a 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -333,9 +333,17 @@ init python in wardrobe: @functools.cache def easteregg(character_name): - head_action = renpy.store.Function(wardrobe_react,"touch", "head") - breasts_action = renpy.store.Function(wardrobe_react, "touch", "breasts") - vagina_action = renpy.store.Function(wardrobe_react, "touch", "vagina") + scope = renpy.get_screen("wardrobe").scope + character = scope["character"] + + def check(what): + req = renpy.store.get_character_requirement(character.name, f"touch {what}") + flag = renpy.store.get_character_progression(character.name) + return (flag >= req) + + head_action = renpy.store.Function(wardrobe_react,"touch", "head") if check("head") else renpy.store.Function(wardrobe_react,"touch_fail", "head") + breasts_action = renpy.store.Function(wardrobe_react, "touch", "breasts") if check("breasts") else renpy.store.Function(wardrobe_react,"touch_fail", "breasts") + vagina_action = renpy.store.Function(wardrobe_react, "touch", "vagina") if check("vagina") else renpy.store.Function(wardrobe_react,"touch_fail", "vagina") # Positions (hardcoded) if character_name == "tonks":