diff --git a/game/characters/luna/clothes/accessory/police_cuffs/0.webp b/game/characters/luna/clothes/accessory/police_cuffs/0.webp index 4897f7ec..ddb13328 100644 --- a/game/characters/luna/clothes/accessory/police_cuffs/0.webp +++ b/game/characters/luna/clothes/accessory/police_cuffs/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:422a4b7f1d6564125c805bdd9631b45ccfb6526fb3d6e195f5f704212ec6f63a -size 3076 +oid sha256:0b2e318f129868b7bc79005000d2e5fea31ffd5256fc68d54b7981cda40d21df +size 3104 diff --git a/game/characters/luna/clothes/accessory/police_cuffs/extra.webp b/game/characters/luna/clothes/accessory/police_cuffs/extra.webp deleted file mode 100644 index f4d7032d..00000000 --- a/game/characters/luna/clothes/accessory/police_cuffs/extra.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51385e6ffaeedcceea449deace754cb49066889721ec18ca9c20b7f1313c604c -size 1026 diff --git a/game/characters/luna/clothes/accessory/police_cuffs/outline.webp b/game/characters/luna/clothes/accessory/police_cuffs/outline.webp index f601fb90..e3056545 100644 --- a/game/characters/luna/clothes/accessory/police_cuffs/outline.webp +++ b/game/characters/luna/clothes/accessory/police_cuffs/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1872839fe7fcd41613821bc8abcc2bea9a823ab65460e2fae47b6816bf3e45d2 -size 3632 +oid sha256:d18d724fc98b402e8e0a5c27edda8cebe75518b2d13ce758bff74241efb66c25 +size 3634 diff --git a/game/characters/luna/clothes/accessory/police_cuffs/skin.webp b/game/characters/luna/clothes/accessory/police_cuffs/skin.webp index e404a5cc..db69d23c 100644 --- a/game/characters/luna/clothes/accessory/police_cuffs/skin.webp +++ b/game/characters/luna/clothes/accessory/police_cuffs/skin.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c4f822343041ef3bf4d3395da2bcd167167e82a39d8ba8c806270bc0e252cfd +oid sha256:497d0f80408c5929ecc7dd94143dea2f1e9409429f36c6dccb30a7ade9e152b0 size 1710 diff --git a/game/characters/luna/clothes/bottom/police_skirt/0.webp b/game/characters/luna/clothes/bottom/police_skirt/0.webp index 3c0b60ad..b3e1f3b4 100644 --- a/game/characters/luna/clothes/bottom/police_skirt/0.webp +++ b/game/characters/luna/clothes/bottom/police_skirt/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c595765ac159e95e8110045ba20153e05b549292b5eb2d6bb1246a0604a9e4f4 -size 7068 +oid sha256:45e625ab2dfe0e881a1d07c580a8f9a7d1975e9e08ee73124bff771e999320b8 +size 7460 diff --git a/game/characters/luna/clothes/bottom/police_skirt/1.webp b/game/characters/luna/clothes/bottom/police_skirt/1.webp deleted file mode 100644 index 25201c32..00000000 --- a/game/characters/luna/clothes/bottom/police_skirt/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:189a05ee9d71b18da2a2c6fe925f5a5fc5df5f7beb6b58f23e1837bd552cc976 -size 3524 diff --git a/game/characters/luna/clothes/bottom/police_skirt/2.webp b/game/characters/luna/clothes/bottom/police_skirt/2.webp deleted file mode 100644 index e7f24f14..00000000 --- a/game/characters/luna/clothes/bottom/police_skirt/2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de942225df2fcda3445bba048a03c75d71737389645a4034bdc0336461f6d00a -size 1122 diff --git a/game/characters/luna/clothes/bottom/police_skirt/extra.webp b/game/characters/luna/clothes/bottom/police_skirt/extra.webp deleted file mode 100644 index f8527bed..00000000 --- a/game/characters/luna/clothes/bottom/police_skirt/extra.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:327f555735d5f84d8b783e19367bcd2886192cea595ba38eec22a8766a74ef8e -size 730 diff --git a/game/characters/luna/clothes/bottom/police_skirt/outline.webp b/game/characters/luna/clothes/bottom/police_skirt/outline.webp index 685235ba..0702d82b 100644 --- a/game/characters/luna/clothes/bottom/police_skirt/outline.webp +++ b/game/characters/luna/clothes/bottom/police_skirt/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a09f56270efaedb91bc46be81c01acd166559910bebf57cae691cc566dd1a09 -size 8168 +oid sha256:5fd6b08872e4b265be29a3ec7a1593ddd7617c7a13dfd9e35062f71303993d36 +size 7676 diff --git a/game/characters/luna/clothes/bottom/police_skirt/skin.webp b/game/characters/luna/clothes/bottom/police_skirt/skin.webp index 89dc08e1..a871d5aa 100644 --- a/game/characters/luna/clothes/bottom/police_skirt/skin.webp +++ b/game/characters/luna/clothes/bottom/police_skirt/skin.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22d9d22269ff0d4c2d2406b797d66ec8434a6b7fd408f9253ca35f4125aecc53 -size 2186 +oid sha256:4356f3be0459df106cd47bcfc505dd7b6269ac825333a8db7ae57f25b6625e27 +size 2192 diff --git a/game/characters/luna/clothes/stockings/police_thigh_highs/0.webp b/game/characters/luna/clothes/stockings/police_thigh_highs/0.webp index 4e51b305..00b282ac 100644 --- a/game/characters/luna/clothes/stockings/police_thigh_highs/0.webp +++ b/game/characters/luna/clothes/stockings/police_thigh_highs/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b977483ebc20faad2d64fc4f7308fa6f29f4a5a001781fc32204d3903d305b8b -size 9312 +oid sha256:f9a8c0177be52fdcbd1acfd82b56163285bcdd9e247a374406f2cdfb3efc4b90 +size 5796 diff --git a/game/characters/luna/clothes/stockings/police_thigh_highs/extra.webp b/game/characters/luna/clothes/stockings/police_thigh_highs/extra.webp deleted file mode 100644 index fdb3355e..00000000 --- a/game/characters/luna/clothes/stockings/police_thigh_highs/extra.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56ef955942a6991873b0af07d84e00a8af8f918ec340140a47b0cd11ee77f2bc -size 1760 diff --git a/game/characters/luna/clothes/stockings/police_thigh_highs/outline.webp b/game/characters/luna/clothes/stockings/police_thigh_highs/outline.webp index 7423324b..ea78b204 100644 --- a/game/characters/luna/clothes/stockings/police_thigh_highs/outline.webp +++ b/game/characters/luna/clothes/stockings/police_thigh_highs/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b8d86d2665057c8a0b7d0ebfb153857dc965a46010523166d3f9ee4d1b4a19b -size 6034 +oid sha256:3f97b090fc188c8454fbda1bec136b1dde2b35a102e85a8a9bc5998edfe51b9b +size 6008 diff --git a/game/characters/luna/clothes/top/police_shirt/0.webp b/game/characters/luna/clothes/top/police_shirt/0.webp index fd6d7936..5569fe3a 100644 --- a/game/characters/luna/clothes/top/police_shirt/0.webp +++ b/game/characters/luna/clothes/top/police_shirt/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1af20b132d64ccd5fb2d27b97871eff11be9e4317894669781daf5d103d1d79e -size 14930 +oid sha256:410f2f0475a3ab264cea9f2e02cd61b0c8eb91077ac08e0f7f79912c4585df2e +size 13438 diff --git a/game/characters/luna/clothes/top/police_shirt/1.webp b/game/characters/luna/clothes/top/police_shirt/1.webp index b2da3da3..34b6b5dc 100644 --- a/game/characters/luna/clothes/top/police_shirt/1.webp +++ b/game/characters/luna/clothes/top/police_shirt/1.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4274096dc52aa87ec18a67a31228410570c5cbf6650a579a9a52a6f1a37dadd -size 1612 +oid sha256:17d821381f17706cf5f128f855234d84e133ba362412e0cf3db1af55abe4db78 +size 1120 diff --git a/game/characters/luna/clothes/top/police_shirt/2.webp b/game/characters/luna/clothes/top/police_shirt/2.webp deleted file mode 100644 index 2cb3380a..00000000 --- a/game/characters/luna/clothes/top/police_shirt/2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e2735d2bc13e569e9ddd2cc2c3060231d18bd0362bc148d580e1369efa5c8e7 -size 1256 diff --git a/game/characters/luna/clothes/top/police_shirt/3.webp b/game/characters/luna/clothes/top/police_shirt/3.webp deleted file mode 100644 index 9afb8ab5..00000000 --- a/game/characters/luna/clothes/top/police_shirt/3.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7ee0ea5d880ba7fa4c7653b11b3187e629f2326500de3eac14c9429d079d48f -size 1598 diff --git a/game/characters/luna/clothes/top/police_shirt/extra.webp b/game/characters/luna/clothes/top/police_shirt/extra.webp deleted file mode 100644 index 09161782..00000000 --- a/game/characters/luna/clothes/top/police_shirt/extra.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5e631904821e36e787a684296d9a73f1b104520fedc43a0237ffa4fc8997aac -size 782 diff --git a/game/characters/luna/clothes/top/police_shirt/outline.webp b/game/characters/luna/clothes/top/police_shirt/outline.webp index 1642d482..14d18235 100644 --- a/game/characters/luna/clothes/top/police_shirt/outline.webp +++ b/game/characters/luna/clothes/top/police_shirt/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd6adbc5643852cddbd71cc1e3d7f3d58c20fd81cbb0f855930c9ee3406f5b1e -size 14050 +oid sha256:9191f98b535623f2f0e0e90755073e0afc119c62cbd4344b0cbeab238662c899 +size 13338 diff --git a/game/characters/luna/clothes/top/police_shirt/skin.webp b/game/characters/luna/clothes/top/police_shirt/skin.webp index b09d6530..bbf88e77 100644 --- a/game/characters/luna/clothes/top/police_shirt/skin.webp +++ b/game/characters/luna/clothes/top/police_shirt/skin.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:485a5646ea113412e63f29ac4cb9c296501af261e5e8a6f8f528637a1981484a +oid sha256:624ae52caf3911ae83c186a6a9e49027afe95955c8a1cc06eac61bf299e0757a size 3402 diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy index 7009e293..2eadaecd 100644 --- a/game/scripts/characters/astoria/events/intro.rpy +++ b/game/scripts/characters/astoria/events/intro.rpy @@ -38,7 +38,7 @@ label astoria_intro_E1: ton "We might be in big trouble, [ton_genie_name]!" ("open", "base", "worried", "mid") call play_music("playful_tension") - g9 "Miss Tonks... Have you been a bad girl?" + gen "Miss Tonks... Have you been a bad girl?" ("grin", xpos="far_left", ypos="head") ton "I'm not joking, [ton_genie_name]!" ("soft", "base", "annoyed", "mid") ton "Something terrible has happened at school today!" ("open", "closed", "annoyed", "R") ton "I believe one of our students has conducted some highly illegal activities against another student!" ("normal", "base", "annoyed", "downR") @@ -70,9 +70,9 @@ label astoria_intro_E1: ton "If this doesn't get dealt with immediately they'll have us both locked up in a cell in Azkaban, do you hear me?!" ("mad", "base", "angry", "mid") gen "Loud and clear..." ("base", xpos="far_left", ypos="head") gen "I'll be locked up in a cell - together with you..." ("base", xpos="far_left", ypos="head") - g9 "I can think of many fates worse than that, if I'm honest." + gen "I can think of many fates worse than that, if I'm honest." ("grin", xpos="far_left", ypos="head") ton "Weren't you so scared of that very thing before?" ("open", "base", "raised", "mid") - g9 "Not when I'm accompanied by someone as lovely as you!" + gen "Not when I'm accompanied by someone as lovely as you!" ("grin", xpos="far_left", ypos="head") ton "................" ("annoyed", "base", "annoyed", "R") ton "You are clearly insane!" ("open", "base", "angry", "mid") # Annoyed ton "Fine... Tell me what you want so we can continue..." ("upset", "base", "base", "mid") @@ -87,7 +87,7 @@ label astoria_intro_E1: "\"Pull on my finger...\"" if d_flag_01 == False: $ d_flag_01 = True ton "I'm sorry?" ("open", "base", "raised", "mid") - g9 "Come on. It's an old trick we Genies like to do!" + gen "Come on. It's an old trick we Genies like to do!" ("grin", xpos="far_left", ypos="head") gen "It's harmless, I swear..." ("base", xpos="far_left", ypos="head") ton "............." ("upset", "base", "angry", "R") ton "Very well..." ("open", "closed", "base", "mid") @@ -109,7 +109,7 @@ label astoria_intro_E1: pause.8 call bld - g9 "Now pull it." + gen "Now pull it." ("grin", xpos="far_left", ypos="head") ton ".................................." ("disgust", "base", "annoyed", "down", xpos="far_right", ypos="head") gen "Try a bit harder..." ("base", xpos="far_left", ypos="head") ton ".............................................." ("normal", "base", "angry", "down") @@ -119,7 +119,7 @@ label astoria_intro_E1: pause.5 call bld - g4 "Why isn't this working?!" + gen "Why isn't this working?!" ("angry", xpos="far_left", ypos="head") gen "(Oh, that's right...)" ("base", xpos="far_left", ypos="head") gen "(I forgot we Genies are unable to fart...)" ("base", xpos="far_left", ypos="head") ton "Are we done here?" ("open", "closed", "base", "mid") @@ -152,10 +152,10 @@ label astoria_intro_E1: # ton "Blow you? With my mouth?" ("base", "base", "base", "mid") # gen "Yes, please." ("base", xpos="far_left", ypos="head") # ton "On your dick, I imagine?" ("base", "base", "base", "mid") - # g9 "Yes, if you would..." + # gen "Yes, if you would..." ("grin", xpos="far_left", ypos="head") # ton "Very well..." ("base", "base", "base", "mid") # ton "Get it out for me, would you..." ("base", "base", "base", "mid") # Naughty look - # g9 "!!!" + # gen "!!!" ("grin", xpos="far_left", ypos="head") # Tonks walks over. # Blkfade. # Genie and Tonks stand behind the desk. @@ -173,12 +173,12 @@ label astoria_intro_E1: "\"Send Nudes.\"": ton "Nudes, [ton_genie_name]?" ("annoyed", "base", "raised", "mid") - g9 "Yes! Send me some nude pictures of yourself!" - g9 "A poster, maybe?" + gen "Yes! Send me some nude pictures of yourself!" ("grin", xpos="far_left", ypos="head") + gen "A poster, maybe?" ("grin", xpos="far_left", ypos="head") ton "Oh..." ("upset", "base", "base", "down") ton "A poster, you say?..." ("horny", "base", "base", "mid") ton "What are you gonna do with it? Put it on your wall and jerk off to it?" ("horny", "base", "angry", "mid") - g9 "You can count on that!" + gen "You can count on that!" ("grin", xpos="far_left", ypos="head") ton "Hold on!{w} Are you going to hang it up here? In your office?!" ("open", "wide", "shocked", "stare") gen "Sure... It's not like there are that many other rooms I can go to..." ("base", xpos="far_left", ypos="head") ton "Oh my... I'll have to put a concealment charm on it then..." ("upset", "base", "worried", "R", hair="horny") @@ -187,7 +187,7 @@ label astoria_intro_E1: ton "(Well they'll just see some dull landscape or another...)" ("normal", "base", "base", "downR") gen "So, I've got this wart on my--" ("base", xpos="far_left", ypos="head") ton "I shall send you an owl with it tomorrow morning, [ton_genie_name]." ("base", "base", "base", "mid") - g9 "Sweet!" + gen "Sweet!" ("grin", xpos="far_left", ypos="head") ton "Now, here is what I'll require your help with..." ("open", "closed", "base", "mid") if "poster_1_gift" not in tonks_mail_list: @@ -196,14 +196,14 @@ label astoria_intro_E1: ton "This girl I've told you about, Susan Bones?" ("soft", "base", "shocked", "mid") ton "The one with--" ("base", "base", "base", "R") - g9 "With the giant tits!" + gen "With the giant tits!" ("grin", xpos="far_left", ypos="head") ton "... The one with the unfortunate luck of being a constant target of bullying and harassment!" ("mad", "closed", "base", "mid") # Annoyed gen "Yes, that too..." ("base", xpos="far_left", ypos="head") ton "That poor girl! She cried the entire time when she told me about what happened..." ("open", "base", "worried", "down") ton "I can't believe she got hit by a curse!" ("mad", "base", "angry", "down") # Angry gen "At least she isn't dead..." ("base", xpos="far_left", ypos="head") ton "No, of course not!" ("open", "base", "angry", "mid") - m "Or Injured?" + gen "Or Injured?" ("base", xpos="far_left", ypos="head") ton "Thankfully not..." ("upset", "base", "base", "R") gen "And nobody tried to shrink her tits?" ("base", xpos="far_left", ypos="head") ton "Don't be silly..." ("open", "closed", "base", "mid") @@ -228,7 +228,7 @@ label astoria_intro_E1: gen "(Does she hate old people as well now?)" ("base", xpos="far_left", ypos="head") ton "Should the Ministry find out about what happened to... Miss Bones." ("upset", "shocked", "worried", "R") - g9 "*He-he-he!*..." + gen "*He-he-he!*..." ("grin", xpos="far_left", ypos="head") ton "Which they most certainly will, as her aunt is head of the Ministry's department for \"Magical Law Enforcement\"..." ("open", "closed", "worried", "down") ton "Our whole operation would be busted! And we'd get locked up once and for all!" ("upset", "base", "worried", "mid") @@ -242,11 +242,11 @@ label astoria_intro_E1: gen "Find{w=0.2}.{w=0.2}.{w=0.2}.{w=0.8} her?" ("base", xpos="far_left", ypos="head") ton "Yes! She heard a girl's voice in her head - while she was under the influence of the imperius curse..." ("open", "base", "angry", "mid") ton "Who told her{w=0.2}.{w=0.2}.{w=0.2}.{w=0.8} to lift up her top." ("upset", "base", "worried", "R") - g9 "Oh yes?" + gen "Oh yes?" ("grin", xpos="far_left", ypos="head") ton "The imperius curse can make people do {b}unspeakable things{/b}!" ("open", "closed", "angry", "mid") ton "I have no doubt that someone as sweet and good-hearted as Susan wouldn't know how to defend herself against it..." ("open", "base", "worried", "mid") ton "So... She showed her breasts to a bunch of other students...{w=1.4} unfortunately..." ("upset", "base", "worried", "R") - g9 "I wish I could have been there to stop it!" + gen "I wish I could have been there to stop it!" ("base", xpos="far_left", ypos="head") ton "Of course you do..." ("open", "closed", "base", "mid") ton "That's sadly all the information I can share..." ("annoyed", "base", "annoyed", "down") ton "Nobody there saw who might have cursed her..." ("open", "base", "worried", "mid") @@ -268,8 +268,8 @@ label astoria_intro_E1: call bld gen "I should definitely get Snape on this..." ("base", xpos="far_left", ypos="head") gen "And Granger..." ("base", xpos="far_left", ypos="head") - g9 "Or I could jerk off instead!" # Achievement if you do, maybe? - g9 "Yes that seems like a good idea right now!" + gen "Or I could jerk off instead!" ("grin", xpos="far_left", ypos="head") # Achievement if you do, maybe? + gen "Yes that seems like a good idea right now!" ("grin", xpos="far_left", ypos="head") # TODO: Add hidden achievement called "Follow the script!" and unlock it if you jerk off after this scene. Maybe add some Susan smut writing for the jerk-off session? @@ -686,8 +686,8 @@ label astoria_intro_E3: gen "Naturally..." ("base", xpos="far_left", ypos="head") sna "Until next time... Albus." ("snape_09") gen "And Albus to you--" ("base", xpos="far_left", ypos="head") - g4 "I mean..." - g9 "Until next time!" + gen "I mean..." ("angry", xpos="far_left", ypos="head") + gen "Until next time!" ("grin", xpos="far_left", ypos="head") sna "..." ("snape_04") # Snape leaves and runs into Tonks. @@ -792,8 +792,8 @@ label astoria_intro_E3: ton "A girl with that type of...{w=0.3} talent, is a rare thing." ("horny", "base", "raised", "L") # Horny ton "I would say, fifty points for Slytherin should be appropriate." ("base", "base", "annoyed", "mid") ast "!!!" ("clench", "base", "base", "mid") - g4 "(If Hermione hears about this - she'll {i}Abra Kadabra{/i} my head off!)" - g4 "(And not the one on my shoulders...)" + gen "(If Hermione hears about this - she'll {i}Abra Kadabra{/i} my head off!)" ("angry", xpos="far_left", ypos="head") + gen "(And not the one on my shoulders...)" ("angry", xpos="far_left", ypos="head") ton "But you'll still have to visit me for detention." ("open", "base", "annoyed", "L") ast "I guess I can do that..." ("smile", "base", "base", "R") ton "Wonderful." ("base", "happyCl", "base", "mid") @@ -826,7 +826,7 @@ label astoria_intro_E3: if d_flag_01: gen "You gave her fifty house points..." ("base", xpos="far_left", ypos="head") - g4 "For what you previously described as a serious crime?" + gen "For what you previously described as a serious crime?" ("angry", xpos="far_left", ypos="head") ton "I know! I shouldn't have rewarded her, but..." ("upset", "closed", "worried", "mid") ton "Did you see how her face lit up!" ("grin", "narrow", "raised", "mid") ton "I thought we were supposed to encourage our students, [ton_genie_name]." ("upset", "base", "shocked", "down") @@ -929,11 +929,11 @@ label nt_he_astoria_E1: ton "You don't know?" ("open", "shocked", "raised", "mid") ton "Well that's not too surprising - all things considered..." ("normal", "narrow", "base", "L") ton "It means she experiences no sexual desires or attractions. To anything!" ("annoyed", "narrow", "shocked", "mid") - g4 "WHAT?!" + gen "WHAT?!" ("angry", xpos="far_left", ypos="head") ton "I know!" ("mad", "base", "worried", "mid") gen "By the great desert sands... That's a curse worse than death." ("base", xpos="far_left", ypos="head") ton "The curse has seemingly gone from killing off random members of their family to preventing new members from being born." ("upset", "base", "base", "R") - #g4 "Wait, since when can spells change their outcome like that?" + #gen "Wait, since when can spells change their outcome like that?" ("base", xpos="far_left", ypos="head") gen "Magic doesn't make any fucking sense in this universe..." ("base", xpos="far_left", ypos="head") ton "Hey, it makes perfect sense!" ("open", "base", "angry", "mid") ton "..." ("upset", "base", "worried", "R") @@ -942,8 +942,8 @@ label nt_he_astoria_E1: ton "Maybe even teach her how to cast Imperio properly." ("annoyed", "base", "base", "R") gen "..." ("base", xpos="far_left", ypos="head") with hpunch - g4 "Hold on a second...{w=0.8} what?!" - g4 "You want to teach this {b}sadist{/b} how to cast those illegal curses?" + gen "Hold on a second...{w=0.8} what?!" ("angry", xpos="far_left", ypos="head") + gen "You want to teach this {b}sadist{/b} how to cast those illegal curses?" ("angry", xpos="far_left", ypos="head") gen "That's what caused all this trouble in the first place!" ("base", xpos="far_left", ypos="head") ton "Don't worry, I'm just gonna teach her the basics..." ("open", "closed", "base", "mid") ton "I won't allow her to go out and curse students at random." ("mad", "closed", "annoyed", "mid") @@ -991,7 +991,7 @@ label astoria_intro_E4: gen "..." ("base", xpos="far_left", ypos="head") "\"Who is it?\"": ast "Professor, may I come in?" - g4 "It's that accursed, cursed girl!" + gen "It's that accursed, cursed girl!" ("angry", xpos="far_left", ypos="head") ast "Sir?" "\"Not now...\"": @@ -1027,7 +1027,7 @@ label astoria_intro_E4: ast "Yes, Sir..." ("annoyed", "base", "base", "mid") gen "(Shit, was I supposed to do something with her?)" ("base", xpos="far_left", ypos="head") ast "...................." ("annoyed", "base", "base", "R") - m "(Oh that's right. Freeing her from her curse...)" + gen "(Oh that's right. Freeing her from her curse...)" ("base", xpos="far_left", ypos="head") ast "Sir, If there's nothing you need of me then I'd like to leave..." ("open", "narrow", "base", "mid") menu: @@ -1060,7 +1060,7 @@ label astoria_intro_E4: jump main_room_menu gen "It's just a couple of sessions with your teacher." ("base", xpos="far_left", ypos="head") - g9 "I'm sure you'll enjoy it!" + gen "I'm sure you'll enjoy it!" ("grin", xpos="far_left", ypos="head") ast "If you say so, Sir." ("open", "closed", "base", "mid") ast "..." ("annoyed", "narrow", "base", "R") ast "Would it be okay if I go there some other time?" ("open", "base", "base", "mid") @@ -1079,7 +1079,7 @@ label astoria_intro_E4: call bld gen "..." ("base", xpos="far_left", ypos="head") gen "(I am way too good to my students.)" ("base", xpos="far_left", ypos="head") - g9 "(Who wouldn't want to be in detention with that nympho?)" + gen "(Who wouldn't want to be in detention with that nympho?)" ("grin", xpos="far_left", ypos="head") gen "(That girl should consider herself lucky...)" ("base", xpos="far_left", ypos="head") $ astoria_busy = True diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body.rpy index bfe00699..3ab7881f 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body.rpy @@ -183,9 +183,9 @@ label cc_pf_strip_T2_intro_E1: menu: "\"Yeah, she's gross.\"": $ cho_mood = 0 - m "Miss Granger's body is nothing compared to yours." + gen "Miss Granger's body is nothing compared to yours." ("base", xpos="far_left", ypos="head") cho "I wholeheartedly agree, Sir!" ("base", "narrow", "angry", "mid") - m "Her tits sag too much, and her fat hips are disgusting..." + gen "Her tits sag too much, and her fat hips are disgusting..." ("base", xpos="far_left", ypos="head") hide cho_main call blktone gen "(Something deep inside me just died saying this...)" ("angry", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy b/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy index 1d78e20f..a3083ec7 100644 --- a/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy +++ b/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy @@ -255,7 +255,7 @@ label cc_pr_spy_girls_T3_alicia: # Has player started imperius curse training? if ag_st_imperio.points > 0: - m "She's not using that im-perv-ius curse, is she?" + gen "She's not using that im-perv-ius curse, is she?" ("base", xpos="far_left", ypos="head") cho "The Imperius curse?" ("open", "narrow", "raised", "mid") gen "That's what I said..." ("base", xpos="far_left", ypos="head") cho "Of course not. That spell is illegal!{w=0.8} She'd be thrown into Azkaban for it..." ("soft", "narrow", "angry", "mid") diff --git a/game/scripts/characters/hermione/events/tutoring.rpy b/game/scripts/characters/hermione/events/tutoring.rpy index 8b2f4a26..49369a05 100644 --- a/game/scripts/characters/hermione/events/tutoring.rpy +++ b/game/scripts/characters/hermione/events/tutoring.rpy @@ -240,7 +240,7 @@ label hg_tutor_E3: her "I'm glad you have such high confidence in me." ("grin", "happyCl", "worried", "mid") gen "And I'm glad you're starting to believe in this. I think you have the potential to master this branch of magic." ("base", xpos="far_left", ypos="head") her "You seem tired, professor." ("open", "squint", "base", "mid") - g11 "{size=-2}(Tired of waiting to annihilate your ass.){/size}" + gen "{size=-2}(Tired of waiting to annihilate your ass.){/size}" ("angry", xpos="far_left", ypos="head") her "Yes, professor?" ("annoyed", "base", "base", "mid") gen "Yes we can!" ("grin", xpos="far_left", ypos="head") gen "Uh, I mean, I'm sure I'll tire you out soon enough, Miss Granger. How about you get some sleep?" ("base", xpos="far_left", ypos="head") @@ -287,12 +287,12 @@ label hg_tutor_E4: her "Alright, but it's embarrassing." ("annoyed", "narrow", "angry", "R", cheeks="blush") gen "{size=-2}(Ooh, I hope they were naked!){/size}" ("grin", xpos="far_left", ypos="head") her "I went to the library to study interactions between plants..." ("open", "closed", "base", "mid") - g11 "{size=-2}(Yeah, yeah, come on...){/size}" + gen "{size=-2}(Yeah, yeah, come on...){/size}" ("angry", xpos="far_left", ypos="head") her "... and I heard muffled sounds." ("base", "base", "base", "R", cheeks="blush") her "I was hoping to catch a teacher doing bad things with one of those Slytherin whores." ("annoyed", "narrow", "angry", "R", cheeks="blush") her "I slowly headed towards the sounds and I discovered two girls in an alcove." ("open", "base", "base", "mid", cheeks="blush") her "I remained hidden to observe them." ("grin", "wink", "base", "mid", cheeks="blush") - g11 "{size=-2}(Come on!){/size}" + gen "{size=-2}(Come on!){/size}" ("angry", xpos="far_left", ypos="head") her "Yes, professor?" ("base", "narrow", "base", "up", cheeks="blush") gen "Yes, no, please continue." ("base", xpos="far_left", ypos="head") her "They were kissing passionately." ("open", "happyCl", "worried", "mid", cheeks="blush") @@ -318,7 +318,7 @@ label hg_tutor_E4: her "But to be honest, sir, I thought you were going to punish those two sluts." gen "Can you provide proof of their crime? No?" ("base", xpos="far_left", ypos="head") gen "Even I can't punish students without proof of any wrongdoing." ("base", xpos="far_left", ypos="head") - g11 "{size=-2}(With the possible exception of you!){/size}" + gen "{size=-2}(With the possible exception of you!){/size}" ("angry", xpos="far_left", ypos="head") gen "Anyway, you've done well. I think it will be enough for this lesson." ("base", xpos="far_left", ypos="head") gen "Remember what I've told you, and good night!" ("base", xpos="far_left", ypos="head") her "Good night, professor." ("base", "base", "base", "mid") @@ -407,7 +407,7 @@ label hg_tutor_E5: call cum_block - g11 "Yes! That's the stuff!" + gen "Yes! That's the stuff!" ("angry", xpos="far_left", ypos="head") hide screen bld1 with d1 call gen_chibi("cum_behind_desk") @@ -1070,7 +1070,7 @@ label hg_tutor_E10: pause .2 her "Insert my fingers into her wet pussy." ("open_tongue", "narrow", "base", "up", cheeks="blush") - g11 "Yes, yes! Now the vibrator!" + gen "Yes, yes! Now the vibrator!" ("angry", xpos="far_left", ypos="head") hide hermione_main call blkfade @@ -1088,10 +1088,10 @@ label hg_tutor_E10: her "Like me! *Aaah* yesssss! {heart} {heart}" ("open_wide_tongue", "narrow", "base", "up", cheeks="blush") call ctc - g11 "*Ahh*! You little whore!!!" + gen "*Ahh*! You little whore!!!" ("angry", xpos="far_left", ypos="head") call gen_chibi("cum_behind_desk") her "The vibrator... *Aaah* I'm still cumming!!" - g11 "Take this!" + gen "Take this!" ("angry", xpos="far_left", ypos="head") hide hermione_main call blkfade @@ -1445,7 +1445,7 @@ label hg_tutor_E12: her "No don't I..." her "Cumm-- {heart} {heart}" ("silly", "base", "worried", "mid", cheeks="blush", tears="soft") her "Agaaain-- *Aaah* {heart}" ("open_wide_tongue", "narrow", "base", "up", cheeks="blush") - g11 "Sorry my little anal whore but I'm starting to get tired." + gen "Sorry my little anal whore but I'm starting to get tired." ("angry", xpos="far_left", ypos="head") her "Don't you dare stop now!" ("scream", "base", "angry", "mid", cheeks="blush", tears="messy", trans=hpunch) her "Just a little more pleassse {heart}" ("grin", "narrow", "base", "dead", cheeks="blush", tears="messy") her "Because I will..." ("grin", "narrow", "base", "dead", cheeks="blush", tears="messy") @@ -1477,7 +1477,7 @@ label hg_tutor_E12: call bld gen "Come back here, girl." ("base", xpos="far_left", ypos="head") - g11 "I need your mouth, I can't hold it anymore." + gen "I need your mouth, I can't hold it anymore." ("angry", xpos="far_left", ypos="head") pause .5 call her_chibi("stand","door","base") @@ -1486,7 +1486,7 @@ label hg_tutor_E12: her "Professor!" ("open", "happy", "base", "mid", cheeks="blush") her "........." ("base", "narrow", "base", "up", cheeks="blush") her "Can I have points for this?" ("mad", "wide", "base", "stare", cheeks="blush") - g11 "Now!" + gen "Now!" ("angry", xpos="far_left", ypos="head") hide hermione_main call blkfade @@ -1507,7 +1507,7 @@ label hg_tutor_E12: call nar(">She briefly nods.") her "*Slurp*! *Gulp*! *Slurp*!" gen "You're doing great my little whore, I will..." ("grin", xpos="far_left", ypos="head") - g11 "Yes!" + gen "Yes!" ("angry", xpos="far_left", ypos="head") call cum_block call her_chibi_scene("bj_cum_in") @@ -1875,11 +1875,11 @@ label hg_tutor_E14: call her_chibi_scene("sex_naked_fast") call nar(">You fuck her butthole fiercely.") her "Yes, yes, again, *aaaah* {heart}" ("open_wide_tongue", "narrow", "base", "up", cheeks="blush") - g11 "Yes, my little whore, yes!" + gen "Yes, my little whore, yes!" ("angry", xpos="far_left", ypos="head") call her_chibi_scene("sex_naked_cum_out") her "*Panting* *panting*" ("open", "narrow", "worried", "mid_soft", cheeks="blush", tears="mascara") call her_chibi_scene("sex_naked_cum_out_done") - g11 "*Panting* *panting*" + gen "*Panting* *panting*" ("angry", xpos="far_left", ypos="head") hide hermione_main call blkfade diff --git a/game/scripts/characters/luna/events/favors/talk_to_me.rpy b/game/scripts/characters/luna/events/favors/talk_to_me.rpy index 59ca1e12..80beddc4 100644 --- a/game/scripts/characters/luna/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/luna/events/favors/talk_to_me.rpy @@ -195,7 +195,7 @@ label ll_pf_talk_T1_E2_intro: gen "If you don't do it correctly you could end up with some severe burns..." ("base", xpos="far_left", ypos="head") gen "(Or mild chafing at the very least.)" ("base", xpos="far_left", ypos="head") - m "Which is why we're going to start by conducting some of the initial testing on myself." + gen "Which is why we're going to start by conducting some of the initial testing on myself." ("base", xpos="far_left", ypos="head") lun "But [lun_genie_name]!" ("angry", "wide", "base", "mid") lun "You didn't tell me this was going to be dangerous... If I knew you could potentially hurt yourself then I would've never asked you to--" ("angry", "base", "worried", "mid") gen "Don't worry... I'm sure It'll be worth it for the cause..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/luna/wardrobe.rpy b/game/scripts/characters/luna/wardrobe.rpy index 9cd96626..52889fc5 100644 --- a/game/scripts/characters/luna/wardrobe.rpy +++ b/game/scripts/characters/luna/wardrobe.rpy @@ -239,12 +239,14 @@ default lun_tattoo3_cumdump = DollCloth("luna", ("piercings & tattoos", "tattoos ## Police Officer Outfit ## ########################### -default lun_stockings_police = DollCloth("luna", ("legwear", "stockings"), "stockings", "police_thigh_highs", [[100, 100, 189, 255]]) -default lun_bottom_police_skirt = DollCloth("luna", ("lower body", "skirts"), "bottom", "police_skirt", [[46, 83, 171, 255], [38, 38, 91, 255], [187, 187, 210, 255]], level=5) -default lun_top_police_shirt = DollCloth("luna", ("upper body", "shirts"), "top", "police_shirt", [[46, 83, 171, 255], [187, 187, 210, 255], [38, 38, 91, 255], [252, 241, 109, 255]], level=5) -default lun_accessory_police_cuffs = DollCloth("luna", ("misc", "accessory"), "accessory1", "police_cuffs", [[187, 187, 210, 255]], zorder=22) +default lun_stockings_police = DollCloth("luna", ("legwear", "stockings"), "stockings", "police_thigh_highs", [[43, 43, 85, 255], [142, 142, 179, 255]]) +default lun_bottom_police_skirt = DollCloth("luna", ("lower body", "skirts"), "bottom", "police_skirt", [[46, 71, 171, 255]], level=5) +default lun_top_police_shirt = DollCloth("luna", ("upper body", "shirts"), "top", "police_shirt", [[46, 71, 171, 255], [187, 187, 210, 255]], level=5) +default lun_accessory_police_belt = DollCloth("luna", ("misc", "accessory"), "accessory2", "police_belt", [[38, 38, 91, 255], [187, 187, 210, 255]]) +default lun_accessory_police_badge = DollCloth("luna", ("misc", "accessory"), "accessory1", "police_badge", [[25, 38, 85, 255],[252, 241, 109, 255]], zorder=16) +default lun_accessory_police_cuffs = DollCloth("luna", ("misc", "accessory"), "accessory2", "police_cuffs", [[187, 187, 210, 255]], zorder=22) -default lun_outfit_police = DollOutfit([lun_hair_base, lun_stockings_police, lun_bottom_police_skirt, lun_top_police_shirt, lun_panties_base1, lun_accessory_police_cuffs]) +default lun_outfit_police = DollOutfit([lun_hair_base, lun_stockings_police, lun_bottom_police_skirt, lun_top_police_shirt, lun_panties_base1, lun_accessory_police_badge, lun_accessory_police_belt], addons=[lun_accessory_police_cuffs]) ######################### ## Harley Quinn Outfit ## @@ -267,5 +269,5 @@ default lun_bottom_casual_jeans = DollCloth("luna", ("lower body", "skirts"), "b default lun_top_casual_sweater = DollCloth("luna", ("upper body", "shirts"), "top", "casual_sweater", [[56, 32, 136, 255], [56, 32, 136, 255]]) default lun_accessory_lionhead = DollCloth("luna", ("misc", "accessory"), "accessory1", "lionhead", [[0, 0, 0, 255]], zorder=29) -default lun_outfit_casual= DollOutfit([lun_panties_base1, lun_bra_base1, lun_bottom_casual_jeans, lun_top_casual_sweater], unlocked=True) +default lun_outfit_casual= DollOutfit([lun_hair_base, lun_panties_base1, lun_bra_base1, lun_bottom_casual_jeans, lun_top_casual_sweater], unlocked=True) default lun_outfit_lion_event = DollOutfit([lun_panties_base1, lun_bra_base1, lun_accessory_lionhead, lun_bottom_casual_jeans, lun_top_casual_sweater], hidden=True) diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy index e3c38449..38087e8d 100644 --- a/game/scripts/characters/tonks/events/hangout.rpy +++ b/game/scripts/characters/tonks/events/hangout.rpy @@ -756,7 +756,7 @@ label nt_he_story_centaur: # Not in use. #ton "Panty pictures!" #gen "What!" ("base", xpos="far_left", ypos="head") #ton "Well, I'm fine with any photographs really, ankles, butts, underwear..." - #m "I see...{nw} + #gen "I see...{nw}" ("base", xpos="far_left", ypos="head") #ton "Feet!" #gen "Feet?" ("angry", xpos="far_left", ypos="head") #ton "Well, anything I can get really." diff --git a/game/scripts/events/map.rpy b/game/scripts/events/map.rpy index db8aa4c6..4d4732f0 100644 --- a/game/scripts/events/map.rpy +++ b/game/scripts/events/map.rpy @@ -30,7 +30,7 @@ label map_attic: call play_sound("door") ">After unlocking the door you're presented to a dusty room filled with random junk and knick-knacks." $ renpy.sound.play("sounds/cough_male.ogg") - g16 "...*cough* *cough*..." + gen "...*cough* *cough*..." ("open", xpos="far_left", ypos="head") gen "This room is just filled with random junk and knick-knacks!" ("angry", xpos="far_left", ypos="head") gen "(So now what... I'm supposed to take a piece of something and use with this scroll?)" ("base", xpos="far_left", ypos="head") gen "(I don't even know what the scroll is supposed to do, how am I going to find what it wants me to use!)" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy index fb9a3488..0e2b916e 100644 --- a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy +++ b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy @@ -169,7 +169,7 @@ label a_bad_time_to_disrobe_part_1: her "I didn't notice that my feet were visible..." ("upset", "base", "angry", "mid", tears="mascara") gen "(Well, that's a shame.)" ("base", xpos="far_left", ypos="head") her "One of the boys saw me shuffle and moved to see what it was so I tried to get away but I slipped... and... and." ("upset", "wide", "base", "shocked", tears="mascara") - g11 "And what?" + gen "And what?" ("angry", xpos="far_left", ypos="head") her "And I slipped and my butt fell out!" ("scream", "wide", "worried", "stare", tears="mascara") gen "{size=18}Thirty points to....{/size}" ("grin", xpos="far_left", ypos="head") diff --git a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy index 6abf402c..9e6b23fb 100644 --- a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy +++ b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy @@ -92,9 +92,9 @@ label a_spaced_out_conversation: sna "What if I were to visit you in your world and make one of my wishes that you be free to use your magic however you should please?" ("snape_09") nar "Genie stared at Snape with something like wonder." nar "It takes quite a bit to make an ageless being like Genie gape in awe." - g5 "That's... {w=1.0}That's brilliant!" + gen "That's... {w=1.0}That's brilliant!" ("open", xpos="far_left", ypos="head") nar "Genie shouted." - g6 "Great Gods, man, that could actually work!" + gen "Great Gods, man, that could actually work!" ("smile", xpos="far_left", ypos="head") nar "Snape was taken aback by Genie's enthusiastic shout, but quickly recovered." nar "He was happy for his friend's excitement, but puzzled." sna "Haven't you ever thought of that before?" ("snape_05") diff --git a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy index 068e198e..46d732e4 100644 --- a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy +++ b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy @@ -579,7 +579,7 @@ label anal_pirate_event_3: gen "I always be right, wench." ("base", xpos="far_left", ypos="head") gen "Now wiggle that wee arse o' yers a wee." ("base", xpos="far_left", ypos="head") her "Like this?" ("silly", "base", "worried", "mid", cheeks="blush",tears="soft") - m "Aye, that be a good wench." + gen "Aye, that be a good wench." ("base", xpos="far_left", ypos="head") her "I be a wench, aren't I?" ("silly", "narrow", "base", "dead") gen "Ye jus' sold me yer asshole fer ninety galleon points. What ye be calling that?" ("base", xpos="far_left", ypos="head") her "Yes, yes...{heart} I be nothing but a wench...{heart}" ("silly", "base", "worried", "mid", cheeks="blush",tears="soft") diff --git a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy index a35441ac..99e855ff 100644 --- a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy +++ b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy @@ -31,7 +31,7 @@ label eating_for_pleasure: gen "Did that hat just speak?!" ("angry", xpos="far_left", ypos="head") with vpunch hat "Of course I speak!" hat "Not only that... I know who you are..." - g5 "You do?" + gen "You do?" ("open", xpos="far_left", ypos="head") gen "Then why haven't you said anything until now!" ("angry", xpos="far_left", ypos="head") gen "I've been sitting here alone for months!" ("angry", xpos="far_left", ypos="head") hat "A wise man told me not to speak unless you have something to say." @@ -123,13 +123,13 @@ label eating_for_pleasure: "-Meat Eater-": $ flag = 0 - g16 "{size=+16}I'll have the pepperoni!{/size}" with vpunch + gen "{size=+16}I'll have the pepperoni!{/size}" ("open", xpos="far_left", ypos="head") with vpunch "*Sigh* One pepperoni... anything else?" $ her_outfit_pizza.group[2].set_color([[180, 50, 10, 255]]) $ her_outfit_pizza.group[3].set_color([[180, 50, 10, 255]]) "-Vegan Delight-": $ flag = 1 - g16 "{size=+16}I'll have the vegetariana!{/size}" with vpunch + gen "{size=+16}I'll have the vegetariana!{/size}" ("open", xpos="far_left", ypos="head") with vpunch "*Sigh* One vegetariana... anything else?" $ her_outfit_pizza.group[2].set_color([[73, 226, 53, 255]]) $ her_outfit_pizza.group[3].set_color([[73, 226, 53, 255]]) @@ -143,14 +143,14 @@ label eating_for_pleasure: gen "Oh... right." ("base", xpos="far_left", ypos="head") call gen_chibi("stand_alt", flip=True) with d3 - g16 "{size=+16}That's all, thanks!{/size}" with hpunch + gen "{size=+16}That's all, thanks!{/size}" ("open", xpos="far_left", ypos="head") with hpunch "And your address?" gen "{size=+8}Headmaster's office, Hogwash!{/size}" ("base", xpos="far_left", ypos="head") "Hogwarts sir?" if flag == 0: - g16 "{size=+8}No, just pepperoni thanks!{/size}" with vpunch + gen "{size=+8}No, just pepperoni thanks!{/size}" ("open", xpos="far_left", ypos="head") with vpunch else: - g16 "{size=+8}No meat please, just olives!{/size}" with vpunch + gen "{size=+8}No meat please, just olives!{/size}" ("open", xpos="far_left", ypos="head") with vpunch "..." "Okay then..." gen "{size=+8}Ten minutes or pizza's free?{/size}" ("base", xpos="far_left", ypos="head") @@ -161,7 +161,7 @@ label eating_for_pleasure: gen "{size=+8}Headmaster's office is on the seventh floor, enjoy the moving staircases!{/size}" ("grin", xpos="far_left", ypos="head") "But sir..." $ renpy.sound.play("sounds/microphone_feedback.ogg") - g16 "{size=+16}Clock's ticking...{/size}" with hpunch + gen "{size=+16}Clock's ticking...{/size}" ("open", xpos="far_left", ypos="head") with hpunch "Okay then, your delivery will be as soon as... humanly possible..." pause 1.0 call gen_chibi("stand", flip=False) @@ -226,18 +226,18 @@ label eating_for_pleasure: call play_sound("knocking") "*Knock-knock-knock*" pause 1.0 - g16 "{size=+4}Who's there?{/size}" + gen "{size=+4}Who's there?{/size}" ("open", xpos="far_left", ypos="head") "{size=+5}Pizza!{/size}" gen "{size=+4}Pizza who?{/size}" ("base", xpos="far_left", ypos="head") "{cps=8}..........{/cps}" "{size=+5}Pizza slut,{w=0.5} sir........{/size}" gen "*he-he-heh*" ("grin", xpos="far_left", ypos="head") gen "Finally..." ("base", xpos="far_left", ypos="head") - g16 "{size=+4}Come in!{/size}" + gen "{size=+4}Come in!{/size}" ("open", xpos="far_left", ypos="head") pause 0.5 call her_walk(action="enter", xpos="desk", ypos="base") her "Your order, sir!" ("smile", "happyCl", "base", "mid", trans=d3) - g5 "What...{w=0.3} the hell...{w=0.3} is this!" + gen "What...{w=0.3} the hell...{w=0.3} is this!" ("open", xpos="far_left", ypos="head") her "What do you mean... Did we get the wrong toppings?" ("annoyed", "base", "worried", "mid") gen "Toppings?!" ("angry", xpos="far_left", ypos="head") gen "There's only two slices! And they're on your body!" ("angry", xpos="far_left", ypos="head") @@ -250,7 +250,7 @@ label eating_for_pleasure: her "" ("grin", "base", "base", "mid", cheeks="blush") pause 1.0 - g5 "{cps=3}..............{/cps}" + gen "{cps=3}..............{/cps}" ("open", xpos="far_left", ypos="head") gen "You expect me to eat this?" ("angry", xpos="far_left", ypos="head") her "Sir, you ordered from pizza slut. A slut and a pizza!" ("annoyed", "base", "worried", "mid") her "Our slogan is \"Enjoy a nice pizza ass with every slice\"!" ("open", "closed", "base", "mid") diff --git a/game/scripts/minigames/mirror/events/genie_house_elf.rpy b/game/scripts/minigames/mirror/events/genie_house_elf.rpy index dc1f4e53..9a9ae327 100644 --- a/game/scripts/minigames/mirror/events/genie_house_elf.rpy +++ b/game/scripts/minigames/mirror/events/genie_house_elf.rpy @@ -27,7 +27,7 @@ label genie_house_elf: sna "You called?" ("snape_23", xpos="base", ypos="base") nar "Snape said with a smirk, doing his best to hide his amusement." - g11 "How did you, how do you..." + gen "How did you, how do you..." ("angry", xpos="far_left", ypos="head") gen "This door, how does it work?" ("base", xpos="far_left", ypos="head") nar "The genie said, now even more frustrated." nar "The genie wasn't used to this... this unfamiliar magic." @@ -52,12 +52,12 @@ label genie_house_elf: hide screen bld1 nar "After a flash of light and a small pop, a house elf appeared in the corner of the room." helf "..." - g5 "What the hell is that?" + gen "What the hell is that?" ("open", xpos="far_left", ypos="head") nar "The genie said, jumping onto the desk as if things appearing out of thin air was new to him." sna "That... is a house elf." ("snape_01", xpos="base", ypos="base") gen "A house... elf?" ("base", xpos="far_left", ypos="head") - g10 "Is that like Santa's elves?" + gen "Is that like Santa's elves?" ("smile", xpos="far_left", ypos="head") nar "The genie said, now climbing down to sit on his chair." sna "Sort of, they don't get paid so they do have that in common..." ("snape_05", xpos="base", ypos="base") nar "Snape muttered under his breath..." diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy index 1d901123..70837721 100644 --- a/game/scripts/minigames/mirror/events/suck_and_run.rpy +++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy @@ -221,7 +221,7 @@ label suck_and_run: gen "*Snore*... *Sn--*" ("base", xpos="far_left", ypos="head") gen "Princess--" ("base", xpos="far_left", ypos="head") call ton_chibi_scene("bj_desk_shocked") - g16 "Tonks?!" + gen "Tonks?!" ("open", xpos="far_left", ypos="head") call play_music("tonks") ton "*Slurp* *Slurp* *Gulp*!" (face="horny", mouth="open_wide_tongue", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll diff --git a/game/scripts/rooms/room_of_requirement/init.rpy b/game/scripts/rooms/room_of_requirement/init.rpy index b718ce8e..e195c25c 100644 --- a/game/scripts/rooms/room_of_requirement/init.rpy +++ b/game/scripts/rooms/room_of_requirement/init.rpy @@ -135,9 +135,9 @@ label room_of_requirement: $ mirror_image = Null() call gen_chibi("stand", flip=True) - g5 "A what?!" + gen "A what?!" ("open", xpos="far_left", ypos="head") sna "A porn creator. Well, technically it's used to let you live out your fantasies, be they impure or not. So not necessarily porn." ("snape_01") - g5 "And you didn't tell me a thing like this existed?" + gen "And you didn't tell me a thing like this existed?" ("open", xpos="far_left", ypos="head") sna "Well, it didn't exist until I made it... and I thought it was moved or destroyed." ("snape_26") gen "Get out." ("angry", xpos="far_left", ypos="head") sna "What?" ("snape_05")