From 53f0de2b602fb8da1177fa87af861bb26d933d1e Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 31 Jan 2024 23:37:18 +0000 Subject: [PATCH] Quality Assurance * Added touch_pussy_pause frame * Fixed arms_touch_tits layering issues --- game/scripts/cg/luna.rpy | 44 ++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/game/scripts/cg/luna.rpy b/game/scripts/cg/luna.rpy index d6915bd4..d1b87799 100644 --- a/game/scripts/cg/luna.rpy +++ b/game/scripts/cg/luna.rpy @@ -425,7 +425,7 @@ layeredimage lun_inspect spread_legs: always "lun_inspect_spread_legs_luna_hair_back" always "lun_inspect_spread_legs_luna_body" - attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab"] + attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab", "touch_tits"] group luna_arm prefix "luna_arm" auto: attribute idle default @@ -435,7 +435,7 @@ layeredimage lun_inspect spread_legs: group luna_clothes variant "luna_clothes" multiple: attribute stockings attribute panties - attribute bra if_not ["luna_shirt", "arms_grab"] + attribute bra if_not ["luna_shirt", "arms_grab", "touch_tits"] attribute shirt attribute skirt @@ -456,14 +456,15 @@ layeredimage lun_inspect spread_legs: always "lun_inspect_genie_head" - group genie_arm_right prefix "arm_right" if_not ["arms_grab"]: + group genie_arm_right prefix "arm_right" if_not ["arms_grab", "touch_tits"]: attribute idle "lun_inspect_genie_arm_right_idle" default attribute touch_mound "lun_inspect_genie_arm_right_touch_mound" attribute touch_tit "lun_inspect_genie_arm_right_touch_tit" attribute touch_pussy "lun_inspect_arm_right_touch_pussy" + attribute touch_pussy_pause "lun_inspect_genie_arm_right_touch_pussy_frame0" attribute down null - group genie_arm_left prefix "arm_left" if_not ["arms_grab"]: + group genie_arm_left prefix "arm_left" if_not ["arms_grab", "touch_tits"]: attribute hold "lun_inspect_genie_arm_left_hold" default attribute touch_tit "lun_inspect_genie_arm_left_grab" @@ -473,7 +474,7 @@ layeredimage lun_inspect spread_legs: attribute genie_clothes_front "lun_inspect_genie_clothes" if_all ["genie_clothes"] default - attribute luna_bra "lun_inspect_spread_legs_luna_bra_grab" if_any ["arms_grab"] + attribute luna_bra "lun_inspect_spread_legs_luna_bra_grab" if_any ["arms_grab", "touch_tits"] always "lun_inspect_vignette" @@ -493,7 +494,7 @@ layeredimage lun_inspect legs_together: always "lun_inspect_legs_together_luna_hair_back" always "lun_inspect_legs_together_luna_body" - attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab"] + attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab", "touch_tits"] group luna_arm prefix "luna_arm" auto: attribute idle default @@ -501,7 +502,7 @@ layeredimage lun_inspect legs_together: group luna_clothes variant "luna_clothes" multiple: attribute stockings attribute panties - attribute bra if_not ["luna_shirt", "arms_grab"] + attribute bra if_not ["luna_shirt", "arms_grab", "touch_tits"] attribute shirt attribute skirt @@ -522,14 +523,15 @@ layeredimage lun_inspect legs_together: always "lun_inspect_genie_head" - group genie_arm_right prefix "arm_right" if_not ["arms_grab"]: + group genie_arm_right prefix "arm_right" if_not ["arms_grab", "touch_tits"]: attribute idle "lun_inspect_genie_arm_right_idle" default attribute touch_mound "lun_inspect_genie_arm_right_touch_mound" attribute touch_tit "lun_inspect_genie_arm_right_touch_tit" attribute touch_pussy "lun_inspect_arm_right_touch_pussy" + attribute touch_pussy_pause "lun_inspect_genie_arm_right_touch_pussy_frame0" attribute down null - group genie_arm_left prefix "arm_left" if_not ["arms_grab"]: + group genie_arm_left prefix "arm_left" if_not ["arms_grab", "touch_tits"]: attribute hold "lun_inspect_genie_arm_left_hold" default attribute touch_tit "lun_inspect_genie_arm_left_grab" @@ -539,7 +541,7 @@ layeredimage lun_inspect legs_together: attribute genie_clothes_front "lun_inspect_genie_clothes" if_all ["genie_clothes"] default - attribute luna_bra "lun_inspect_legs_together_luna_bra_grab" if_any ["arms_grab"] + attribute luna_bra "lun_inspect_legs_together_luna_bra_grab" if_any ["arms_grab", "touch_tits"] always "lun_inspect_vignette" @@ -557,7 +559,7 @@ layeredimage lun_inspect head_back_spread_legs: always "lun_inspect_head_back_spread_legs_luna_hair_back" always "lun_inspect_head_back_spread_legs_luna_body" - attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab"] + attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab", "touch_tits"] group luna_arm prefix "luna_arm" auto: attribute idle default @@ -565,7 +567,7 @@ layeredimage lun_inspect head_back_spread_legs: group luna_clothes variant "luna_clothes" multiple: attribute stockings attribute panties - attribute bra if_not ["luna_shirt", "arms_grab"] + attribute bra if_not ["luna_shirt", "arms_grab", "touch_tits"] attribute shirt attribute skirt @@ -584,14 +586,15 @@ layeredimage lun_inspect head_back_spread_legs: always "lun_inspect_genie_head" - group genie_arm_right prefix "arm_right" if_not ["arms_grab"]: + group genie_arm_right prefix "arm_right" if_not ["arms_grab", "touch_tits"]: # attribute idle "lun_inspect_genie_arm_right_idle" default attribute touch_mound "lun_inspect_genie_arm_right_touch_mound" default attribute touch_tit "lun_inspect_genie_arm_right_touch_tit" attribute touch_pussy "lun_inspect_arm_right_touch_pussy" + attribute touch_pussy_pause "lun_inspect_genie_arm_right_touch_pussy_frame0" attribute down null - group genie_arm_left prefix "arm_left" if_not ["arms_grab"]: + group genie_arm_left prefix "arm_left" if_not ["arms_grab", "touch_tits"]: attribute hold "lun_inspect_genie_arm_left_hold" default attribute touch_tit "lun_inspect_genie_arm_left_grab" @@ -599,7 +602,7 @@ layeredimage lun_inspect head_back_spread_legs: attribute grab "lun_inspect_genie_arm_both_grab_tits" attribute touch_tits "lun_inspect_genie_arm_both_touch_tits" - attribute luna_bra "lun_inspect_head_back_spread_legs_luna_bra_grab" if_any ["arms_grab"] + attribute luna_bra "lun_inspect_head_back_spread_legs_luna_bra_grab" if_any ["arms_grab", "touch_tits"] always "lun_inspect_vignette" @@ -615,7 +618,7 @@ layeredimage lun_inspect head_back_legs_together: always "lun_inspect_head_back_legs_together_luna_hair_back" always "lun_inspect_head_back_legs_together_luna_body" - attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab"] + attribute breastfix "lun_inspect_background_breastfix" default if_any ["luna_bra", "arms_grab", "touch_tits"] group luna_arm prefix "luna_arm" auto: attribute idle default @@ -623,7 +626,7 @@ layeredimage lun_inspect head_back_legs_together: group luna_clothes variant "luna_clothes" multiple: attribute stockings attribute panties - attribute bra if_not ["luna_shirt", "arms_grab"] + attribute bra if_not ["luna_shirt", "arms_grab", "touch_tits"] attribute shirt attribute skirt @@ -642,14 +645,15 @@ layeredimage lun_inspect head_back_legs_together: always "lun_inspect_genie_head" - group genie_arm_right prefix "arm_right" if_not ["arms_grab"]: + group genie_arm_right prefix "arm_right" if_not ["arms_grab", "touch_tits"]: # attribute idle "lun_inspect_genie_arm_right_idle" default # attribute touch_mound "lun_inspect_genie_arm_right_touch_mound" attribute touch_tit "lun_inspect_genie_arm_right_touch_tit" default attribute touch_pussy "lun_inspect_arm_right_touch_pussy_alt" + attribute touch_pussy_pause "lun_inspect_genie_arm_right_spread_legs_touch_pussy_frame0" attribute down null - group genie_arm_left prefix "arm_left" if_not ["arms_grab"]: + group genie_arm_left prefix "arm_left" if_not ["arms_grab", "touch_tits"]: attribute hold "lun_inspect_genie_arm_left_hold" default attribute touch_tit "lun_inspect_genie_arm_left_grab" @@ -657,7 +661,7 @@ layeredimage lun_inspect head_back_legs_together: attribute grab "lun_inspect_genie_arm_both_grab_tits" attribute touch_tits "lun_inspect_genie_arm_both_touch_tits" - attribute luna_bra "lun_inspect_head_back_legs_together_luna_bra_grab" if_any ["arms_grab"] + attribute luna_bra "lun_inspect_head_back_legs_together_luna_bra_grab" if_any ["arms_grab", "touch_tits"] always "lun_inspect_vignette"