Commit Graph

817 Commits

Author SHA1 Message Date
LoafyLemon dcb2f30348 Bugfix
* Fixed another layering issue
2024-03-27 16:28:35 +00:00
LoafyLemon fffdc788a2 Bug fix
* Fixed breast layer order for 'Talk To Me' CG.
2024-03-27 16:20:57 +00:00
LoafyLemon a91e0efe72 Wetness layers
* Added wetness layers for 'Talk To Me' CG.
2024-03-27 16:12:09 +00:00
LoafyLemon 6176e0cdda Cum layers
* Added cum layers for 'Talk To Me' CG.
2024-03-27 15:47:35 +00:00
Johnny28 ee23310ae0 Refactoring
* Removed old Luna chibi animations.
* Minor text edits.
2024-03-27 16:04:38 +01:00
LoafyLemon c56404b169 Refactoring
* Removed no longer required chibi edits.
2024-03-27 14:49:16 +00:00
LoafyLemon 6d6f58538e Bug fixes
* Fixed presplash loading bar
* Disabled sparkle in title animation
2024-03-26 19:34:11 +00:00
LoafyLemon d25cd0fc2a New logo and bug fix
* Added new logo
* Fixed credits scroll animation
2024-03-26 19:20:38 +00:00
LoafyLemon a89f7b8161 Update Credits 2024-03-25 15:22:06 +00:00
LoafyLemon 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
LoafyLemon b62b7bcc3a Achievements System Tweaks for Ren'py 8.2.X 2024-03-25 14:39:35 +00:00
Gouvernathor 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
Gouvernathor 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
LoafyLemon 7071d30b82 Merge branch 'dev' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into dev 2024-03-24 18:25:59 +00:00
Johnny28 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
LoafyLemon 0597621c54 Random Object Refactoring and a bug fix (by
Gouvernathor)
2024-03-24 18:18:34 +00:00
Gouvernathor 9a088d22e1 Fix 9ee1de9
(cherry picked from commit 5252c7eae2)
2024-03-24 18:08:53 +00:00
Gouvernathor ef17df3698 Make the wardrobe variables dynamic
(cherry picked from commit 9ee1de9fd0)
2024-03-24 18:08:26 +00:00
Gouvernathor ad2e009665 Change the spinner box character
(cherry picked from commit 902cf9b4d9)
2024-03-24 18:03:24 +00:00
Gouvernathor 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
Gouvernathor 9d8444241b Optimize choice screen constants and variables
(cherry picked from commit c77f2ca46e)
2024-03-24 17:58:37 +00:00
LoafyLemon 606c9c55e0 Merge fix 2024-03-24 17:57:18 +00:00
LoafyLemon 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
LoafyLemon 26b1e7f051 Fix weather storm and create the weather image tag (by
Gouvernathor)
2024-03-24 17:54:06 +00:00
LoafyLemon 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
Gouvernathor 47da88a59e Merge fix 2024-03-24 17:43:00 +00:00
Gouvernathor 51e2f49606 Avoid using an actual image reference instead of direct null
(cherry picked from commit f8251f921b)
2024-03-24 17:42:32 +00:00
Gouvernathor 30747a50b0 Don't use mutables in signatures
(cherry picked from commit a88706142f)
2024-03-24 17:42:22 +00:00
Gouvernathor 726406e11b Simplify menu position
(cherry picked from commit 9479859edd)
2024-03-24 17:40:49 +00:00
Gouvernathor c3c0969be8 Sort inplace and skip unused variable
(cherry picked from commit e84d5cbdf0)
2024-03-24 17:40:40 +00:00
Gouvernathor d38d442688 Fix variable name and move defaults
(cherry picked from commit f6c0054be0)
2024-03-24 17:40:26 +00:00
Gouvernathor c5fb9a630c Merge labels into menus
(cherry picked from commit a29b7ec28b)
2024-03-24 17:39:16 +00:00
Gouvernathor 0d8c4df1fd Remove mutable in signature and pop todo
(cherry picked from commit 15b15b9085)
2024-03-24 17:38:39 +00:00
Gouvernathor 1e96385c47 Remove dependency
(cherry picked from commit 3fef941366)
2024-03-24 17:35:59 +00:00
Gouvernathor a516e76f9b Better pass kwargs
this is not py2 anymore

(cherry picked from commit 6b2766e668)
2024-03-24 17:34:17 +00:00
Gouvernathor 21c170e256 Don't use protected variable name
(cherry picked from commit 2f2a9b985b)
2024-03-24 17:33:33 +00:00
Gouvernathor 93526daa17 Use scene statement instead of equivalent
(cherry picked from commit d132436843)
2024-03-24 17:33:03 +00:00
Gouvernathor 7beb1e4c1d Simplify and quicken summon list iteration
(cherry picked from commit 110847e9e6)
2024-03-24 17:32:07 +00:00
Gouvernathor d1345a051d Make variables dynamic
or constant, in one case

(cherry picked from commit 1918def870)
2024-03-24 17:31:21 +00:00
Gouvernathor db26683c25 Internal tweaks
(cherry picked from commit d34a96284c)
2024-03-24 17:31:05 +00:00
Gouvernathor 03d1c9a2c4 Improve and fix last
(cherry picked from commit acfb09516c)
2024-03-24 17:29:54 +00:00
Gouvernathor 9665d565d8 Replace show screen with call screen
(cherry picked from commit 1672b2381a)
2024-03-24 17:29:12 +00:00
Gouvernathor f2d2c045af Factorize pos
(cherry picked from commit e242c0e43a)
2024-03-24 17:28:39 +00:00
Gouvernathor f99c81b14a Factorize pos
(cherry picked from commit d7c8e39b08)
2024-03-24 17:28:29 +00:00
Gouvernathor 7e3a078dce Avoid single-use function
(cherry picked from commit 313849696c)
2024-03-24 17:27:50 +00:00
Gouvernathor 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
Gouvernathor 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
Gouvernathor 20c00bbc74 merge fix 2024-03-24 17:26:42 +00:00
Gouvernathor 19d81fa9b8 Bug Fixes 2024-03-24 17:17:19 +00:00
Gouvernathor 26ecf0e6f0 Use a grid for the inventory
(cherry picked from commit c1ab7f7b85)
2024-03-24 17:06:17 +00:00
Gouvernathor 6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e)
2024-03-24 17:06:06 +00:00
Gouvernathor d17b04e93d Better text interpolation in screens
(cherry picked from commit 14607f2eb1)
2024-03-24 17:04:58 +00:00
Gouvernathor d063d7fc5f Simplify crop_image_zoom calls
(cherry picked from commit def10a09ac)
2024-03-24 17:04:05 +00:00
Gouvernathor 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
Gouvernathor dbfb22b566 Fix 070d14a
(cherry picked from commit ed2a817c84)
2024-03-24 17:01:18 +00:00
Gouvernathor 815c90109b Use inplace sort and generator expressions
(cherry picked from commit 87ce17df8b)
2024-03-24 17:01:11 +00:00
Gouvernathor 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
Gouvernathor 84f3473bf0 Remove unused xalign
(cherry picked from commit 070d14a685)
2024-03-24 17:00:54 +00:00
Gouvernathor d1aaeb157e Separate xalign and yalign
(cherry picked from commit a36c0ba222)
2024-03-24 17:00:44 +00:00
Gouvernathor fa3e1e4450 Refactor states.menu_pos and remove reset_menu_position
(cherry picked from commit fbe8035c43)
2024-03-24 17:00:35 +00:00
Gouvernathor d01f9ec1f1 Use statement instead of equivalent
(cherry picked from commit c3f753a460)
2024-03-24 16:59:19 +00:00
Gouvernathor 91019374f5 Avoid circular reference
(cherry picked from commit db30cd66d3)
2024-03-24 16:59:11 +00:00
Gouvernathor ba9865ab70 Make the rotate animation subpixel
(cherry picked from commit 4b8371e292)
2024-03-24 16:58:19 +00:00
Gouvernathor a893892ecf Fix and simplify the map
in addition to benigh simplification, this actually fixes a bug : setting pos and align in the same line is a bug, it's always been unspecified, you should have been setting *anchor* instead. xycenter does that now.

(cherry picked from commit 48c4c4ecad)
2024-03-24 16:57:40 +00:00
Gouvernathor 2255d028e1 Remove unnecessary screen variable
(cherry picked from commit b222860bec)
2024-03-24 16:57:03 +00:00
Gouvernathor fd50b5d05a Save calling update_character_map_locations several times
(cherry picked from commit c64635aace)
2024-03-24 16:56:51 +00:00
Gouvernathor 38fa26e5bf replace equivalent with statement
(cherry picked from commit ef62f74eed)
2024-03-24 16:56:35 +00:00
Gouvernathor 066f007e63 Reform random map locations
the locations of the different characters aren't independant, but they weren't in the first place

(cherry picked from commit 9a3fe1df65)
2024-03-24 16:51:27 +00:00
Gouvernathor fb69dfa676 Use statements instead of equivalents
(cherry picked from commit 77e40301c9)
2024-03-24 16:50:52 +00:00
Gouvernathor ff49d9fa95 Avoid circular reference
it clogs pickling and garbage-collecting

(cherry picked from commit 42f690f966)
2024-03-24 16:49:22 +00:00
Gouvernathor fe5a7402a9 No it doesn't
(cherry picked from commit 884c264f04)
2024-03-24 16:48:49 +00:00
Gouvernathor b34dc20901 Better text in screens
(cherry picked from commit 23a264c8f4)
2024-03-24 16:48:21 +00:00
Gouvernathor 9ea4431f0e Auto-cleanup public variables
I chose not to add them directly in the screen, to keep it readable
but even though they're still global variables, now they are dynamic and cleaned as soon as we exit the menu

(cherry picked from commit 32cf1de3a0)
2024-03-24 16:39:50 +00:00
Gouvernathor be9f071660 Clean most stats variables from the global store
(cherry picked from commit c493a4b9aa)
2024-03-24 16:37:10 +00:00
Gouvernathor 202807e320 Fix genie reform
(cherry picked from commit 1618fc378f)
2024-03-24 16:36:29 +00:00
Gouvernathor 0a6b5e41df Use define for constants
(cherry picked from commit bbc1df1ea6)
2024-03-24 16:36:03 +00:00
Gouvernathor c908f2e90b Further clean junk variable
(cherry picked from commit ca64492beb)
2024-03-24 16:35:37 +00:00
Gouvernathor 3a77f89fab Add style, clean junk variables
(cherry picked from commit 3d62c8b818)
2024-03-24 16:35:23 +00:00
Gouvernathor 993b5c845a Simplify function
(cherry picked from commit bb2edc9a7b)
2024-03-24 16:35:13 +00:00
Gouvernathor 0e9dae05bd Use repr instead of manually added single quotes
(cherry picked from commit 2ccece1a3d)
2024-03-24 16:34:56 +00:00
Gouvernathor 4248f7f6d0 Improve ATL syntax
use the dedicated xycenter property
avoid setting the previous end-interpolation values before starting the new one, to avoid a jump if the player advances too quickly (also shortens the code)
add subpixel True, even though it doesn't seem very effective
prepare improvement in next renpy version

(cherry picked from commit 8b6627f588)
2024-03-24 16:31:08 +00:00
Gouvernathor 00da7e8855 Simplify generic CG code
(cherry picked from commit 40ddb29185)
2024-03-24 16:30:26 +00:00
Gouvernathor d7ba36baa8 Better animation
(cherry picked from commit aa95f701dc)
2024-03-24 16:30:03 +00:00
Gouvernathor 2a54c483e8 Simplify some code
(cherry picked from commit 641893217e)
2024-03-24 16:29:45 +00:00
Gouvernathor 4ee49a225b Reform genie layeredimage
(cherry picked from commit 3a429070fc)
2024-03-24 16:27:26 +00:00
Gouvernathor 603990cf13 Repr instead of adding quotes
(cherry picked from commit 15e3e240fc)
2024-03-24 16:26:07 +00:00
Gouvernathor 97f0cef931 Simplify hide/show expression
(cherry picked from commit 9c274bee6f)
2024-03-24 16:25:50 +00:00
Gouvernathor 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
Gouvernathor 60479ad32d Avoid using reset_variables
(cherry picked from commit 2e17dd2582)
2024-03-24 16:23:38 +00:00
Gouvernathor 094b010b7a Avoid using lists
(cherry picked from commit 78230893a8)
2024-03-24 16:22:53 +00:00
Gouvernathor 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
Gouvernathor 3b4db03a6c Upgrade other uses of image manipulators
(cherry picked from commit a9dc195379)
2024-03-24 16:20:23 +00:00
Gouvernathor 0e4fccfa26 Modernize use of matrixcolor
(cherry picked from commit 985a0a79ed)
2024-03-24 16:20:04 +00:00
Gouvernathor fe0193cfc2 Hasten ConditionSwitch-es
(cherry picked from commit 9d52bd9c92)
2024-03-24 16:19:37 +00:00
Gouvernathor 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
Gouvernathor 11047626e1 Factorize jumps in the elif
(cherry picked from commit 6dc1a04810)
2024-03-24 16:17:29 +00:00
Gouvernathor 67e589f47f Hasten elif chain
avoid reevaluating the choice equality

(cherry picked from commit 9b419fcbc3)
2024-03-24 16:17:14 +00:00
Gouvernathor 482969eaae Use renpy statement instead of python equivalent
(cherry picked from commit 976455bfc9)
2024-03-24 16:16:11 +00:00
Gouvernathor 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
Gouvernathor f941b77409 Convert ball_hint to a screen variable
no leak

(cherry picked from commit 4ec94d28f5)
2024-03-24 16:14:45 +00:00