Compare commits

...

68 Commits

Author SHA1 Message Date
LoafyLemon e717064980 Fix Tonks hangout chibi 2024-05-17 20:35:11 +01:00
LoafyLemon 9d6b304a65 Custom Console Experiment 2024-05-17 20:05:51 +01:00
LoafyLemon 361330dd0b Remove android crash defender (obsolete) 2024-05-17 14:27:11 +01:00
LoafyLemon 1d1d2ed0f7 Recalculate missed positions 2024-05-17 14:20:23 +01:00
LoafyLemon 0ed0f9aa9f Fix Snape ypos head 2024-05-16 17:39:18 +01:00
LoafyLemon 344b6b67c9 Fix Genie's ypos head position 2024-05-16 17:07:03 +01:00
LoafyLemon f947d80e2a Recalculate explicit integer positions for dolls 2024-05-16 16:55:02 +01:00
LoafyLemon 249a04fd29 Genie and Snape doll layer fix 2024-05-16 16:41:32 +01:00
LoafyLemon 6a2092035b Recalculate doll positions on the screen and detach console from screens 2024-05-16 15:59:33 +01:00
LoafyLemon 0ef31a4a68 Hide dolls on dolls layer during chibi hide calls 2024-05-16 15:24:01 +01:00
LoafyLemon 0ed6aad365 Replace redundant call label with a scene statement 2024-05-16 15:13:23 +01:00
LoafyLemon 384a4c67e5 Move tutorials to interface layer 2024-05-16 14:33:28 +01:00
LoafyLemon 82fec8bdcd Detach dolls from screens 2024-05-15 23:02:05 +01:00
LoafyLemon f64cbdee03 Detach interface and gameplay elements.
* Scaling fixes
* Attempt at splitting interface and gameplay elements
* Temporary room zoom fix
2024-05-15 22:47:08 +01:00
LoafyLemon 81748af47e Bug fixes
* Fixed intro events
2024-05-15 20:26:23 +01:00
LoafyLemon 2a086ede4a Bug fix
* Fixed phoenix petting/feeding chibi positions
2024-05-15 19:49:14 +01:00
LoafyLemon 1cccaaeb8d Bug fixes
* Fixed Cho nickname scope
* Another attempt at fixing chibi positions and scale
2024-05-15 19:29:46 +01:00
LoafyLemon 2cd6237811 Main Room and Genie scaling
* Fixed room scaling
* Fixed genie scaling
2024-05-15 16:51:33 +01:00
LoafyLemon 8d50133b79 New Textbox
* Implemented new textbox
* Implemented nickname handling for the namebox
* Implemented new reworked fonts
* Implemented PC parts of the textbox
* Recalculated sprite positions, offsets and zooms.
2024-05-14 21:54:03 +01:00
LoafyLemon 999aedd8d4 Change resolution from 1080x600 -> 1920x1080 (Oh god, what am I doing...) 2024-05-14 15:08:17 +01:00
LoafyLemon 3745fb46e9 Ignore console calls in dev stdout 2024-05-14 15:07:18 +01:00
LoafyLemon 978be68399 Add CycleShopCategory 2024-05-03 22:20:51 +01:00
LoafyLemon a8d183e804 Shop Actions
* Implemented SwitchShopCategory and SortFilter screen actions
2024-05-03 21:57:10 +01:00
LoafyLemon 2b2a3182c6 Merge dev into interface 2024-05-03 20:13:32 +01:00
LoafyLemon 93de0cd4da Improve translation support (part 7)
(cherry picked from commit 64a624c89b)
2024-05-03 18:55:10 +01:00
LoafyLemon 395bcf50c0 Improve translation support (part 6)
(cherry picked from commit 0b477fb762)
2024-05-03 18:55:08 +01:00
LoafyLemon 7ab018394f Improve translation support (part 5) 2024-05-03 18:55:04 +01:00
LoafyLemon 06b26b3316 Bug fix
(cherry picked from commit d89867c692)
2024-05-03 17:57:23 +01:00
LoafyLemon 5c3e0cc409 Fix
(cherry picked from commit 4cdf71f5b8)
2024-05-03 17:57:20 +01:00
LoafyLemon c022413e47 Improve translation support (part 4)
(cherry picked from commit 27e07d6d73)
2024-05-03 17:57:15 +01:00
LoafyLemon b8c9212abb Improve translation support (part 3)
(cherry picked from commit feced7b1cf)
2024-05-03 17:57:05 +01:00
LoafyLemon 080bfdcb9c Improve translation support (part 2)
(cherry picked from commit 5616f77813)
2024-05-03 17:57:03 +01:00
LoafyLemon 0350d680b4 Improve translation support (part 1)
(cherry picked from commit 2b409db496)
2024-05-03 17:56:53 +01:00
LoafyLemon 8b272ca8b5 gitignore 2024-04-28 17:04:00 +01:00
LoafyLemon c38763c065 Merge branch 'refs/heads/dev' into interface 2024-04-28 16:46:23 +01:00
LoafyLemon 99fbcd4ea7 DollClothDynamic
* Added new prefix for lookahead type.
* Added tracked item rebuild for the purpose of tracking types
2024-04-28 15:33:40 +01:00
LoafyLemon 8aa1a84efb Bug fix
* Fix detection of orphaned script and clarify the exception
2024-04-28 13:43:47 +01:00
LoafyLemon df724981d2 House Points and Currencies
* Added common style properties for houses
* Added unique displayable for gold when in the main room
* Unified currency screen to support arbitrary displayables and properties.
* Unified transforms
* Put interface elements onto interface layer
* Hooked house points into the new currency screen
* Improved animation and display of values during animation.
* Allow independent animation of each supplied displayable
* Remove redundant code
2024-04-27 18:12:13 +01:00
LoafyLemon 7069cc1294 Refactoring
* Refactored old house points references
* Updates set_points method to use a dict to work with multiple changes at once.
2024-04-27 15:24:14 +01:00
LoafyLemon 7a4b31bf63 House points
* Added house points to states.env
* Added visuals for when points are added or subtracted
* Updated points increment animation and refactored the screen
2024-04-27 01:54:41 +01:00
LoafyLemon 4e01b71a99 Regression
* Revert cache for seeded randomisation due to the loss of seeded randomisation when functools.cache decorator is present
2024-04-27 01:05:53 +01:00
LoafyLemon 51877952d4 Hookup gold gains to seeded randomiser 2024-04-27 00:51:45 +01:00
LoafyLemon eb90a77262 Hookup weather to seeded randomiser 2024-04-27 00:47:19 +01:00
LoafyLemon 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
LoafyLemon 22f831e424 Cheaters do not prosper!
* Added rollback cheating detection for cardgame packs.
2024-04-26 16:06:19 +01:00
LoafyLemon eb70637a02 Add safe to interactive tutorial 2024-04-26 15:35:05 +01:00
LoafyLemon f1b3117909 New Room Object + Bug Fixes
* Added safe object (Proof of concept)
* Fixed tokens references
2024-04-26 14:56:50 +01:00
LoafyLemon 1ecd879929 Calendar
* Added timed events to the calendar (proof of concept)
2024-04-26 14:22:01 +01:00
LoafyLemon 7ea08f8584 Refactor moon checks 2024-04-26 13:59:29 +01:00
LoafyLemon c7f7f6c8a0 Refactored currencies
* Removed game class (superseded)
* Refactored currencies
* Bug fixes
2024-04-25 20:39:50 +01:00
LoafyLemon 085a4d8e9c Refactoring weather checks 2024-04-25 20:15:36 +01:00
LoafyLemon 333fdfed51 Refactoring day checks 2024-04-25 20:14:25 +01:00
LoafyLemon ec991ccd22 Refactoring gold checks 2024-04-25 20:12:50 +01:00
LoafyLemon b56d84a301 Refactoring cheats checks 2024-04-25 20:11:30 +01:00
LoafyLemon cc6fe6909c Refactoring difficulty checks 2024-04-25 20:10:46 +01:00
LoafyLemon 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
LoafyLemon 7535e0b756 Weather + Seasons + calendar
* Redesigned weather systems and added seasons along with seeded weights for each quarter.
* Added weather forecast to the calendar
* Bug fixes
2024-04-25 16:33:49 +01:00
LoafyLemon 2c9348be59 Calendar
* Add weekdays method and weekday display to the calendar
* Bug fixes
2024-04-23 20:19:36 +01:00
LoafyLemon 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
LoafyLemon 63b1afc817 Say box
* Unify say box
2024-04-23 19:25:17 +01:00
LoafyLemon 5ea5f8c2b4 Calendar Placeholder 2024-04-22 21:54:04 +01:00
LoafyLemon 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
LoafyLemon 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
LoafyLemon 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
LoafyLemon 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
LoafyLemon f267528d4f Wheelmenu placeholders 2024-04-17 19:23:53 +01:00
LoafyLemon 5b16c80dac Animation + styling 2024-04-15 19:56:14 +01:00
LoafyLemon 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
351 changed files with 4813 additions and 3981 deletions

3
.gitignore vendored
View File

@ -11,6 +11,9 @@ Desktop.ini
$RECYCLE.BIN/ $RECYCLE.BIN/
.DS_Store .DS_Store
# Hidden dirs
*/.*
# Python # Python
*.py[cod] *.py[cod]

BIN
game/gui/creamy_pumpkin_pie/fonts/Hack-Bold.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/fonts/Hack-BoldItalic.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/fonts/Hack-Italic.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/fonts/Hack-Regular.ttf (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/fonts/creativeblock-bb.bold.ttf (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/namebox.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/textbox.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_astoria.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_button.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_button_opaque.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_cho.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_frame.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_genie.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_gradient.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_hermione.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_luna.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/interface/wheelmenu/wheelmenu_snape.png (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More