Fix

Kinetic text and Genie jerk off
* Added kinetic text. * Added new Genie jerk off dialogue for each girl as they unlock, and random fictional girl option. * Minor fixes.
2024-06-28 17:38:21 +02:00 · 2024-06-28 17:30:53 +02:00 · 2024-06-26 18:41:01 +02:00 · 2024-06-26 17:40:25 +01:00 · 2024-06-26 18:27:21 +02:00 · 2024-06-26 16:23:32 +01:00
432 changed files with 8591 additions and 7863 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,6 +11,9 @@ Desktop.ini
 $RECYCLE.BIN/
 .DS_Store
 # Hidden dirs
 */.*
 # Python
 *.py[cod]
--- a/game/gui/creamy_pumpkin_pie/banners/banners_empty_gryffindor.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_gryffindor.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_empty_hufflepuff.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_hufflepuff.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_empty_ravenclaw.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_ravenclaw.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_empty_slytherin.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_slytherin.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor_emblem.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor_emblem.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff_emblem.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff_emblem.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_leading.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_leading.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw_emblem.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw_emblem.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_slytherin.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_slytherin.png
--- a/game/gui/creamy_pumpkin_pie/banners/banners_slytherin_emblem.png
+++ b/game/gui/creamy_pumpkin_pie/banners/banners_slytherin_emblem.png
--- a/game/gui/creamy_pumpkin_pie/book/book_background.png
+++ b/game/gui/creamy_pumpkin_pie/book/book_background.png
--- a/game/gui/creamy_pumpkin_pie/book/book_bar_empty.png
+++ b/game/gui/creamy_pumpkin_pie/book/book_bar_empty.png
--- a/game/gui/creamy_pumpkin_pie/book/book_bar_full.png
+++ b/game/gui/creamy_pumpkin_pie/book/book_bar_full.png
--- a/game/gui/creamy_pumpkin_pie/book/book_button_check_checked.png
+++ b/game/gui/creamy_pumpkin_pie/book/book_button_check_checked.png
--- a/game/gui/creamy_pumpkin_pie/book/book_button_check_empty.png
+++ b/game/gui/creamy_pumpkin_pie/book/book_button_check_empty.png
--- a/game/gui/creamy_pumpkin_pie/book/book_button_radio_checked.png
+++ b/game/gui/creamy_pumpkin_pie/book/book_button_radio_checked.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Johnny28	227b07ae09	Fix	2024-06-28 17:38:21 +02:00
Johnny28	97639772a5	Kinetic text and Genie jerk off * Added kinetic text. * Added new Genie jerk off dialogue for each girl as they unlock, and random fictional girl option. * Minor fixes.	2024-06-28 17:30:53 +02:00
Johnny28	cb3ef44eb6	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-26 18:41:01 +02:00
LoafyLemon	68ad738cf3	Bug fix	2024-06-26 17:40:25 +01:00
Johnny28	d1dbe31b6c	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-26 18:27:21 +02:00
LoafyLemon	578310ad71	Reimplement hide interface hotkey and allow hiding choice menus as well as the say screen	2024-06-26 16:23:32 +01:00
LoafyLemon	0709368ea4	Allow dolls on interface layer while in head position, tweak character transforms, fix male character transforms	2024-06-26 16:10:44 +01:00
Johnny28	26fb4e6f01	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-26 14:39:38 +02:00
LoafyLemon	4cd4648370	Tweak oversample	2024-06-25 21:31:29 +01:00
LoafyLemon	dc0e34e5fc	Implement new house emblems, banners, and house points displayable, sunset top bar	2024-06-25 20:57:56 +01:00
Johnny28	0834d59e99	Kinetic text	2024-06-25 16:49:58 +02:00
LoafyLemon	a97391b10c	Merge remote-tracking branch 'refs/remotes/origin/kinetic_text' into interface2	2024-06-22 13:49:10 +01:00
LoafyLemon	2db398b100	Add new doodles	2024-06-22 13:40:33 +01:00
LoafyLemon	50869dd97c	Implement help screen, tweak text sizes, fix in_context func	2024-06-18 19:46:57 +01:00
LoafyLemon	4706519a63	Handle empty history	2024-06-18 18:45:13 +01:00
LoafyLemon	0248476ac5	Add mountains to the history screen	2024-06-18 17:43:54 +01:00
Johnny28	e01a955afa	Kinetic text	2024-06-18 16:02:23 +02:00
Johnny28	62e2393fef	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-17 21:06:26 +02:00
LoafyLemon	c8a9b39c00	Add cursor states to bars and sliders	2024-06-17 19:43:08 +01:00
LoafyLemon	53cfc1bf23	Bug fix	2024-06-17 19:35:25 +01:00
LoafyLemon	c9db632d6b	Implement history screen and sliders, add sounds	2024-06-17 19:25:20 +01:00
LoafyLemon	af76d839a1	Add icon text tag	2024-06-17 19:24:31 +01:00
Johnny28	bf9088de23	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-15 18:39:53 +02:00
LoafyLemon	2e240545a5	Tweaks, Bug fixes, Cleanup	2024-06-15 17:37:31 +01:00
Johnny28	5beab11f64	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-15 18:25:16 +02:00
LoafyLemon	1f0c5ecb90	Ensure translation support in navigation and credits	2024-06-15 17:02:56 +01:00
Johnny28	08bb9f96cc	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-15 17:04:06 +02:00
LoafyLemon	f7c91ebcf7	Bug fix * Fixed performance regression due to dynamic displayable in long text	2024-06-15 15:59:18 +01:00
Johnny28	8df242f37e	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-15 15:43:32 +02:00
LoafyLemon	d7e7cba7ad	Overhaul credits interface, Bug fixes, Music Player	2024-06-15 00:05:49 +01:00
Johnny28	3060ed7e0e	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-14 18:57:15 +02:00
LoafyLemon	4b7c4ff60f	GUI Cleanup and restructuring	2024-06-14 16:34:50 +01:00
Johnny28	8d7a685b58	Kinetic text	2024-06-14 13:42:47 +02:00
Johnny28	c705a298d2	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-14 13:42:15 +02:00
LoafyLemon	9b200a7177	Finalise navigation menu	2024-06-13 23:35:42 +01:00
LoafyLemon	85b8c10ad7	Add FilePageLast action for the save menu	2024-06-12 16:56:39 +01:00
Johnny28	92e35611e1	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-11 16:05:54 +02:00
Johnny28	9a82682569	Kinetic text * More kinetic text additions.	2024-06-11 16:05:05 +02:00
LoafyLemon	ad017851e6	Bug fixes * Fixed navigation menu being clickable during pseudo hide event * Fixed wrong menu being displayed when accesses from the quick menu	2024-06-08 18:18:09 +01:00
Johnny28	1f18f6b0e6	Kinetic Text * More kinetic text additions.	2024-06-08 15:43:16 +02:00
Johnny28	f0c79eb0cf	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-07 21:51:08 +02:00
LoafyLemon	b3a76cce17	Bug fixes * Implemented workaround for navigation menu transforms not receiving 'hide' events. * Fixed text overflow in navigation menu	2024-06-07 17:19:57 +01:00
Johnny28	e91b95d882	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-07 12:17:26 +02:00
LoafyLemon	6244dbbcce	Enable new navigation menu	2024-06-06 20:25:13 +01:00
Johnny28	ac62b9c8f9	Kinetic text * More kinetic text additions.	2024-06-06 17:36:26 +02:00
Johnny28	5a78a30577	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-06 13:28:38 +02:00
LoafyLemon	7612c0bf1f	Save menu * Implement new save/load menus	2024-06-05 22:25:18 +01:00
Johnny28	6d4a4e1e42	Kinetic text * More kinetic text additions.	2024-06-04 15:34:35 +02:00
Johnny28	c6ed6726a9	Kinetic text * More kinetic text additions.	2024-06-04 09:50:07 +02:00
Johnny28	eee88b6933	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-06-04 09:49:38 +02:00
LoafyLemon	63859b37f2	Partial Implementation of Navigation menus	2024-06-01 20:46:53 +01:00
Johnny28	7c0a367307	Kinetic text * Added kinetic text to Luna events.	2024-06-01 16:00:54 +02:00
Johnny28	65af3fd0d5	Kinetic text * Added kinetic text to Hermione anal sex favour. * Removed unnecessary ctc calls. * Minor fixes.	2024-05-30 17:26:10 +02:00
Johnny28	40a35cbc54	Merge remote-tracking branch 'origin/interface2' into kinetic_text	2024-05-30 14:03:42 +02:00
LoafyLemon	792467e25a	Handle choice menu overflow	2024-05-29 22:16:58 +01:00
LoafyLemon	e9cadcdc89	Improve styling and implement confirm popup	2024-05-29 21:31:12 +01:00
LoafyLemon	676a90f519	Bug fix * Fixed menu scale	2024-05-29 20:33:31 +01:00
Johnny28	9b1848e52b	Kinetic text * Added kinetic text to Hermione sex favour. * Removed unnecessary ctc calls.	2024-05-29 15:36:48 +02:00
LoafyLemon	21ef470c6c	Implement new cursors	2024-05-28 21:10:37 +01:00
LoafyLemon	c2e9c6debc	Merge branch 'kinetic_text' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into kinetic_text	2024-05-28 20:51:54 +01:00
LoafyLemon	ee768b18ce	Choice progression * Add completion status info to the choice menu * Add style support for kinetic text tags * Begin modal prompt screen implementation * Cleanup	2024-05-28 20:51:41 +01:00
Johnny28	8d33aeca8b	Updated kinetic text	2024-05-28 21:24:48 +02:00
LoafyLemon	ac9727bdf2	Finalise kinetic text tags	2024-05-28 19:34:22 +01:00
LoafyLemon	2b1208bc7e	Kinetic Text - Heart animation	2024-05-28 16:54:01 +01:00
LoafyLemon	b7a0d19559	Merge branch 'refs/heads/interface2' into kinetic_text	2024-05-28 15:42:10 +01:00
LoafyLemon	d0f3a550b7	Bug fix * Fixed wrongly assigned xsize for the text displayable in kinetic text	2024-05-28 15:39:10 +01:00
Johnny28	b53bfdfa56	Kinetic text * Added kinetic text to hg_sex_1.	2024-05-28 12:27:29 +02:00
LoafyLemon	2bdd5138ce	Bug fix	2024-05-27 18:57:46 +01:00
LoafyLemon	b44f7188dc	Assign character tags to dolls layer	2024-05-27 18:54:57 +01:00
LoafyLemon	2680593bf6	Shudder - Kinetic Text	2024-05-27 16:33:13 +01:00
LoafyLemon	d293b0c973	Implement Frame	2024-05-24 15:19:34 +01:00
LoafyLemon	fe1cc62c5d	Tweak Wheelmenu Animation	2024-05-24 12:14:46 +01:00
LoafyLemon	f5cbcdc1eb	Implement Kinetic Text Tags	2024-05-23 23:16:45 +01:00
LoafyLemon	14d4d0c431	Bugfix	2024-05-23 18:08:39 +01:00
LoafyLemon	2b04947b9f	Transitions * Apply transitions for dolls only to the doll layer * Add missing doll transitions for Genie	2024-05-21 21:00:35 +01:00
LoafyLemon	972b9dcd70	Bug fix	2024-05-21 20:51:31 +01:00
LoafyLemon	53548aecdb	Fix {w} text tag affecting textbox animation.	2024-05-21 20:35:01 +01:00
LoafyLemon	2b40aeba9d	TODO * For future reference	2024-05-21 18:45:06 +01:00
LoafyLemon	0da545a13b	Avoid double click	2024-05-21 02:28:55 +01:00
LoafyLemon	d59040613b	Animate choice menu	2024-05-21 02:27:21 +01:00
LoafyLemon	e4f0a9531d	Bug fix	2024-05-21 02:10:28 +01:00
LoafyLemon	52de19950d	Bug fix	2024-05-21 02:07:48 +01:00
LoafyLemon	a56d826a10	Improve text box and animate it	2024-05-21 01:58:08 +01:00
LoafyLemon	18b1b271bb	Implement new choice menu	2024-05-21 00:08:41 +01:00
LoafyLemon	b6091a839d	Eventqueue Bug fix * Fixed events not being marked as completed	2024-05-21 00:06:46 +01:00
LoafyLemon	07489362c8	Cbibis * Implement animation pause intervals for the new chibi class * Fix static animations not playing due to a timeout.	2024-05-19 21:29:14 +01:00
LoafyLemon	587425723e	Remove android crash defender (obsolete)	2024-05-19 21:27:37 +01:00
LoafyLemon	3320f20101	Genie and Snape doll layer fix	2024-05-19 21:19:17 +01:00
LoafyLemon	ab9f072848	Detach console	2024-05-19 21:18:49 +01:00
LoafyLemon	e24b60514e	Hide dolls on dolls layer during chibi hide calls	2024-05-19 21:18:06 +01:00
LoafyLemon	8f8b9f2f80	Replace redundant call label with a scene statement	2024-05-19 21:15:26 +01:00
LoafyLemon	ac10302a69	Move tutorials to interface layer	2024-05-19 21:14:53 +01:00
LoafyLemon	93c0b24da0	Detach dolls from screens	2024-05-19 21:14:30 +01:00
LoafyLemon	15ebe27d0a	Detach interface and gameplay elements.	2024-05-19 21:12:51 +01:00
LoafyLemon	5967c358ca	Style fix	2024-05-19 21:08:55 +01:00
LoafyLemon	c089ebe81d	Bug fix	2024-05-19 21:08:48 +01:00
LoafyLemon	d9d9a2bacb	Textbox	2024-05-19 21:08:36 +01:00
LoafyLemon	3745fb46e9	Ignore console calls in dev stdout	2024-05-14 15:07:18 +01:00
LoafyLemon	978be68399	Add CycleShopCategory	2024-05-03 22:20:51 +01:00
LoafyLemon	a8d183e804	Shop Actions * Implemented SwitchShopCategory and SortFilter screen actions	2024-05-03 21:57:10 +01:00
LoafyLemon	2b2a3182c6	Merge dev into interface	2024-05-03 20:13:32 +01:00
LoafyLemon	93de0cd4da	Improve translation support (part 7) (cherry picked from commit `64a624c89b`)	2024-05-03 18:55:10 +01:00
LoafyLemon	395bcf50c0	Improve translation support (part 6) (cherry picked from commit `0b477fb762`)	2024-05-03 18:55:08 +01:00
LoafyLemon	7ab018394f	Improve translation support (part 5)	2024-05-03 18:55:04 +01:00
LoafyLemon	06b26b3316	Bug fix (cherry picked from commit `d89867c692`)	2024-05-03 17:57:23 +01:00
LoafyLemon	5c3e0cc409	Fix (cherry picked from commit `4cdf71f5b8`)	2024-05-03 17:57:20 +01:00
LoafyLemon	c022413e47	Improve translation support (part 4) (cherry picked from commit `27e07d6d73`)	2024-05-03 17:57:15 +01:00
LoafyLemon	b8c9212abb	Improve translation support (part 3) (cherry picked from commit `feced7b1cf`)	2024-05-03 17:57:05 +01:00
LoafyLemon	080bfdcb9c	Improve translation support (part 2) (cherry picked from commit `5616f77813`)	2024-05-03 17:57:03 +01:00
LoafyLemon	0350d680b4	Improve translation support (part 1) (cherry picked from commit `2b409db496`)	2024-05-03 17:56:53 +01:00
LoafyLemon	8b272ca8b5	gitignore	2024-04-28 17:04:00 +01:00
LoafyLemon	c38763c065	Merge branch 'refs/heads/dev' into interface	2024-04-28 16:46:23 +01:00
LoafyLemon	99fbcd4ea7	DollClothDynamic * Added new prefix for lookahead type. * Added tracked item rebuild for the purpose of tracking types	2024-04-28 15:33:40 +01:00
LoafyLemon	8aa1a84efb	Bug fix * Fix detection of orphaned script and clarify the exception	2024-04-28 13:43:47 +01:00
LoafyLemon	df724981d2	House Points and Currencies * Added common style properties for houses * Added unique displayable for gold when in the main room * Unified currency screen to support arbitrary displayables and properties. * Unified transforms * Put interface elements onto interface layer * Hooked house points into the new currency screen * Improved animation and display of values during animation. * Allow independent animation of each supplied displayable * Remove redundant code	2024-04-27 18:12:13 +01:00
LoafyLemon	7069cc1294	Refactoring * Refactored old house points references * Updates set_points method to use a dict to work with multiple changes at once.	2024-04-27 15:24:14 +01:00
LoafyLemon	7a4b31bf63	House points * Added house points to states.env * Added visuals for when points are added or subtracted * Updated points increment animation and refactored the screen	2024-04-27 01:54:41 +01:00
LoafyLemon	4e01b71a99	Regression * Revert cache for seeded randomisation due to the loss of seeded randomisation when functools.cache decorator is present	2024-04-27 01:05:53 +01:00
LoafyLemon	51877952d4	Hookup gold gains to seeded randomiser	2024-04-27 00:51:45 +01:00
LoafyLemon	eb90a77262	Hookup weather to seeded randomiser	2024-04-27 00:47:19 +01:00
LoafyLemon	db86910a8e	Seed Randomisation, Map, Refactoring, Bug Fixes * Added seeded randomisation w/ cache * Updated help menu hotkeys section * Decoupled map from the desk (New map artwork to be added) * Removed old desk menu * Removed old desk images * Removed/Fixed door_randomobj and map_randomobj causing pickling issues	2024-04-27 00:41:38 +01:00
LoafyLemon	22f831e424	Cheaters do not prosper! * Added rollback cheating detection for cardgame packs.	2024-04-26 16:06:19 +01:00
LoafyLemon	eb70637a02	Add safe to interactive tutorial	2024-04-26 15:35:05 +01:00
LoafyLemon	f1b3117909	New Room Object + Bug Fixes * Added safe object (Proof of concept) * Fixed tokens references	2024-04-26 14:56:50 +01:00
LoafyLemon	1ecd879929	Calendar * Added timed events to the calendar (proof of concept)	2024-04-26 14:22:01 +01:00
LoafyLemon	7ea08f8584	Refactor moon checks	2024-04-26 13:59:29 +01:00
LoafyLemon	c7f7f6c8a0	Refactored currencies * Removed game class (superseded) * Refactored currencies * Bug fixes	2024-04-25 20:39:50 +01:00
LoafyLemon	085a4d8e9c	Refactoring weather checks	2024-04-25 20:15:36 +01:00
LoafyLemon	333fdfed51	Refactoring day checks	2024-04-25 20:14:25 +01:00
LoafyLemon	ec991ccd22	Refactoring gold checks	2024-04-25 20:12:50 +01:00
LoafyLemon	b56d84a301	Refactoring cheats checks	2024-04-25 20:11:30 +01:00
LoafyLemon	cc6fe6909c	Refactoring difficulty checks	2024-04-25 20:10:46 +01:00
LoafyLemon	8aba361ea9	Refactoring + Environment * Partially sunset `game` var store and move relevant special variables inside `states` store. * Replace `game.daytime` -> `states.env.daytime`	2024-04-25 19:49:09 +01:00
LoafyLemon	7535e0b756	Weather + Seasons + calendar * Redesigned weather systems and added seasons along with seeded weights for each quarter. * Added weather forecast to the calendar * Bug fixes	2024-04-25 16:33:49 +01:00
LoafyLemon	2c9348be59	Calendar * Add weekdays method and weekday display to the calendar * Bug fixes	2024-04-23 20:19:36 +01:00
LoafyLemon	0a213edac3	Calendar + Paperwork + Moon phases * Added simple calendar * Added half-moon phase (Artwork pending) * Made moon phases cyclical rather than random * Refactored paperwork and moon bonuses	2024-04-23 19:26:24 +01:00
LoafyLemon	63b1afc817	Say box * Unify say box	2024-04-23 19:25:17 +01:00
LoafyLemon	5ea5f8c2b4	Calendar Placeholder	2024-04-22 21:54:04 +01:00
LoafyLemon	4fbb2abad7	Interactive Object Highlight, Foreground, Bug fixes * Added interactive room object highlights * Added spacebar hotkey for the room objects highlights * Added overlay param for room objects * Fixed paperwork wheel menu action available before paperwork unlocks * Improved foreground image handling for room objects	2024-04-22 20:26:12 +01:00
LoafyLemon	9d76d6088f	Engine, Wheel menu, intro, bug fixes * Added IfExpr Action. * Added string evals for If func. * Added reset_action method for RoomObject class. * Added new actions appropriate for room relevant objects. * Fixed a potential issue with reset_variables method within Events class. * Fixed single button radius calculation in wheel menu * Fixed crash if a null list of actions was supplied to create_wheelmenu method. * Converted intro to use wheel menu actions. * Split existing room object labels where it made sense.	2024-04-22 18:11:01 +01:00
LoafyLemon	8e589f45b6	Icons, sound effects, and bug fixes * Added new head icons for characters * Fixed initial genie head position for the wheel menu * Added new interface sounds * Converted door interface to the new wheel menu (partial) * Fixed wheel menu condition bug	2024-04-18 16:57:31 +01:00
LoafyLemon	ca583cfd19	Wheelmenu + Tooltip + Cheats * Added wheelmenu buttons (WIP) * Moved cheats menu inside the wheelmenu * Added animations * Added new tooltip styling	2024-04-17 21:50:53 +01:00
LoafyLemon	f267528d4f	Wheelmenu placeholders	2024-04-17 19:23:53 +01:00
LoafyLemon	5b16c80dac	Animation + styling	2024-04-15 19:56:14 +01:00
LoafyLemon	588f1df01b	Wheelmenu + Phoenix * Added wheel menu constructor * Added new features to the phoenix * Added desk and phoenix objects to the wheelmenu	2024-04-15 19:06:18 +01:00