Commit Graph

105 Commits

Author SHA1 Message Date
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
815c90109b Use inplace sort and generator expressions
(cherry picked from commit 87ce17df8b)
2024-03-24 17:01:11 +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
d01f9ec1f1 Use statement instead of equivalent
(cherry picked from commit c3f753a460)
2024-03-24 16:59:19 +00:00
91019374f5 Avoid circular reference
(cherry picked from commit db30cd66d3)
2024-03-24 16:59:11 +00:00
ba9865ab70 Make the rotate animation subpixel
(cherry picked from commit 4b8371e292)
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 48c4c4ecad)
2024-03-24 16:57:40 +00:00
2255d028e1 Remove unnecessary screen variable
(cherry picked from commit b222860bec)
2024-03-24 16:57:03 +00:00
fd50b5d05a Save calling update_character_map_locations several times
(cherry picked from commit c64635aace)
2024-03-24 16:56:51 +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 9a3fe1df65)
2024-03-24 16:51:27 +00:00
fb69dfa676 Use statements instead of equivalents
(cherry picked from commit 77e40301c9)
2024-03-24 16:50:52 +00:00
ff49d9fa95 Avoid circular reference
it clogs pickling and garbage-collecting

(cherry picked from commit 42f690f966)
2024-03-24 16:49:22 +00:00
fe5a7402a9 No it doesn't
(cherry picked from commit 884c264f04)
2024-03-24 16:48:49 +00:00
b34dc20901 Better text in screens
(cherry picked from commit 23a264c8f4)
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 32cf1de3a0)
2024-03-24 16:39:50 +00:00
be9f071660 Clean most stats variables from the global store
(cherry picked from commit c493a4b9aa)
2024-03-24 16:37:10 +00:00
0a6b5e41df Use define for constants
(cherry picked from commit bbc1df1ea6)
2024-03-24 16:36:03 +00:00
c908f2e90b Further clean junk variable
(cherry picked from commit ca64492beb)
2024-03-24 16:35:37 +00:00
3a77f89fab Add style, clean junk variables
(cherry picked from commit 3d62c8b818)
2024-03-24 16:35:23 +00:00
993b5c845a Simplify function
(cherry picked from commit bb2edc9a7b)
2024-03-24 16:35:13 +00:00
3b4db03a6c Upgrade other uses of image manipulators
(cherry picked from commit a9dc195379)
2024-03-24 16:20:23 +00:00
f941b77409 Convert ball_hint to a screen variable
no leak

(cherry picked from commit 4ec94d28f5)
2024-03-24 16:14:45 +00:00
d9912ece6c Fix 15c998c 2024-03-24 16:09:16 +00:00
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 3e86094b0b)
2024-03-24 16:00:53 +00:00
13608b6cfa Bug fixes
* Fixed missing 'whore collar' unlock method call
* Fixed gallery not working correctly by extending call_replay funcionality by adding support for nested stores
2023-10-28 18:49:42 +01:00
316aea6a5a Bug fixes and autosaves
* Added autosave toggle
* Fixed achievements being granted in replay scope
2023-07-25 17:54:33 +01:00
6e93d8628f Bug fixes and improvements
* Added dev skip for cardgame for testing purposes (I swear!)
* Fixed missing achievement triggers for 'Mad Hatter' and 'Poster Boy'
* Fixed cardgame twins challenge being inaccessible
* Fixed colour picker invoking non-existing image outside wardrobe scope
* Disabled cardgame easter egg (broken, requires refactoring)
* Improved cardgame hints
* Improved cardgame event handling
* Fixed grammar
2023-07-08 21:44:47 +01:00
b08e0d0071 Astoria spell training and improvements
* Converted Astoria's spell training into the new system, and cleaned up the code.
* Improved Astoria's menu layout
* Replaced -hidden- menu feature names with actual the actual feature names
* Refactored Astoria's file structure and naming convention
* Temporarily disabled spell training stats
2023-07-02 17:39:28 +01:00