c705a298d2
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-06-14 13:42:15 +02:00
9b200a7177
Finalise navigation menu
2024-06-13 23:35:42 +01:00
85b8c10ad7
Add FilePageLast action for the save menu
2024-06-12 16:56:39 +01:00
92e35611e1
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-06-11 16:05:54 +02:00
9a82682569
Kinetic text
...
* More kinetic text additions.
2024-06-11 16:05:05 +02:00
ad017851e6
Bug fixes
...
* Fixed navigation menu being clickable during pseudo hide event
* Fixed wrong menu being displayed when accesses from the quick menu
2024-06-08 18:18:09 +01:00
1f18f6b0e6
Kinetic Text
...
* More kinetic text additions.
2024-06-08 15:43:16 +02:00
f0c79eb0cf
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-06-07 21:51:08 +02:00
b3a76cce17
Bug fixes
...
* Implemented workaround for navigation menu transforms not receiving 'hide' events.
* Fixed text overflow in navigation menu
2024-06-07 17:19:57 +01:00
e91b95d882
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-06-07 12:17:26 +02:00
6244dbbcce
Enable new navigation menu
2024-06-06 20:25:13 +01:00
ac62b9c8f9
Kinetic text
...
* More kinetic text additions.
2024-06-06 17:36:26 +02:00
5a78a30577
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-06-06 13:28:38 +02:00
7612c0bf1f
Save menu
...
* Implement new save/load menus
2024-06-05 22:25:18 +01:00
6d4a4e1e42
Kinetic text
...
* More kinetic text additions.
2024-06-04 15:34:35 +02:00
c6ed6726a9
Kinetic text
...
* More kinetic text additions.
2024-06-04 09:50:07 +02:00
eee88b6933
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-06-04 09:49:38 +02:00
63859b37f2
Partial Implementation of Navigation menus
2024-06-01 20:46:53 +01:00
7c0a367307
Kinetic text
...
* Added kinetic text to Luna events.
2024-06-01 16:00:54 +02:00
65af3fd0d5
Kinetic text
...
* Added kinetic text to Hermione anal sex favour.
* Removed unnecessary ctc calls.
* Minor fixes.
2024-05-30 17:26:10 +02:00
40a35cbc54
Merge remote-tracking branch 'origin/interface2' into kinetic_text
2024-05-30 14:03:42 +02:00
792467e25a
Handle choice menu overflow
2024-05-29 22:16:58 +01:00
e9cadcdc89
Improve styling and implement confirm popup
2024-05-29 21:31:12 +01:00
676a90f519
Bug fix
...
* Fixed menu scale
2024-05-29 20:33:31 +01:00
9b1848e52b
Kinetic text
...
* Added kinetic text to Hermione sex favour.
* Removed unnecessary ctc calls.
2024-05-29 15:36:48 +02:00
21ef470c6c
Implement new cursors
2024-05-28 21:10:37 +01:00
c2e9c6debc
Merge branch 'kinetic_text' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into kinetic_text
2024-05-28 20:51:54 +01:00
ee768b18ce
Choice progression
...
* Add completion status info to the choice menu
* Add style support for kinetic text tags
* Begin modal prompt screen implementation
* Cleanup
2024-05-28 20:51:41 +01:00
8d33aeca8b
Updated kinetic text
2024-05-28 21:24:48 +02:00
ac9727bdf2
Finalise kinetic text tags
2024-05-28 19:34:22 +01:00
2b1208bc7e
Kinetic Text - Heart animation
2024-05-28 16:54:01 +01:00
b7a0d19559
Merge branch 'refs/heads/interface2' into kinetic_text
2024-05-28 15:42:10 +01:00
d0f3a550b7
Bug fix
...
* Fixed wrongly assigned xsize for the text displayable in kinetic text
2024-05-28 15:39:10 +01:00
b53bfdfa56
Kinetic text
...
* Added kinetic text to hg_sex_1.
2024-05-28 12:27:29 +02:00
2bdd5138ce
Bug fix
2024-05-27 18:57:46 +01:00
b44f7188dc
Assign character tags to dolls layer
2024-05-27 18:54:57 +01:00
2680593bf6
Shudder - Kinetic Text
2024-05-27 16:33:13 +01:00
d293b0c973
Implement Frame
2024-05-24 15:19:34 +01:00
fe1cc62c5d
Tweak Wheelmenu Animation
2024-05-24 12:14:46 +01:00
f5cbcdc1eb
Implement Kinetic Text Tags
2024-05-23 23:16:45 +01:00
14d4d0c431
Bugfix
2024-05-23 18:08:39 +01:00
2b04947b9f
Transitions
...
* Apply transitions for dolls only to the doll layer
* Add missing doll transitions for Genie
2024-05-21 21:00:35 +01:00
972b9dcd70
Bug fix
2024-05-21 20:51:31 +01:00
53548aecdb
Fix {w} text tag affecting textbox animation.
2024-05-21 20:35:01 +01:00
2b40aeba9d
TODO
...
* For future reference
2024-05-21 18:45:06 +01:00
0da545a13b
Avoid double click
2024-05-21 02:28:55 +01:00
d59040613b
Animate choice menu
2024-05-21 02:27:21 +01:00
e4f0a9531d
Bug fix
2024-05-21 02:10:28 +01:00
52de19950d
Bug fix
2024-05-21 02:07:48 +01:00
a56d826a10
Improve text box and animate it
2024-05-21 01:58:08 +01:00
18b1b271bb
Implement new choice menu
2024-05-21 00:08:41 +01:00
b6091a839d
Eventqueue Bug fix
...
* Fixed events not being marked as completed
2024-05-21 00:06:46 +01:00
07489362c8
Cbibis
...
* Implement animation pause intervals for the new chibi class
* Fix static animations not playing due to a timeout.
2024-05-19 21:29:14 +01:00
587425723e
Remove android crash defender (obsolete)
2024-05-19 21:27:37 +01:00
3320f20101
Genie and Snape doll layer fix
2024-05-19 21:19:17 +01:00
ab9f072848
Detach console
2024-05-19 21:18:49 +01:00
e24b60514e
Hide dolls on dolls layer during chibi hide calls
2024-05-19 21:18:06 +01:00
8f8b9f2f80
Replace redundant call label with a scene statement
2024-05-19 21:15:26 +01:00
ac10302a69
Move tutorials to interface layer
2024-05-19 21:14:53 +01:00
93c0b24da0
Detach dolls from screens
2024-05-19 21:14:30 +01:00
15ebe27d0a
Detach interface and gameplay elements.
2024-05-19 21:12:51 +01:00
5967c358ca
Style fix
2024-05-19 21:08:55 +01:00
c089ebe81d
Bug fix
2024-05-19 21:08:48 +01:00
d9d9a2bacb
Textbox
2024-05-19 21:08:36 +01:00
3745fb46e9
Ignore console calls in dev stdout
2024-05-14 15:07:18 +01:00
978be68399
Add CycleShopCategory
2024-05-03 22:20:51 +01:00
a8d183e804
Shop Actions
...
* Implemented SwitchShopCategory and SortFilter screen actions
2024-05-03 21:57:10 +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
395bcf50c0
Improve translation support (part 6)
...
(cherry picked from commit 0b477fb762
2024-05-03 18:55:08 +01:00
7ab018394f
Improve translation support (part 5)
2024-05-03 18:55:04 +01:00
06b26b3316
Bug fix
...
(cherry picked from commit d89867c692
2024-05-03 17:57:23 +01:00
5c3e0cc409
Fix
...
(cherry picked from commit 4cdf71f5b8
2024-05-03 17:57:20 +01:00
c022413e47
Improve translation support (part 4)
...
(cherry picked from commit 27e07d6d73
2024-05-03 17:57:15 +01:00
b8c9212abb
Improve translation support (part 3)
...
(cherry picked from commit feced7b1cf
2024-05-03 17:57:05 +01:00
080bfdcb9c
Improve translation support (part 2)
...
(cherry picked from commit 5616f77813
2024-05-03 17:57:03 +01:00
0350d680b4
Improve translation support (part 1)
...
(cherry picked from commit 2b409db496
2024-05-03 17:56:53 +01:00
c38763c065
Merge branch 'refs/heads/dev' into interface
2024-04-28 16:46:23 +01:00
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
8aa1a84efb
Bug fix
...
* Fix detection of orphaned script and clarify the exception
2024-04-28 13:43:47 +01:00
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
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
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
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
51877952d4
Hookup gold gains to seeded randomiser
2024-04-27 00:51:45 +01:00
eb90a77262
Hookup weather to seeded randomiser
2024-04-27 00:47:19 +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
22f831e424
Cheaters do not prosper!
...
* Added rollback cheating detection for cardgame packs.
2024-04-26 16:06:19 +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
1ecd879929
Calendar
...
* Added timed events to the calendar (proof of concept)
2024-04-26 14:22:01 +01:00
7ea08f8584
Refactor moon checks
2024-04-26 13:59:29 +01:00
c7f7f6c8a0
Refactored currencies
...
* Removed game class (superseded)
* Refactored currencies
* Bug fixes
2024-04-25 20:39:50 +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
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
2c9348be59
Calendar
...
* Add weekdays method and weekday display to the calendar
* Bug fixes
2024-04-23 20:19:36 +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
63b1afc817
Say box
...
* Unify say box
2024-04-23 19:25:17 +01:00
5ea5f8c2b4
Calendar Placeholder
2024-04-22 21:54:04 +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
5b16c80dac
Animation + styling
2024-04-15 19:56:14 +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
e295fbb791
PixelateMask Shader
2024-04-08 15:48:23 +01:00
5c4ce667a5
Replace unneccesary eval
2024-04-03 12:38:48 +01:00
0dc071261b
Unlock Luna's favours in developer skip
2024-04-02 16:31:14 +01:00
61da56b6c8
Partially revert #7ca17b7 (Breaks dev debug)
2024-04-02 16:21:13 +01:00
9aff807593
Bug fixes
...
* Fixed inconsistent spacing
* Fixed inconsistent state var access
2024-04-02 16:18:18 +01:00
908beae5d3
Maintain access convention within save compat
2024-04-02 14:19:59 +01:00
d8751d73b9
Remove nonsense calls of getattr
...
(cherry picked from commit 7ca17b7ba7
2024-04-02 13:53:55 +01:00
224194754f
Avoid using unnecessary screens
2024-04-02 13:44:04 +01:00
e3c5fb609d
Avoid python statement
...
(cherry picked from commit 22348f0901
2024-04-02 13:41:44 +01:00
e04fd221dd
Flag unreachable code
...
(cherry picked from commit 25820e002a
2024-04-02 13:37:20 +01:00
ef97c273db
Linting dynamic
...
(cherry picked from commit 60244e258a
2024-04-02 13:36:59 +01:00
2566ef665f
Version bump
2024-03-31 21:20:39 +01:00
86f95fcfe4
Save compatibility bug fix
...
* Fix broken save state
2024-03-31 21:19:28 +01:00
e50292c1e6
Minor fixes
2024-03-30 21:39:37 +01:00
f06d33cd8d
Bug fix, save compatibility
...
* Fixed zorder issue with Tonks' office outfit accessory
2024-03-30 20:11:56 +00:00
b54a65a7ee
Bug fix
...
* Fixed imported outfits not appearing in the list, until the category of the wardrobe is changed.
2024-03-30 19:47:54 +00:00
e93aa18285
Bug fixes
...
* Fixed mixed paths in outfit import feature
* Fixed paths in outfit import feature
* Fixed missing imports
2024-03-30 19:20:46 +00:00
7164a782e7
Remove unused imports
...
(cherry picked from commit ec3483ae26
2024-03-30 18:21:15 +00:00
7e4d4a6799
Fix
...
(cherry picked from commit 218d8c63d2
2024-03-30 18:14:24 +00:00
cd6de9aa8c
Remove the last setattr on the store
...
benign in this case since the variable is builtin, but consistency and good practices
(cherry picked from commit 1d1d18ad1c
2024-03-30 18:14:08 +00:00
1bd428a0d8
Avoid mutable objects in signature
...
(cherry picked from commit 31ebf9356a
2024-03-30 18:13:10 +00:00
62cb39cd19
Default queues instead of using instanciation magic
...
(cherry picked from commit f7f0ecb566
2024-03-30 18:13:03 +00:00
fb7fc5300e
hotfix
...
(cherry picked from commit 750d8dff4d
2024-03-30 18:11:03 +00:00
c5c04ff79e
Convert existing cds using the new system
...
(cherry picked from commit 4770be5f1b
2024-03-30 18:04:49 +00:00
6408942054
Exception type
...
(cherry picked from commit a048b0e3cc
2024-03-30 18:02:15 +00:00
ea59c387d2
Turn unnecessary class into namespace
...
(cherry picked from commit 34165c7b2b
2024-03-30 18:02:08 +00:00
630ede144c
Add dynamic statement
...
(cherry picked from commit e98680d123
2024-03-30 18:01:56 +00:00
b489b59545
Add decorator
...
(cherry picked from commit 8e80555393
2024-03-30 18:00:08 +00:00
04a07328fe
Cleanup
...
(cherry picked from commit 17ebf50170
2024-03-30 17:59:58 +00:00
707e14e0cf
fix
...
(cherry picked from commit 375b77b2ab
2024-03-30 17:58:36 +00:00
7f71d15e70
Speedup dict accesses
...
nested dicts are حَرَام but due punishment will come at a later time
(cherry picked from commit ffc47109ed
2024-03-30 17:58:30 +00:00
af2142393f
Remove another throwaway variable
...
(cherry picked from commit f39cebc06f
2024-03-30 17:57:51 +00:00
faba726a3d
Avoid code duplication and using throwaway variables
...
(cherry picked from commit 66f8f5ab28
2024-03-30 17:57:41 +00:00
36582d0f9c
Final f-string batch
...
some uses of str.format remain, but converting them would be more trouble than it's worth
(cherry picked from commit f17cffa3ec
2024-03-30 17:57:17 +00:00
068629d34d
Warn about using reset_variables
...
(cherry picked from commit 04f76d2b54
2024-03-30 17:55:40 +00:00
a7a9fe2d9e
A bunch more f-strings
...
I'm not done
(cherry picked from commit be88d0ed7e
2024-03-30 17:55:26 +00:00
d9f9454a03
Translation doesn't work like that
...
(cherry picked from commit 5fa2a0ff19
2024-03-30 17:53:18 +00:00
b62fbcb179
More f-strings
...
(cherry picked from commit 15b6025d39
2024-03-30 17:53:07 +00:00
5659c4e4f4
Fix kwarg calls
...
(cherry picked from commit 489f43cd0b
2024-03-30 17:52:59 +00:00
