From 186cb39803c2246e270af75627168b1172e23b2b Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 5 Jul 2022 22:19:24 +0100 Subject: [PATCH] Butt Plugs * Moved Hermione's butt plugs into their proper type * Removed obsolete image files --- .../clothes/accessory/buttplug_large_1/0.webp | 3 --- .../clothes/accessory/buttplug_large_1/1.webp | 3 --- .../clothes/accessory/buttplug_large_1/2.webp | 3 --- .../clothes/accessory/buttplug_large_1/outline.webp | 3 --- .../clothes/accessory/buttplug_medium_1/0.webp | 3 --- .../clothes/accessory/buttplug_medium_1/1.webp | 3 --- .../clothes/accessory/buttplug_medium_1/2.webp | 3 --- .../clothes/accessory/buttplug_medium_1/3.webp | 3 --- .../clothes/accessory/buttplug_medium_1/outline.webp | 3 --- .../clothes/accessory/buttplug_small_1/0.webp | 3 --- .../clothes/accessory/buttplug_small_1/1.webp | 3 --- .../clothes/accessory/buttplug_small_1/outline.webp | 3 --- game/characters/hermione/clothes/plugs/large.webp | 3 --- game/characters/hermione/clothes/plugs/medium.webp | 3 --- game/characters/hermione/clothes/plugs/small.webp | 3 --- game/scripts/characters/hermione/wardrobe.rpy | 7 +++---- game/scripts/options.rpy | 2 +- game/scripts/utility/updater.rpy | 12 ++++++++++++ game/scripts/wardrobe/color_picker.rpy | 8 +++----- 19 files changed, 19 insertions(+), 55 deletions(-) delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_large_1/0.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_large_1/1.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_large_1/2.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_large_1/outline.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_medium_1/0.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_medium_1/1.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_medium_1/2.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_medium_1/3.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_medium_1/outline.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_small_1/0.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_small_1/1.webp delete mode 100644 game/characters/hermione/clothes/accessory/buttplug_small_1/outline.webp delete mode 100644 game/characters/hermione/clothes/plugs/large.webp delete mode 100644 game/characters/hermione/clothes/plugs/medium.webp delete mode 100644 game/characters/hermione/clothes/plugs/small.webp diff --git a/game/characters/hermione/clothes/accessory/buttplug_large_1/0.webp b/game/characters/hermione/clothes/accessory/buttplug_large_1/0.webp deleted file mode 100644 index 6b056a3c..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_large_1/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e6ae257851d8f61517d94964f9942e07be6dd8400f34c56d2e78445f0eb6c38 -size 3158 diff --git a/game/characters/hermione/clothes/accessory/buttplug_large_1/1.webp b/game/characters/hermione/clothes/accessory/buttplug_large_1/1.webp deleted file mode 100644 index 6eedd639..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_large_1/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b07d6b77b4cb5e4bf5334528fbc8ae1ad256340be273aa5a37d2f1f98de35d5 -size 1048 diff --git a/game/characters/hermione/clothes/accessory/buttplug_large_1/2.webp b/game/characters/hermione/clothes/accessory/buttplug_large_1/2.webp deleted file mode 100644 index 5ee3d81f..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_large_1/2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e22f8194bf344f442039b0dfa862a96a89695dc5674ef9e27b28cd09bcec14c8 -size 1476 diff --git a/game/characters/hermione/clothes/accessory/buttplug_large_1/outline.webp b/game/characters/hermione/clothes/accessory/buttplug_large_1/outline.webp deleted file mode 100644 index dadf242e..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_large_1/outline.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1c0965c0530cde8cb1ba1d063ca96d79092332baf7b90ecf1ff2d0e65e00a4e -size 4578 diff --git a/game/characters/hermione/clothes/accessory/buttplug_medium_1/0.webp b/game/characters/hermione/clothes/accessory/buttplug_medium_1/0.webp deleted file mode 100644 index 3890816b..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_medium_1/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9dcd4bdb702bac32f9be9f7cb5cfb21d35baa0362dfe03fcb73139dd7aefe58 -size 1794 diff --git a/game/characters/hermione/clothes/accessory/buttplug_medium_1/1.webp b/game/characters/hermione/clothes/accessory/buttplug_medium_1/1.webp deleted file mode 100644 index 2315a936..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_medium_1/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae9b7412b2d44523bf331bd4b7891e9858e0fda19bd8975fab7d958b804d26bb -size 2080 diff --git a/game/characters/hermione/clothes/accessory/buttplug_medium_1/2.webp b/game/characters/hermione/clothes/accessory/buttplug_medium_1/2.webp deleted file mode 100644 index 9f6d6321..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_medium_1/2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c2449ebbbad6d7bb907575ca738ea72b5e131874ef86099c5c919f0ee1613ee -size 1748 diff --git a/game/characters/hermione/clothes/accessory/buttplug_medium_1/3.webp b/game/characters/hermione/clothes/accessory/buttplug_medium_1/3.webp deleted file mode 100644 index 36594661..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_medium_1/3.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f33c88e479bc4db8f78455c324726e8b390adf8c0b90029b969698e41e3ad4f7 -size 1174 diff --git a/game/characters/hermione/clothes/accessory/buttplug_medium_1/outline.webp b/game/characters/hermione/clothes/accessory/buttplug_medium_1/outline.webp deleted file mode 100644 index 362e67d7..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_medium_1/outline.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bf0abf3d9e66a19541ef0831eea3304b2ce60622f6a34bf0ec7116e9c4b0654 -size 4668 diff --git a/game/characters/hermione/clothes/accessory/buttplug_small_1/0.webp b/game/characters/hermione/clothes/accessory/buttplug_small_1/0.webp deleted file mode 100644 index 73a500ed..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_small_1/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3757cd882368cc8cdaa6d700eccabaff8587931b1bf7feb71d55f2c0f055f7ab -size 1804 diff --git a/game/characters/hermione/clothes/accessory/buttplug_small_1/1.webp b/game/characters/hermione/clothes/accessory/buttplug_small_1/1.webp deleted file mode 100644 index 89fd5770..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_small_1/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23d6d22d8d7ee1eb2cacd9cf2099786b623899832e0883199d1c7015c096fa26 -size 984 diff --git a/game/characters/hermione/clothes/accessory/buttplug_small_1/outline.webp b/game/characters/hermione/clothes/accessory/buttplug_small_1/outline.webp deleted file mode 100644 index cf8d74d4..00000000 --- a/game/characters/hermione/clothes/accessory/buttplug_small_1/outline.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32937dd2be26c2044a771e2f35d676d4feb508d87c04795def9bc0ce9629e67f -size 2562 diff --git a/game/characters/hermione/clothes/plugs/large.webp b/game/characters/hermione/clothes/plugs/large.webp deleted file mode 100644 index 2d5ff6a2..00000000 --- a/game/characters/hermione/clothes/plugs/large.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c62e5bc1ef5557cd6ceac2db89f0f8a490694c91dc73b23680f41db39d3e723 -size 43118 diff --git a/game/characters/hermione/clothes/plugs/medium.webp b/game/characters/hermione/clothes/plugs/medium.webp deleted file mode 100644 index 5e857b67..00000000 --- a/game/characters/hermione/clothes/plugs/medium.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:469b177aa2b905c1076f8cea1b8eaf3ed5de679a48d51f22cc77e04545ebc5ad -size 41542 diff --git a/game/characters/hermione/clothes/plugs/small.webp b/game/characters/hermione/clothes/plugs/small.webp deleted file mode 100644 index 70439372..00000000 --- a/game/characters/hermione/clothes/plugs/small.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49f37f49195e8e6b22040cbe5d1b35a37baefdd9372c51db8a69be2d35a8b751 -size 23570 diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy index 852aab55..87338ffc 100644 --- a/game/scripts/characters/hermione/wardrobe.rpy +++ b/game/scripts/characters/hermione/wardrobe.rpy @@ -532,10 +532,9 @@ default her_neckwear_slave_collar = DollCloth("hermione", ("head", "neckwear"), ################ ## Butt Plugs ## ################ -default her_buttplug_small1 = DollCloth("hermione", ("misc", "accessory"), "accessory0", "buttplug_small_1", [[252, 195, 219, 255], [84, 76, 214, 255]], zorder=-1, level=15) -default her_buttplug_medium1 = DollCloth("hermione", ("misc", "accessory"), "accessory0", "buttplug_medium_1", [[255, 255, 119, 255], [243, 140, 9, 255], [255, 76, 46, 255], [84, 76, 214, 255]], zorder=-1, level=19) -default her_buttplug_large1 = DollCloth("hermione", ("misc", "accessory"), "accessory0", "buttplug_large_1", [[99, 208, 14, 255], [254, 108, 181, 255], [84, 76, 214, 255]], zorder=-1, level=23) - +default her_buttplug_small1 = DollCloth("hermione", ("misc", "accessory"), "buttplug", "buttplug_small_1", [[252, 195, 219, 255], [84, 76, 214, 255]], zorder=-1, level=15) +default her_buttplug_medium1 = DollCloth("hermione", ("misc", "accessory"), "buttplug", "buttplug_medium_1", [[255, 255, 119, 255], [243, 140, 9, 255], [255, 76, 46, 255], [84, 76, 214, 255]], zorder=-1, level=19) +default her_buttplug_large1 = DollCloth("hermione", ("misc", "accessory"), "buttplug", "buttplug_large_1", [[99, 208, 14, 255], [254, 108, 181, 255], [84, 76, 214, 255]], zorder=-1, level=23) ############### ## Piercings ## diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy index 45332ac5..6ca8721b 100644 --- a/game/scripts/options.rpy +++ b/game/scripts/options.rpy @@ -30,7 +30,7 @@ define config.developer = "auto" define config.console = True # Game version and naming -define config.version = "1.43.2" +define config.version = "1.43.3" define compatible_version = 1.43 define config.name = "Witch Trainer Silver" diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 1f1bb263..75923de3 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -75,6 +75,18 @@ init python: else: char.animation = None + if current <= 1.432: + her_buttplug_small1.type = "buttplug" + her_buttplug_medium1.type = "buttplug" + her_buttplug_large1.type = "buttplug" + + her_buttplug_small1.set_imagepath() + her_buttplug_small1.set_layers() + her_buttplug_medium1.set_imagepath() + her_buttplug_medium1.set_layers() + her_buttplug_large1.set_imagepath() + her_buttplug_large1.set_layers() + if current > latest: raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest)) diff --git a/game/scripts/wardrobe/color_picker.rpy b/game/scripts/wardrobe/color_picker.rpy index fcfc556a..7ae6f9dd 100644 --- a/game/scripts/wardrobe/color_picker.rpy +++ b/game/scripts/wardrobe/color_picker.rpy @@ -403,13 +403,11 @@ screen colorpickerscreen(item=None): zorder 30 modal True - default is_cheating = config.developer or cheat_wardrobe_alpha - if item: + default is_cheating = config.developer or cheat_wardrobe_alpha default is_blacklisted = item.type.startswith(tuple(item.blacklist_unequip)) default is_allowed = item.type.startswith(("makeup", "tattoo")) - - default transparency = not is_blacklisted and item and (is_allowed or is_cheating) + default transparency = item and not is_blacklisted and (is_allowed or is_cheating) if config.developer: vbox: @@ -423,7 +421,7 @@ screen colorpickerscreen(item=None): frame: style_prefix "colorpicker" background "cp_frame" - align (0.5, 0.5) + align (0.2, 0.5) padding (18, 18) has vbox