diff --git a/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_-1.webp b/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_-1.webp index 1954c613..b2d55eef 100644 --- a/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_-1.webp +++ b/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_-1.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea81b3d3118ff28aebbc2875aabcda0c4a44d091f36c9842ed6d77c00e0f8e76 -size 7384 +oid sha256:8ae9e532806f99164a717cd70bdb71d4ad6e9d3c949c5d232c36dd54f9b3d2b0 +size 7498 diff --git a/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_101.webp b/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_101.webp index 69df38f0..899ad8a1 100644 --- a/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_101.webp +++ b/game/characters/luna/poses/default/clothes/robe/coat_flasher/2_zorder_101.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f76addc758f6144302af3fb24c25c95b339ce1d568336300155c3096c2ac61df -size 12458 +oid sha256:9c46809f20e082a32a7edbbde25978d6387c1e38c7ca970f3f1905b0196a3e4c +size 13042 diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy index 7ca34f4b..bd591b34 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy @@ -510,7 +510,7 @@ label cc_pf_strip_T3_intro_E2: cho @ cheeks blush "..." ("normal", "narrow", "worried", "L") cho @ cheeks heavy_blush "I don't think they're big enough." ("open", "narrow", "worried", "downR") # sad cho @ cheeks heavy_blush "" ("normal", "narrow", "worried", "down") - ton @ hair angry "Big enough for what? Impress some idiot?" ("open", "narrow", "annoyed", "L") + ton @ hair angry "Big enough for what? Impressing some idiot?" ("open", "narrow", "annoyed", "L") ton "No offence, Professor." ("soft", "narrow", "base", "mid") gen "None taken..." ("base", xpos="far_left", ypos="head") ton "You don't need large breasts. Especially not if you want to have a career in Quidditch." ("open", "base", "base", "L") diff --git a/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy b/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy index 36280049..50fc73aa 100644 --- a/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy +++ b/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy @@ -576,7 +576,7 @@ label her_potion_luna_give: lun "Yes?" ("soft", "base", "raised", "mid") gen "What if you bump into her?" ("base", xpos="far_left", ypos="head") lun "Oh I wouldn't worry about that, [name_genie_hermione]..." ("grin", "narrow", "base", "R") - lun "She will probably think I'm some kind of wrackspurts-induced hallucination or something." ("open", "closed", "base", "mid") + lun "She will probably think I'm some kind of wrackspurt-induced hallucination or something." ("open", "closed", "base", "mid") gen "True." ("base", xpos="far_left", ypos="head") gen "Off you go then." ("base", xpos="far_left", ypos="head") lun "Good day, [name_genie_hermione]." ("base", "base", "base", "mid") diff --git a/game/scripts/characters/luna/chitchats.rpy b/game/scripts/characters/luna/chitchats.rpy index 26ad1325..614003df 100644 --- a/game/scripts/characters/luna/chitchats.rpy +++ b/game/scripts/characters/luna/chitchats.rpy @@ -53,11 +53,11 @@ label luna_chitchat: block: lun "[name_genie_luna]...{w=0.4} There's something I've been meaning to ask you." ("open", "closed", "base", "mid") lun "Could we avoid putting up so many mistletoes during the holiday celebrations?" ("soft", "base", "base", "mid") - lun "It would highly decrease the risk of a Nargle infestation." ("open", "base", "base", "mid") + lun "It would highly decrease the risk of a nargle infestation." ("open", "base", "base", "mid") block: lun "Why are there no school trips at Hogwarts?" ("open", "base", "raised", "mid") - lun "I'd love to take one to Sweden and look for the Crumple-Horned Snorkack." ("grin", "base", "base", "mid") + lun "I'd love to take one to Sweden and look for the crumple-horned snorkack." ("grin", "base", "base", "mid") block: lun "[name_genie_luna], you really need to do something about Peeves." ("annoyed", "base", "base", "R") @@ -155,14 +155,50 @@ label luna_chitchat: block: lun "How come you're so skilled at unhooking a woman's bra, [name_genie_luna]?" ("open", "base", "base", "down") - lun "Wait, what am I saying...{w=0.4} Of course the great Albus Dumbledore can do it with ease..." ("angry", "wide", "base", "mid") + lun "Wait, what am I saying...{w=0.4} Of course the great Albus Dumbledore can do it with ease..." ("angry", "wide", "base", "mid") - # elif states.lun.tier == 4: + elif states.lun.tier == 4: - # lun "My fingers just aren't big enough to get rid of these spurts properly." - # lun "I hope well be able to find even more ways to get rid of them." + random: + block: + lun "My fingers just aren't enough to get rid of these spurts properly." ("open", "narrow", "base", "downR") + lun "I hope we'll be able to find even more ways to get rid of them." ("soft", "narrow", "base", "mid") - # lun "I can't believe how slippery it got down there when you had me touch myself." - # lun "A bunch of slimy buggers is what they are!" + block: + lun "I can't believe how slippery it got down there when you had me touch myself." ("angry", "narrow", "base", "down") + lun "Such a slimy bunch of buggers!" ("angry", "base", "base", "mid") + + block: + lun "I can't wait to see what kind of method you've got in store for me next!" ("grin", "base", "base", "mid") + lun "If only my other classes could be this fun." ("grin", "narrow", "base", "mid") + + block: + lun "Master baiter, master baiter, I could never hate her!" ("smile", "closed", "base", "mid") + lun "Sorry [name_genie_luna]... I think peeves' chanting may have got to me." ("soft", "base", "base", "stare") + + block: + lun "I've noticed that I'm quite ticklish under my feet." ("soft", "base", "base", "down") + lun "Hold on... I wonder if wrackspurts are also affected by gravity..." ("mad", "base", "base", "mid") + + block: + lun "I never once thought that a finger would be able to fit inside me so easily." ("soft", "base", "raised", "down") + lun "I mean... I hadn't even considered putting a finger inside me before..." ("angry", "closed", "base", "mid") + + block: + lun "I've got a feeling... That tonight's gonna be a good night... That tonight's gonna be a go-ood night..." ("smile", "closed", "base", "mid") + lun "Oh, sorry [name_genie_luna]... We've been listening to this classical muggle song during our muggle studies, and I can't get it out of my head." ("angry", "wink", "base", "mid") + + block: + lun "It's a bit embarrassing to say..." ("soft", "narrow", "base", "downR") + lun "But I think I may have wet the bed last night." ("open", "narrow", "base", "downR") + lun "It appears I've gained the ability to expel the wrackspurts in my sleep..." ("angry", "base", "base", "mid") + + block: + lun "I feel quite comfortable being naked." ("open", "closed", "base", "mid") + lun "Of course, there's always the risk of wrackspurts getting inside, but at least I don't have to worry about my underwear getting wet." ("grin", "base", "base", "mid") + + block: + lun "I wonder if you'd be able to brew some sort of smell strengthening potion..." ("soft", "base", "base", "R") + lun "That way we could locate wrackspurts by the smell..." ("soft", "base", "base", "R") return diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy index 994925a9..e2bd6b7a 100644 --- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy +++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy @@ -114,9 +114,9 @@ label ll_pf_inspect_T2_E1_intro: nar "Focusing your attention on the girl's breasts, you feel your cock harden more and more with each stroke..." - lun "Great! So, what do I have to do to get the Wrackspurts out of them?" ("smile", "base", "base", "mid") + lun "Great! So, what do I have to do to get the wrackspurts out of them?" ("smile", "base", "base", "mid") gen "*Mmm*...{w=0.4} The what, sorry?" ("base", xpos="far_left", ypos="head") - lun "The Wrackspurts, [name_genie_luna]..." ("open", "base", "raised", "mid") + lun "The wrackspurts, [name_genie_luna]..." ("open", "base", "raised", "mid") gen "*Ah*...{w=0.4} Those bloody things." ("base", xpos="far_left", ypos="head") gen "Let's see..." ("base", xpos="far_left", ypos="head") gen "Tell...{w=0.4} *Ngh*...{w=0.4} Tell me a bit about them..." ("base", xpos="far_left", ypos="head") @@ -212,8 +212,8 @@ label ll_pf_inspect_T2_E1_intro: nar "Luna turns back around, and as you get a full view of her front, you feel yourself getting close to the edge." lun @ cheeks blush "So that's how you came up with the idea of rubbing your penis, [name_genie_luna]!" ("grin", "wink", "base", "mid", trans=dissolve) - lun @ cheeks blush "To bait the Wrackspurts to one spot!" ("crooked_smile", "base", "base", "mid") - lun @ cheeks blush "Since your penis is a sensitive area, rubbing it gets the Wrackspurts all excited..." ("smile", "closed", "base", "mid") + lun @ cheeks blush "To bait the wrackspurts to one spot!" ("crooked_smile", "base", "base", "mid") + lun @ cheeks blush "Since your penis is a sensitive area, rubbing it gets the wrackspurts all excited..." ("smile", "closed", "base", "mid") nar "*Fap* *Fap* *Fap*..." @@ -756,7 +756,7 @@ label ll_pf_inspect_T2_E3_intro: elif luna.is_worn("bottom"): nar "Noticing Luna's ever-increasing excitement, you put your hands on either side of her hips, and pull the fabric down swiftly..." elif luna.is_worn("panties"): - nar "You oggle Luna's choice of underwear, before swiftly pulling them down right to her ankles..." + nar "You ogle at Luna's underwear, before swiftly pulling them down right to her ankles..." lun @ cheeks blush "" ("clench", "narrow", "base", "downR") $ luna.strip("clothes") @@ -928,10 +928,10 @@ label ll_pf_inspect_T2_E3_intro: with d5 lun "[name_genie_luna], that was incredible!" ("base", "narrow", "base", "mid") - lun "Did you see how many Wrackspurts I expelled?" ("crooked_smile", "base", "raised", "mid") + lun "Did you see how many wrackspurts I expelled?" ("crooked_smile", "base", "raised", "mid") gen "Very impressive indeed." ("base", xpos="far_left", ypos="head") lun "I can't believe we finally did it!" ("crooked_smile", "happyCl", "base", "mid") - lun "Finally, a foolproof way of expelling Wrackspurts from other areas than your brain!" ("crooked_smile", "narrow", "base", "mid") + lun "Finally, a foolproof way of expelling wrackspurts from other areas than your brain!" ("crooked_smile", "narrow", "base", "mid") gen "Quite the discovery! I'm sure we'll be able to help a lot of backed up people." ("grin", xpos="far_left", ypos="head") lun "Yes!" ("grin", "base", "base", "mid") lun "So, what next? We've solved it now, right?" ("grin", "base", "raised", "mid") @@ -943,7 +943,7 @@ label ll_pf_inspect_T2_E3_intro: gen "No!" ("angry", xpos="far_left", ypos="head") gen "I need to watch--{w=0.2} *Err*...{w=0.4} Instruct you, so you can alleviate yourself properly and safely." ("base", xpos="far_left", ypos="head") lun "Oh, of course [name_genie_luna]!" ("mad", "base", "base", "mid") - lun "Hopefully the Wrackspurts will leave me alone until then..." ("angry", "narrow", "base", "downL") #blush looking down + lun "Hopefully the wrackspurts will leave me alone until then..." ("angry", "narrow", "base", "downL") #blush looking down gen "Hopefully..." ("base", xpos="far_left", ypos="head") gen "(Although I doubt it.)" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy index ba8c53ea..7b820ef6 100644 --- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy +++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy @@ -619,7 +619,7 @@ label ll_pf_masturbate_T3_E3_intro: lun @ cheeks blush "*Ah*... {heart} Yes..." ("grin", "narrow", "base", "up") gen "By the great desert sands! You're sopping wet!" lun @ cheeks blush "I'm sorry [name_genie_luna]... I just...{w=0.3} Need this really bad...{heart}" ("mad", "happyCl", "base", "stare") - lun @ cheeks blush "These Wrackspurts...{w=0.4} *Ah*..." ("upset", "happyCl", "base", "mid") + lun @ cheeks blush "These wrackspurts...{w=0.4} *Ah*..." ("upset", "happyCl", "base", "mid") lun @ cheeks blush "They've been very tiresome..." ("angry", "narrow", "base", "up") nar "Without being prompted, Luna pushes a finger inside her and starts fingering herself." @@ -790,7 +790,7 @@ label ll_pf_masturbate_T3_E3_intro: gen "(Hold on...)" ("grin", xpos="far_left", ypos="head") lun "*Huh*? Did you have a revelation, [name_genie_hermione]?" ("grin", "base", "raised", "mid") gen "You've just given me a great idea!" ("grin", xpos="far_left", ypos="head") - lun "Oooh! What is it? Is it a new method of dealing with the Wrackspurts?" ("crooked_smile", "base", "base", "mid") + lun "Oooh! What is it? Is it a new method of dealing with the wrackspurts?" ("crooked_smile", "base", "base", "mid") gen "Why yes indeed, [name_luna_genie]!" ("base", xpos="far_left", ypos="head") lun "Marvellous!" ("smile", "happyCl", "base", "mid") gen "Although it might be a hard one, so I hope you're ready to take it on, [name_luna_genie]." ("base", xpos="far_left", ypos="head") @@ -820,6 +820,9 @@ label ll_pf_masturbate_T3_E4_repeat: #Luna chibi walks to desk call lun_walk("desk", "base") + show screen blkfade + with d3 + $ luna.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid") stop weather fadeout 4 @@ -1057,7 +1060,7 @@ label ll_pf_masturbate_T3_E4_repeat: lun "Yes?" ("base", "base", "raised", "mid") gen "(No wonder she didn't look phased by taking her clothes off...)" ("base", xpos="far_left", ypos="head") gen "How very progressive..." ("base", xpos="far_left", ypos="head") - lun "That way, there are fewer places for the Nargles to hide." ("grin", "base", "base", "mid") + lun "That way, there are fewer places for the nargles to hide." ("grin", "base", "base", "mid") gen "I see..." ("grin", xpos="far_left", ypos="head") gen "(Just smile and nod...)" ("grin", xpos="far_left", ypos="head") gen "Well then... I'll let you know when our next session will be [name_luna_genie]." ("base", xpos="far_left", ypos="head") 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 10c3180d..2f9e5080 100644 --- a/game/scripts/characters/luna/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/luna/events/favors/talk_to_me.rpy @@ -433,7 +433,7 @@ label ll_pf_talk_T1_E3_intro: lun "You've done it!" ("smile", "narrow", "base", "mid") gen "I was just scratching--" ("angry", xpos="far_left", ypos="head") gen "Sorry, what did you say?" ("angry", xpos="far_left", ypos="head") - lun "You expelled the Wrackspurts!" ("grin", "happyCl", "base", "mid") + lun "You expelled the wrackspurts!" ("grin", "happyCl", "base", "mid") gen "I did?" ("base", xpos="far_left", ypos="head") lun "And through your penis no less!" ("grin", "base", "base", "downL") lun "You're a genius!" ("grin", "base", "base", "mid") @@ -590,7 +590,7 @@ label ll_pf_talk_T1_E4_repeat: nar "You keep stroking your shaft as Luna watches your every move." nar "Stroking it faster and faster, you feel yourself getting closer and closer to the edge by the second." - lun @ cheeks blush "It's pulsating! How many Wrackspurts do you have in there?" ("disgust", "base", "base", "downL") + lun @ cheeks blush "It's pulsating! How many wrackspurts do you have in there?" ("disgust", "base", "base", "downL") gen "It's...{w=0.4} Filled to the brim!" ("angry", xpos="far_left", ypos="head") lun @ cheeks blush "Do you need me to get Madam Pomfrey?" ("mad", "base", "base", "mid") gen "*Ah*...{w=0.4} Who?" ("angry", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/luna/events/intro.rpy b/game/scripts/characters/luna/events/intro.rpy index 2bd5f951..720e67d6 100644 --- a/game/scripts/characters/luna/events/intro.rpy +++ b/game/scripts/characters/luna/events/intro.rpy @@ -127,7 +127,7 @@ label luna_intro_E1: "-Oral examination-": $ d_flag_01 = True gen "So... What's your name?" ("base", xpos="far_left", ypos="head") - lun "...{w=0.8}Wrackspurts..." ("open", "closed", "low", "mid") + lun "...{w=0.8} Wrackspurts..." ("open", "closed", "low", "mid") gen "Charming..." ("base", xpos="far_left", ypos="head") gen "(I suppose that is a plausible name in this world...)" ("base", xpos="far_left", ypos="head") $ name_luna_genie = "Miss Backspurts?" @@ -137,7 +137,7 @@ label luna_intro_E1: $ mouse_slap() lun "No!" ("angry", "happyCl", "low", "mid") gen "..." ("angry", xpos="far_left", ypos="head") - lun "The Nargles..." ("open", "happyCl", "low", "mid") + lun "The nargles..." ("open", "happyCl", "low", "mid") gen "The what now?" ("base", xpos="far_left", ypos="head") lun "*Inaudible mumbling*..." ("upset", "closed", "low", "mid") gen "*Hmm*..." ("base", xpos="far_left", ypos="head") @@ -493,7 +493,7 @@ label luna_intro_E2: #Luna knocks on door stop music fadeout 1.0 play sound "sounds/knocking.ogg" - "*knock-knock-knock*" + "*Knock-knock-knock*" gen "Who is it?" ("base", xpos="far_left", ypos="head") lun "Luna." @@ -551,7 +551,7 @@ label luna_intro_E2: lun "*Hmm*..." ("soft", "narrow", "raised", "downL") if states.gen.masturbating: - nar "*fap-fap-fap*!" + nar "*Fap-fap-fap*!" gen "(Look at the tits on this girl, such a lovely profile!)" ("angry", xpos="far_left", ypos="head") gen "(And that lush blonde hair! I'd love to wrap it around my dick!)" ("grin", xpos="far_left", ypos="head") else: @@ -570,7 +570,7 @@ label luna_intro_E2: if states.gen.masturbating: gen "(Whatever. As long as I can beat my meat in peace.)" ("grin", xpos="far_left", ypos="head") - nar "*fap-fap-fap*" + nar "*Fap-fap-fap*" call lun_walk("desk", "base") pause 0.25 @@ -602,7 +602,7 @@ label luna_intro_E2: lun "There's such a strange aura in here..." gen "(Yes! It's the aura of me going crazy for you, you fucking slut!)" - nar "{size=+3}*{b}fap{/b}-fap-{b}fap{/b}*{/size}" + nar "{size=+3}*{b}Fap{/b}-fap-{b}fap{/b}*{/size}" else: lun "There's such a strange aura in here..." lun "It's like a big hollow tree..." @@ -647,7 +647,7 @@ label luna_intro_E2: gen "There's more where that came from." ("grin", xpos="far_left", ypos="head") lun "So you can see {i}them{/i} too, Professor?" ("angry", "wide", "base", "mid") gen "See what?" ("base", xpos="far_left", ypos="head") - lun "*sigh* Just as expected." ("upset", "narrow", "base", "down") + lun "*Sigh* Just as expected." ("upset", "narrow", "base", "down") lun "You could see them if you had one of these." ("grin", "base", "base", "mid") else: gen "I can't see anything." ("base", xpos="far_left", ypos="head") @@ -694,7 +694,7 @@ label luna_intro_E2: gen "What are you seeing in this room exactly?" ("base", xpos="far_left", ypos="head") lun "Wrackspurts, sir, and lots of them too!" ("soft", "narrow", "base", "mid") gen "Brackspurts?" ("base", xpos="far_left", ypos="head") - lun "Wrackspurt sir..." ("open", "base", "base", "L") + lun "Wrackspurts, sir..." ("open", "base", "base", "L") gen "I see...{w=0.2} *Err*, I mean I don't." ("base", xpos="far_left", ypos="head") gen "(Is she making all this shit up, or am I supposed to know about these things?)" ("base", xpos="far_left", ypos="head") gen "Well, I can't say I've ever come across these whackspurs you speak of." ("base", xpos="far_left", ypos="head") @@ -706,8 +706,7 @@ label luna_intro_E2: gen "Now I must say that's quite bold for a student to just waltz into their headmasters office and shill their--" ("base", xpos="far_left", ypos="head") lun "Oh... No sir!" ("mad", "narrow", "base", "downL") lun "I'm just worried that we might have an infestation on our hands and--" ("angry", "closed", "base", "mid") - lun "..." ("angry", "narrow", "base", "down") - #Luna eyes down + lun "..." ("angry", "narrow", "base", "down") #Luna looks down pause .5 nar "Luna gives you an uncomfortable look and then turns her gaze to the floor." gen "An infestation?" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy b/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy index 997a3820..14d901bd 100644 --- a/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy +++ b/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy @@ -206,7 +206,7 @@ label spectrespecs_E4: gen "(What the--)" ("angry", xpos="far_left", ypos="head") gen "What are you doing, Miss Lovegood?" ("base", xpos="far_left", ypos="head") - lun @ cheeks blush "It's the Wrackspurts, sir..." ("clench", "narrow", "base", "down") + lun @ cheeks blush "It's the wrackspurts, sir..." ("clench", "narrow", "base", "down") gen "What?" ("base", xpos="far_left", ypos="head") lun @ cheeks blush "They've been bothering me for months..." ("mad", "narrow", "base", "down") diff --git a/game/scripts/characters/luna/gifts.rpy b/game/scripts/characters/luna/gifts.rpy index bc316cee..f02fe736 100644 --- a/game/scripts/characters/luna/gifts.rpy +++ b/game/scripts/characters/luna/gifts.rpy @@ -8,100 +8,189 @@ label give_lun_gift(gift_item): $ states.lun.gifted = True if gift_item == lollipop_ITEM: - lun "A lollipop?" + lun "A lollipop?" ("open", "base", "base", "down") call give_gift("You give the lollipop to Luna...", gift_item) - lun "My father always believed that you should always have something sugary around in case any baby unicorns come to visit." - lun "Thank you, [name_genie_luna]." + lun "My father says that you should always have something sugary around in case a baby unicorn comes to visit." ("grin", "base", "base", "mid") + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") elif gift_item == chocolate_ITEM: - lun "Chocolate?" + lun "Chocolate?" ("grin", "base", "base", "down") call give_gift("You give the chocolate to Luna...", gift_item) - lun "*Aaah*, I heard these helps with dementia... Or was it Dementors?" + lun "I heard that eating chocolate helps with dementia...{w=0.4} Or was it dementors?" ("soft", "narrow", "base", "mid") elif gift_item == plush_owl_ITEM: - lun "A plush owl?" - call give_gift("You give the owl plushie to Luna...", gift_item) - lun "I love owls... Always had a few around me growing up, delivering the newspaper my father publishes." + lun "A plush owl?" ("open", "base", "base", "down") + call give_gift("You give the stuffed owl to Luna...", gift_item) + lun "I love owls... Growing up, there were always a few of them around, delivering my father's newspaper." ("grin", "base", "base", "mid") elif gift_item == butterbeer_ITEM: - lun "Butterbeer?" + lun "Butterbeer?" ("open", "base", "base", "mid") + lun "I could use the cork for another necklace!" ("grin", "base", "base", "mid") call give_gift("You give the bottle to Luna...", gift_item) - lun "How did you know? I didn't wear my cork necklace today." - lun "Thank you, [name_genie_luna]." + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") elif gift_item == science_mag_ITEM: - lun "Magical creatures weekly?" - call give_gift("You give an assortment of educational magazines to Luna...", gift_item) - lun "Thestrals and their link with death..." - lun "Interesting..." + lun "Magical creatures weekly?" ("open", "narrow", "base", "down") + lun "My daddy says that this publication refuses to recognize the existence of the Crumple-horned Snorkack..." ("annoyed", "narrow", "annoyed", "mid") + lun "Sorry [name_genie_luna], but I'll have to refuse." ("open", "closed", "base", "mid") elif gift_item == girls_mag_ITEM: - call give_gift("You give the girls magazine to Luna...",gift_item) - #Add text + lun "Girlz weekly?" ("soft", "base", "raised", "down") + lun "This must be one of those magazines my daddy warned me about!" ("angry", "base", "base", "down") + lun "[name_genie_luna]!" ("angry", "base", "base", "mid") + lun "They're corporate shills who prioritize selling their own products over advocating for the use of essential oils!" ("angry", "base", "base", "mid") + lun "That's what my daddy told me, anyway." ("grin", "closed", "base", "mid") elif gift_item == adult_mag_ITEM: - call give_gift("You give the adult magazine to Luna...",gift_item) - #Add text + lun "This isn't \"The Quibbler\"..." ("open", "base", "worried", "down") + lun "[name_genie_luna], you shouldn't be helping my daddy's competition!" ("angry", "base", "worried", "mid") + lun "Please, issue a refund!" ("open", "base", "worried", "mid") elif gift_item == porn_mag_ITEM: - call give_gift("You give the porn magazine to Luna...",gift_item) - #Add text + lun "This isn't \"The Quibbler\"..." ("annoyed", "base", "base", "down") + lun "[name_genie_luna], you shouldn't be helping my daddy's competition!" ("angry", "base", "annoyed", "mid") + lun "Please, issue a refund!" ("angry", "base", "base", "mid") elif gift_item == krum_poster_ITEM: - call give_gift("You give the poster to Luna...",gift_item) - #Add text + lun "Viktor Krum..." ("soft", "base", "raised", "down") + lun "Who is that, again?" ("open", "base", "raised", "mid") + lun "I'm uncertain if it's such a good idea to put this up on my wall, just in case the other girls ask me about it." ("upset", "base", "base", "down") + lun "I appreciate the thought though, [name_genie_luna]." ("base", "base", "base", "mid") elif gift_item == sexy_lingerie_ITEM: + lun "I've seen a couple of the other girls wearing these!" ("soft", "base", "base", "down") call give_gift("You give the lingerie to Luna...",gift_item) - #Add text + lun "Thank you, [name_genie_luna]!" ("base", "base", "base", "mid") elif gift_item == sexy_stockings_ITEM : + lun "Very unique! I like it!" ("grin", "base", "base", "down") call give_gift("You give the stockings to Luna...",gift_item) - #Add text + lun "Thank you, [name_genie_luna]!" ("base", "base", "base", "mid") elif gift_item == pink_condoms_ITEM: + lun "Condoms?!" ("mad", "wide", "base", "mid") + lun "... I never knew they sold those rubbery creatures." ("angry", "base", "base", "stare") + lun "Yes, we shall study them thoroughly!" ("base", "base", "base", "mid") call give_gift("You give the condoms to Luna...",gift_item) - #Add text + lun "Thank you [name_genie_luna]." ("grin", "base", "base", "mid") elif gift_item == vibrator_ITEM: + lun "A back-massager!" ("grin", "base", "base", "down") call give_gift("You give the vibrator to Luna...",gift_item) - #Add text + lun "Thank you, [name_genie_luna]!" ("grin", "base", "base", "mid") elif gift_item == anal_lube_ITEM: + lun "Lube?" ("soft", "base", "raised", "down") + lun "Will this help me get rid of the wrackspurts?" ("open", "base", "raised", "mid") call give_gift("You give the anal lube to Luna...",gift_item) - #Add text + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") elif gift_item == ballgag_and_cuffs_ITEM: + lun "What is this?" ("soft", "base", "raised", "down") + lun "Does this go in your mouth?" ("open", "base", "raised", "down") + lun "But, [name_genie_luna]... How am I supposed to talk if I wear this?" ("annoyed", "narrow", "base", "mid") call give_gift("You give the handcuffs to Luna...",gift_item) - #Add text + lun "Thank you, I suppose..." ("soft", "base", "base", "downR") elif gift_item == anal_plugs_ITEM: - call give_gift("You give the anal plugs to Luna...",gift_item) - #Add text + if states.lun.tier <= 1: + lun "Anal... plugs?" ("soft", "narrow", "raised", "down") + lun "I don't understand..." ("annoyed", "base", "base", "mid") + elif states.lun.tier == 2: + lun "Anal plugs..." ("soft", "base", "base", "down") + lun "Are these supposed to help with the wrackspurts?" ("open", "base", "annoyed", "mid") + call give_gift("You give the anal plugs to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") + elif states.lun.tier == 3: + lun "Anal plugs..." ("open", "base", "base", "down") + lun "Yes, I should probably use one of these to assist with redirecting the wrackspurts to a single area..." ("grin", "base", "base", "down") + call give_gift("You give the anal plugs to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") + else: + lun "*Mmm*... Anal plugs... I bet these will feel good..." ("grin", "narrow", "base", "down") + lun "I mean, I bet these will help me deal with the wrackspurts!" ("angry", "base", "base", "mid") + call give_gift("You give the anal plugs to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") elif gift_item == testral_strapon_ITEM: - call give_gift("You give the strap-on to Luna...",gift_item) - #Add text + if states.lun.tier <= 1: + lun "A unicorn horn!" ("smile", "wide", "base", "down") + call give_gift("You give the strap-on to Luna...",gift_item) + lun "I love it!" ("grin", "wide", "base", "mid") + elif states.lun.tier == 2: + lun "This is some sort of phallus, isn't it?" ("soft", "base", "base", "down") + lun "Very peculiar..." ("soft", "base", "base", "down") + lun "I shall study it for our research." ("open", "closed", "base", "mid") + call give_gift("You give the strap-on to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") + elif states.lun.tier == 3: + lun "A penis!" ("grin", "base", "base", "down") + lun "But, what are the straps for?" ("open", "base", "base", "down") + lun "*Hmm*... I'll have to study it..." ("soft", "base", "base", "down") + call give_gift("You give the strap-on to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") + elif states.lun.tier == 4: + lun "So, if I wore this... I'll have my own penis?" ("open", "base", "base", "down") + lun "But, [name_genie_luna], I don't think I'll be able to funnel the wrackspurts through this..." ("angry", "base", "base", "mid") + lun "There's no hole!" ("angry", "narrow", "base", "mid") + else: + lun "*Hmm*... You're supposed to put your legs through these holes, right?" ("open", "base", "base", "down") + lun "But [name_genie_luna], this would cover up my lady parts!" ("angry", "base", "base", "mid") + lun "Wait...{w=0.4} You're testing me! Did I pass?" ("angry", "narrow", "base", "mid") elif gift_item == broom_2000_ITEM: - call give_gift("You give the broom to Luna...",gift_item) - #Add text + if states.lun.tier <= 1: + lun "A broom?" ("open", "base", "raised", "down") + lun "Hold on, there's an attachment on this seat..." ("angry", "base", "low", "down") + lun "Oh, it's an art piece!" ("grin", "base", "base", "down") + call give_gift("You give the broom to Luna...",gift_item) + lun "Thank you, [name_genie_luna]!" ("base", "base", "base", "mid") + elif states.lun.tier == 2: + lun "A broom, with an attached penis?" ("open", "base", "raised", "down") + lun "Oh! You want me to study it, even when I'm flying?" ("grin", "base", "base", "mid") + lun "Wait... That can't be it..." ("angry", "base", "base", "mid") + call give_gift("You give the broom to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") + elif states.lun.tier == 3: + lun "A broom with a penis attached to it?" ("soft", "base", "base", "down") + lun "I never knew brooms could grow penises..." ("soft", "base", "raised", "mid") + lun "You learn something new every day..." ("grin", "base", "base", "mid") + call give_gift("You give the broom to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") + elif states.lun.tier == 4: + lun "A broom with a penis on it... Or is that two penises?" ("soft", "base", "raised", "down") + lun "How very strange..." ("open", "narrow", "base", "down") + lun "I shall study it." ("base", "base", "base", "mid") + call give_gift("You give the broom to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("grin", "base", "base", "mid") + else: + lun "A penis broom?" ("soft", "base", "raised", "down") + lun "Or is it a broom penis, perhaps?" ("open", "narrow", "base", "down") + lun "Very interesting..." ("base", "base", "base", "mid") + call give_gift("You give the broom to Luna...",gift_item) + lun "Thank you, [name_genie_luna]." ("grin", "base", "base", "mid") elif gift_item == sexdoll_ITEM: + lun "A doll?" ("open", "base", "base", "down") + lun "It says Joanne on it." ("soft", "narrow", "raised", "down") + lun "Well, hello there Joanne." ("grin", "base", "base", "down") call give_gift("You give the doll to Luna...",gift_item) - #Add text + lun "I'm sure we're going to be great friends..." ("smile", "base", "base", "down") elif gift_item == anal_beads_ITEM: + lun "Such a lovely necklace!" ("grin", "narrow", "base", "down") call give_gift("You give the anal beads to Luna...",gift_item) - #Add text + lun "Thank you, [name_genie_luna]." ("grin", "base", "base", "mid") elif gift_item == wine_ITEM: + lun "Wine... How lovely!" ("grin", "base", "base", "down") call give_gift("You give the wine to Luna...", gift_item) - #Add text + lun "Thank you, [name_genie_luna]." ("base", "base", "base", "mid") elif gift_item == firewhisky_ITEM: + lun "Firewhisky... How lovely!" ("grin", "base", "base", "down") call give_gift("You give the firewhisky to Luna...", gift_item) - #Add text + lun "Thank you, [name_genie_luna]" ("base", "base", "base", "mid") lun "" (xpos="base",ypos="base") hide luna_main diff --git a/game/scripts/characters/luna/summon.rpy b/game/scripts/characters/luna/summon.rpy index 5229db0a..2d1b3094 100644 --- a/game/scripts/characters/luna/summon.rpy +++ b/game/scripts/characters/luna/summon.rpy @@ -55,14 +55,11 @@ label summon_luna: nar "You haven't unlocked this feature yet." jump luna_requests - "-Give Item-" (icon="interface/icons/small/gift.webp"): - $ TBA_message() + "-Give Item-" (icon="interface/icons/small/gift.webp") if states.lun.favors_unlocked: + hide luna_main with d1 + call gift_menu jump luna_requests - # hide luna_main with d1 - # call gift_menu - # jump luna_requests - # Dismiss "-Dismiss her-": stop music fadeout 3.0 diff --git a/game/scripts/characters/luna/wardrobe_reactions.rpy b/game/scripts/characters/luna/wardrobe_reactions.rpy index 3fd9280c..0ca23527 100644 --- a/game/scripts/characters/luna/wardrobe_reactions.rpy +++ b/game/scripts/characters/luna/wardrobe_reactions.rpy @@ -28,10 +28,10 @@ define lun_responses = { label lun_reaction_category_fail(category): if category == "upper undergarment": - lun "Is this part of our Wrackspurt research [name_genie_luna]?" ("open", "base", "raised", "mid") + lun "Is this part of our wrackspurt research [name_genie_luna]?" ("open", "base", "raised", "mid") gen "*Err*... I just thought maybe you could... Never mind..." ("base", xpos="far_left", ypos="head") elif category == "lower undergarment": - lun "Is this part of our Wrackspurt research [name_genie_luna]?" ("soft", "base", "base", "mid") + lun "Is this part of our wrackspurt research [name_genie_luna]?" ("soft", "base", "base", "mid") gen "*Err*... I just thought maybe you could... Never mind..." ("base", xpos="far_left", ypos="head") elif category == "piercings & tattoos": @@ -77,7 +77,7 @@ label lun_reaction_touch(what): elif states.lun.tier == 3: random: lun "Is my head another one of those sensitive areas you spoke about?" ("open", "base", "raised", "mid") - lun "I don't think there's anywhere for me to release the Wrackspurts from up there, but thank you anyway..." ("base", "narrow", "base", "mid") + lun "I don't think there's anywhere for me to release the wrackspurts from up there, but thank you anyway..." ("base", "narrow", "base", "mid") lun "Are you sure this technique is working [name_genie_luna]?" ("annoyed", "base", "raised", "mid") elif states.lun.tier == 2: random: @@ -94,7 +94,7 @@ label lun_reaction_touch(what): else: #Tier 1 random: lun "I think I lost a pencil up there, let me know if you find it." ("soft", "base", "base", "up") - lun "I already checked for Nargles this morning but I suppose you can't be too careful..." ("base", "base", "base", "down") + lun "I already checked for nargles this morning but I suppose you can't be too careful..." ("base", "base", "base", "down") block: lun "Thank you [name_genie_luna]." ("grin", "closed", "base", "mid") @@ -118,7 +118,7 @@ label lun_reaction_touch(what): random: lun @ cheeks blush "Come... Come out already..." ("soft", "closed", "base", "mid") block: - lun @ cheeks blush "*Mmm*... How come I don't really see any of the Wrackspurts coming out from here?" ("disgust", "narrow", "base", "mid") + lun @ cheeks blush "*Mmm*... How come I don't really see any of the wrackspurts coming out from here?" ("disgust", "narrow", "base", "mid") gen "*Err*..." ("base", xpos="far_left", ypos="head") lun @ cheeks blush "It feels really good so why aren't any of them coming out?" ("annoyed", "base", "base", "mid") block: @@ -154,13 +154,13 @@ label lun_reaction_touch(what): if states.lun.tier == 5: random: lun @ cheeks blush "*Ah*... S-so good... How did I ever live without this?" ("normal", "closed", "base", "mid") - lun @ cheeks blush "*Mmm*... Nasty... Wrackspurts..." ("base", "closed", "base", "mid") + lun @ cheeks blush "*Mmm*... Nasty... wrackspurts..." ("base", "closed", "base", "mid") lun @ cheeks blush "Please... Help me get rid of them again..." ("crooked_smile", "narrow", "base", "mid") elif states.lun.tier == 4: random: lun @ cheeks blush "Whoa... I didn't think just using your mouth could produce such a strong response." ("open", "wide", "base", "mid") lun @ cheeks blush "*Ah*... It's almost like a ripple of water... Except running through my body..." ("soft", "closed", "base", "mid") - lun @ cheeks blush "*Mmm*... Those nasty Wrackspurts... I can feel them getting agitated already..." ("grin", "narrow", "base", "downR") + lun @ cheeks blush "*Mmm*... Those nasty wrackspurts... I can feel them getting agitated already..." ("grin", "narrow", "base", "downR") elif states.lun.tier == 3: random: lun @ cheeks blush "*Ohhhh*... This is going to be my new happy memory when I have to summon a patronus!" ("base", "narrow", "base", "down") @@ -220,7 +220,7 @@ label lun_reaction_equip_fail(item): lun "*Hmm*..." ("annoyed", "base", "base", "mid") gen "What?" ("base", xpos="far_left", ypos="head") lun "There's a weird aura surrounding this piece of garment." ("open", "closed", "base", "mid") - lun "It seems to be affecting the Wrackspurts, as if they're multiplying!" ("disgust", "base", "base", "mid") + lun "It seems to be affecting the wrackspurts, as if they're multiplying!" ("disgust", "base", "base", "mid") if states.lun.level < 4: lun "I'm sorry [name_genie_luna] but I can't wear that... Not until we find a way of dealing with them." ("open", "closed", "base", "mid") else: @@ -376,10 +376,10 @@ label lun_reaction_equip_outfit(item): elif item == lun_outfit_lace1: #Req 7 (bra, panties) gen "Put on this lace lingerie for me will you?" ("base", xpos="far_left", ypos="head") lun "These are pretty..." ("soft", "base", "base", "down") - lun "But don't you think the Nargles would try to hide in them?" ("angry", "base", "base", "mid") + lun "But don't you think the nargles would try to hide in them?" ("angry", "base", "base", "mid") gen "*Err*... Don't you mean the spurts?" ("base", xpos="far_left", ypos="head") - lun "No [name_genie_luna]...{w=0.4} Nargles loves anything with roses on them..." ("soft", "narrow", "base", "mid") - lun "Although now that you mention it, Nargles and Wrackspurts don't like each other so perhaps it's a good time to test that theory." ("grin", "base", "base", "mid") + lun "No [name_genie_luna]...{w=0.4} nargles loves anything with roses on them..." ("soft", "narrow", "base", "mid") + lun "Although now that you mention it, nargles and wrackspurts don't like each other so perhaps it's a good time to test that theory." ("grin", "base", "base", "mid") ######################## ## Rave Bikini Outfit ## @@ -674,7 +674,7 @@ label lun_reaction_equip_outfit_fail(item): gen "Why not?" ("base", xpos="far_left", ypos="head") lun "If I stood here for too long without a bra, then I don't doubt they'd get to me!" ("angry", "closed", "worried", "mid") gen "Who?" ("base", xpos="far_left", ypos="head") - lun "The Wrackspurts!" ("angry", "wink", "base", "mid") + lun "The wrackspurts!" ("angry", "wink", "base", "mid") gen "Oh..." ("base", xpos="far_left", ypos="head") gen "(Maybe I could convince her once she's more confident about dealing with the spurts...)" ("base", xpos="far_left", ypos="head") @@ -706,7 +706,7 @@ label lun_reaction_equip_outfit_fail(item): gen "And skip the underwear." ("base", xpos="far_left", ypos="head") if states.lun.level < 4: lun "But [name_genie_luna]!" ("angry", "wide", "base", "mid") - lun "What about the Wrackspurts?" ("clench", "wink", "base", "mid") + lun "What about the wrackspurts?" ("clench", "wink", "base", "mid") gen "What do you mean, what about the spurts?" ("base", xpos="far_left", ypos="head") lun "They'll be able to get in there if I'm not wearing any underwear!" ("clench", "base", "base", "mid") gen "Really?" ("base", xpos="far_left", ypos="head") @@ -743,7 +743,7 @@ label lun_reaction_equip_outfit_fail(item): lun "But [name_genie_luna]!" ("mad", "base", "base", "down") lun "These got roses on them!" ("angry", "narrow", "base", "down") gen "So?" ("base", xpos="far_left", ypos="head") - lun "The Nargles would surely try and hide in them if I put this on!" ("clench", "happyCl", "base", "mid") + lun "The nargles would surely try and hide in them if I put this on!" ("clench", "happyCl", "base", "mid") gen "(How many of these made up things does she believe in?)" ("base", xpos="far_left", ypos="head") ######################## @@ -869,7 +869,7 @@ label lun_reaction_equip_outfit_fail(item): gen "I've got this latex outfit for you to wear." ("base", xpos="far_left", ypos="head") lun "Latex?" ("soft", "base", "raised", "mid") gen "That's right... It's this one right here." ("base", xpos="far_left", ypos="head") - lun "But... There are holes in it... What about the Wrackspurts?" ("angry", "base", "low", "mid") + lun "But... There are holes in it... What about the wrackspurts?" ("angry", "base", "low", "mid") gen "*Err*..." ("base", xpos="far_left", ypos="head") lun "*Phew*... Disaster, successfully avoided." ("base", "closed", "base", "mid") @@ -994,7 +994,7 @@ label lun_reaction_blacklist(item): lun "It seems no bra can fit in this garment." ("open", "base", "base", "down") if "panties" in item.blacklist and luna.is_worn("panties"): - lun "The Wrackspurts would have a feast as I would not be able to wear panties with this." ("upset", "narrow", "base", "down") + lun "The wrackspurts would have a feast as I would not be able to wear panties with this." ("upset", "narrow", "base", "down") gen "Trust me, I know what I'm doing." ("base", xpos="far_left", ypos="head") lun "If you say so [name_genie_luna]." ("base", "base", "base", "mid")