Commit Graph

824 Commits

Author SHA1 Message Date
19d81fa9b8 Bug Fixes 2024-03-24 17:17:19 +00:00
26ecf0e6f0 Use a grid for the inventory
(cherry picked from commit c1ab7f7b85f153b174be6ad7bfa564880a639953)
2024-03-24 17:06:17 +00:00
6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e02b1a17b1154bf104d52cb5c21a2f3)
2024-03-24 17:06:06 +00:00
d17b04e93d Better text interpolation in screens
(cherry picked from commit 14607f2eb1b46c679305d4f00b3513fdb9bf3bf0)
2024-03-24 17:04:58 +00:00
d063d7fc5f Simplify crop_image_zoom calls
(cherry picked from commit def10a09acabedff27a7d4c85c05bffda6ae68c7)
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 3278b1f4afdb9ce887cdac0e87c28a61b974a737)
2024-03-24 17:01:46 +00:00
dbfb22b566 Fix 070d14a
(cherry picked from commit ed2a817c842ebaa56ea75508532660a66256ea87)
2024-03-24 17:01:18 +00:00
815c90109b Use inplace sort and generator expressions
(cherry picked from commit 87ce17df8b0dedfd9fc8d0cc2f16a9c28c3e6f0b)
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 eae844ef0ba31c67b6c2ae5a5a5bd1e33da67b58)
2024-03-24 17:01:04 +00:00
84f3473bf0 Remove unused xalign
(cherry picked from commit 070d14a685f625557548a29cd15e6d3e6d972252)
2024-03-24 17:00:54 +00:00
d1aaeb157e Separate xalign and yalign
(cherry picked from commit a36c0ba2221c3257bf7c58c81db53fe443fd9600)
2024-03-24 17:00:44 +00:00
fa3e1e4450 Refactor states.menu_pos and remove reset_menu_position
(cherry picked from commit fbe8035c43eadcced7ab3fd1ed8b57613ec0562c)
2024-03-24 17:00:35 +00:00
d01f9ec1f1 Use statement instead of equivalent
(cherry picked from commit c3f753a460dda577fa3bad4724673b58c7956c92)
2024-03-24 16:59:19 +00:00
91019374f5 Avoid circular reference
(cherry picked from commit db30cd66d33502161bb90939516782761283c06e)
2024-03-24 16:59:11 +00:00
ba9865ab70 Make the rotate animation subpixel
(cherry picked from commit 4b8371e29285894ec6942b47a0380c8a64601894)
2024-03-24 16:58:19 +00:00
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 48c4c4ecad44402bff76e3b4dbafeeda5424b6af)
2024-03-24 16:57:40 +00:00
2255d028e1 Remove unnecessary screen variable
(cherry picked from commit b222860bec0b6ed6f4210239a51c4c572c3e597d)
2024-03-24 16:57:03 +00:00
fd50b5d05a Save calling update_character_map_locations several times
(cherry picked from commit c64635aacea784e02c96b2565edf160ac450d842)
2024-03-24 16:56:51 +00:00
38fa26e5bf replace equivalent with statement
(cherry picked from commit ef62f74eedc1ba690544ba7eb4a1a901c1cb7c85)
2024-03-24 16:56:35 +00:00
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 9a3fe1df6538977ac4f44122b64574138422f119)
2024-03-24 16:51:27 +00:00
fb69dfa676 Use statements instead of equivalents
(cherry picked from commit 77e40301c9b8f15dc84d702d324ff3cf171d9057)
2024-03-24 16:50:52 +00:00
ff49d9fa95 Avoid circular reference
it clogs pickling and garbage-collecting

(cherry picked from commit 42f690f966d6993ffb3075021dceac97fb229147)
2024-03-24 16:49:22 +00:00
fe5a7402a9 No it doesn't
(cherry picked from commit 884c264f040765e8124bb997b313e989fe0b799f)
2024-03-24 16:48:49 +00:00
b34dc20901 Better text in screens
(cherry picked from commit 23a264c8f476a126ab4482a4394a4cb6422ed93b)
2024-03-24 16:48:21 +00:00
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 32cf1de3a0eaa901f2ba3df99589b6842d6a550b)
2024-03-24 16:39:50 +00:00
be9f071660 Clean most stats variables from the global store
(cherry picked from commit c493a4b9aa45ae4aa619a9edbb09bc0e5bea98b3)
2024-03-24 16:37:10 +00:00
202807e320 Fix genie reform
(cherry picked from commit 1618fc378ffcc3d8b76691ed3cf7acf6eb3b1200)
2024-03-24 16:36:29 +00:00
0a6b5e41df Use define for constants
(cherry picked from commit bbc1df1ea67e6fa2de6042f20153189470aa49b7)
2024-03-24 16:36:03 +00:00
c908f2e90b Further clean junk variable
(cherry picked from commit ca64492beba5aa37458c8118b90fe9d75e8511b6)
2024-03-24 16:35:37 +00:00
3a77f89fab Add style, clean junk variables
(cherry picked from commit 3d62c8b8181911572efa471f26906cbffe5b8ffd)
2024-03-24 16:35:23 +00:00
993b5c845a Simplify function
(cherry picked from commit bb2edc9a7bca99da2286b402aadad8b64a610335)
2024-03-24 16:35:13 +00:00
0e9dae05bd Use repr instead of manually added single quotes
(cherry picked from commit 2ccece1a3de0dc5595d4adf8b49fe4a681733d63)
2024-03-24 16:34:56 +00:00
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 8b6627f588fc4a3049c77f5bf9bb0d18f2ec9d6e)
2024-03-24 16:31:08 +00:00
00da7e8855 Simplify generic CG code
(cherry picked from commit 40ddb2918515cee48114cdada4cdb79d6535db6f)
2024-03-24 16:30:26 +00:00
d7ba36baa8 Better animation
(cherry picked from commit aa95f701dc2cc372e31b119c5e935a90e9cd4a9b)
2024-03-24 16:30:03 +00:00
2a54c483e8 Simplify some code
(cherry picked from commit 641893217e8c52ee1dac4aedc097e300fa71e4f4)
2024-03-24 16:29:45 +00:00
4ee49a225b Reform genie layeredimage
(cherry picked from commit 3a429070fc8519900e02cec972363fe79f760825)
2024-03-24 16:27:26 +00:00
603990cf13 Repr instead of adding quotes
(cherry picked from commit 15e3e240fc29ae4003ac4b32c801f11f7af4f741)
2024-03-24 16:26:07 +00:00
97f0cef931 Simplify hide/show expression
(cherry picked from commit 9c274bee6f37cd44a86ec1267bb5f34859a83403)
2024-03-24 16:25:50 +00:00
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 eeb68cb6c67beb1f50b4ae98ea9510f55dd52802)
2024-03-24 16:25:06 +00:00
60479ad32d Avoid using reset_variables
(cherry picked from commit 2e17dd258223bdecbacbc415eb307fcc54ac2401)
2024-03-24 16:23:38 +00:00
094b010b7a Avoid using lists
(cherry picked from commit 78230893a8de70ea443e4e6730c0516fb651d4fb)
2024-03-24 16:22:53 +00:00
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 3b6dd38e195b997d8f569957d87d657a28ddf54c)
2024-03-24 16:21:28 +00:00
3b4db03a6c Upgrade other uses of image manipulators
(cherry picked from commit a9dc1953793591578fe807e2aca551ab84509050)
2024-03-24 16:20:23 +00:00
0e4fccfa26 Modernize use of matrixcolor
(cherry picked from commit 985a0a79ede816783f2a0f59f238509013a3f25f)
2024-03-24 16:20:04 +00:00
fe0193cfc2 Hasten ConditionSwitch-es
(cherry picked from commit 9d52bd9c92edbd7525cfdb27a1d36437cdd6ac76)
2024-03-24 16:19:37 +00:00
0c564a521b Use expression instead of image
the only documented lingua
this is AST-equivalent

(cherry picked from commit 542db72609883b59d66f35db9178839d972288d7)
2024-03-24 16:19:01 +00:00
11047626e1 Factorize jumps in the elif
(cherry picked from commit 6dc1a048109f88a1b0c51a1ed3692fdfd69312d8)
2024-03-24 16:17:29 +00:00
67e589f47f Hasten elif chain
avoid reevaluating the choice equality

(cherry picked from commit 9b419fcbc3dce2238107cf4cb0fbbc5508df8584)
2024-03-24 16:17:14 +00:00
482969eaae Use renpy statement instead of python equivalent
(cherry picked from commit 976455bfc9f311439f655d6a737f4dd8032d314f)
2024-03-24 16:16:11 +00:00