Merge remote-tracking branch 'origin/dev' into Python3

Minor writing adjustments
* Improved some Luna Chit-chat writing.
2023-02-18 23:19:32 +00:00 · 2023-02-18 23:47:01 +01:00 · 2023-02-18 21:56:29 +00:00 · 2023-02-15 23:20:00 +00:00 · 2023-02-14 22:17:04 +00:00 · 2023-02-13 22:59:46 +00:00
1116 changed files with 3635 additions and 3307 deletions
--- a/game/characters/astoria/body/armleft/on_hips.webp
+++ b/game/characters/astoria/body/armleft/on_hips.webp
--- a/game/characters/astoria/body/armleft/on_hips_fix.webp
+++ b/game/characters/astoria/body/armleft/on_hips_fix.webp
--- a/game/characters/astoria/body/armright/on_hips.webp
+++ b/game/characters/astoria/body/armright/on_hips.webp
--- a/game/characters/astoria/body/armright/on_hips_fix.webp
+++ b/game/characters/astoria/body/armright/on_hips_fix.webp
--- a/game/characters/astoria/body/base/front.webp
+++ b/game/characters/astoria/body/base/front.webp
--- a/game/characters/astoria/body/breasts/normal.webp
+++ b/game/characters/astoria/body/breasts/normal.webp
--- a/game/characters/astoria/bodyparts/frame/default/skin.webp
+++ b/game/characters/astoria/bodyparts/frame/default/skin.webp
--- a/game/characters/astoria/clothes/bottom/pants_1/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/pants_1/armfix.webp
--- a/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp
--- a/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp
+++ b/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp
--- a/game/characters/astoria/clothes/headgear/ann_takamaki/default/0.webp
+++ b/game/characters/astoria/clothes/headgear/ann_takamaki/default/0.webp
--- a/game/characters/astoria/clothes/headgear/ann_takamaki/default/1.webp
+++ b/game/characters/astoria/clothes/headgear/ann_takamaki/default/1.webp
--- a/game/characters/astoria/clothes/headgear/ann_takamaki/default/outline.webp
+++ b/game/characters/astoria/clothes/headgear/ann_takamaki/default/outline.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/angry/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/angry/0.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/annoyed/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/annoyed/0.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/base/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/base/0.webp
--- a/game/characters/astoria/clothes/makeup/lipstick/clench/0.webp
+++ b/game/characters/astoria/clothes/makeup/lipstick/clench/0.webp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
LoafyLemon	b48f602e35	Merge remote-tracking branch 'origin/dev' into Python3	2023-02-18 23:19:32 +00:00
Johnny28	8dc77e81b3	Minor writing adjustments * Improved some Luna Chit-chat writing.	2023-02-18 23:47:01 +01:00
LoafyLemon	d58ebb35f7	Bug fixes * Fixed missing import in studio scope * Fixed some sprite positions * Added a hint for tutoring.	2023-02-18 21:56:29 +00:00
LoafyLemon	9b02b229c9	Colour Theory * Apply colour theory to colour randomisation.	2023-02-15 23:20:00 +00:00
LoafyLemon	0051845804	Bug fixes * Fixed sprite positioning in some events * Fixed story inconsistencies, spelling mistakes, and grammar in some events * Fixed leading house checks in some events	2023-02-14 22:17:04 +00:00
LoafyLemon	968b8aab01	Bug fix + Sanity check * Fixed Cho's Sweater 2 * Added sanity check for mismatched number of textures and colours for clothing items, with a user-friendly warning rather than a hard crash	2023-02-13 22:59:46 +00:00
LoafyLemon	7ed5b01227	Bug fixes * Fixed pulse_hover animation resetting * Fixed Hermione's hold book pose * Fixed minor story inconsistencies and spelling * Fixed Tonks' hair colour not resetting * Blocked Hermione from being summoned during Tonks' investigation * Blocked Snape from being summoned during the day (It's not like he'd help anyway) * Updated tutorials to reflect these changes	2023-02-13 22:17:37 +00:00
Johnny28	9eb2305901	Luna - Cork Necklace * Added Redrawn Necklace with colourable layers.	2023-02-13 00:00:24 +01:00
LoafyLemon	7d1e761308	Bug Fix (Windows) * Replaced os.path.join with posixpath.join in some instances to enforce UNIX paths	2023-02-11 21:25:15 +00:00
LoafyLemon	fb8e3aab0f	Outfit import/export * Re-implemented image payload injection using Python3-compliant methods * Added sanity checks for image importing and exporting * Added compression for the payload * Added user input for exported image file names * Removed redundant layer for Tonks' ribbon bra * Updated MyMod clothing definition example. * Fixed regression in outfit clone functions	2023-02-10 23:12:16 +00:00
LoafyLemon	5fdf1e87fe	Bug fixes * Fixed traceback crash (doh!) caused by uncaught ast eval exception * Fixed dev colour code info screen	2023-02-09 19:35:52 +00:00
LoafyLemon	dcdd54cdfe	Colour Re-implementation * Overhauled colour codes support with Ren'py supplied Color class * Added support for hexadecimals alongside colour tuples w/ backwards compatibility * Reduced colour assignments overhead * Converted all colour lists into hexadecimals for all characters	2023-02-08 21:40:28 +00:00
LoafyLemon	3586bba211	Modding support * Added the ability to add fan-made characters, and to modify the existing ones through modpath overrides * Changed modpath initialisation to automatically add 'mods/' directory	2023-02-08 17:37:12 +00:00
LoafyLemon	4061dcceeb	Merge fix	2023-02-07 22:05:15 +00:00
LoafyLemon	35ac11d10d	Update scripts * Updated scripts to reflect bodyparts changes	2023-02-07 19:31:21 +00:00
LoafyLemon	2acccbea5a	Bodyparts, Modding, Bug fixes * Added DollBodypart class to allow more extensive modding support for characters, along with dedicates layers for breasts, hips and so on... * Added more bangs into DollClothDynamic, allowing tracking of singular objects and the ability to chainload the IDs * Added get_character_body global method * Added istype global method * Improved caching, layering for dynamic clothes * Improved hashing for Doll instances * Improved readability and improved internal naming convention for Doll-type classes * Removed dedicated buttplug slot (superseded by multislot reimplementation) * Fixed clothing supplied skin layer issues with zorders * Fixed DollClothDynamic __repr__ lack of quotes * Fixed Hermione's open_wide_tongue mouth * Fixed Hermione's tattoos missing images * Fixed Cho's 'goodbye' after-summon skit using wrong number of expressions	2023-02-07 19:22:05 +00:00
Johnny28	58b4639007	Wardobe file organization - Part 2 * Renamed clothing pieces for consistency.	2023-02-07 17:47:29 +01:00
Johnny28	a847ef2aca	Fix	2023-02-07 17:23:48 +01:00
Johnny28	12078176ee	Wardobe file organization * Organized Wardrobe files.	2023-02-07 17:13:30 +01:00
LoafyLemon	69e7f5e542	Convert Potions * Converted Hermione's potion body changes into clothing items for better maintainability and to provide modding support * Composited body images of characters into singular files to reduce layering complexity and overhead * Fixed Luna's eyemasks	2023-02-05 17:25:11 +00:00
LoafyLemon	3d40049b81	Merge branch 'dev' into Python3	2023-01-30 20:35:25 +00:00
LoafyLemon	c3b117b874	Bug fix * Fixed character studio	2023-01-30 20:18:54 +00:00
LoafyLemon	e8a617ac7b	Bug fixes * Fixed Tonks' elf year skin zorder * Fixed icon cropping for makeup	2023-01-20 20:21:39 +00:00
LoafyLemon	9491299be0	Bug fix * Fixed item zorders to reflect the new values	2023-01-20 16:52:09 +00:00
LoafyLemon	22a84479dd	Dynamic Cum Layering * Added dynamic cum layering based on clothing and facial states w/ backwards compatibility * Fixed layers zordering * Refactored default layer dicts * Fixed repr class name in DollClothDynamic * Added back and front zorder modifiers to cum layers * Fixed cum layers not updating on call * Fixed skin layers fighting for zorder with the body	2023-01-19 21:55:19 +00:00
LoafyLemon	2946efbd2b	Bug Fixes * Refresh image if showing on specific function calls	2023-01-19 18:07:10 +00:00
LoafyLemon	99f174cfbb	Refactoring, Optimizations, Bug fixes * Fixed Hermione's hslut panties * Refactored image calls * Refactored character poses (partially) * Added hash generation to all Doll-type displayables * Hashed and cached Doll layers (Greatly improves rollback performance) * Fixed outfit and colour randomization * Added is_stale method to doll-type displayables to reduce code complexity * Removed doll-related redundant global methods * Added AVIF format support * Simplified Doll posing * and more...	2023-01-18 20:22:59 +00:00
LoafyLemon	c1b04f6ccd	IO Overhaul, Refactoring, and more * Refactored DollFace * Refactored DollBody * Refactored DollCum * Refactored DollCloth * Refactored Doll * Refactored clothing item zorders * Refactored implementation of body, face, cum, clothing layers * Refactored function calls * Removed DollLipstick * Added DollMakeup class, allowing adding dynamic clothes tracking face states * Added DollClothDynamic, allowing dynamic clothes tracking other cloth states with bangs support * Added cache to frequently called functions, drastically reducing the overhead * Added hash system, reducing clone redundancy * Added layer modifiers support for all types (face, body, cum, clothes etc.) * Added support for an arbitrary number of equipped multislot clothing items (makeup, tattoos, piercings, etc.) * Simplified initialization for clothing items and dolls * Simplified class function calls * Reduced the number of image creation calls * Added hue support for additional skin layers * Added displayable support to image cropping function * Replaced store cache with built-in functools cache for _list_files function * Refactored all character files * and more...	2023-01-14 23:04:54 +00:00
LoafyLemon	2c35c2d5df	Optimizations * Disabled detection of orphaned scripts for non-devs * Added cache to renpy.list_files to reduce IO overhead (~14s -> ~0.01s per 10k calls) * Fixed wrong module call in weather.	2023-01-03 21:27:35 +00:00
LoafyLemon	43d18f0de1	Remove backported rand func (Superseded)	2023-01-03 20:04:11 +00:00
LoafyLemon	7533b82331	Merge remote-tracking branch 'origin/dev' into Python3	2023-01-03 19:50:23 +00:00
LoafyLemon	870bfa29b4	Merge branch 'dev' into Python3	2022-12-28 19:20:38 +00:00
LoafyLemon	c32d926742	Coroutines * Implemented asynchronous coroutines for Doll and Outfit generators	2022-11-11 22:24:47 +00:00
LoafyLemon	dd4b2898e0	Bug fixes * Fixed Luna sprite persisting throughout Wardrobe context * Fixed regression related to wardrobe chit-chats due to the mixing of renpy and python scopes	2022-11-04 21:17:41 +00:00
LoafyLemon	2b01668442	Merge remote-tracking branch 'origin/dev' into Python3	2022-10-19 22:19:16 +01:00
LoafyLemon	b8bc54fc54	Bug fix * Fixed an issue with the order of layers caused by the use of sets	2022-10-19 22:19:05 +01:00
LoafyLemon	022da2a727	Merge branch 'dev' into Python3	2022-10-16 19:37:12 +01:00
LoafyLemon	d6e8efaaa3	Refactoring	2022-09-29 22:19:55 +01:00
LoafyLemon	860dea3baa	Merge branch 'dev' into Python3	2022-09-29 19:54:08 +01:00
LoafyLemon	89822a4198	Merge remote-tracking branch 'origin/dev' into Python3	2022-09-23 17:50:35 +01:00
LoafyLemon	e5a7060af9	Refactoring	2022-09-21 21:57:04 +01:00
LoafyLemon	c352f8cea3	Python3 IO encoding changes	2022-09-21 19:22:14 +01:00