Commit Graph

57 Commits

Author SHA1 Message Date
Gouvernathor a7a9fe2d9e A bunch more f-strings
I'm not done

(cherry picked from commit be88d0ed7e)
2024-03-30 17:55:26 +00:00
LoafyLemon 38d2494bc3 Fix conflicting properties (by Gouvernathor)
big work
what was reliable before is now not, in recent versions of renpy, which is why we added that new config (which I put in say.rpy, but it can be moved somewhere else)
Also fixes the game_menu's title position, incidentally

some changes are incompatible with my diary and achievement branches, respectively, they will need to be merged with a bit of manual care
2024-03-25 14:57:36 +00:00
Gouvernathor 6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e)
2024-03-24 17:06:06 +00:00
Gouvernathor 0e9dae05bd Use repr instead of manually added single quotes
(cherry picked from commit 2ccece1a3d)
2024-03-24 16:34:56 +00:00
Gouvernathor 0c564a521b Use expression instead of image
the only documented lingua
this is AST-equivalent

(cherry picked from commit 542db72609)
2024-03-24 16:19:01 +00:00
Gouvernathor 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
LoafyLemon 683af5ae42 Bug fix
* Removed broke transition vpunch_repeat
2023-07-16 22:17:58 +01:00
LoafyLemon 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
Johnny28 01c0ccd585 Minor writing fixes/additions.
* Added additional dialogues for when Hermione agrees to perform favours, even though Gryffindor is in the lead.
* Minor fixes
2023-05-17 16:14:18 +02:00
Johnny28 7f9bbda2f5 Face parameter removal (Cho)
* Removed face parameter for Cho and reposed events that relied on it.
* Minor fix.
2023-05-11 18:59:55 +02:00
Johnny28 b1d470a1d0 Proofreading 2023-05-10 17:03:05 +02:00
LoafyLemon 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
LoafyLemon 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
LoafyLemon bccce7b115 Refactoring blush and tears (Tonks) 2023-04-26 01:31:25 +01:00
LoafyLemon c23906d8ef Refactoring blush and tears (Luna) 2023-04-26 01:25:46 +01:00
LoafyLemon 915a1e25ab Refactoring blush and tears (Hermione) 2023-04-26 01:21:55 +01:00
LoafyLemon 11fcc2acf4 Refactoring blush and tears (Cho) 2023-04-26 01:09:08 +01:00
LoafyLemon 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
LoafyLemon 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
LoafyLemon 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
LoafyLemon 670e7d82fb Refactor variables - Part 2
* Finished refactoring quest and character vars
* Removed quest class (superseded)
2023-04-03 00:48:38 +01:00
LoafyLemon 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
LoafyLemon 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
Johnny28 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
Johnny28 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
LoafyLemon bbcaba9c03 Bug fix
* Fixed regex replace issue with comments (Thanks @vorjat!)
2023-03-16 23:41:47 +00:00
LoafyLemon 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
Johnny28 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
LoafyLemon 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
LoafyLemon 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
LoafyLemon 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
Johnny28 fed21d20de Minor fixes
* Fixed missing expression during "a bad time to disrobe" mirror story.
* Minor writing fixes.
2023-03-08 16:12:03 +01:00
Johnny28 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
LoafyLemon 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
LoafyLemon 35ac11d10d Update scripts
* Updated scripts to reflect bodyparts changes
2023-02-07 19:31:21 +00:00
LoafyLemon 870bfa29b4 Merge branch 'dev' into Python3 2022-12-28 19:20:38 +00:00
Johnny28 e4c3c3e51d Outfit
* Added Tonks Santa outfit.
* Added outfit unlock and Tonks to xmas Mirror story.
2022-12-23 02:09:10 +01:00
Johnny28 08c347a321 fix 2022-12-22 15:40:50 +01:00
LoafyLemon 860212b5e1 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-21 20:38:20 +00:00
LoafyLemon 367fabc739 Decorations
* Added naughty list decor
* Added window decor
* Added garland decor
* Improved poster enlarging
2022-12-17 21:52:44 +00:00
Johnny28 b29701f39c 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-14 18:32:54 +01:00
Johnny28 f58d18b2ac Xmas Story - Posing - Part 1 2022-12-12 22:08:39 +01:00
LoafyLemon e169296009 Xmas Story 2022-12-11 19:37:56 +00:00
Johnny 16bff74037 Proofreading 2022-10-21 19:12:16 +02:00
Johnny 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
LoafyLemon d6e8efaaa3 Refactoring 2022-09-29 22:19:55 +01:00
LoafyLemon 3f31988bc0 Bug fixes and posing
* Fixed image tags for vibrator event
* Fixed errors reported by lint
* Added NPC reactions
* Added basic posing for Hermione during vibrator events
2022-09-13 21:58:52 +01:00
LoafyLemon def68027ec Mirror Story - Rewards 2022-09-08 22:41:59 +01:00
LoafyLemon 15771e31ef Proofreading 2022-09-07 19:40:33 +01:00
Johnny e1316f1da3 Mirror Story - Blueballing Bad
* Added fan created mirror story, (Blueballing Bad) Written by NotTera.
2022-09-06 18:46:01 +02:00