Merge branch 'dev' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into dev

Random Object Refactoring and a bug fix (by
Gouvernathor)
2024-03-24 18:25:59 +00:00 · 2024-03-24 18:18:34 +00:00 · 2024-03-24 18:08:53 +00:00 · 2024-03-24 18:08:26 +00:00 · 2024-03-24 18:03:24 +00:00 · 2024-03-24 18:02:19 +00:00
109 changed files with 1291 additions and 1404 deletions
--- a/game/characters/genie/outfits/robes_beard.webp
+++ b/game/characters/genie/outfits/robes_beard.webp
--- a/game/images/characters/genie/genie_bbase.webp
+++ b/game/images/characters/genie/genie_bbase.webp
--- a/game/images/characters/genie/genie_face_angry.webp
+++ b/game/images/characters/genie/genie_face_angry.webp
--- a/game/images/characters/genie/genie_face_grin.webp
+++ b/game/images/characters/genie/genie_face_grin.webp
--- a/game/images/characters/genie/genie_face_open.webp
+++ b/game/images/characters/genie/genie_face_open.webp
--- a/game/images/characters/genie/genie_face_smile.webp
+++ b/game/images/characters/genie/genie_face_smile.webp
--- a/game/images/characters/genie/genie_goatee.webp
+++ b/game/images/characters/genie/genie_goatee.webp
--- a/game/images/characters/genie/genie_outfit_nude.webp
+++ b/game/images/characters/genie/genie_outfit_nude.webp
--- a/game/images/characters/genie/genie_outfit_robes.webp
+++ b/game/images/characters/genie/genie_outfit_robes.webp
--- a/game/images/characters/genie/genie_outfit_santa.webp
+++ b/game/images/characters/genie/genie_outfit_santa.webp
--- a/game/images/characters/genie/genie_santa_beard_angry.webp
+++ b/game/images/characters/genie/genie_santa_beard_angry.webp
--- a/game/images/characters/genie/genie_santa_beard_base.webp
+++ b/game/images/characters/genie/genie_santa_beard_base.webp
--- a/game/images/characters/genie/genie_santa_beard_grin.webp
+++ b/game/images/characters/genie/genie_santa_beard_grin.webp
--- a/game/images/characters/genie/genie_santa_beard_open.webp
+++ b/game/images/characters/genie/genie_santa_beard_open.webp
--- a/game/images/characters/genie/genie_santa_beard_smile.webp
+++ b/game/images/characters/genie/genie_santa_beard_smile.webp
--- a/game/images/rooms/main_room/weather/lightning_01.webp
+++ b/game/images/rooms/main_room/weather/lightning_01.webp
--- a/game/images/rooms/main_room/weather/lightning_05.webp
+++ b/game/images/rooms/main_room/weather/lightning_05.webp
--- a/game/scripts/animations/ani_astoria.rpy
+++ b/game/scripts/animations/ani_astoria.rpy
@ -88,11 +88,11 @@ image ch_ast wand_imperio:
        random_blink("characters/astoria/chibis/wand_imperio/ag_head_02.webp", "characters/astoria/chibis/wand_imperio/ag_head_01.webp")

    contains:
-        "blank"
+        Null()
        pause.12
        "characters/astoria/chibis/wand_imperio/ag_head_03.webp"
        pause 1
-        "blank"
+        Null()

    contains:
        xpos 78
@ -113,7 +113,7 @@ image ch_ast wand_imperio:
        alpha 1.0
        "characters/astoria/chibis/wand_imperio/smoke.webp"
        linear 1.0 xzoom 1.0 xpos -34 ypos 37
-        "blank"
+        Null()

    contains:
        xpos -34
--- a/game/scripts/animations/generator.rpy
+++ b/game/scripts/animations/generator.rpy
@ -1,8 +1,6 @@
-image object:
-    Null()
-
 transform OBJbutterfly(hue=random.randint(0, 359)):
    zoom random.uniform(0.4, 0.85)
+    matrixcolor HueMatrix(hue)

    choice:
        pause random.randint(1, 7)
@ -22,13 +20,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
            ease_circ 1.0 rotate 15
            repeat
        parallel:
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/0.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/2.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
            repeat
    choice:
@ -49,13 +47,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
            ease_circ 1.0 rotate -15
            repeat
        parallel:
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/0.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/2.webp" with d3
            pause .3
-            im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
+            "images/rooms/quidditch_pitch/butterfly/1.webp" with d3
            pause .3
            repeat
    repeat
--- a/game/scripts/cg/common.rpy
+++ b/game/scripts/cg/common.rpy
@ -1,4 +1,3 @@
-
 init 5 python:
    def her_cg_doll(st, at):
        return hermione.image, None
@ -25,35 +24,21 @@ image CG cho_doll = DynamicDisplayable(cho_cg_doll)
 image CG ast_doll = DynamicDisplayable(ast_cg_doll)
 image CG sus_doll = DynamicDisplayable(sus_cg_doll)

-image CG luna = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG lun_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
+transform CG_masker(child):
+    contains:
+        "images/CG/common/bg.webp"
+    contains:
+        AlphaMask(
+            Fixed(Transform(child, zoom=1.2, pos=(880, -180)), xfit=True, yfit=True),
+            "images/CG/common/mask.webp",
+        )

-image CG hermione = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG her_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
-
-image CG tonks = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG ton_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
-
-image CG cho = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG cho_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
-
-image CG astoria = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG ast_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
-
-image CG susan = Fixed(
-    "images/CG/common/bg.webp",
-    AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG sus_doll", zoom=1.2)), "images/CG/common/mask.webp"),
-    )
+image CG luna = At("CG lun_doll", CG_masker)
+image CG hermione = At("CG her_doll", CG_masker)
+image CG tonks = At("CG ton_doll", CG_masker)
+image CG cho = At("CG cho_doll", CG_masker)
+image CG astoria = At("CG ast_doll", CG_masker)
+image CG susan = At("CG sus_doll", CG_masker)

 # Snape CG
 screen snape_groping():
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
LoafyLemon	7071d30b82	Merge branch 'dev' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into dev	2024-03-24 18:25:59 +00: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 5252c7eae291bd2e29681ffbe705295adb3dacf0)	2024-03-24 18:08:53 +00:00
Gouvernathor	ef17df3698	Make the wardrobe variables dynamic (cherry picked from commit 9ee1de9fd05225dfb2d13fc9d1ec01f286305894)	2024-03-24 18:08:26 +00:00
Gouvernathor	ad2e009665	Change the spinner box character (cherry picked from commit 902cf9b4d96270561256c547907e138104180f97)	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 7a25a13926cd40e7f657f6336062aa48255b4b64)	2024-03-24 18:02:19 +00:00
Gouvernathor	9d8444241b	Optimize choice screen constants and variables (cherry picked from commit c77f2ca46e405a95f5fab6af75bfd4ae348f0a3d)	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 f8251f921b6287030a506b7906eadcb91fc94d30)	2024-03-24 17:42:32 +00:00
Gouvernathor	30747a50b0	Don't use mutables in signatures (cherry picked from commit a88706142f7322c85a8b63163e0e16c46113475e)	2024-03-24 17:42:22 +00:00
Gouvernathor	726406e11b	Simplify menu position (cherry picked from commit 9479859eddefa1465b0c28e4eb71ce95ffac59f3)	2024-03-24 17:40:49 +00:00
Gouvernathor	c3c0969be8	Sort inplace and skip unused variable (cherry picked from commit e84d5cbdf01f37cb8dd04920c06223fd52307f26)	2024-03-24 17:40:40 +00:00
Gouvernathor	d38d442688	Fix variable name and move defaults (cherry picked from commit f6c0054be03f0d2406a2d6c59e9a14ab3734992c)	2024-03-24 17:40:26 +00:00
Gouvernathor	c5fb9a630c	Merge labels into menus (cherry picked from commit a29b7ec28b6b1ab3894985822218368ea8acef04)	2024-03-24 17:39:16 +00:00
Gouvernathor	0d8c4df1fd	Remove mutable in signature and pop todo (cherry picked from commit 15b15b90858039461cf9290f652f4cb5fc387d1c)	2024-03-24 17:38:39 +00:00
Gouvernathor	1e96385c47	Remove dependency (cherry picked from commit 3fef9413662908223c262470c9285ec352c08998)	2024-03-24 17:35:59 +00:00
Gouvernathor	a516e76f9b	Better pass kwargs this is not py2 anymore (cherry picked from commit 6b2766e66852881a1f06d4b74b597d2c51feae75)	2024-03-24 17:34:17 +00:00
Gouvernathor	21c170e256	Don't use protected variable name (cherry picked from commit 2f2a9b985bd93955a9a2c87730024ead8145d725)	2024-03-24 17:33:33 +00:00
Gouvernathor	93526daa17	Use scene statement instead of equivalent (cherry picked from commit d132436843004f2009b3ff079e45f310606ef7f7)	2024-03-24 17:33:03 +00:00
Gouvernathor	7beb1e4c1d	Simplify and quicken summon list iteration (cherry picked from commit 110847e9e66a436d84279f41037dfb93e428f360)	2024-03-24 17:32:07 +00:00
Gouvernathor	d1345a051d	Make variables dynamic or constant, in one case (cherry picked from commit 1918def870d185cf970ca4904447b30424350f51)	2024-03-24 17:31:21 +00:00
Gouvernathor	db26683c25	Internal tweaks (cherry picked from commit d34a96284c179ef32aed145d1aa5838949d0c04a)	2024-03-24 17:31:05 +00:00
Gouvernathor	03d1c9a2c4	Improve and fix last (cherry picked from commit acfb09516ce125451a3ba87c1fad2e3b4013c897)	2024-03-24 17:29:54 +00:00
Gouvernathor	9665d565d8	Replace show screen with call screen (cherry picked from commit 1672b2381ac0afce864f8507fe3928297e3754f3)	2024-03-24 17:29:12 +00:00
Gouvernathor	f2d2c045af	Factorize pos (cherry picked from commit e242c0e43a2fb268c05a8c1a40d0a1b539712ac7)	2024-03-24 17:28:39 +00:00
Gouvernathor	f99c81b14a	Factorize pos (cherry picked from commit d7c8e39b08b41a28abd2a05b0b4d6870c3b230ff)	2024-03-24 17:28:29 +00:00
Gouvernathor	7e3a078dce	Avoid single-use function (cherry picked from commit 313849696cc6416bdc17f595a3ec94703c354e5d)	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 38787bdc4c76b87be2c465b29412f93697a06f26)	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 aefa88e4d24483f5c1be51206d1ef5fe5044672e)	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 c1ab7f7b85f153b174be6ad7bfa564880a639953)	2024-03-24 17:06:17 +00:00
Gouvernathor	6860614062	Use the correct operator(s) for None (cherry picked from commit 837d6b378e02b1a17b1154bf104d52cb5c21a2f3)	2024-03-24 17:06:06 +00:00
Gouvernathor	d17b04e93d	Better text interpolation in screens (cherry picked from commit 14607f2eb1b46c679305d4f00b3513fdb9bf3bf0)	2024-03-24 17:04:58 +00:00
Gouvernathor	d063d7fc5f	Simplify crop_image_zoom calls (cherry picked from commit def10a09acabedff27a7d4c85c05bffda6ae68c7)	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 3278b1f4afdb9ce887cdac0e87c28a61b974a737)	2024-03-24 17:01:46 +00:00
Gouvernathor	dbfb22b566	Fix 070d14a (cherry picked from commit ed2a817c842ebaa56ea75508532660a66256ea87)	2024-03-24 17:01:18 +00:00
Gouvernathor	815c90109b	Use inplace sort and generator expressions (cherry picked from commit 87ce17df8b0dedfd9fc8d0cc2f16a9c28c3e6f0b)	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 eae844ef0ba31c67b6c2ae5a5a5bd1e33da67b58)	2024-03-24 17:01:04 +00:00
Gouvernathor	84f3473bf0	Remove unused xalign (cherry picked from commit 070d14a685f625557548a29cd15e6d3e6d972252)	2024-03-24 17:00:54 +00:00
Gouvernathor	d1aaeb157e	Separate xalign and yalign (cherry picked from commit a36c0ba2221c3257bf7c58c81db53fe443fd9600)	2024-03-24 17:00:44 +00:00
Gouvernathor	fa3e1e4450	Refactor states.menu_pos and remove reset_menu_position (cherry picked from commit fbe8035c43eadcced7ab3fd1ed8b57613ec0562c)	2024-03-24 17:00:35 +00:00
Gouvernathor	d01f9ec1f1	Use statement instead of equivalent (cherry picked from commit c3f753a460dda577fa3bad4724673b58c7956c92)	2024-03-24 16:59:19 +00:00
Gouvernathor	91019374f5	Avoid circular reference (cherry picked from commit db30cd66d33502161bb90939516782761283c06e)	2024-03-24 16:59:11 +00:00
Gouvernathor	ba9865ab70	Make the rotate animation subpixel (cherry picked from commit 4b8371e29285894ec6942b47a0380c8a64601894)	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 48c4c4ecad44402bff76e3b4dbafeeda5424b6af)	2024-03-24 16:57:40 +00:00
Gouvernathor	2255d028e1	Remove unnecessary screen variable (cherry picked from commit b222860bec0b6ed6f4210239a51c4c572c3e597d)	2024-03-24 16:57:03 +00:00
Gouvernathor	fd50b5d05a	Save calling update_character_map_locations several times (cherry picked from commit c64635aacea784e02c96b2565edf160ac450d842)	2024-03-24 16:56:51 +00:00
Gouvernathor	38fa26e5bf	replace equivalent with statement (cherry picked from commit ef62f74eedc1ba690544ba7eb4a1a901c1cb7c85)	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 9a3fe1df6538977ac4f44122b64574138422f119)	2024-03-24 16:51:27 +00:00
Gouvernathor	fb69dfa676	Use statements instead of equivalents (cherry picked from commit 77e40301c9b8f15dc84d702d324ff3cf171d9057)	2024-03-24 16:50:52 +00:00
Gouvernathor	ff49d9fa95	Avoid circular reference it clogs pickling and garbage-collecting (cherry picked from commit 42f690f966d6993ffb3075021dceac97fb229147)	2024-03-24 16:49:22 +00:00
Gouvernathor	fe5a7402a9	No it doesn't (cherry picked from commit 884c264f040765e8124bb997b313e989fe0b799f)	2024-03-24 16:48:49 +00:00
Gouvernathor	b34dc20901	Better text in screens (cherry picked from commit 23a264c8f476a126ab4482a4394a4cb6422ed93b)	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 32cf1de3a0eaa901f2ba3df99589b6842d6a550b)	2024-03-24 16:39:50 +00:00
Gouvernathor	be9f071660	Clean most stats variables from the global store (cherry picked from commit c493a4b9aa45ae4aa619a9edbb09bc0e5bea98b3)	2024-03-24 16:37:10 +00:00
Gouvernathor	202807e320	Fix genie reform (cherry picked from commit 1618fc378ffcc3d8b76691ed3cf7acf6eb3b1200)	2024-03-24 16:36:29 +00:00
Gouvernathor	0a6b5e41df	Use define for constants (cherry picked from commit bbc1df1ea67e6fa2de6042f20153189470aa49b7)	2024-03-24 16:36:03 +00:00
Gouvernathor	c908f2e90b	Further clean junk variable (cherry picked from commit ca64492beba5aa37458c8118b90fe9d75e8511b6)	2024-03-24 16:35:37 +00:00
Gouvernathor	3a77f89fab	Add style, clean junk variables (cherry picked from commit 3d62c8b8181911572efa471f26906cbffe5b8ffd)	2024-03-24 16:35:23 +00:00
Gouvernathor	993b5c845a	Simplify function (cherry picked from commit bb2edc9a7bca99da2286b402aadad8b64a610335)	2024-03-24 16:35:13 +00:00
Gouvernathor	0e9dae05bd	Use repr instead of manually added single quotes (cherry picked from commit 2ccece1a3de0dc5595d4adf8b49fe4a681733d63)	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 8b6627f588fc4a3049c77f5bf9bb0d18f2ec9d6e)	2024-03-24 16:31:08 +00:00
Gouvernathor	00da7e8855	Simplify generic CG code (cherry picked from commit 40ddb2918515cee48114cdada4cdb79d6535db6f)	2024-03-24 16:30:26 +00:00
Gouvernathor	d7ba36baa8	Better animation (cherry picked from commit aa95f701dc2cc372e31b119c5e935a90e9cd4a9b)	2024-03-24 16:30:03 +00:00
Gouvernathor	2a54c483e8	Simplify some code (cherry picked from commit 641893217e8c52ee1dac4aedc097e300fa71e4f4)	2024-03-24 16:29:45 +00:00
Gouvernathor	4ee49a225b	Reform genie layeredimage (cherry picked from commit 3a429070fc8519900e02cec972363fe79f760825)	2024-03-24 16:27:26 +00:00
Gouvernathor	603990cf13	Repr instead of adding quotes (cherry picked from commit 15e3e240fc29ae4003ac4b32c801f11f7af4f741)	2024-03-24 16:26:07 +00:00
Gouvernathor	97f0cef931	Simplify hide/show expression (cherry picked from commit 9c274bee6f37cd44a86ec1267bb5f34859a83403)	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 eeb68cb6c67beb1f50b4ae98ea9510f55dd52802)	2024-03-24 16:25:06 +00:00
Gouvernathor	60479ad32d	Avoid using reset_variables (cherry picked from commit 2e17dd258223bdecbacbc415eb307fcc54ac2401)	2024-03-24 16:23:38 +00:00
Gouvernathor	094b010b7a	Avoid using lists (cherry picked from commit 78230893a8de70ea443e4e6730c0516fb651d4fb)	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 3b6dd38e195b997d8f569957d87d657a28ddf54c)	2024-03-24 16:21:28 +00:00
Gouvernathor	3b4db03a6c	Upgrade other uses of image manipulators (cherry picked from commit a9dc1953793591578fe807e2aca551ab84509050)	2024-03-24 16:20:23 +00:00
Gouvernathor	0e4fccfa26	Modernize use of matrixcolor (cherry picked from commit 985a0a79ede816783f2a0f59f238509013a3f25f)	2024-03-24 16:20:04 +00:00
Gouvernathor	fe0193cfc2	Hasten ConditionSwitch-es (cherry picked from commit 9d52bd9c92edbd7525cfdb27a1d36437cdd6ac76)	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 542db72609883b59d66f35db9178839d972288d7)	2024-03-24 16:19:01 +00:00
Gouvernathor	11047626e1	Factorize jumps in the elif (cherry picked from commit 6dc1a048109f88a1b0c51a1ed3692fdfd69312d8)	2024-03-24 16:17:29 +00:00
Gouvernathor	67e589f47f	Hasten elif chain avoid reevaluating the choice equality (cherry picked from commit 9b419fcbc3dce2238107cf4cb0fbbc5508df8584)	2024-03-24 16:17:14 +00:00
Gouvernathor	482969eaae	Use renpy statement instead of python equivalent (cherry picked from commit 976455bfc9f311439f655d6a737f4dd8032d314f)	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 4c52d1638faa4feef72fab92e3c8ff57c19e7272)	2024-03-24 16:16:01 +00:00
Gouvernathor	f941b77409	Convert ball_hint to a screen variable no leak (cherry picked from commit 4ec94d28f51389b901a11f16d9387d00670e599d)	2024-03-24 16:14:45 +00:00
Gouvernathor	415c90d11c	Use the call screen statement in this case this particular syntax is very precisely documented in the screens page (cherry picked from commit f51f3a30a192f92361ae0e69ff7c8bc8a7fb7e14)	2024-03-24 16:13:58 +00:00
Gouvernathor	d3a2929b6c	Better None syntax (cherry picked from commit 8d4216a4768dfae2526a9347dcdb6f6507a9d206)	2024-03-24 16:13:32 +00:00
Gouvernathor	2110eeb92a	Simpler inline conditional (cherry picked from commit da636e93ab69a9553464a61b60644b820c2f85f2)	2024-03-24 16:12:53 +00:00
Gouvernathor	5ef4d4f2db	Avoid extraneous bool call (cherry picked from commit 6a4b56a182d7e46ecb2ad0bcbaa7828357589cce)	2024-03-24 16:12:42 +00:00
Gouvernathor	f1a0c779f6	Sort in-place to save time (cherry picked from commit 36d3a5d1a79827a2c0f718fdf4124f61109a346c)	2024-03-24 16:12:30 +00:00
Gouvernathor	780c028eb3	Use python hide instead of a single-use function (cherry picked from commit a606fc9ca264cff17755859c8323c00e1eee12b8)	2024-03-24 16:10:22 +00:00
Gouvernathor	12e2bbcfb6	Fix indent (cherry picked from commit 925cf611c1c9bc3620b6a31448c7cfd56364dce2)	2024-03-24 16:10:00 +00:00
LoafyLemon	d9912ece6c	Fix 15c998c	2024-03-24 16:09:16 +00:00
Gouvernathor	d48708579b	Fix misuse of variable - don't use a reserved name (starting with an underscore) - use a file-local mangled name (starting with two underscores - use renpy.dynamx to cleanup the variable automatically (cherry picked from commit 3e86094b0b68321703bc6de21b95bf4c450715fb)	2024-03-24 16:00:53 +00:00
Gouvernathor	47b5184e06	Repr instead of adding simple quotes manually it's a tad slower but it's a better general practice and we're in an error handling branch anyway (cherry picked from commit e80bd9e6e697fd594db4b73644a15392a268ae55)	2024-03-24 15:55:25 +00:00
Gouvernathor	b60c87e9f8	Sirt in-place to save time not the first time, so that we can still pass it iterators (cherry picked from commit 21cb97b2e20c3f4cae346682b13e3bd208f57b6e)	2024-03-24 15:54:42 +00:00
Gouvernathor	36578fdd67	Simplify that call (cherry picked from commit b21e179df00406feb676f1af9e55150958b25320)	2024-03-24 15:53:40 +00:00
Gouvernathor	200760471f	skip unnecessary lambda (cherry picked from commit 94a6f9302b21712f90b84bca8318559c789a55b5)	2024-03-24 15:53:19 +00:00