Commit Graph

146 Commits

Author SHA1 Message Date
f2d2c045af Factorize pos
(cherry picked from commit e242c0e43a)
2024-03-24 17:28:39 +00:00
f99c81b14a Factorize pos
(cherry picked from commit d7c8e39b08)
2024-03-24 17:28:29 +00:00
7e3a078dce Avoid single-use function
(cherry picked from commit 313849696c)
2024-03-24 17:27:50 +00:00
3579e2a38b Add safe return
otherwise the implicit return is at the end of the file, which means if we add another label down the file, it will be executed after give_gift

(cherry picked from commit 38787bdc4c)
2024-03-24 17:27:12 +00:00
f78c269fc8 Add data privacy when computing house points
the dynamic variables are needed for the show screen call

(cherry picked from commit aefa88e4d2)
2024-03-24 17:26:57 +00:00
20c00bbc74 merge fix 2024-03-24 17:26:42 +00:00
19d81fa9b8 Bug Fixes 2024-03-24 17:17:19 +00:00
26ecf0e6f0 Use a grid for the inventory
(cherry picked from commit c1ab7f7b85)
2024-03-24 17:06:17 +00:00
6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e)
2024-03-24 17:06:06 +00:00
d17b04e93d Better text interpolation in screens
(cherry picked from commit 14607f2eb1)
2024-03-24 17:04:58 +00:00
d063d7fc5f Simplify crop_image_zoom calls
(cherry picked from commit def10a09ac)
2024-03-24 17:04:05 +00:00
a5b47a41e7 Remove get_zoom and use builtin fit feature
using renpy.render, wtf

(cherry picked from commit 3278b1f4af)
2024-03-24 17:01:46 +00:00
815c90109b Use inplace sort and generator expressions
(cherry picked from commit 87ce17df8b)
2024-03-24 17:01:11 +00:00
84f3473bf0 Remove unused xalign
(cherry picked from commit 070d14a685)
2024-03-24 17:00:54 +00:00
d1aaeb157e Separate xalign and yalign
(cherry picked from commit a36c0ba222)
2024-03-24 17:00:44 +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
d01f9ec1f1 Use statement instead of equivalent
(cherry picked from commit c3f753a460)
2024-03-24 16:59:19 +00:00
91019374f5 Avoid circular reference
(cherry picked from commit db30cd66d3)
2024-03-24 16:59:11 +00:00
ba9865ab70 Make the rotate animation subpixel
(cherry picked from commit 4b8371e292)
2024-03-24 16:58:19 +00:00
a893892ecf Fix and simplify the map
in addition to benigh simplification, this actually fixes a bug : setting pos and align in the same line is a bug, it's always been unspecified, you should have been setting *anchor* instead. xycenter does that now.

(cherry picked from commit 48c4c4ecad)
2024-03-24 16:57:40 +00:00
2255d028e1 Remove unnecessary screen variable
(cherry picked from commit b222860bec)
2024-03-24 16:57:03 +00:00
fd50b5d05a Save calling update_character_map_locations several times
(cherry picked from commit c64635aace)
2024-03-24 16:56:51 +00:00
066f007e63 Reform random map locations
the locations of the different characters aren't independant, but they weren't in the first place

(cherry picked from commit 9a3fe1df65)
2024-03-24 16:51:27 +00:00
fb69dfa676 Use statements instead of equivalents
(cherry picked from commit 77e40301c9)
2024-03-24 16:50:52 +00:00
ff49d9fa95 Avoid circular reference
it clogs pickling and garbage-collecting

(cherry picked from commit 42f690f966)
2024-03-24 16:49:22 +00:00
fe5a7402a9 No it doesn't
(cherry picked from commit 884c264f04)
2024-03-24 16:48:49 +00:00
b34dc20901 Better text in screens
(cherry picked from commit 23a264c8f4)
2024-03-24 16:48:21 +00:00
9ea4431f0e Auto-cleanup public variables
I chose not to add them directly in the screen, to keep it readable
but even though they're still global variables, now they are dynamic and cleaned as soon as we exit the menu

(cherry picked from commit 32cf1de3a0)
2024-03-24 16:39:50 +00:00
be9f071660 Clean most stats variables from the global store
(cherry picked from commit c493a4b9aa)
2024-03-24 16:37:10 +00:00
0a6b5e41df Use define for constants
(cherry picked from commit bbc1df1ea6)
2024-03-24 16:36:03 +00:00
c908f2e90b Further clean junk variable
(cherry picked from commit ca64492beb)
2024-03-24 16:35:37 +00:00
3a77f89fab Add style, clean junk variables
(cherry picked from commit 3d62c8b818)
2024-03-24 16:35:23 +00:00
993b5c845a Simplify function
(cherry picked from commit bb2edc9a7b)
2024-03-24 16:35:13 +00:00
3b4db03a6c Upgrade other uses of image manipulators
(cherry picked from commit a9dc195379)
2024-03-24 16:20:23 +00:00
f941b77409 Convert ball_hint to a screen variable
no leak

(cherry picked from commit 4ec94d28f5)
2024-03-24 16:14:45 +00:00
d9912ece6c Fix 15c998c 2024-03-24 16:09:16 +00:00
d48708579b Fix misuse of variable
- don't use a reserved name (starting with an underscore)
- use a file-local mangled name (starting with two underscores
- use renpy.dynamx to cleanup the variable automatically

(cherry picked from commit 3e86094b0b)
2024-03-24 16:00:53 +00:00
13608b6cfa Bug fixes
* Fixed missing 'whore collar' unlock method call
* Fixed gallery not working correctly by extending call_replay funcionality by adding support for nested stores
2023-10-28 18:49:42 +01:00
316aea6a5a Bug fixes and autosaves
* Added autosave toggle
* Fixed achievements being granted in replay scope
2023-07-25 17:54:33 +01:00
6e93d8628f Bug fixes and improvements
* Added dev skip for cardgame for testing purposes (I swear!)
* Fixed missing achievement triggers for 'Mad Hatter' and 'Poster Boy'
* Fixed cardgame twins challenge being inaccessible
* Fixed colour picker invoking non-existing image outside wardrobe scope
* Disabled cardgame easter egg (broken, requires refactoring)
* Improved cardgame hints
* Improved cardgame event handling
* Fixed grammar
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
650563775e Bug fix
* Fix a rare bug that will mask parser bugs due to the order of initialization
2023-07-02 17:03:44 +01:00
a5187e378c Snape's Hangout Events
* Converted Snape's hangout events into the new system, and cleaned up relevant code.
* Fixed unreachable cho_quid_E9 event due to an unintentional jump
* Temporarily disabled Snape's hangout stats
2023-07-02 01:25:59 +01:00
2f74221abb Bug fixes
* Fixed name conflict within screen scopes (pickling error)
* Fixed expression editor error
2023-06-28 17:47:41 +01:00
13a7017773 Convert Hermione's Personal Favours into the new Event system to address code logic bugs.
* Added internal counter for queues
* Simplified global vars for event completion checks.
* Temporarily disabled Hermione's statistics menu
* Replaced counter/points checks with status flags.
* Disabled debug profiling for images
2023-06-24 23:27:13 +01:00
b1d58d4ff7 Music and improvements
* Added new sex theme music
* Adjusted cumshot animation for Quidditch Outro
2023-06-19 19:02:36 +01:00
bda2831df1 CG Posing
* Posed part two of Cho Dual CG.
* Added music.
* Updated credits.
2023-06-13 16:21:02 +02:00
91fd7d3a0b Fixes
* Fixed misnamed "Jerk off naked" chibi animation, which caused it not to load.
* Fixed Hermione "-Let's Duel-" menu unlock.
* Fixed misnamed Tonks event vars, which caused her to not appear during the intro.
* Fixed misnamed Tonks event vars in cheats, which caused her events not to get skipped when you skip the intro.
* Moved temp "_cumming" variable to "hg_pf_admire_breasts_T3" as it is later checked even if you don't pick "masturbate" option.

* Minor writing and blktone fixes.
2023-05-14 12:15:10 +02:00
30687923d7 Bug fixes
* Fixed mods enabled persistent set chicken and the egg problem (init)
* Fixed gift items referencing old variable
2023-05-10 16:16:42 +01: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
66bb068fea Bug fix
* Fixed Astoria's stats var reference
2023-04-27 14:58:48 +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
41ce7b3cc9 Splash screen
* Updated splash screen image
2023-04-20 18:14:12 +01:00
d3d2f6c8aa Modding support
* Resolved CHARACTERS constant to allow adding custom characters without having to rely on monkey patching.
2023-04-11 20:36:25 +01:00
f8a1d75d9b Bug fixes
* Added missing hooch head icon
* Removed leftover references to update_interface functionality
* Fixed missing directory for expressions causing crashes in character studio
* Fixed unlock state detection in character studio
* Fixed hooch studio crash
2023-04-09 20:54:15 +01:00
b6038c56e3 Merge branch 'Variables' into dev 2023-04-03 16:26:45 +01:00
4b5dbdf5c5 Bug fix
* Fixed tooltip displayable var interpolation
2023-04-03 01:32:49 +01: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
9f5c99d4d8 Bug fixes
* Fixed double fade effect when give_reward label was called
* Fixed Susan's face cum layers not displaying due to wrong file structure
* Fixed card game tutorial highlight placement
* Fixed wardrobe vertical scrollbar styling not adhering to time of day
* Fixed card game tutorial being covered by narrator fade
2023-03-28 22:06:48 +01:00
a7daf38e36 Refactor
* Replaced one-off screen effects with images
* Restructured objects and decorations image files and placed them in the relevant room directories
* Moved some image definitions into relevant mirror story scripts
* Removed old interface assets
2023-03-28 20:11:35 +01:00
8341ddae35 Refactor
* Updated whitespace
* Refactored responses relying on random choices
2023-03-28 18:47:55 +01:00
f29f8aecfe Tooltip improvements and bug fixes
* Disabled tooltips on android devices
* Improved screen boundary detection to avoid overflow
* Improved readability and padding
* Fixed the existence of tooltip parameter causing massive lag spikes on hover/unhover events (even when tooltips were disabled) by patching the related engine focus function
2023-03-23 21:25:38 +00: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
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
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
fcd56f4516 Bug fixes
* Fixed parcel icon references
* Fixed character studio pose reference
* Fixed and updated expression editor to work with new paths, and disabled editor initialization until it is explicitly executed
* Fixed common wardrobe functions initialization offset
* Fixed typos
2023-03-09 21:56:16 +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
e0e9d23d2a Bug fixes and improvements
* Fixed wardrobe not initializing in replay context
* Fixed unequip all clothes cheat
* Fixed example mod file structure
* Fixed ability to rollback to the broken past during the game's start
* Simplified initialization
* Simplified mods module importing and parsing, reducing possible number of fail points
* Moved audio channel registration to options (config) file
* Added default zorder for `cg` image tag
* Added rpym format to .editorconfig
2023-03-02 23:06:16 +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
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
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
870bfa29b4 Merge branch 'dev' into Python3 2022-12-28 19:20:38 +00:00
f8a06b0864 Xmas Story
* Added new Genie Stripper Santa Outfit.
* Added experimental Genie Outfit cheat.
* Refactored santa speaker to utilize a single `gen` speaker and applied the change to all affected events.
* Improved base Genie model, the default robes outfit and image creation code.
2022-12-22 23:40:40 +00:00
1d25e458f5 Bug Fixes
* Fixed decoration menu page swap arrow position
* Fixed room and title screen animations restarting with every interaction
2022-12-22 23:40:40 +00:00
022da2a727 Merge branch 'dev' into Python3 2022-10-16 19:37:12 +01:00
896c73f7d8 Update credits 2022-10-08 23:35:47 +01:00
d6e8efaaa3 Refactoring 2022-09-29 22:19:55 +01:00
e5a7060af9 Refactoring 2022-09-21 21:57:04 +01:00
5bdf050a75 Vibrator Interface
* Added vibrator interface to the public event
* Fixed invalid syntax
2022-09-20 21:08:46 +01:00
d98c4e2bb9 Cleanup
* Removed redundant image files and scripts
2022-07-15 17:40:05 +01:00
822f35c08c Color Picker
* Rewritten and re-implemented color picker in shading language
* Vastly improved performance
* Added live preview back
* Overhauled interface
* Code Cleanup
* Reduced import overhead
2022-07-05 21:38:03 +01:00
09af431344 Bug fixes
* Fixed a rare crash during init caused by monkey-patched loadable function
* Fixed stats screen character scaling
* Fixed non-functional alpha slider
* Fixed missing Genie sprite inside stats screen
2022-06-29 19:46:19 +01:00
8542fabbb4 Bugfix
* Fixed editor active flag becoming stuck after rolling back to before it was called
* Put editor onto interface layer to exclude it from transitions
2022-06-16 21:38:20 +01:00
108475316d Tooltip improvements
* Moved calculations into a transform function.
* Reduced overhead
2022-05-31 16:03:20 +01:00
a4e953ecf3 Bug fix
* Forbid editor from applying changes when hidden
* Allow skip interaction when editor is hidden
2022-05-27 16:23:37 +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
42756113b8 WTS 2022-05-17 00:48:22 +01:00