Fixes and improvements

* Added tier checks to Hermione chit-chats.
* Fixed issue when picking Hermione's "Mudblood" nickname where no dialogue would play if you haven't fucked her.

* Minor writing fixes.
This commit is contained in:
Johnny28 2023-10-11 15:43:08 +02:00
parent 86bbceac91
commit fb14f83e21
3 changed files with 372 additions and 370 deletions

View File

@ -7,7 +7,7 @@ label hermione_chitchat:
$ states.her.chatted = True $ states.her.chatted = True
### Tier 1 ### ### Tier 1 ###
if states.her.level >= 0 and states.her.level <= 3: if states.her.tier == 1:
random: random:
block: block:
her "Maybe, if I work harder, I could squeeze a few more classes into my schedule..." ("open", "closed", "angry", "mid") her "Maybe, if I work harder, I could squeeze a few more classes into my schedule..." ("open", "closed", "angry", "mid")
@ -59,7 +59,8 @@ label hermione_chitchat:
her "" ("normal", "base", "base", "mid") her "" ("normal", "base", "base", "mid")
### Tier 2 Low ### ### Tier 2 Low ###
if states.her.level >= 4 and states.her.level <= 6: if states.her.tier == 2:
if states.her.level <= 6:
random: random:
block: block:
her "I read somewhere that a full moon often makes it easier to concentrate at a task at hand..." ("open", "closed", "angry", "mid") her "I read somewhere that a full moon often makes it easier to concentrate at a task at hand..." ("open", "closed", "angry", "mid")
@ -120,7 +121,7 @@ label hermione_chitchat:
her "I suppose you are helping me..." ("open", "base", "base", "mid") her "I suppose you are helping me..." ("open", "base", "base", "mid")
### Tier 2 High ### ### Tier 2 High ###
if states.her.level >= 7 and states.her.level <= 9: else:
random: random:
her "I dislike the entire house of Slytherin with all my heart, [name_genie_hermione]." ("angry", "base", "angry", "mid") her "I dislike the entire house of Slytherin with all my heart, [name_genie_hermione]." ("angry", "base", "angry", "mid")
@ -178,7 +179,7 @@ label hermione_chitchat:
her "It must be due to my current state of undress..." ("open", "base", "base", "mid") her "It must be due to my current state of undress..." ("open", "base", "base", "mid")
### Tier 3 ### ### Tier 3 ###
if states.her.level >= 10 and states.her.level <= 12: if states.her.tier == 3:
random: random:
block: block:
her "My \"men's rights movement\" has been losing its popularity lately..." ("open", "base", "worried", "mid") her "My \"men's rights movement\" has been losing its popularity lately..." ("open", "base", "worried", "mid")
@ -239,7 +240,8 @@ label hermione_chitchat:
her "No, you'll still have to pay me for that." ("open", "base", "base", "mid") her "No, you'll still have to pay me for that." ("open", "base", "base", "mid")
### Tier 4 Low ### ### Tier 4 Low ###
if states.her.level >= 13 and states.her.level <= 15: if states.her.tier == 4:
if states.her.level <= 15:
random: random:
her "What will it be today, [name_genie_hermione]?" ("annoyed", "narrow", "annoyed", "mid") her "What will it be today, [name_genie_hermione]?" ("annoyed", "narrow", "annoyed", "mid")
@ -290,7 +292,7 @@ label hermione_chitchat:
### Tier 4 High ### ### Tier 4 High ###
if states.her.level >= 16 and states.her.level <= 18: else:
random: random:
block if hermione.is_any_worn("top", "bra"): block if hermione.is_any_worn("top", "bra"):
her "Would you like me to show you my breasts today, [name_genie_hermione]?" ("open", "narrow", "worried", "down") her "Would you like me to show you my breasts today, [name_genie_hermione]?" ("open", "narrow", "worried", "down")
@ -350,7 +352,7 @@ label hermione_chitchat:
her "Do you believe we have learned enough, or will you be inviting Professor Snape again in the future?" ("annoyed", "base", "base", "R") her "Do you believe we have learned enough, or will you be inviting Professor Snape again in the future?" ("annoyed", "base", "base", "R")
### Tier 5 ### ### Tier 5 ###
if states.her.level >= 19 and states.her.level <= 21: if states.her.tier == 5:
random: random:
her "I am doing well... Thank you for asking." ("base", "base", "base", "mid") her "I am doing well... Thank you for asking." ("base", "base", "base", "mid")
@ -406,6 +408,7 @@ label hermione_chitchat:
her "" ("base", "narrow", "base", "mid_soft") her "" ("base", "narrow", "base", "mid_soft")
### Tier 6 Low ### ### Tier 6 Low ###
if states.her.tier == 6:
if states.her.level == 22: if states.her.level == 22:
random: random:
block if not states.her.ev.yule_ball.complete: block if not states.her.ev.yule_ball.complete:
@ -455,7 +458,7 @@ label hermione_chitchat:
her "" ("upset", "closed", "base", "mid") her "" ("upset", "closed", "base", "mid")
### Tier 6 High ### ### Tier 6 High ###
if states.her.level >= 23: else:
random: random:
block: block:
her @ cheeks blush "If you ever need some \"assistance\", [name_genie_hermione]... Please let me know." ("open_wide_tongue", "base", "base", "R") her @ cheeks blush "If you ever need some \"assistance\", [name_genie_hermione]... Please let me know." ("open_wide_tongue", "base", "base", "R")

View File

@ -429,7 +429,7 @@ label hg_pr_flash_T4_E3:
her "Instead, as I was outside in one of the courtyards..." her "Instead, as I was outside in one of the courtyards..."
her "... I just pulled my shirt up and pressed my bare chest against the window of a nearby classroom..." ("angry", "narrow", "base", "down") her "... I just pulled my shirt up and pressed my bare chest against the window of a nearby classroom..." ("angry", "narrow", "base", "down")
her "I stood there like that for several seconds..." her "I stood there like that for several seconds..."
her "To make sure that at least someone would see them from the outside..." her "To make sure that at least someone would see them.."
her "I hope this still counts, [name_genie_hermione]..." ("angry", "base", "base", "mid") her "I hope this still counts, [name_genie_hermione]..." ("angry", "base", "base", "mid")
gen "*Hmm*..." ("base", xpos="far_left", ypos="head") gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
gen "How many students would you estimate, being behind that window?" ("base", xpos="far_left", ypos="head") gen "How many students would you estimate, being behind that window?" ("base", xpos="far_left", ypos="head")

View File

@ -171,7 +171,7 @@ label hermione_talk:
jump hermione_change_fail jump hermione_change_fail
"-Mudblood-": "-Mudblood-":
$ temp_name = "Mudblood" $ temp_name = "Mudblood"
if states.her.level >= 22: if states.her.level >= 22 and states.her.status.sex:
jump hermione_change jump hermione_change
else: else:
jump hermione_change_fail jump hermione_change_fail
@ -218,7 +218,7 @@ label hermione_change:
elif temp_name == "Girl": elif temp_name == "Girl":
if states.her.level >=1 and states.her.level < 3: if states.her.level >=1 and states.her.level < 3:
her "This girl thing again?" ("annoyed", "happy", "base", "mid") her "This girl thing again?" ("annoyed", "happy", "base", "mid")
her "*sigh*..." ("soft", "happy", "base", "R") her "*Sigh*..." ("soft", "happy", "base", "R")
elif states.her.level >=3: elif states.her.level >=3:
her "Fine... I don't mind." ("soft", "base", "base", "R") her "Fine... I don't mind." ("soft", "base", "base", "R")
elif temp_name == "Nerd": elif temp_name == "Nerd":
@ -228,7 +228,7 @@ label hermione_change:
her "Like what exactly?" ("normal", "narrow", "base", "mid_soft") her "Like what exactly?" ("normal", "narrow", "base", "mid_soft")
gen "Nothing to worry about, things will work out..." ("base", xpos="far_left", ypos="head") gen "Nothing to worry about, things will work out..." ("base", xpos="far_left", ypos="head")
gen "Nerd..." ("grin", xpos="far_left", ypos="head") gen "Nerd..." ("grin", xpos="far_left", ypos="head")
her "*tsk* ..." ("soft", "narrow", "base", "R_soft") her "*Tsk* ..." ("soft", "narrow", "base", "R_soft")
her "" ("normal", "narrow", "base", "R_soft") her "" ("normal", "narrow", "base", "R_soft")
elif states.her.level >= 5 and states.her.level < 19: elif states.her.level >= 5 and states.her.level < 19:
her "I can be a bit nerdy sometimes I suppose..." ("angry", "happyCl", "base", "mid", emote="sweat") her "I can be a bit nerdy sometimes I suppose..." ("angry", "happyCl", "base", "mid", emote="sweat")
@ -431,7 +431,6 @@ label hermione_change:
gen "But where's the fun in that?" ("base", xpos="far_left", ypos="head") gen "But where's the fun in that?" ("base", xpos="far_left", ypos="head")
her @ cheeks blush "Why do I even bother... *sigh*" ("soft", "narrow", "base", "R_soft") her @ cheeks blush "Why do I even bother... *sigh*" ("soft", "narrow", "base", "R_soft")
elif temp_name == "Mudblood": elif temp_name == "Mudblood":
if states.her.level >= 21 and states.her.status.sex:
her "A{w=0.5}...{w=0.5} {size=+6}{b}{cps=20}mud{w=0.5}blood{/cps}{/b}?!{/size}" ("shock", "wide", "base", "stare") her "A{w=0.5}...{w=0.5} {size=+6}{b}{cps=20}mud{w=0.5}blood{/cps}{/b}?!{/size}" ("shock", "wide", "base", "stare")
her "Did I hear you right, [name_genie_hermione]?!" ("normal", "wide", "base", "mid") her "Did I hear you right, [name_genie_hermione]?!" ("normal", "wide", "base", "mid")
menu: menu: