Commit Graph

61 Commits

Author SHA1 Message Date
1cccaaeb8d Bug fixes
* Fixed Cho nickname scope
* Another attempt at fixing chibi positions and scale
2024-05-15 19:29:46 +01:00
2cd6237811 Main Room and Genie scaling
* Fixed room scaling
* Fixed genie scaling
2024-05-15 16:51:33 +01:00
2b2a3182c6 Merge dev into interface 2024-05-03 20:13:32 +01:00
93de0cd4da Improve translation support (part 7)
(cherry picked from commit 64a624c89b)
2024-05-03 18:55:10 +01:00
7ab018394f Improve translation support (part 5) 2024-05-03 18:55:04 +01:00
51877952d4 Hookup gold gains to seeded randomiser 2024-04-27 00:51:45 +01:00
db86910a8e Seed Randomisation, Map, Refactoring, Bug Fixes
* Added seeded randomisation w/ cache
* Updated help menu hotkeys section
* Decoupled map from the desk (New map artwork to be added)
* Removed old desk menu
* Removed old desk images
* Removed/Fixed door_randomobj and map_randomobj causing pickling issues
2024-04-27 00:41:38 +01:00
eb70637a02 Add safe to interactive tutorial 2024-04-26 15:35:05 +01:00
f1b3117909 New Room Object + Bug Fixes
* Added safe object (Proof of concept)
* Fixed tokens references
2024-04-26 14:56:50 +01:00
7ea08f8584 Refactor moon checks 2024-04-26 13:59:29 +01:00
085a4d8e9c Refactoring weather checks 2024-04-25 20:15:36 +01:00
333fdfed51 Refactoring day checks 2024-04-25 20:14:25 +01:00
ec991ccd22 Refactoring gold checks 2024-04-25 20:12:50 +01:00
b56d84a301 Refactoring cheats checks 2024-04-25 20:11:30 +01:00
cc6fe6909c Refactoring difficulty checks 2024-04-25 20:10:46 +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
0a213edac3 Calendar + Paperwork + Moon phases
* Added simple calendar
* Added half-moon phase (Artwork pending)
* Made moon phases cyclical rather than random
* Refactored paperwork and moon bonuses
2024-04-23 19:26:24 +01:00
4fbb2abad7 Interactive Object Highlight, Foreground, Bug fixes
* Added interactive room object highlights
* Added spacebar hotkey for the room objects highlights
* Added overlay param for room objects
* Fixed paperwork wheel menu action available before paperwork unlocks
* Improved foreground image handling for room objects
2024-04-22 20:26:12 +01:00
9d76d6088f Engine, Wheel menu, intro, bug fixes
* Added IfExpr Action.
* Added string evals for If func.
* Added reset_action method for RoomObject class.
* Added new actions appropriate for room relevant objects.
* Fixed a potential issue with reset_variables method within Events class.
* Fixed single button radius calculation in wheel menu
* Fixed crash if a null list of actions was supplied to create_wheelmenu method.
* Converted intro to use wheel menu actions.
* Split existing room object labels where it made sense.
2024-04-22 18:11:01 +01:00
8e589f45b6 Icons, sound effects, and bug fixes
* Added new head icons for characters
* Fixed initial genie head position for the wheel menu
* Added new interface sounds
* Converted door interface to the new wheel menu (partial)
* Fixed wheel menu condition bug
2024-04-18 16:57:31 +01:00
ca583cfd19 Wheelmenu + Tooltip + Cheats
* Added wheelmenu buttons (WIP)
* Moved cheats menu inside the wheelmenu
* Added animations
* Added new tooltip styling
2024-04-17 21:50:53 +01:00
f267528d4f Wheelmenu placeholders 2024-04-17 19:23:53 +01:00
588f1df01b Wheelmenu + Phoenix
* Added wheel menu constructor
* Added new features to the phoenix
* Added desk and phoenix objects to the wheelmenu
2024-04-15 19:06:18 +01: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
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
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
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
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