Commit Graph

61 Commits

Author SHA1 Message Date
2b2a3182c6 Merge dev into interface 2024-05-03 20:13:32 +01:00
395bcf50c0 Improve translation support (part 6)
(cherry picked from commit 0b477fb762)
2024-05-03 18:55:08 +01:00
b8c9212abb Improve translation support (part 3)
(cherry picked from commit feced7b1cf)
2024-05-03 17:57:05 +01:00
0350d680b4 Improve translation support (part 1)
(cherry picked from commit 2b409db496)
2024-05-03 17:56:53 +01:00
7069cc1294 Refactoring
* Refactored old house points references
* Updates set_points method to use a dict to work with multiple changes at once.
2024-04-27 15:24:14 +01:00
085a4d8e9c Refactoring weather checks 2024-04-25 20:15:36 +01:00
8aba361ea9 Refactoring + Environment
* Partially sunset `game` var store and move relevant special variables inside `states` store.
* Replace `game.daytime` -> `states.env.daytime`
2024-04-25 19:49:09 +01:00
7e4d4a6799 Fix
(cherry picked from commit 218d8c63d2)
2024-03-30 18:14:24 +00:00
62cb39cd19 Default queues instead of using instanciation magic
(cherry picked from commit f7f0ecb566)
2024-03-30 18:13:03 +00:00
6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e)
2024-03-24 17:06:06 +00:00
675839d28e Re-enable some menu yaligns and reimplement menu sets
these menu yaligns had been disabled for a long time (the menu_y variable was never read)

(cherry picked from commit eae844ef0b)
2024-03-24 17:01:04 +00:00
fa3e1e4450 Refactor states.menu_pos and remove reset_menu_position
(cherry picked from commit fbe8035c43)
2024-03-24 17:00:35 +00:00
4658a97b4a Bug fixes and improvements
* Improved skipping performance by delaying the call to render functions until after skipping ends
* Fixed skipping not refreshing the doll image
* Fixed skipping callback handler being affected by rollback
* Refactored doll show method
2023-07-25 17:54:34 +01:00
ba7ee49915 Fix
* Fixed Astoria and Tonks outfits not being set properly during spell training.
2023-07-15 18:43:22 +02:00
2f136986e2 Bug fixes
* Fixed character cheeks and tears layers being stuck in both gameplay and character studio
* Fixed missing reset properties during end event labels
* Improved updater hint for potential edge cases
2023-07-08 21:44:47 +01:00
b08e0d0071 Astoria spell training and improvements
* Converted Astoria's spell training into the new system, and cleaned up the code.
* Improved Astoria's menu layout
* Replaced -hidden- menu feature names with actual the actual feature names
* Refactored Astoria's file structure and naming convention
* Temporarily disabled spell training stats
2023-07-02 17:39:28 +01:00
48c3c77167 fixes
* Added _event.cancel() on events that should get canceled rather than marked as "failed"
* Renamed event var for clarity.
2023-06-26 16:37:17 +02:00
b610494c5f Fix
* Fixed incorrect genie expressions being set during Astoria nickname chats.
2023-05-14 12:29:46 +02:00
b1d470a1d0 Proofreading 2023-05-10 17:03:05 +02:00
20de093e34 Proofreading 2023-05-09 15:45:34 +02:00
3d73d8c00d Bug fixes
* Fixed regression in sprites positioning method
* Fixed missing paperwork unlock when using quick start
* Removed redundant align attribute from doll class
2023-05-02 21:14:38 +01:00
f66c5df6b7 Face parameter removal (astoria)
* Removed face parameter for Astoria and reposed events that relied on it.
2023-05-02 19:29:53 +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
24069a3956 Refactoring blush and tears (Susan) 2023-04-26 01:26:48 +01:00
915a1e25ab Refactoring blush and tears (Hermione) 2023-04-26 01:21:55 +01:00
803f3a36ce Refactoring blush and tears (Astoria)
* Converted blush face statements to temporary blush face attributes
* Fixed previously omitted Tonks' hair calls
2023-04-26 00:29:33 +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
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
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
5eba0300c7 Fixes and improvements
* Improved parts of the Susan/Astoria writing.
2023-03-24 16:38:38 +01:00
2e0dbeb8c4 Fixes and improvements
* Improved parts of the Susan/Astoria intro.
* Adjusted "Tonks poster" Acquisition for consistency.

* Minor writing fixes.
2023-03-23 15:52:01 +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
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
0d4fedf3ad Bug fixes
* Fixed zorder issues on some items
2023-03-14 23:35:20 +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
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
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
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
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
12078176ee Wardobe file organization
* Organized Wardrobe files.
2023-02-07 17:13:30 +01: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