Commit Graph

70 Commits

Author SHA1 Message Date
40335c5fa4 Rename some parameters to avoid shadowing builtin names 2024-04-01 22:35:46 +02:00
a7a9fe2d9e A bunch more f-strings
I'm not done

(cherry picked from commit be88d0ed7e)
2024-03-30 17:55:26 +00:00
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
6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e)
2024-03-24 17:06:06 +00:00
0e9dae05bd Use repr instead of manually added single quotes
(cherry picked from commit 2ccece1a3d)
2024-03-24 16:34:56 +00:00
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
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
f81822071b Card game "boss battle" one-liners improvements
* Proofread and improved the card game boss battle one-liners.
* Minor fix.
2024-03-18 12:44:40 +01:00
b0ae56b247 Bug fix
* Fixed puzzle generator outputting invalid combinations due to the lack of floor division
2023-07-26 22:50:01 +01:00
699f68742f Bug fixes
* Fixed cardgame TypeError crash during random matches
* Fixed mistakenly excluded ExampleMod from releases
2023-07-25 17:54:33 +01:00
683af5ae42 Bug fix
* Removed broke transition vpunch_repeat
2023-07-16 22:17:58 +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
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
f8d6a15aaa Improvements and fixes
* Improved Hermione Tier 5 and 6 events.
* Improved Hermione Cardgame wager event.

* Added Hermione titjob var.
* Minor fixes.
2023-05-30 17:55:26 +02:00
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
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
b1d470a1d0 Proofreading 2023-05-10 17:03:05 +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
11fcc2acf4 Refactoring blush and tears (Cho) 2023-04-26 01:09:08 +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
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
db5e4347f7 Adjust event name for clarity 2023-04-03 17:57:14 +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
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
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
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
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
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
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
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
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
a84c8063df Minor fixes
* Fixed Snape positioning during Hermione CardGame BJ event.
* Improved Cardgame tutorial writing.
2023-03-08 12:42:33 +01: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
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
870bfa29b4 Merge branch 'dev' into Python3 2022-12-28 19:20:38 +00:00
e4c3c3e51d Outfit
* Added Tonks Santa outfit.
* Added outfit unlock and Tonks to xmas Mirror story.
2022-12-23 02:09:10 +01:00