From 462921aeedebe0ad5c2221cbffaba8d5e628e646 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 6 Jul 2022 16:27:29 +0100 Subject: [PATCH] Bug fixes * Fixed animations (again) * Added unstaged butt plug files * Updated save compatibility --- .../clothes/buttplug/buttplug_large_1/0.webp | 3 +++ .../clothes/buttplug/buttplug_large_1/1.webp | 3 +++ .../clothes/buttplug/buttplug_large_1/2.webp | 3 +++ .../clothes/buttplug/buttplug_large_1/outline.webp | 3 +++ .../clothes/buttplug/buttplug_medium_1/0.webp | 3 +++ .../clothes/buttplug/buttplug_medium_1/1.webp | 3 +++ .../clothes/buttplug/buttplug_medium_1/2.webp | 3 +++ .../clothes/buttplug/buttplug_medium_1/3.webp | 3 +++ .../buttplug/buttplug_medium_1/outline.webp | 3 +++ .../clothes/buttplug/buttplug_small_1/0.webp | 3 +++ .../clothes/buttplug/buttplug_small_1/1.webp | 3 +++ .../clothes/buttplug/buttplug_small_1/outline.webp | 3 +++ .../scripts/characters/astoria/events/clothing.rpy | 2 +- .../cho/events/quidditch/gryffindor_match.rpy | 8 ++++---- .../cho/events/quidditch/hufflepuff_match.rpy | 4 ++-- game/scripts/characters/cho/events/summon.rpy | 2 +- .../characters/hermione/events/clothing.rpy | 2 +- game/scripts/characters/tonks/events/clothing.rpy | 2 +- .../characters/tonks/events/clothing_old.txt | 2 +- game/scripts/utility/updater.rpy | 14 ++++++++++++++ 20 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_large_1/0.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_large_1/1.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_large_1/2.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_large_1/outline.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_medium_1/0.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_medium_1/1.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_medium_1/2.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_medium_1/3.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_medium_1/outline.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_small_1/0.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_small_1/1.webp create mode 100644 game/characters/hermione/clothes/buttplug/buttplug_small_1/outline.webp diff --git a/game/characters/hermione/clothes/buttplug/buttplug_large_1/0.webp b/game/characters/hermione/clothes/buttplug/buttplug_large_1/0.webp new file mode 100644 index 00000000..6b056a3c --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_large_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e6ae257851d8f61517d94964f9942e07be6dd8400f34c56d2e78445f0eb6c38 +size 3158 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_large_1/1.webp b/game/characters/hermione/clothes/buttplug/buttplug_large_1/1.webp new file mode 100644 index 00000000..6eedd639 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_large_1/1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b07d6b77b4cb5e4bf5334528fbc8ae1ad256340be273aa5a37d2f1f98de35d5 +size 1048 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_large_1/2.webp b/game/characters/hermione/clothes/buttplug/buttplug_large_1/2.webp new file mode 100644 index 00000000..5ee3d81f --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_large_1/2.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e22f8194bf344f442039b0dfa862a96a89695dc5674ef9e27b28cd09bcec14c8 +size 1476 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_large_1/outline.webp b/game/characters/hermione/clothes/buttplug/buttplug_large_1/outline.webp new file mode 100644 index 00000000..dadf242e --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_large_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c0965c0530cde8cb1ba1d063ca96d79092332baf7b90ecf1ff2d0e65e00a4e +size 4578 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_medium_1/0.webp b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/0.webp new file mode 100644 index 00000000..3890816b --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9dcd4bdb702bac32f9be9f7cb5cfb21d35baa0362dfe03fcb73139dd7aefe58 +size 1794 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_medium_1/1.webp b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/1.webp new file mode 100644 index 00000000..2315a936 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae9b7412b2d44523bf331bd4b7891e9858e0fda19bd8975fab7d958b804d26bb +size 2080 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_medium_1/2.webp b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/2.webp new file mode 100644 index 00000000..9f6d6321 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/2.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c2449ebbbad6d7bb907575ca738ea72b5e131874ef86099c5c919f0ee1613ee +size 1748 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_medium_1/3.webp b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/3.webp new file mode 100644 index 00000000..36594661 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/3.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f33c88e479bc4db8f78455c324726e8b390adf8c0b90029b969698e41e3ad4f7 +size 1174 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_medium_1/outline.webp b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/outline.webp new file mode 100644 index 00000000..362e67d7 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_medium_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bf0abf3d9e66a19541ef0831eea3304b2ce60622f6a34bf0ec7116e9c4b0654 +size 4668 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_small_1/0.webp b/game/characters/hermione/clothes/buttplug/buttplug_small_1/0.webp new file mode 100644 index 00000000..73a500ed --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_small_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3757cd882368cc8cdaa6d700eccabaff8587931b1bf7feb71d55f2c0f055f7ab +size 1804 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_small_1/1.webp b/game/characters/hermione/clothes/buttplug/buttplug_small_1/1.webp new file mode 100644 index 00000000..89fd5770 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_small_1/1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23d6d22d8d7ee1eb2cacd9cf2099786b623899832e0883199d1c7015c096fa26 +size 984 diff --git a/game/characters/hermione/clothes/buttplug/buttplug_small_1/outline.webp b/game/characters/hermione/clothes/buttplug/buttplug_small_1/outline.webp new file mode 100644 index 00000000..cf8d74d4 --- /dev/null +++ b/game/characters/hermione/clothes/buttplug/buttplug_small_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32937dd2be26c2044a771e2f35d676d4feb508d87c04795def9bc0ce9629e67f +size 2562 diff --git a/game/scripts/characters/astoria/events/clothing.rpy b/game/scripts/characters/astoria/events/clothing.rpy index fa27b7ba..893d6dd9 100644 --- a/game/scripts/characters/astoria/events/clothing.rpy +++ b/game/scripts/characters/astoria/events/clothing.rpy @@ -7,7 +7,7 @@ label astoria_summon_setup: # Reset doll state $ astoria.wear("all") $ astoria.set_cum(None) - $ astoria.animation = [] + $ astoria.animation = None if astoria_outfits_schedule: $ astoria.equip_random_outfit() diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index fb42e14d..38aa176d 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -130,7 +130,7 @@ label gryffindor_match: $ cho.equip(cho_outfit_quidditch) $ cho.set_pose("broom") - $ cho.animation = [sprite_fly_idle] + $ cho.animation = sprite_fly_idle $ snape_chibi.zorder = 4 $ tonks_chibi.zorder = 3 @@ -629,7 +629,7 @@ label gryffindor_match: sna "..." ("snape_25") #Oh shit... face ton "What did I tell you about calling me--" ("mad", "wide", "annoyed", "mid", xpos="far_right", ypos=200) gen "I'm trying to watch the game here..." ("base", xpos="far_left", ypos="head") - $ tonks.animation = [] + $ tonks.animation = None $ tonks.set_body_hue(0) with d9 ton "He started it..." ("mad", "narrow", "annoyed", "mid", ypos="head") @@ -965,7 +965,7 @@ label gryffindor_match: # Transition to Cho on her broom $ cho.equip(cho_outfit_quidditch_gryffindor) $ cho.set_pose("broom") - $ cho.animation = [sprite_fly_idle] + $ cho.animation = sprite_fly_idle call cho_chibi("fly", 1100, 140) call cho_walk(530, 360, speed=2) @@ -1462,7 +1462,7 @@ label gryffindor_match_return: pause 1 $ cho.set_pose(None) - $ cho.animation = [] + $ cho.animation = None $ cho.strip("all") call play_music("stop") diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index a33b0beb..344196f7 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -941,7 +941,7 @@ label hufflepuff_match: # Transition to Cho on her broom $ cho.set_pose("broom") - $ cho.animation = [sprite_fly_idle] + $ cho.animation = sprite_fly_idle call cho_chibi("fly", 1100, 140) call cho_walk(530, 360, speed=2) @@ -1005,7 +1005,7 @@ label hufflepuff_match: call cho_walk(1200, 500+180, speed=2) pause 2 - $ cho.animation = [] + $ cho.animation = None $ cho.set_pose(None) call cho_chibi("reset") diff --git a/game/scripts/characters/cho/events/summon.rpy b/game/scripts/characters/cho/events/summon.rpy index f2caf354..8a5ad776 100644 --- a/game/scripts/characters/cho/events/summon.rpy +++ b/game/scripts/characters/cho/events/summon.rpy @@ -5,7 +5,7 @@ label cho_summon_setup: # Reset doll state $ cho.wear("all") $ cho.set_cum(None) - $ cho.animation = [] + $ cho.animation = None # Unlock favours at tier 3 # this will probably move to a cho_quid_E# event once we've implemented Gryffindor lead-up events diff --git a/game/scripts/characters/hermione/events/clothing.rpy b/game/scripts/characters/hermione/events/clothing.rpy index 4b6f2988..95456370 100644 --- a/game/scripts/characters/hermione/events/clothing.rpy +++ b/game/scripts/characters/hermione/events/clothing.rpy @@ -4,7 +4,7 @@ label hermione_summon_setup: # Reset doll state $ hermione.wear("all") $ hermione.set_cum(None) - $ hermione.animation = [] + $ hermione.animation = None # # TODO: Remove obsolete variables and fix the code after clothes have been added. diff --git a/game/scripts/characters/tonks/events/clothing.rpy b/game/scripts/characters/tonks/events/clothing.rpy index c6d2cc19..651995ae 100644 --- a/game/scripts/characters/tonks/events/clothing.rpy +++ b/game/scripts/characters/tonks/events/clothing.rpy @@ -3,7 +3,7 @@ label tonks_summon_setup: # Reset doll state $ tonks.wear("all") $ tonks.set_cum(None) - $ tonks.animation = [] + $ tonks.animation = None if not tonks_strip_happened and cc_pf_strip.is_event_complete(3, 3) and ton_friendship >= 20 and tonks.is_any_worn("top", "bottom", "bra", "panties"): $ tonks_strip_happened = True #TODO use to make event not repeat diff --git a/game/scripts/characters/tonks/events/clothing_old.txt b/game/scripts/characters/tonks/events/clothing_old.txt index 3fb2ca4d..b54079be 100644 --- a/game/scripts/characters/tonks/events/clothing_old.txt +++ b/game/scripts/characters/tonks/events/clothing_old.txt @@ -9,7 +9,7 @@ label tonks_summon_setup: # Reset doll state $ tonks.wear("all") $ tonks.set_cum(None) - $ tonks.animation = [] + $ tonks.animation = None $ random_number = renpy.random.randint(1, 20) if 5 > random_number > 0 and tonks.is_worn("top") and ton_friendship >= 50: diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 75923de3..365915ed 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -87,6 +87,20 @@ init python: her_buttplug_large1.set_imagepath() her_buttplug_large1.set_layers() + # Need to repeat the fix, because I am a donkey + for i in CHARACTERS: + char = get_character_object(i) + + if isinstance(char.animation, list) and char.animation: + char.animation = char.animation[0] + else: + char.animation = None + + if hasattr(store, "color_favorites"): + for i, col in enumerate(store.color_favorites): + col = Color(tuple(col)) + store.colorpicker.favorites[i] = col + if current > latest: raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest))