Commit Graph

171 Commits

Author SHA1 Message Date
181b4aa2bc Refactoring blush and tears (Hooch) 2023-04-26 01:23:45 +01:00
915a1e25ab Refactoring blush and tears (Hermione) 2023-04-26 01:21:55 +01:00
11fcc2acf4 Refactoring blush and tears (Cho) 2023-04-26 01:09:08 +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
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
db5e4347f7 Adjust event name for clarity 2023-04-03 17:57:14 +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
fab4da6f76 Bug fixes
* Fixed import initialization offset
* Fixed and converted hooch chibi images into spritesheets
* Fixed hooch chibi calls
* Fixed new chibi format file dirs
* Fixed inner thought overlay displaying above side images
* Added default audio fadeout value of 1.0
* Removed rebuild method calls (superseded)
* Removed incompatible updater code
* Converted cho new chibi into spritesheets (Placeholder)
* Commented out dev code to avoid issues
2023-03-21 00:38:33 +00:00
fe67e3d9ca Fixes
* Fixed Cho Quidditch outfit not being set properly during Gryffindor tactic talk, and base outfit getting overwritten.

* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
* Minor writing improvements.
* Minor Doll positioning improvements.
2023-03-20 13:19:57 +01:00
c0da6f3731 Bug fixes
* Added a hint regarding the 'brutes' section of Cho's quidditch quest
* Fixed face and cum submodule processors referencing a wrong vars
* Fixed face and cum submodules custom zorder modifiers
* Fixed cum submodule zorder assignments and simplified the code
2023-03-19 19:22:05 +00: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
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
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
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
e482eb8eea Minor fixes 2023-03-12 00:25:12 +01: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
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
1ed3ec9a4b Cho Tattoos
* Added Cho Tattoos:
	* Arrows
	* Barcode
	* Bitemark
	* Cum Here
	* Lick Me
	* Pull
	* Snatch
	* Trainee
2023-03-09 14:18:14 +01:00
acfba4a43a Bug fix
* Fixed Tonks' fuming animation during quidditch
2023-03-04 23:32:11 +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
52b9c50c7b Bug fixes
* Fixed temporarily hidden clothes being excluded from staleness checks during pose changes
* Fixed Luna's lion outfit
* Replaced list method call with a for loop, to avoid large list memory allocation
* Fixed big booba an dumpy cheats
* Fixed body controller submodule hash generator
* Fixed cho panties throw crashing the game
* Fixed Outfit/Clothing unlock referenced methods
* Excluded body submodule from doll and icon image generation (superseded by bodyparts)
2023-03-03 00:50:50 +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
cf5e7945cc Writing tweak
* Added missing "Panties Acquired" message.
* Removed Repeating "Panties Acquired" message.
2023-02-26 22:35:57 +01:00
fb87fa4962 Writing fixes
* Minor writing fixes.
2023-02-24 13:58:19 +01: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
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
58b4639007 Wardobe file organization - Part 2
* Renamed clothing pieces for consistency.
2023-02-07 17:47:29 +01:00
12078176ee Wardobe file organization
* Organized Wardrobe files.
2023-02-07 17:13:30 +01:00
3d40049b81 Merge branch 'dev' into Python3 2023-01-30 20:35:25 +00:00
9491299be0 Bug fix
* Fixed item zorders to reflect the new values
2023-01-20 16:52:09 +00:00
99f174cfbb Refactoring, Optimizations, Bug fixes
* Fixed Hermione's hslut panties
* Refactored image calls
* Refactored character poses (partially)
* Added hash generation to all Doll-type displayables
* Hashed and cached Doll layers (Greatly improves rollback performance)
* Fixed outfit and colour randomization
* Added is_stale method to doll-type displayables to reduce code complexity
* Removed doll-related redundant global methods
* Added AVIF format support
* Simplified Doll posing
* and more...
2023-01-18 20:22:59 +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
07d30a6d2f Cho Quidditch Outro - Part 3 2023-01-12 00:19:35 +01:00
987c48d4cf Cho Quidditch Outro - Part 2 2023-01-10 20:30:38 +01:00
571652ea4a Cho Quidditch Outro - Part 1 2023-01-03 19:23:29 +00:00
aa6942bd0b Reimplement "Virgin Killer outfit"" 2022-12-22 23:42:34 +00:00
ffc24fa9f8 Revert "Virgin Killer outfit" 2022-12-22 23:40:40 +00:00
47ac29730d Outfits
* Added remaining outfit pieces
2022-12-22 23:40:40 +00:00
dd95b0dc43 Virgin Killer outfit
* Added Cho Virgin killer outfit.
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
2f5b4b0a83 Cho Events - CG posing Part 5
* Posed part of the event.
2022-12-10 20:11:38 +01:00
726050a332 Cho Events - CG posing Part 4
* Posed part of the event.
* Adjusted 2 images.
2022-12-08 19:55:02 +01: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
51acc26ab7 Cho Events - CG posing - Part 2
* Added desk cum layers
* Added more expressions
* Adjusted some expressions
* Finished initial CG posing implementation
2022-12-03 22:38:31 +00:00
a81deb7129 Cho Events - CG posing - Part 1 2022-12-01 21:39:12 +00:00
d74daee216 Cho Events - Part 2
* Added additional writing for CG.
2022-11-25 18:48:12 +01:00
55a8e8e358 Cho Events - Part 1
* Split 'Inspect her body' into sections, to make the events more manageable.
* Added new content for Tier 2.
* Added new content for Tier 3.
* Added a flag for Cho's blowjob events.
2022-11-18 23:47:26 +00:00
5c96a89d9e Bug Fixes
* Fixed overlapping menu during Quidditch Training
* Fixed some text issues
* Make sure to fit images before blitting
2022-07-15 23:03:14 +01:00
462921aeed Bug fixes
* Fixed animations (again)
* Added unstaged butt plug files
* Updated save compatibility
2022-07-06 16:27:29 +01:00
bf5710bf10 Bug fixes
* Default renderer to Auto for compatibility reasons
* Fixed animation assignments for dolls
* Fixed missing side images for non-doll speakers
2022-06-24 18:32:41 +01:00
cc7989b6cf Bug fixes
* Fixed meter vbar styling
* Version bump
2022-06-21 21:22:35 +01:00
b81d7323c5 Bug fixes
* Fixed outfit scheduling overriding outfits in certain events
* Fixed Hermione's jobs transition issues
2022-06-20 18:45:02 +01:00
7870da0905 Bug fixes
* Fix `fem` caller unnecessary arguments (Caused by regex most likely)
* Fixed xray displayable opaque Render flag (superseded by internal Ren'py changes)
* Fixed Doll animation concatenation to list
2022-06-19 22:27:08 +01:00
e4a77ced9e Fixed incorrect xpos usage on character doll positions. 2022-06-19 18:05:43 +02:00
1f776778db Susan posing
* Finished remaining posing.
* Adjusted "down" pupil position.
2022-06-19 03:47:53 +02:00
cd485b2bac Bug fixes
* Added checkpoints to forbid the editor from rolling back to menu context
* Added forced checkpoint for when the editor is being opened to avoid rolling back to before it was opened (by opening a console for example)
* Alleviated the issue for when the game tries to recover from the place it cannot stop rolling back, but version var is unavailable because of it being not initialized in that moment
2022-06-17 22:05:08 +01:00
f02b655c8c Susan Expressions
* Prepared Susan expression calls for posing
2022-06-15 22:17:20 +01:00
d86d0ac69d Lint improvements
* Added lint ignore tag detection for spoken strings.
* Fixed lint incorrectly marking newline characters as multiple spaces.
* Fixed lint incorrect behaviour for oxford commas.
* Fixed issues exposed by lint.
* Removed unreachable code.
2022-05-20 19:48:05 +01:00
205ca1ff3b Luna Police outfit tweaks and Genie expression replacements
* Re-implemented Luna Police outfit with separated Badge and Belt
* Replaced remaining Old genie sprite images (except g8 and blue genie images)
2022-05-20 20:34:30 +02:00
42756113b8 WTS 2022-05-17 00:48:22 +01:00