Compare commits

...

145 Commits

Author SHA1 Message Date
Gouvernathor a67243c9c0 Cleanup following f573db7 (on the renpy repo) 2023-11-18 05:05:21 +01:00
Gouvernathor 8c1005003f Rework the diary system using call screen and actions 2023-11-18 02:00:48 +01:00
Gouvernathor 1a54d1741f Fix test label name 2023-11-18 01:50:49 +01:00
Gouvernathor c44c1792e2 Revamp the diary system and make it work 2023-11-17 23:42:51 +01:00
Gouvernathor a88706142f Don't use mutables in signatures 2023-11-17 04:37:45 +01:00
Gouvernathor 8d3eede436 Tweaks 2023-11-17 04:35:53 +01:00
Gouvernathor d40af370a8 Upgrade brewing menu
the usual : make variables dynamic, use call screen instead of show screen...
2023-11-17 04:31:20 +01:00
Gouvernathor 9479859edd Simplify menu position 2023-11-17 04:07:53 +01:00
Gouvernathor e84d5cbdf0 Sort inplace and skip unused variable 2023-11-17 04:05:49 +01:00
Gouvernathor f6c0054be0 Fix variable name and move defaults 2023-11-17 04:04:15 +01:00
Gouvernathor a29b7ec28b Merge labels into menus 2023-11-17 04:03:52 +01:00
Gouvernathor 15b15b9085 Remove mutable in signature and pop todo 2023-11-17 03:52:56 +01:00
Gouvernathor 3fef941366 Remove dependency 2023-11-17 03:52:39 +01:00
Gouvernathor 6b2766e668 Better pass kwargs
this is not py2 anymore
2023-11-17 03:46:34 +01:00
Gouvernathor 2f2a9b985b Don't use protected variable name 2023-11-17 03:46:18 +01:00
Gouvernathor d132436843 Use scene statement instead of equivalent 2023-11-17 03:41:56 +01:00
Gouvernathor 110847e9e6 Simplify and quicken summon list iteration 2023-11-17 03:38:06 +01:00
Gouvernathor 1918def870 Make variables dynamic
or constant, in one case
2023-11-17 03:31:07 +01:00
Gouvernathor d34a96284c Internal tweaks 2023-11-17 03:29:45 +01:00
Gouvernathor acfb09516c Improve and fix last 2023-11-17 03:16:28 +01:00
Gouvernathor 1672b2381a Replace show screen with call screen 2023-11-17 03:13:17 +01:00
Gouvernathor e242c0e43a Factorize pos 2023-11-17 03:08:51 +01:00
Gouvernathor d7c8e39b08 Factorize pos 2023-11-17 03:07:16 +01:00
Gouvernathor 313849696c Avoid single-use function 2023-11-17 03:05:12 +01:00
Gouvernathor 9a7a1d4686 Fix 32cf1de
the call is useless anyway, always has been
2023-11-17 02:59:23 +01:00
Gouvernathor 2e80d3a8d8 nitpicks 2023-11-17 02:53:09 +01:00
Gouvernathor 38787bdc4c 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
2023-11-17 02:49:44 +01:00
Gouvernathor aefa88e4d2 Add data privacy when computing house points
the dynamic variables are needed for the show screen call
2023-11-17 02:47:17 +01:00
Gouvernathor ebcfa4b78d Use hide instead of single-use function 2023-11-17 02:39:35 +01:00
Gouvernathor b2196d3ca5 Fix abe5d55 2023-11-17 02:34:05 +01:00
Gouvernathor a7ad9fafc7 Simplify position and parameters 2023-11-17 02:31:46 +01:00
Gouvernathor 6216b62ef9 Turn two actions into functions
technically not as correct, but works all the same and is relatively faster (but it will be replaced with better actions in the future anyway)
the pickle lock, if any, for removing them in the future, becomes easier to solve
2023-11-17 02:15:31 +01:00
Gouvernathor abe5d551fc Roll most local actions out 2023-11-17 02:12:26 +01:00
Gouvernathor 87a77163de Probable typo 2023-11-17 02:07:57 +01:00
Gouvernathor 38a94e774b Some big work on the inventory system
turn the show into a call screen
replace all return actions with specific local actions (WIP, more changes to come)
make the global variables at least dynamic
make the mode parameter a parameter of the label (so, a dynamic variable too, as a result)
replace the bigger actions with local labels
tweak text entries, comparisons, iterations... details
2023-11-17 01:48:07 +01:00
Gouvernathor 25f375c88b Better and faster iteration, using foreach 2023-11-17 01:48:05 +01:00
Gouvernathor c1ab7f7b85 Use a grid for the inventory 2023-11-17 01:48:03 +01:00
Gouvernathor 837d6b378e Use the correct operator(s) for None 2023-11-17 01:48:01 +01:00
Gouvernathor 14607f2eb1 Better text interpolation in screens 2023-11-17 01:47:59 +01:00
Gouvernathor def10a09ac Simplify crop_image_zoom calls 2023-11-17 01:47:57 +01:00
Gouvernathor 3278b1f4af Remove get_zoom and use builtin fit feature
using renpy.render, wtf
2023-11-17 01:47:55 +01:00
Gouvernathor ed2a817c84 Fix 070d14a 2023-11-17 01:47:28 +01:00
Gouvernathor 87ce17df8b Use inplace sort and generator expressions 2023-11-16 02:17:25 +01:00
Gouvernathor eae844ef0b 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)
2023-11-16 02:12:22 +01:00
Gouvernathor 070d14a685 Remove unused xalign 2023-11-16 01:55:20 +01:00
Gouvernathor a36c0ba222 Separate xalign and yalign 2023-11-16 01:54:22 +01:00
Gouvernathor fbe8035c43 Refactor states.menu_pos and remove reset_menu_position 2023-11-16 01:51:18 +01:00
Gouvernathor c3f753a460 Use statement instead of equivalent 2023-11-16 01:43:47 +01:00
Gouvernathor db30cd66d3 Avoid circular reference 2023-11-16 01:38:39 +01:00
Gouvernathor 4b8371e292 Make the rotate animation subpixel 2023-11-16 01:36:36 +01:00
Gouvernathor 48c4c4ecad 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.
2023-11-16 01:34:38 +01:00
Gouvernathor b222860bec Remove unnecessary screen variable 2023-11-16 01:11:38 +01:00
Gouvernathor c64635aace Save calling update_character_map_locations several times 2023-11-16 00:49:14 +01:00
Gouvernathor ef62f74eed replace equivalent with statement 2023-11-16 00:14:04 +01:00
Gouvernathor 9a3fe1df65 Reform random map locations
the locations of the different characters aren't independant, but they weren't in the first place
2023-11-16 00:13:42 +01:00
Gouvernathor 77e40301c9 Use statements instead of equivalents 2023-11-15 23:47:24 +01:00
Gouvernathor 42f690f966 Avoid circular reference
it clogs pickling and garbage-collecting
2023-11-15 23:46:46 +01:00
Gouvernathor 884c264f04 No it doesn't 2023-11-15 23:41:29 +01:00
Gouvernathor 23a264c8f4 Better text in screens 2023-11-15 23:24:55 +01:00
Gouvernathor 32cf1de3a0 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
2023-11-15 23:06:04 +01:00
Gouvernathor c493a4b9aa Clean most stats variables from the global store 2023-11-15 22:51:38 +01:00
Gouvernathor 1618fc378f Fix genie reform 2023-11-15 22:51:10 +01:00
Gouvernathor bbc1df1ea6 Use define for constants 2023-11-15 21:34:14 +01:00
Gouvernathor ca64492beb Further clean junk variable 2023-11-15 21:26:57 +01:00
Gouvernathor 3d62c8b818 Add style, clean junk variables 2023-11-15 21:25:10 +01:00
Gouvernathor bb2edc9a7b Simplify function 2023-11-15 21:24:47 +01:00
Gouvernathor 2ccece1a3d Use repr instead of manually added single quotes 2023-11-15 20:54:03 +01:00
Gouvernathor 8b6627f588 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
2023-11-15 20:44:48 +01:00
Gouvernathor 40ddb29185 Simplify generic CG code 2023-11-15 20:44:46 +01:00
Gouvernathor aa95f701dc Better animation 2023-11-15 20:44:44 +01:00
Gouvernathor 641893217e Simplify some code 2023-11-15 20:44:42 +01:00
Gouvernathor 3a429070fc Reform genie layeredimage 2023-11-15 20:44:39 +01:00
Gouvernathor 15e3e240fc Repr instead of adding quotes 2023-11-15 20:44:36 +01:00
Gouvernathor 9c274bee6f Simplify hide/show expression 2023-11-15 20:44:35 +01:00
Gouvernathor eeb68cb6c6 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
2023-11-15 20:44:33 +01:00
Gouvernathor 5460ec2572 Remove now-unused reset_variables relying on implem details
It is used in a txt draft which I didn't change, it can be done if deemed necessary
I think this function should be kept off, as it is both more dangerous and slower than the workarounds
2023-11-15 20:44:30 +01:00
Gouvernathor 2e17dd2582 Avoid using reset_variables 2023-11-15 20:43:34 +01:00
Gouvernathor 78230893a8 Avoid using lists 2023-11-15 20:43:32 +01:00
Gouvernathor 3b6dd38e19 Use childful transforms as displayable
that's not *explicitly* documented, but it won't change any time soon
also deletes a placeholder image
2023-11-15 20:43:30 +01:00
Gouvernathor a9dc195379 Upgrade other uses of image manipulators 2023-11-15 20:43:28 +01:00
Gouvernathor 985a0a79ed Modernize use of matrixcolor 2023-11-15 20:43:25 +01:00
Gouvernathor 9d52bd9c92 Hasten ConditionSwitch-es 2023-11-15 20:43:23 +01:00
Gouvernathor 542db72609 Use expression instead of image
the only documented lingua
this is AST-equivalent
2023-11-15 20:43:20 +01:00
Gouvernathor 6dc1a04810 Factorize jumps in the elif 2023-11-15 20:43:18 +01:00
Gouvernathor 9b419fcbc3 Hasten elif chain
avoid reevaluating the choice equality
2023-11-15 20:43:15 +01:00
Gouvernathor 976455bfc9 Use renpy statement instead of python equivalent 2023-11-15 20:43:13 +01:00
Gouvernathor 4c52d1638f 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
2023-11-15 20:43:11 +01:00
Gouvernathor 4ec94d28f5 Convert ball_hint to a screen variable
no leak
2023-11-15 20:43:10 +01:00
Gouvernathor f51f3a30a1 Use the call screen statement in this case
this particular syntax is very precisely documented in the screens page
2023-11-15 20:43:08 +01:00
Gouvernathor 8d4216a476 Better None syntax 2023-11-15 20:43:05 +01:00
Gouvernathor da636e93ab Simpler inline conditional 2023-11-15 20:43:04 +01:00
Gouvernathor 6a4b56a182 Avoid extraneous bool call 2023-11-15 20:43:01 +01:00
Gouvernathor 36d3a5d1a7 Sort in-place to save time 2023-11-15 20:42:59 +01:00
Gouvernathor a606fc9ca2 Use python hide instead of a single-use function 2023-11-15 20:42:57 +01:00
Gouvernathor 925cf611c1 Fix indent 2023-11-15 20:42:55 +01:00
Gouvernathor 15c998cd5a Weird variable setting 2023-11-15 20:42:52 +01:00
Gouvernathor 3e86094b0b 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
2023-11-15 20:42:50 +01:00
Gouvernathor e80bd9e6e6 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
2023-11-15 20:42:48 +01:00
Gouvernathor 21cb97b2e2 Sirt in-place to save time
not the first time, so that we can still pass it iterators
2023-11-15 20:42:45 +01:00
Gouvernathor b21e179df0 Simplify that call 2023-11-15 20:42:43 +01:00
Gouvernathor 94a6f9302b skip unnecessary lambda 2023-11-15 20:42:41 +01:00
LoafyLemon f93f50e9ac Update README 2023-11-15 20:42:40 +01:00
Gouvernathor 52ed1d37de Scrap some prepended newlines 2023-11-15 15:42:23 +00:00
Gouvernathor 8286be4a50 init is ignored when early is used 2023-11-15 15:42:23 +00:00
Gouvernathor a1e4f05998 Update the timeit function to use the timeit module
add the autorange function as a bonus (I like it better)

Patch-1-pull-request
2023-11-15 15:41:24 +00:00
Gouvernathor 0d0c54058d Hasten is_integer
the commented further improvement should be done too imo, but up to you
2023-11-15 15:38:35 +00:00
Gouvernathor 19bfc010c8 Avoid creating an unnecessary list (use an iterator instead) 2023-11-15 15:38:34 +00:00
Gouvernathor 36d79b4bb2 Hasten istype 2023-11-15 15:38:34 +00:00
LoafyLemon b550040369 Bug fix
* Fixed an issue with Tonks' auror coat sleeve
2023-11-15 15:26:55 +00:00
Johnny28 bab691b985 Luna Fellatio CG posing 2023-11-14 14:43:22 +01:00
Johnny28 4d5a7fef3b Luna Fellatio CG posing and nicknames
* Event posing.
* Added nickname for Genie "Genie".
* Added unlock req for Luna "Cumslut" nickname.
2023-11-10 16:17:32 +01:00
Johnny28 682d0b424c Luna Fellatio CG posing 2023-11-08 16:49:22 +01:00
Johnny28 42353f5669 Luna Fellatio CG posing and writing
* Posed more of the event.
* Adjusted the writing to improve the flow, added some more jokes and sexual comments.
2023-11-06 15:42:25 +01:00
Johnny28 40d273bee1 Luna Fellatio CG posing 2023-11-04 16:08:04 +01:00
Johnny28 7d6f66035c Luna Fellatio CG posing 2023-11-03 14:55:12 +01:00
LoafyLemon 07ab3ffef9 Bug fix
* Fixed missing shadow for the hand during the idle state
2023-11-03 13:51:52 +00:00
Johnny28 211c52041e Luna Fellatio CG posing
* Posed more of the event.
* Added more image loops.
* Fixed some shadows on genie arm images.
2023-11-03 14:06:50 +01:00
LoafyLemon 5eb5ec63fa Luna T4 Fellatio - Additions
* Added missing arm attribute controller
* Added animation loops
* Added cum layers for Luna for Hair, Chest, Face
* Updated .gitignore
2023-11-01 17:39:28 +00:00
Johnny28 be76f33759 Luna Fellatio CG posing
* Posed part of the Luna BJ favours.
* Added sexual activity vars.
2023-11-01 16:32:38 +01:00
LoafyLemon 57c1dccb8a Luna T4 Fellatio - Pose 5/5
* Implemented fellatio poses 2-5
* Added previously misplaced images
* Initial implementation for posing
2023-10-31 15:24:44 +00:00
LoafyLemon 5286827d6e Bug fixes
* Fixed a typos in character name references
2023-10-31 11:45:05 +00:00
LoafyLemon 3ede6dba2d Luna T4 Fellatio - Pose 1/5
* Implemented idle/stroking pose
* Updated .gitignore to not include development PNG files
2023-10-30 14:51:50 +00:00
LoafyLemon c55be2cb68 Luna T4 Fellatio Events
* Initial implementation for Luna's Tier 4 fellatio events
2023-10-30 13:03:43 +00:00
LoafyLemon 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
LoafyLemon f5ef31c88b Merge branch 'current' into dev 2023-10-18 12:57:55 +01:00
LoafyLemon 6fbf369d3e Bug fix
* Fixed sorting of numbered doll layers starting with double digits
2023-10-18 12:48:35 +01:00
Johnny28 1d6be6a490 Bugfix
* Fixed issue where Hermione's outfit would revert when picking "naked" option during sex.
2023-10-15 21:04:38 +02:00
Johnny28 fb14f83e21 Fixes and improvements
* Added tier checks to Hermione chit-chats.
* Fixed issue when picking Hermione's "Mudblood" nickname where no dialogue would play if you haven't fucked her.

* Minor writing fixes.
2023-10-11 15:43:08 +02:00
Johnny28 86bbceac91 Writing and fixes
* Added and posed Tier 4 Luna Chit-Chats.
* Added and posed Luna Gift-Chats.
* Fixed some missing colour on "flasher" outfit.
* Minor writing fixes.
2023-09-18 12:24:42 +02:00
LoafyLemon 7e768adddf Bug fix
Fixed flipped parameters in Bodyparts class init code, causing issues with mods
2023-09-08 20:40:46 +01:00
LoafyLemon 9b5fb5c419 Merge branch 'current' into dev 2023-07-27 01:02:32 +01:00
LoafyLemon 22ce846d81 Expand matrixes support for body layers 2023-07-27 01:02:32 +01:00
LoafyLemon 34c356b29b Update whitespace 2023-07-27 01:02:32 +01:00
LoafyLemon bf8f58ee10 Luna Outfits and model improvements
* Added cumslut outfit
* Added latex outfit
* Added flasher outfit
* Improved quality of the base model
2023-07-27 01:02:32 +01:00
LoafyLemon b0ae56b247 Bug fix
* Fixed puzzle generator outputting invalid combinations due to the lack of floor division
2023-07-26 22:50:01 +01:00
LoafyLemon a343610eb3 Bug fixes
* Fixed layering issue when more than one layer contains a zorder modifier
2023-07-26 18:54:30 +01:00
LoafyLemon 4658a97b4a Bug fixes and improvements
* Improved skipping performance by delaying the call to render functions until after skipping ends
* Fixed skipping not refreshing the doll image
* Fixed skipping callback handler being affected by rollback
* Refactored doll show method
2023-07-25 17:54:34 +01:00
LoafyLemon 148d2fcac5 Bug fixes
* Fixed updater logo issues
* Fixed modpath getting 'mods' subpath appended to it recursively with each clone
2023-07-25 17:54:34 +01:00
LoafyLemon 6b8c9adb7f Bug fixes
* Fixed updater (AGAIN!!)
* Disabled the 'server not responding' hint because it doesn't really match what's happening in the server code
* Version bump
2023-07-25 17:54:34 +01:00
LoafyLemon 71c2c3fd8f Bug fix
* Fixed mods warning for compatible mods due to old var reference
2023-07-25 17:54:34 +01:00
LoafyLemon 699f68742f Bug fixes
* Fixed cardgame TypeError crash during random matches
* Fixed mistakenly excluded ExampleMod from releases
2023-07-25 17:54:33 +01:00
LoafyLemon 316aea6a5a Bug fixes and autosaves
* Added autosave toggle
* Fixed achievements being granted in replay scope
2023-07-25 17:54:33 +01:00
LoafyLemon 962cc2f695 Bug fixes
* Fixed outfit deletion tab not updating the list of items
* Fixed Tonks' public requests menu crashing due to an omitted result type
* Removed manual image rebuilding in wardrobe (superseded)
2023-07-25 17:54:33 +01:00
LoafyLemon ebc865b798 Bug fix
* Fixed stale images being displayed when threading is enabled and no image was called in a while
2023-07-25 17:54:33 +01:00
Johnny28 b41a4263ea Luna clothing.
* Added Nail polish.
* Added Piercings.
* Added Tank top with shorts outfit.
* Added Bimbo outfit.
* Updated Heart glasses artwork.
2023-07-22 15:37:48 +02:00
589 changed files with 6161 additions and 2291 deletions

120
README.md

File diff suppressed because it is too large Load Diff

2
game/characters/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
# We don't want to include PNGs in GIT
*.png

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More