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
cc6e76d154
Generalized use of f-strings
...
(cherry picked from commit fa0acdbfff
2024-03-30 17:52:43 +00:00
f673985bc3
Avoid shadowing the builtin
...
(cherry picked from commit e4d64839b8
2024-03-30 17:52:17 +00:00
9182e5b750
Unnecessary formatting
...
(cherry picked from commit c816674c7c
2024-03-30 17:51:34 +00:00
3ebb5c53f4
Factorize check
...
(cherry picked from commit 40be2ccf18
2024-03-30 17:51:17 +00:00
1cc3374330
Update build info
2024-03-29 18:08:55 +00:00
aaa5ff6beb
Fixed issues reported by lint
2024-03-29 15:22:18 +01:00
5efd315847
Bug fixes, Save Compatibility, Secularisation
2024-03-28 15:48:19 +00:00
1d6cc4fb47
Luna Talk to me CG posing
...
* Posed the remainder of the event.
2024-03-28 15:59:36 +01:00
dcb2f30348
Bugfix
...
* Fixed another layering issue
2024-03-27 16:28:35 +00:00
fffdc788a2
Bug fix
...
* Fixed breast layer order for 'Talk To Me' CG.
2024-03-27 16:20:57 +00:00
a91e0efe72
Wetness layers
...
* Added wetness layers for 'Talk To Me' CG.
2024-03-27 16:12:09 +00:00
6176e0cdda
Cum layers
...
* Added cum layers for 'Talk To Me' CG.
2024-03-27 15:47:35 +00:00
ee23310ae0
Refactoring
...
* Removed old Luna chibi animations.
* Minor text edits.
2024-03-27 16:04:38 +01:00
6d6f58538e
Bug fixes
...
* Fixed presplash loading bar
* Disabled sparkle in title animation
2024-03-26 19:34:11 +00:00
d25cd0fc2a
New logo and bug fix
...
* Added new logo
* Fixed credits scroll animation
2024-03-26 19:20:38 +00:00
a89f7b8161
Update Credits
2024-03-25 15:22:06 +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
b62b7bcc3a
Achievements System Tweaks for Ren'py 8.2.X
2024-03-25 14:39:35 +00:00
019ca9e9a9
Allow several achievements to be displayed at the same time
...
like in steam
the change to popup_animation is not thoroughly tested
(cherry picked from commit f714e482f6
2024-03-24 18:36:33 +00:00
f0c9aaa153
Rebase the achievements system on the builtin feature
...
a lot of work, but entirely backwards-compatible !
no visible change (no intended ones at least) except maybe performance
2024-03-24 18:36:29 +00:00
7071d30b82
Merge branch 'dev' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into dev
2024-03-24 18:25:59 +00:00
fbbb7f5665
Luna Talk to me CG Posing PT 1
...
* Posed part of the event.
* Adjusted layer order.
2024-03-24 19:24:51 +01:00
0597621c54
Random Object Refactoring and a bug fix (by
...
Gouvernathor)
2024-03-24 18:18:34 +00:00
9a088d22e1
Fix 9ee1de9
...
(cherry picked from commit 5252c7eae2
2024-03-24 18:08:53 +00:00
ef17df3698
Make the wardrobe variables dynamic
...
(cherry picked from commit 9ee1de9fd0
2024-03-24 18:08:26 +00:00
ad2e009665
Change the spinner box character
...
(cherry picked from commit 902cf9b4d9
2024-03-24 18:03:24 +00:00
f871b036dd
Improve threading when predicting the wardrobe
...
don't use single-underscore names
if available, use the thread-safer invoke_in_main_thread (not required when setting the global variables)
set __lock to True outside of the thread, otherwise if the thread starts late, the while loop is skipped
call get_character_object in the main thread
(cherry picked from commit 7a25a13926
2024-03-24 18:02:19 +00:00
9d8444241b
Optimize choice screen constants and variables
...
(cherry picked from commit c77f2ca46e
2024-03-24 17:58:37 +00:00
606c9c55e0
Merge fix
2024-03-24 17:57:18 +00:00
d4726d3be2
Fix and improve big_bang (by
...
Gouvernathor)
the "on show" wasn't working for some reason and wasn't necessary anyway
easeout was probaly mixed up with easein, in any case easein renders much better
using easein_cubic for a sharper explosion
2024-03-24 17:56:01 +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
47da88a59e
Merge fix
2024-03-24 17:43:00 +00:00
51e2f49606
Avoid using an actual image reference instead of direct null
...
(cherry picked from commit f8251f921b
2024-03-24 17:42:32 +00:00
30747a50b0
Don't use mutables in signatures
...
(cherry picked from commit a88706142f
2024-03-24 17:42:22 +00:00
726406e11b
Simplify menu position
...
(cherry picked from commit 9479859edd
2024-03-24 17:40:49 +00:00
c3c0969be8
Sort inplace and skip unused variable
...
(cherry picked from commit e84d5cbdf0
2024-03-24 17:40:40 +00:00
d38d442688
Fix variable name and move defaults
...
(cherry picked from commit f6c0054be0
2024-03-24 17:40:26 +00:00
c5fb9a630c
Merge labels into menus
...
(cherry picked from commit a29b7ec28b
2024-03-24 17:39:16 +00:00
0d8c4df1fd
Remove mutable in signature and pop todo
...
(cherry picked from commit 15b15b9085
2024-03-24 17:38:39 +00:00
1e96385c47
Remove dependency
...
(cherry picked from commit 3fef941366
2024-03-24 17:35:59 +00:00
a516e76f9b
Better pass kwargs
...
this is not py2 anymore
(cherry picked from commit 6b2766e668
2024-03-24 17:34:17 +00:00
21c170e256
Don't use protected variable name
...
(cherry picked from commit 2f2a9b985b
2024-03-24 17:33:33 +00:00
93526daa17
Use scene statement instead of equivalent
...
(cherry picked from commit d132436843
2024-03-24 17:33:03 +00:00
7beb1e4c1d
Simplify and quicken summon list iteration
...
(cherry picked from commit 110847e9e6
2024-03-24 17:32:07 +00:00
d1345a051d
Make variables dynamic
...
or constant, in one case
(cherry picked from commit 1918def870
2024-03-24 17:31:21 +00:00
db26683c25
Internal tweaks
...
(cherry picked from commit d34a96284c
2024-03-24 17:31:05 +00:00
03d1c9a2c4
Improve and fix last
...
(cherry picked from commit acfb09516c
2024-03-24 17:29:54 +00:00
9665d565d8
Replace show screen with call screen
...
(cherry picked from commit 1672b2381a
2024-03-24 17:29:12 +00:00
f2d2c045af
Factorize pos
...
(cherry picked from commit e242c0e43a
2024-03-24 17:28:39 +00:00
f99c81b14a
Factorize pos
...
(cherry picked from commit d7c8e39b08
2024-03-24 17:28:29 +00:00
7e3a078dce
Avoid single-use function
...
(cherry picked from commit 313849696c
2024-03-24 17:27:50 +00:00
3579e2a38b
Add safe return
...
otherwise the implicit return is at the end of the file, which means if we add another label down the file, it will be executed after give_gift
(cherry picked from commit 38787bdc4c
2024-03-24 17:27:12 +00:00
f78c269fc8
Add data privacy when computing house points
...
the dynamic variables are needed for the show screen call
(cherry picked from commit aefa88e4d2
2024-03-24 17:26:57 +00:00
20c00bbc74
merge fix
2024-03-24 17:26:42 +00:00
19d81fa9b8
Bug Fixes
2024-03-24 17:17:19 +00:00
26ecf0e6f0
Use a grid for the inventory
...
(cherry picked from commit c1ab7f7b85
2024-03-24 17:06:17 +00:00
6860614062
Use the correct operator(s) for None
...
(cherry picked from commit 837d6b378e
2024-03-24 17:06:06 +00:00
d17b04e93d
Better text interpolation in screens
...
(cherry picked from commit 14607f2eb1
2024-03-24 17:04:58 +00:00
d063d7fc5f
Simplify crop_image_zoom calls
...
(cherry picked from commit def10a09ac
2024-03-24 17:04:05 +00:00
a5b47a41e7
Remove get_zoom and use builtin fit feature
...
using renpy.render, wtf
(cherry picked from commit 3278b1f4af
2024-03-24 17:01:46 +00:00
dbfb22b566
Fix 070d14a
...
(cherry picked from commit ed2a817c84
2024-03-24 17:01:18 +00:00
815c90109b
Use inplace sort and generator expressions
...
(cherry picked from commit 87ce17df8b
2024-03-24 17:01:11 +00:00
675839d28e
Re-enable some menu yaligns and reimplement menu sets
...
these menu yaligns had been disabled for a long time (the menu_y variable was never read)
(cherry picked from commit eae844ef0b
2024-03-24 17:01:04 +00:00
84f3473bf0
Remove unused xalign
...
(cherry picked from commit 070d14a685
2024-03-24 17:00:54 +00:00
d1aaeb157e
Separate xalign and yalign
...
(cherry picked from commit a36c0ba222
2024-03-24 17:00:44 +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
