Commit Graph

48 Commits

Author SHA1 Message Date
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
606c9c55e0 Merge fix 2024-03-24 17:57:18 +00:00
26b1e7f051 Fix weather storm and create the weather image tag (by
Gouvernathor)
2024-03-24 17:54:06 +00:00
2ef20d57da Clarify and simplify weather (by
Gouvernathor)

remove two blank images (useless and slower than Null())
clarify in weather.rpy which are images directly shown on the screen and not just ingredients for the others
simplify the screen code
2024-03-24 17:53:07 +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
40caec9428 Fix test call
it raised an exception in my case, and I'm fairly sure this is how it's supposed to work
also adds a complimentary hidden reset at the end

(cherry picked from commit eeb68cb6c6)
2024-03-24 16:25:06 +00:00
60479ad32d Avoid using reset_variables
(cherry picked from commit 2e17dd2582)
2024-03-24 16:23:38 +00:00
094b010b7a Avoid using lists
(cherry picked from commit 78230893a8)
2024-03-24 16:22:53 +00:00
94404f4ed7 Use childful transforms as displayable
that's not *explicitly* documented, but it won't change any time soon
also deletes a placeholder image

(cherry picked from commit 3b6dd38e19)
2024-03-24 16:21:28 +00:00
fe0193cfc2 Hasten ConditionSwitch-es
(cherry picked from commit 9d52bd9c92)
2024-03-24 16:19:37 +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
11047626e1 Factorize jumps in the elif
(cherry picked from commit 6dc1a04810)
2024-03-24 16:17:29 +00:00
67e589f47f Hasten elif chain
avoid reevaluating the choice equality

(cherry picked from commit 9b419fcbc3)
2024-03-24 16:17:14 +00:00
482969eaae Use renpy statement instead of python equivalent
(cherry picked from commit 976455bfc9)
2024-03-24 16:16:11 +00:00
5197b6a7a6 Use dynamic variable and condense menu-label syntax
The label is jumped to and not called, but the variable will still clean itself up eventually

(cherry picked from commit 4c52d1638f)
2024-03-24 16:16:01 +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
415c90d11c Use the call screen statement in this case
this particular syntax is very precisely documented in the screens page

(cherry picked from commit f51f3a30a1)
2024-03-24 16:13:58 +00:00
d3a2929b6c Better None syntax
(cherry picked from commit 8d4216a476)
2024-03-24 16:13:32 +00:00
2110eeb92a Simpler inline conditional
(cherry picked from commit da636e93ab)
2024-03-24 16:12:53 +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
f1ee0cbcd3 Cloud fix 2023-12-17 17:54:19 +00:00
79e25c27e9 Bug fixes
* Improved efficiency of RoomObject image creation
* Fixed a crash during one of the Tonks' hangout events
* Fixed DollMakeup object lacking clone method, causing issues with saved outfits
* Fixed DollMakeup non-uniform parameter order
* Fixed doll strip method affecting types like pubic hair, piercings, and tattoos
* Fixed ATL flicker on room objects due to inefficient creation of the images for room objects
2023-07-05 21:56:53 +01:00
3d1a5e5c79 Panty Thief and refactoring
* Converted 'panty thief' event into the new system, and moved it into 'odd jobs' section
* Removed shaming menu from Hermione (superseded)
* Removed shaming_class, and relevant pieces of code (superseded)
* Split maid and promoter jobs, and simplified the file structure
2023-07-01 22:26:07 +01:00
b1d470a1d0 Proofreading 2023-05-10 17:03:05 +02: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
5172fe4725 Improvements and fixes.
* Improved Hermione "Panty Thief" variants.

* Removed old CG calls.
* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
2023-04-05 15:59:53 +02: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
14a92834a0 Refactor and bug fix
* Moved weather images into main_room directory
* Fixed main_room image prediction
2023-03-28 20:22:06 +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
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
8df4960a1b Map events and Bug fixes
* Converted the event into new format
* Fixed layering bugs
* Fixed return labels
* Fixed Narrator fade being applied on top of CGs
* Fixed music restarting twice whenever Genie returns to the office
2023-03-16 21:58:10 +00:00
591377163a Lint, CDS, and bug fixes
* Added weights support to random block statements
* Added missing `open_wide_tongue_panties` mouth for Hermione
* Simplified CDS vars and attributes, and changed them to be in line with Renpy standards
* Fixed linting of character statements
* Fixed 'jazz take 2.ogg' file being located in the wrong directory
* Fixed minimum and maximum allowed initialization offset for statements
* Fixed show image statement missing space
* Fixed poster image show statement to enable prediction
* Fixed updater screen lacking parenthesis (was valid but slowed down initialization)
* Fixed random statement prediction
* Fixed uncommented Tonks chit-chat check (forgot to do so after testing)
2023-03-13 20:29:05 +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
870bfa29b4 Merge branch 'dev' into Python3 2022-12-28 19:20:38 +00:00
216649d37c Bug fix
* Fixed naughty list username retrieval failing on Windows
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
04fa574b29 Decorations
* Added naughty list decor
* Added window decor
* Added garland decor
* Improved poster enlarging
2022-12-22 23:40:40 +00:00
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
d6e8efaaa3 Refactoring 2022-09-29 22:19:55 +01:00
91f44064dc Weather improvements
* Reimplemented weather using renpy image methods
* Fixed weather causing fps drop
* Added cached weather results to the main room
* Reduced animation overhead
* Removed weather screen
* Unified day and night cloud images
2022-05-31 15:31:41 +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