Commit Graph

778 Commits

Author SHA1 Message Date
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