Commit Graph

207 Commits

Author SHA1 Message Date
38fc9f2344 Merge branch 'dev' into temporary-expressions 2023-05-01 17:26:01 +01:00
d36fb0f1c8 Improvements
* Improved writing for "Dance for me Snape" variant of Hermione's "Dance for me" favours.
* Added additional flags for inside Hermione sex events.
2023-04-27 17:08:45 +02:00
2d56efde49 Bug fixes
* Fixed empty parenthesis left after regex replacements
* Converted statements omitted by regex
* Fixed missing spaces in some statements
* Removed none values for cheeks parameters
* Fixed incompatible assignments
2023-04-26 02:18:45 +01:00
f99f37c7bc Refactoring Tonks dynamic hair
* Converted hair parameter assignment to temporary attribute
* Fixed Tonks' hair remaining stuck in a temporary colour
* Unified character parameters
2023-04-26 01:52:58 +01:00
bccce7b115 Refactoring blush and tears (Tonks) 2023-04-26 01:31:25 +01:00
c23906d8ef Refactoring blush and tears (Luna) 2023-04-26 01:25:46 +01:00
915a1e25ab Refactoring blush and tears (Hermione) 2023-04-26 01:21:55 +01:00
eec59a58e4 Defer show
* Defer re-showing sprite until next statement call (less expensive and suits the writer better)
2023-04-26 00:24:11 +01:00
2ee9d0fb16 Temporary expression assignment support
* Added temporary expression assignment functionality
* Fixed get_face returning a live dict object instead of a dict copy
* Improved and simplified character speaker functions
* Removed obsolete face dicts
2023-04-26 00:18:17 +01:00
57965bd8f5 Flags and bug fixes
* Added creampie, anal_creampie, gokkun, statuses
* Fixed double defined memory flag
* Fixed non-existent screen call in some events
* Fixed a non-existent hermione expression call
* Fixed non-existent hide image tag call
* Fixed menu text styling, and grammar
* Fixed status flags not adhering to the naming convention
* Replaced caught_genie_masturbating status flag with an event flag
* Added additional event flags where it made sense
2023-04-24 20:50:50 +01:00
735bc3f736 Flag fixes and additions
* Added "states.her.status.caught_genie_masturbating" flag, and changed previous "states.her.status.handjob" checks to use it.
* Added "states.her.status.cum_body" flag, used to check when genie first cums on Hermione's clothes/body.

* Adjusted some checks.
2023-04-24 13:06:09 +02:00
1b3c313900 Milestones tutorial
* Added milestones tutorial, briefly explaining the relationship system
* Added temporary flag to disable one-off dialogue option during 'give me a handy' sub-event
2023-04-22 21:45:22 +01:00
a0d8ed6bfd Improvements
* Improved and posed "Give me a handy".
* Posed "Dance for me".
* Adjusted some of Hermione's nickname requirements to align with her attitude.

* Minor writing improvements.
2023-04-22 17:26:14 +02:00
a2e53fd8ee Bug fixes
* Fixed Hermione 'suck it' repeat fail variant on tier 4 not working.
* Fixed character emotes
2023-04-19 22:17:01 +01:00
bdc5a8be49 Bug fixes
* Fixed CGController incompatibility with Ren'py automatic image definition system causing issues with Cho handjob/blowjob CG scenes
* Converted introductory CGs into show statements
* Converted quidditch CGs into show statements
* Converted potions CGs into show statements
* Reviewed and removed redundant CG code
2023-04-19 01:03:54 +01:00
24ff32aab6 Improvements
* Improved writing and posing for "Dance for me masturbate".
2023-04-18 16:23:19 +02:00
6409b2b7d8 Proofreading 2023-04-16 18:25:21 +02:00
21b98b437d Improvements
* Improved Hermione "Dance for me", "Grope ass".

* Renamed some temp variables for consistency.
* Minor fixes.
2023-04-16 16:13:19 +02:00
a1bafde299 Improvements
* Improved writing and posing, and added sound effects for Hermione "grope her" and "final events".
* Added more randomized dialogue when Hermione agrees to do favours even when Gryffindor is in the lead.
2023-04-12 13:38:29 +02:00
e4c8e2de73 Improvements
* Improved writing and posing for "show me your panties, show me your tits, give a handjob, kiss a girl and final events".
2023-04-11 18:41:35 +02:00
212021a482 Improvements
* Improved writing and posing for "flash your tits, flirt with studetns, flirt with teachers, kiss a girl and let them grope you" public requests.
2023-04-06 16:34:21 +02:00
5172fe4725 Improvements and fixes.
* Improved Hermione "Panty Thief" variants.

* Removed old CG calls.
* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
2023-04-05 15:59:53 +02:00
6b3a20bd2d Eventchecks and fix
* Added check for if you've asked Hermione to strip during Tier 2 dancing, for writing variation once she agrees on Tier 3.
* Added writing variant for Hermione Tier 3 show breasts ending, if you came on her.
* Adjusted event name var.
2023-04-03 19:40:11 +02:00
db5e4347f7 Adjust event name for clarity 2023-04-03 17:57:14 +01:00
e50f8762da Fixes and improvements
* Fixed genie distributing more points than he promised on "Flash A Classmate" public requests.
* Improved writing and posing during "show me your tits, flash your tits, flirt with students, flirt with teachers, kiss a girl and "let them grope you".
* Removed blktone and bld in some places where it's replaced by inner thought and narrator character.
* Lowered points payout slightly for "Kiss a girl" public favour.
* Removed mood penalty on one of Hermione's public events as bad mood is inescapable.
2023-04-03 18:15:05 +02:00
be1fecbc11 Refactor variables - Part 3 2023-04-03 01:30:15 +01:00
670e7d82fb Refactor variables - Part 2
* Finished refactoring quest and character vars
* Removed quest class (superseded)
2023-04-03 00:48:38 +01:00
3df4778fca Bug fixes
* Fixed missed or overlooked changes
2023-04-01 00:28:37 +01:00
b28a3e250d Refactor variables - Part 1
* Added get_character_scheduling function
* Removed update_interface_color calls (Redundant)
* Redesigned variable naming convention to simplify assignment and lookup
* Removed counter_class (Superseded)
* Removed DynamicDisplayable CG implementation (Superseded)
2023-03-31 23:41:48 +01:00
3a08d72b20 proofreading 2023-03-30 15:48:54 +02:00
99b15859c0 Writing improvements
* Improved hg_pf_talk_tonks_T3_intro_E1 and hg_pf_talk_tonks.
* Added a new talk option during Luna's intro.
2023-03-29 23:05:49 +02:00
8341ddae35 Refactor
* Updated whitespace
* Refactored responses relying on random choices
2023-03-28 18:47:55 +01:00
7b18968627 Writing improvements
* Improved hg_pf_talk_T3.
* Minor fixes.
2023-03-28 18:45:30 +02:00
641fc2fadb Fixes and improvements
* Added strip sounds during Lockheart Tattoo public event.
* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
* Minor writing improvements/fixes.
* Doll positioning and posing improvements.
2023-03-25 16:42:13 +01:00
1263a062aa Hermione scene fixes
* Fixed Hermione's titjob scene
2023-03-21 21:50:06 +00:00
78d05ec008 Fixes
* Fixed some narrator calls.
* Minor writing improvements.
2023-03-20 15:56:52 +01:00
309aa12e1e Writing improvements and fixes
* Improved Cho Gryffindor match leadup public favours.
* Fixed some calls showing multiple ">".
* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
* Changed Hermione calling lollipops "Candy" since she's not American.
2023-03-18 16:14:56 +01:00
b5cc8da4c4 Fixes and more
* Fixed miss-named Cho "crooked_smile" expression.
* Fixed Tonks' "Morph" effect being delayed in some instances.
* Fixed some calls showing multiple ">".

* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
* Minor writing fixes.
* Minor character positioning fixes.
2023-03-17 16:48:17 +01:00
bbcaba9c03 Bug fix
* Fixed regex replace issue with comments (Thanks @vorjat!)
2023-03-16 23:41:47 +00:00
8ad59d1421 Bug fixes
* Fixed a regression in music playback
* Unexposed monkey-patched engine functions to avoid issues
2023-03-16 22:55:14 +00:00
8df4960a1b Map events and Bug fixes
* Converted the event into new format
* Fixed layering bugs
* Fixed return labels
* Fixed Narrator fade being applied on top of CGs
* Fixed music restarting twice whenever Genie returns to the office
2023-03-16 21:58:10 +00:00
129b9256e1 Fixes and more
* Re-added Tonks' Silky dress using in-engine opacity to allow 0 opacity.
* Adjusted some calls to work with new bld/blktone functions.
* Fixed Hermione talking about herself rather than genie. (nickname)

* Minor writing and positioning fixes
2023-03-15 20:52:15 +01:00
e1feea93d4 Bug fixes
* Fixed Hermione's card game job opportunity logic
* Fixed keysym lacking an action in save ui.
* Fixed missing image definitions
* Fixed outfit randomizer affecting bodypart layers
* Fixed a typo
2023-03-14 23:26:12 +00:00
93d87717ac Hermione forest BJ proofreading and Lint fixes
* Proofread Hermione forest BJ.
* Fixed writing styling inconsistencies reported by Lint.
2023-03-14 18:23:39 +01:00
591377163a Lint, CDS, and bug fixes
* Added weights support to random block statements
* Added missing `open_wide_tongue_panties` mouth for Hermione
* Simplified CDS vars and attributes, and changed them to be in line with Renpy standards
* Fixed linting of character statements
* Fixed 'jazz take 2.ogg' file being located in the wrong directory
* Fixed minimum and maximum allowed initialization offset for statements
* Fixed show image statement missing space
* Fixed poster image show statement to enable prediction
* Fixed updater screen lacking parenthesis (was valid but slowed down initialization)
* Fixed random statement prediction
* Fixed uncommented Tonks chit-chat check (forgot to do so after testing)
2023-03-13 20:29:05 +00:00
3db9804d10 Hermione forest BJ improvements and fix
* Added temporary school clothing on doll to go with CG.
* Added doll stripping.
* Added cum on Hermione Doll hair after last event.
* Adjusted writing to fit better with the rest of the game.

* Fixed Hermione doll positioning.
2023-03-13 19:54:10 +01:00
14ca2bfba6 Fixes and improvements
* Removed blktone in some places where "nar" character already applies it.
* Added some dialogue options during "cc_pf_talk_T1_intro_E2".
2023-03-13 13:54:13 +01:00
01a2df27e7 Transitions and Bug fixes
* Moved transition definitions into their own file.
* Removed narrator name and side image
* Added automatic narrator speaker fade
* Added automatic inner thought gradient fade
* Fixed night.ogg playback
2023-03-12 21:40:16 +00:00
dc212e80d1 Audio
* Added `sound` sfx channel
* Refactored and unified sound & music calls
* Fixed missing sounds in astoria events
* Removed hide_screens label (Redundant)
* Removed play_music, play_sound call labels
2023-03-11 22:01:39 +00:00
b2e7c44b2e Narrator
* Reworked narrator calls and unified them across the entire game
* Added narrator screen inheriting from say screen
* Removed obsolete narrator code
2023-03-11 19:43:02 +00:00
669bf3bd06 Bug fixes
* Fixed breasts potion intro label typo
* Fixed menus page calculation (PY2 -> PY3)
* Fixed menu page arrow rotation in Twins Shop
* Fixed ball dress being able to be given out before getting the actual item in a parcel
* Fixed Hermione vibrator event CG wetness layering
2023-03-11 17:41:07 +00:00
22b6e66f53 CDS - Random
* Implemented random dialogue CDS supporting:
 - If statements
 - Renpy statements
 - Renpy blocks
 - Prediction
 - Expression editor (yay!)
 - Parsing errors handling
* Refactored randomized dialogues to use `random` CDS
* Removed obsolete code
2023-03-10 23:09:32 +00:00
0aef8f2e64 Fixes
* Fixed largest breasts not being displayed during breast expand potion event.
* Added mask for "big2" breasts.

* Minor writing adjustments.
2023-03-10 17:06:48 +01:00
300c26f336 Minor fixes
* Hermione sex CG - fixed wrong "tears" being used on some lines.
2023-03-09 16:43:30 +01:00
a84c8063df Minor fixes
* Fixed Snape positioning during Hermione CardGame BJ event.
* Improved Cardgame tutorial writing.
2023-03-08 12:42:33 +01:00
c03a75eb4b Fixes
* Adjusted z.order on some wardrobe items.
* Fixed Susan school robe 3 back layer.
* Added missing and removed unnecessary arm fix layers.
2023-03-07 19:05:42 +01:00
d271d23f90 Hermione scene fixes
* Fixed all leftover bugs during Hermione vanilla sex and anal sex scenes
* Removed redundant code
2023-03-06 21:56:01 +00:00
9b771d1a77 Bug fix
* Fixed character calls breaking when the supplied number of expressions was less than 4, from now on expressions must be supplied as keyword arguments (this is already internally enforced)
2023-03-04 20:59:39 +00:00
751575c556 Posing, clothing and fixes
* Added wet pussy and squirting when Tonks is masturbating, morphed as Hermione.
* Added Cho nose and cheeks freckles.
* Added redrawn versions of old cho clothing:
	* top_tanktop_1
	* top_tanktop_2
	* witch (hat)

* Re-Added Hermione freckles to work better with multi-layer toggles.
* Re-Posed Hermione masturbation events.
* Re-Posed Luna masturbation events.
* Renamed some clothing folders for consistency.

* Fixed Cho Virgin-killer skin layer outline overlaps.
* Fixed Miss-labeled expression folders and names.
* Fixed folder structure on Hermione Masturbating pose folders.
2023-03-02 17:37:36 +01:00
96f0113c95 Nicknames
* Unified naming convention for nicknames as per writer's request
* Fixed dum lack of dynamic name flag
2023-03-01 22:14:00 +00:00
69c0e93be5 Hermione Scene fixes
* Fixed eyes and pupils, and merged them into one image
* Added missing shadows
* Converted files to webp format
* Fixed tears calls
* Fixed layering
* Removed dev label
2023-03-01 20:19:18 +00:00
c1d5ce4a16 Hermione sex - Minor writing adjustments 2023-02-28 19:20:13 +01:00
d38d287887 Bug fixes
* Fixed CG not being hidden at the end
* Fixed hide character calls
* Smoothened camera animation
* Fixed outfit checks
* Fixed lockhart tattoo item checks and calls
2023-02-27 23:20:20 +00:00
f036e508e1 Hermione Scene + mix fixes
* Replaced old calls in added clothing choice.
* Added clothing state check for strip so it won't play the sound if she's already naked.
* Minor writing tweaks.
2023-02-27 15:52:42 +01:00
12517df4aa CG changes and assets cleanup
* Improved camera handling during CGs
* Converted some CGs into image statements
* Removed old and obsolete assets that are not in use
2023-02-26 22:03:23 +00:00
1176e18613 Hermione Scene + Bug fixes
* Added arbitrary cum layers support for dolls
* Improved camera handling during Hermione sex scene
* Added additional clothing options during Hermione sex scene
* Fixed texture leak in Hermione sex scene
* Fixed image prediction in Hermione sex scene
* Converted Hermione face calls during sex scene to layered images
* Reorganized hermione sex scene assets
2023-02-26 22:03:23 +00:00
d58ebb35f7 Bug fixes
* Fixed missing import in studio scope
* Fixed some sprite positions
* Added a hint for tutoring.
2023-02-18 21:56:29 +00:00
0051845804 Bug fixes
* Fixed sprite positioning in some events
* Fixed story inconsistencies, spelling mistakes, and grammar in some events
* Fixed leading house checks in some events
2023-02-14 22:17:04 +00:00
7ed5b01227 Bug fixes
* Fixed pulse_hover animation resetting
* Fixed Hermione's hold book pose
* Fixed minor story inconsistencies and spelling
* Fixed Tonks' hair colour not resetting
* Blocked Hermione from being summoned during Tonks' investigation
* Blocked Snape from being summoned during the day (It's not like he'd help anyway)
* Updated tutorials to reflect these changes
2023-02-13 22:17:37 +00:00
dcdd54cdfe Colour Re-implementation
* Overhauled colour codes support with Ren'py supplied Color class
* Added support for hexadecimals alongside colour tuples w/ backwards compatibility
* Reduced colour assignments overhead
* Converted all colour lists into hexadecimals for all characters
2023-02-08 21:40:28 +00:00
4061dcceeb Merge fix 2023-02-07 22:05:15 +00:00
35ac11d10d Update scripts
* Updated scripts to reflect bodyparts changes
2023-02-07 19:31:21 +00:00
2acccbea5a Bodyparts, Modding, Bug fixes
* Added DollBodypart class to allow more extensive modding support for characters, along with dedicates layers for breasts, hips and so on...
* Added more bangs into DollClothDynamic, allowing tracking of singular objects and the ability to chainload the IDs
* Added get_character_body global method
* Added istype global method
* Improved caching, layering for dynamic clothes
* Improved hashing for Doll instances
* Improved readability and improved internal naming convention for Doll-type classes
* Removed dedicated buttplug slot (superseded by multislot reimplementation)
* Fixed clothing supplied skin layer issues with zorders
* Fixed DollClothDynamic __repr__ lack of quotes
* Fixed Hermione's open_wide_tongue mouth
* Fixed Hermione's tattoos missing images
* Fixed Cho's 'goodbye' after-summon skit using wrong number of expressions
2023-02-07 19:22:05 +00:00
12078176ee Wardobe file organization
* Organized Wardrobe files.
2023-02-07 17:13:30 +01:00
69e7f5e542 Convert Potions
* Converted Hermione's potion body changes into clothing items for better maintainability and to provide modding support
* Composited body images of characters into singular files to reduce layering complexity and overhead
* Fixed Luna's eyemasks
2023-02-05 17:25:11 +00:00
9491299be0 Bug fix
* Fixed item zorders to reflect the new values
2023-01-20 16:52:09 +00:00
c1b04f6ccd IO Overhaul, Refactoring, and more
* Refactored DollFace
* Refactored DollBody
* Refactored DollCum
* Refactored DollCloth
* Refactored Doll
* Refactored clothing item zorders
* Refactored implementation of body, face, cum, clothing layers
* Refactored function calls
* Removed DollLipstick
* Added DollMakeup class, allowing adding dynamic clothes tracking face states
* Added DollClothDynamic, allowing dynamic clothes tracking other cloth states with bangs support
* Added cache to frequently called functions, drastically reducing the overhead
* Added hash system, reducing clone redundancy
* Added layer modifiers support for all types (face, body, cum, clothes etc.)
* Added support for an arbitrary number of equipped multislot clothing items (makeup, tattoos, piercings, etc.)
* Simplified initialization for clothing items and dolls
* Simplified class function calls
* Reduced the number of image creation calls
* Added hue support for additional skin layers
* Added displayable support to image cropping function
* Replaced store cache with built-in functools cache for _list_files function
* Refactored all character files
* and more...
2023-01-14 23:04:54 +00:00
47ac29730d Outfits
* Added remaining outfit pieces
2022-12-22 23:40:40 +00:00
488d2aae0d Mirror story posing + outfits
* Posed Xmas Mirror story dialogue

* Added Cho Reindeer Outfit.
* Added Luna Reindeer Outfit.

* Partially added Luna Bunny-girl outfit.
* Partially added Cho Bunny-girl outfit.
* Partially added Hermione Bunny-girl outfit.
* Partially added Hermione Reindeer Outfit.
2022-12-22 23:40:40 +00:00
28f507e212 Cho Events - CG posing - Part 3
* Posed part of the event.
* Added additional writing.

* Minor writing fixes.
2022-12-06 20:37:34 +01:00
f8d7a6915c Fix
* Fixed sound not playing.
2022-10-22 02:04:18 +02:00
0dada1d367 Fixes and improvements
Mirror of Erised:
* Set doll positioning at start of mirror stories to ensure dolls are correct.
* Adjusted Doll flip on "A booty at sea" story.
* Removed Doll Cum layers on "A booty at sea" story as genie cums inside/on her back.
* Improved "A bad time to disrobe" writing.

* "Flash your tits", Minor writing fix
2022-10-20 18:44:56 +02:00
d1c37b11eb Minor fixes.
* Text consistency.
* Art tweaks on Hermione squirting base pose.
2022-10-16 23:19:06 +02:00
54d12585c1 Bug fixes
* Fixed code logic for Hermione's gift items
2022-10-15 18:56:47 +01:00
34f5d96e3b Small logic fix
* Adjusted writing (dev)
2022-10-10 20:01:50 +02:00
5e76ca2cb2 Bugfixes
* Fixed leaking menu option (dev)
* Proofreading (dev)
2022-10-10 18:54:02 +01:00
215bb24f9b Hermione Masturbate favour Squirting
* Added squirting to Hermione masturbate favour.
* Added "squirt_transition" image variants (mix of "squirt" and "squirt_post" for when she cums multiple times).
* Removed unnecessary code that's already part of end label.
* Removed "set music volume" for one of the events.
2022-10-10 17:11:30 +02:00
257e932617 Bugfix
* Fixed wrong expressing being used on genie speaker.
2022-10-10 13:49:16 +02:00
1c4e01b3da Bug fixes
* Fixed return events not initiating on Buttplug gift item event.
* Fixed soundfile naming issue.
2022-10-10 13:40:58 +02:00
be85fbbda2 Vibrator Event - Additional Menu option
* Added option to send Hermione away if Public path isn't available.
2022-10-09 23:49:33 +02:00
94b86e0b55 Cleaned Hermione up
* Removed Cum layer as Hermione changes clothing.
2022-10-09 22:48:10 +02:00
b55fceda83 Vibrator Event
* Fixed small inconsistency in intro on replay success writing if she's hasn't worn them before.
2022-10-08 23:40:16 +02:00
10e99cbc05 Bug fixes and additions
* Added rummage sound
* Added noshake parameter to personal CG
* Remastered vibrator sounds to avoid clipping
* Improved dialogue pacing
* Improved chibis positioning
* Fixed weather sounds playing over public CG
* Fixed shaking CG displayable
* Fixed logic issues
2022-10-06 22:22:53 +01:00
1e63a1651c vibrator Event
* Muted weather sounds during public CG
2022-10-03 18:44:30 +02:00
634d4cb0b9 Minor writing tweaks 2022-10-03 01:33:55 +02:00
2032a820a1 Proofreading 2022-10-02 23:37:23 +01:00
63a699e74a Vibrator public Ambient sounds
* Added ambient outside sounds.
2022-10-03 00:13:46 +02:00
4e2ad91cf2 Vibrator Event
* Added vibrator animation to public path
* Fixed vibrator animation
* Added choice menu logic
2022-10-02 22:22:51 +01:00
fe050afcda Vibrator event posing
* Finished posing Vibrator event.
* Added Minor wetness layer on personal CG.
* Improved image transitions on split up dialogue lines.
2022-10-02 14:35:13 +02:00
1171cc81d5 Vibrator event posing and Businesswoman Outfit chats
* Posed Vibrator public event.
* Added Tonks "Businesswoman" related chats.
2022-09-29 15:54:41 +02:00