Compare commits

...

5 Commits

Author SHA1 Message Date
1f18f6b0e6 Kinetic Text
* More kinetic text additions.
2024-06-08 15:43:16 +02:00
f0c79eb0cf Merge remote-tracking branch 'origin/interface2' into kinetic_text 2024-06-07 21:51:08 +02:00
b3a76cce17 Bug fixes
* Implemented workaround for navigation menu transforms not receiving 'hide' events.
* Fixed text overflow in navigation menu
2024-06-07 17:19:57 +01:00
e91b95d882 Merge remote-tracking branch 'origin/interface2' into kinetic_text 2024-06-07 12:17:26 +02:00
6244dbbcce Enable new navigation menu 2024-06-06 20:25:13 +01:00
17 changed files with 365 additions and 332 deletions

View File

@ -3520,7 +3520,6 @@ label hg_vibrators_public_return:
play sound "sounds/click4.ogg"
stop background
stop background
stop music fadeout 1.0
hide vibrator_interface
hide cg

View File

@ -13,7 +13,7 @@ label her_maid_job:
her "Of course I'll help!" ("base", "base", "base", "mid")
gen "Great, then I've got this maid's outfit for you!" ("base", xpos="far_left", ypos="head")
her "..." ("angry", "narrow", "base", "down")
her "What is this?!" ("clench", "squint", "base", "down")
her "{shake}What is this?!{/shake}" ("clench", "squint", "base", "down")
gen "A maid's outfit!" ("base", xpos="far_left", ypos="head")
gen "You'll need it for the cleaning you're about to do." ("base", xpos="far_left", ypos="head")
her "[name_genie_hermione], this isn't what I thought you meant..." ("disgust", "squint", "base", "mid")
@ -121,7 +121,7 @@ label her_maid_job:
if states.her.level < 4:
if not is_in_lead(states.env.gryffindor):
her "*Hmph!*..." ("upset", "base", "annoyed", "mid", xpos="right", ypos="base")
her "*Hmph*!..." ("upset", "base", "annoyed", "mid", xpos="right", ypos="base")
else:
her "No, thank you, [name_genie_hermione]." ("open", "squint", "base", "mid", xpos="right", ypos="base")
gen "What do you mean, no?" ("angry", xpos="far_left", ypos="head")

View File

@ -25,7 +25,7 @@ label hg_pr_panty_thief_T1_E1:
her "Yes, [name_genie_hermione]?" ("base", "base", "base", "mid")
gen "Give me your panties!" ("base", xpos="far_left", ypos="head")
her "Give you--" ("angry", "wide", "base", "stare")
her "My panties!?!" ("angry", "wide", "worried", "mid")
her "{shake}My panties!?!{/shake}" ("angry", "wide", "worried", "mid")
gen "That's right, I could really use a pair to--"
her "I refuse!" ("open", "happyCl", "worried", "mid")
gen "What? Why not?" ("base", xpos="far_left", ypos="head")
@ -75,7 +75,7 @@ label hg_pr_panty_thief_e1:
gen "I will need your panties..." ("base", xpos="far_left", ypos="head")
if not states.her.status.stripping:
her "My panties?!" ("open", "base", "worried", "mid")
her "{shake}My panties?!{/shake}" ("open", "base", "worried", "mid")
gen "That's right..." ("base", xpos="far_left", ypos="head")
her "But then... I won't have anything to--" ("angry", "base", "worried", "R")
her "And you..." ("open", "base", "worried", "mid")
@ -430,7 +430,7 @@ label hg_pr_panty_thief_e1_reactions:
her "*Mmmhhhmmm*" ("full_panties", "narrow", "base", "dead")
gen "Open your mouth, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
play sound "sounds/gltch.ogg"
her "*Ahhhhh*" ("open_wide_tongue_panties", "narrow", "annoyed", "up")
her "{wave}Aaaaah...{/wave}" ("open_wide_tongue_panties", "narrow", "annoyed", "up")
gen "That's a good girl... Nice and clean." ("base", xpos="far_left", ypos="head")
gen "You can take them out now." ("base", xpos="far_left", ypos="head")
her "........" ("angry", "happyCl", "worried", "up")

View File

@ -205,7 +205,7 @@ label her_promoter_job_return:
gen "You most likely ended up making that guy's night." ("grin", xpos="far_left", ypos="head")
her @ cheeks blush "More like month... seeing how much he..." ("open", "narrow", "worried", "down")
her "Anyway..." ("normal", "base", "base", "mid")
her "glad you agree." ("base", "happy", "base", "mid_soft")
her "Glad you agree." ("base", "happy", "base", "mid_soft")
her "Here's your payment." ("open", "base", "base", "mid")
call give_reward(_("You have received twenty gold"), "interface/icons/gold.webp")
@ -233,7 +233,7 @@ label her_promoter_job_return:
gen "Didn't think you'd be interested in such... unorthodox sales tactics..." ("grin", xpos="far_left", ypos="head")
her @ cheeks blush "I was curious to see if it would work more than anything else." ("base", "closed", "base", "mid")
her "I tried it out to test the legitimacy of the claims in that book of theirs..." ("open", "base", "base", "mid")
gen "of course..." ("base", xpos="far_left", ypos="head")
gen "Of course..." ("base", xpos="far_left", ypos="head")
gen "And how many times did you test this... theory of yours." ("base", xpos="far_left", ypos="head")
her "There's no conclusion to be made by just testing a theory once [name_genie_hermione]." ("normal", "closed", "angry", "mid")
her "Anyway..." ("open", "base", "base", "mid")

View File

@ -65,7 +65,7 @@ label her_potion_cat_give:
gen "Ready to try another potion?" ("base", xpos="far_left", ypos="head")
nar "You bring out the thick potion and swirl it in front of Hermione."
her "Is this another Polyjuice potion?" ("open", "squint", "base", "mid")
gen "...{w=0.5}no?" ("base", xpos="far_left", ypos="head")
gen "...{w=0.5}No?" ("base", xpos="far_left", ypos="head")
her "You're lying..." ("open", "closed", "base", "mid")
if states.her.level < 16:
@ -91,7 +91,7 @@ label her_potion_cat_give:
nar "Hermione downs the thick potion."
her "*Bleugh*." ("open_tongue", "happyCl", "base", "mid")
her "{shake}*Bleugh*{/shake}" ("open_tongue", "happyCl", "base", "mid")
gen "Well done." ("base", xpos="far_left", ypos="head")
if not states.her.ev.potions.polyjuice_cat_drank:
@ -312,7 +312,7 @@ label her_potion_cat_return:
play sound "sounds/hiss_girl.ogg"
her "..." ("mad", "base", "angry", "mid") #Hissing
her @ cheeks blush "..." ("disgust", "wide", "base", "down") #Wide eyed
gen "{size=+5}*Pwah-Ha-Ha-Hah*!{/size}" ("grin", xpos="far_left", ypos="head")
gen "{shake}*Pwah-Ha-Ha-Hah*!{/shake}" ("grin", xpos="far_left", ypos="head")
her @ cheeks blush "I can't believe you!" ("scream", "base", "annoyed", "mid")
call her_walk(action="leave")
@ -355,7 +355,7 @@ label her_potion_cat_return:
pause 0.8
call her_chibi("stand","mid","base")
her "*Ah*..." ("open_tongue", "happyCl", "base", "mid")
her "{bounce}*Ah*...{/bounce}" ("open_tongue", "happyCl", "base", "mid")
gen "You did it!" ("grin", xpos="far_left", ypos="head")
her @ cheeks blush "Did you not want me to?" ("annoyed", "squint", "base", "mid")
@ -593,7 +593,7 @@ label her_potion_cat_return:
her @ cheeks blush "*Purr* *Purr* *Purr*" ("open_wide_tongue", "narrow", "base", "mid_soft")
nar "Hermione pushes forward and the tip of your cock rests on her purring throat."
gen "{size=+10}*ARGH*!!!!!!!!!!!!!!!!{/size}" ("angry", xpos="far_left", ypos="head")
her "*Purr* *Purr* *Purr*" ("open_wide_tongue", "narrow", "base", "up_soft")
her "{shake}*Purr* *Purr* *Purr*{/shake}" ("open_wide_tongue", "narrow", "base", "up_soft")
nar "The vibrations prove too much, and you shoot your load directly down her throat."
@ -615,7 +615,7 @@ label her_potion_cat_return:
pause.8
nar "Hermione pulls your cock out of her purring mouth."
gen "*Ah*... That was amazing..." ("base", xpos="far_left", ypos="head")
gen "{bounce}*Ah*...{/bounce} That was amazing..." ("base", xpos="far_left", ypos="head")
her "...{w=0.6}{nw}" ("full_cum", "happy", "base", "mid_soft")
play sound "sounds/gulp.ogg"

View File

@ -168,7 +168,7 @@ label her_potion_luna_give:
her @ cheeks blush "What do you mean whose face you will be--" ("clench", "base", "base", "mid")
play sound "sounds/burp.ogg"
her "*Burp*" ("full", "happyCl", "worried", "mid")
her "{shudder}*Burp*{/shudder}" ("full", "happyCl", "worried", "mid")
her "...{w=0.5}{nw}" ("mad", "happyCl", "base", "mid")
her "...{fast}" ("mad", "base", "base", "mid")
her @ cheeks blush "I beg your pardon, I'm not sure where that came from--" ("mad", "squint", "base", "mid")
@ -264,7 +264,7 @@ label her_potion_luna_give:
lun "You turned me into Loony--{w=0.4} I mean Luna Lovegood?!" ("clench", "wide", "base", "mid")
gen "Very astute, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
gen "And now if you don't mind, I'd like you to bare your--, her chest for me..." ("base", xpos="far_left", ypos="head")
lun "What?!" ("disgust", "wide", "base", "mid")
lun "{shake}What?!{/shake}" ("disgust", "wide", "base", "mid")
if states.her.level < 16:
lun @ cheeks blush "I can't believe what you're suggesting, you're asking me to show off another student's breasts?" ("disgust", "base", "annoyed", "mid")
@ -413,7 +413,7 @@ label her_potion_luna_give:
lun @ cheeks blush "I want fifty points." ("scream", "happyCl", "base", "mid")
gen "That's a bit much, don't you think?" ("base", xpos="far_left", ypos="head")
lun @ cheeks blush "You're asking me to take the clothes off another student without their permission..." ("mad", "narrow", "base", "mid")
gen "Well technically--" ("base", xpos="far_left", ypos="head")
gen "Well, technically--" ("base", xpos="far_left", ypos="head")
lun @ cheeks blush "..." ("angry", "narrow", "annoyed", "mid")
menu:

View File

@ -177,7 +177,7 @@ label give_her_gift(gift_item):
if states.her.level < 6:
her "Are that...?" ("open", "base", "base", "mid")
her "Adult magazines, [name_genie_hermione]?" ("open", "base", "base", "mid")
her "Given to me by An esteemed wizard of your status?" ("annoyed", "narrow", "angry", "R")
her "Given to me by an esteemed wizard of your status?" ("annoyed", "narrow", "angry", "R")
her "[name_genie_hermione], surely you could find a more productive way to spend your spare time." ("disgust", "narrow", "base", "mid_soft")
her "And I most definitely would not have use for those..." ("angry", "base", "angry", "mid")
call her_mood(7)
@ -304,7 +304,7 @@ label give_her_gift(gift_item):
elif gift_item == pink_condoms_ITEM:
if states.her.level < 6:
her "Condoms?!" ("angry", "wide", "base", "stare")
her "{shake}Condoms?!{/shake}" ("angry", "wide", "base", "stare")
her "[name_genie_hermione], I wouldn't even know what to do with them..." ("scream", "closed", "angry", "mid")
call her_mood(6)
elif states.her.level < 12:
@ -328,9 +328,13 @@ label give_her_gift(gift_item):
if states.her.level < 6:
her "A magic wand?" ("base", "base", "base", "mid")
her "No, it doesn't look like--" ("soft", "base", "base", "mid")
play sound "sounds/click4.ogg"
play background "sounds/vibrator_medium.ogg"
her ".........?" ("soft", "base", "base", "mid")
her "!!!" ("angry", "wide", "base", "stare")
her "{shake}!!!{/shake}" ("angry", "wide", "base", "stare")
her @ cheeks blush "[name_genie_hermione]!" ("angry", "base", "angry", "mid")
play sound "sounds/click4.ogg"
stop background
her "This is just beyond inappropriate!" ("scream", "closed", "angry", "mid")
call her_mood(10)
elif states.her.level < 12:
@ -453,7 +457,7 @@ label give_her_gift(gift_item):
her "Thank you very much, [name_genie_hermione]. I promise to take good care of it." ("open", "closed", "base", "mid")
call her_mood(-20)
elif states.her.level < 12:
her "!!!" ("angry", "wide", "base", "stare")
her "{shake}!!!{/shake}" ("angry", "wide", "base", "stare")
her "That is..." ("angry", "narrow", "base", "down")
her "But it doesn't even look... human..." ("angry", "narrow", "base", "down")
her "I mean..." ("annoyed", "narrow", "angry", "R")
@ -524,7 +528,7 @@ label give_her_gift(gift_item):
elif gift_item == sexdoll_ITEM:
if states.her.level < 6:
her "Is this..." ("shock", "wide", "base", "stare")
her "A sex doll?!" ("angry", "happyCl", "worried", "mid",emote="sweat")
her "{shake}A sex doll?!{/shake}" ("angry", "happyCl", "worried", "mid",emote="sweat")
her "[name_genie_hermione]!!!" ("scream", "happyCl", "worried", "mid")
call her_mood(20)
elif states.her.level < 12:

File diff suppressed because it is too large Load Diff

View File

@ -66,7 +66,7 @@ screen preferences_general():
text _("Skipping")
textbutton _("Skip Unseen Text") action Preference("skip", "toggle")
textbutton _("Until dialog menu") action InvertSelected(Preference("after choices", "toggle"))
textbutton _("Skip Until dialog menu") action InvertSelected(Preference("after choices", "toggle"))
text _("Text Speed")
bar value Preference("text speed") style "navigation_bar"
@ -158,7 +158,7 @@ screen preferences_sound():
screen preferences_accessibility():
frame style "navigation_page_left":
vbox:
label _("Accessibility")
label _("Other")
text _("Text Font")
vbox:
@ -204,7 +204,18 @@ screen preferences_accessibility():
textbutton "Delete persistent data ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_PERSISTENT, Function(delete_persistent))
textbutton "Delete save files ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_SAVES, Function(delete_saves))
frame style "navigation_page_right":
pass
frame style "navigation_note":
xysize (180, 180)
pos (20, 50)
at transform:
rotate 6
text "TIP: If text overflows, try reducing vertical text spacing."
frame style "navigation_note":
xysize (180, 180)
pos (25, 150)
at transform:
rotate -4
text "You could also try changing the font, it might help! :)"
define gui.CONFIRM_DELETE_PERSISTENT = """{color=#7a0000}Warning!{/color}
{size=-4}You are about to reset all persistent data, including

File diff suppressed because it is too large Load Diff

View File

@ -27,6 +27,8 @@ init python:
renpy.music.register_channel("sound2", "sfx", False)
renpy.music.register_channel("weather", "weather", True)
default _game_menu_screen = "navigation"
# Configuration
# https://www.renpy.org/doc/html/config.html
@ -126,8 +128,8 @@ define config.default_music_volume = 0.8
define config.default_sfx_volume = 1.0
# Transitions
define config.enter_transition = f3
define config.exit_transition = f3
define config.enter_transition = None
define config.exit_transition = None
define config.intra_transition = d1
define config.main_game_transition = f3
define config.game_main_transition = f3

View File

@ -123,7 +123,7 @@ init python early:
def enable_game_menu():
global _game_menu_screen
_game_menu_screen = "save_screen"
_game_menu_screen = "navigation"
def make_revertable(obj):
if isinstance(obj, _list):

View File

@ -211,8 +211,8 @@ label _wardrobe:
show screen main_room
show screen ui_top_bar
$ _game_menu_screen = "save" # documented
$ _skipping = True # documented
$ _game_menu_screen = "navigation"
$ _skipping = True
$ renpy.stop_predict(__predicted)
$ __predicted = None
$ renpy.suspend_rollback(False)