From b2fc769e69a2c951cacc99e9af27f0e2f4fa9d80 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 8 Oct 2022 21:59:31 +0100 Subject: [PATCH] Save Compatibility * Added a workaround for call stack issues on old saves * Rebuilt whitespace * Removed redundant load_fix functions --- game/images.whitespace | 312 +++++++++++++++++++++++++++++- game/scripts/utility/load_fix.rpy | 51 ----- game/scripts/utility/updater.rpy | 13 ++ 3 files changed, 318 insertions(+), 58 deletions(-) delete mode 100644 game/scripts/utility/load_fix.rpy diff --git a/game/images.whitespace b/game/images.whitespace index 89cd5c5b..a2782ad5 100644 --- a/game/images.whitespace +++ b/game/images.whitespace @@ -1945,10 +1945,21 @@ characters/hermione/clothes/accessory/ball_sash/1.webp:498,766,131,125 characters/hermione/clothes/accessory/ball_sash/extra.webp:510,769,43,117 characters/hermione/clothes/accessory/ball_sash/outline.webp:414,765,308,232 characters/hermione/clothes/accessory/ball_sash/outline_back.webp:458,990,242,7 +characters/hermione/clothes/accessory/bb_tie/0.webp:501,513,176,362 +characters/hermione/clothes/accessory/bb_tie/1.webp:502,569,83,305 +characters/hermione/clothes/accessory/bb_tie/2.webp:502,574,81,300 +characters/hermione/clothes/accessory/bb_tie/outline.webp:501,511,178,366 +characters/hermione/clothes/accessory/bb_tie/skin.webp:514,535,127,339 characters/hermione/clothes/accessory/bunny_badge/0.webp:568,789,60,99 characters/hermione/clothes/accessory/bunny_badge/outline.webp:568,789,61,101 characters/hermione/clothes/accessory/cat_tail/0.webp:315,950,147,237 characters/hermione/clothes/accessory/cat_tail/outline.webp:312,947,152,240 +characters/hermione/clothes/accessory/clit_vibrators/0.webp:530,835,85,155 +characters/hermione/clothes/accessory/clit_vibrators/1.webp:527,849,95,77 +characters/hermione/clothes/accessory/clit_vibrators/2.webp:558,964,133,38 +characters/hermione/clothes/accessory/clit_vibrators/extra.webp:533,899,63,75 +characters/hermione/clothes/accessory/clit_vibrators/outline.webp:525,834,167,170 +characters/hermione/clothes/accessory/clit_vibrators/skin.webp:542,838,67,131 characters/hermione/clothes/accessory/croft_belt/0.webp:432,815,278,240 characters/hermione/clothes/accessory/croft_belt/1.webp:443,869,225,175 characters/hermione/clothes/accessory/croft_belt/2.webp:494,854,61,38 @@ -1965,6 +1976,12 @@ characters/hermione/clothes/accessory/leg_wrap/1.webp:504,857,169,168 characters/hermione/clothes/accessory/leg_wrap/outline.webp:488,856,207,170 characters/hermione/clothes/accessory/msmarv_ribbon/0.webp:434,797,270,317 characters/hermione/clothes/accessory/msmarv_ribbon/outline.webp:431,794,275,323 +characters/hermione/clothes/accessory/nipple_vibrators/0.webp:437,553,276,135 +characters/hermione/clothes/accessory/nipple_vibrators/1.webp:436,548,193,137 +characters/hermione/clothes/accessory/nipple_vibrators/2.webp:661,589,73,47 +characters/hermione/clothes/accessory/nipple_vibrators/extra.webp:440,628,257,35 +characters/hermione/clothes/accessory/nipple_vibrators/outline.webp:434,547,302,143 +characters/hermione/clothes/accessory/nipple_vibrators/skin.webp:451,571,266,94 characters/hermione/clothes/accessory/tifa_belt/0.webp:452,841,237,111 characters/hermione/clothes/accessory/tifa_belt/1.webp:524,894,22,10 characters/hermione/clothes/accessory/tifa_belt/extra.webp:452,849,237,52 @@ -2073,11 +2090,15 @@ characters/hermione/clothes/bottom/yen_skirt/0.webp:454,824,239,151 characters/hermione/clothes/bottom/yen_skirt/outline.webp:451,822,244,155 characters/hermione/clothes/bra/bandaids/0.webp:437,634,169,66 characters/hermione/clothes/bra/bandaids/outline.webp:435,632,173,68 -characters/hermione/clothes/bra/basic_bra_1/0.webp:448,515,232,211 +characters/hermione/clothes/bra/basic_bra_1/0.webp:436,516,243,209 characters/hermione/clothes/bra/basic_bra_1/1.webp:523,677,26,22 characters/hermione/clothes/bra/basic_bra_1/mask.webp:0,0,1010,1200 characters/hermione/clothes/bra/basic_bra_1/outline.webp:447,515,235,211 characters/hermione/clothes/bra/basic_bra_1/skin.webp:507,526,151,199 +characters/hermione/clothes/bra/basic_bra_vibrators/0.webp:436,516,243,209 +characters/hermione/clothes/bra/basic_bra_vibrators/1.webp:524,677,25,22 +characters/hermione/clothes/bra/basic_bra_vibrators/outline.webp:434,515,247,211 +characters/hermione/clothes/bra/basic_bra_vibrators/skin.webp:507,527,151,198 characters/hermione/clothes/bra/bikini_bra_1/0.webp:436,626,160,65 characters/hermione/clothes/bra/bikini_bra_1/1.webp:450,626,148,67 characters/hermione/clothes/bra/bikini_bra_1/extra.webp:433,635,149,51 @@ -2330,10 +2351,14 @@ characters/hermione/clothes/neckwear/whore_collar/overlay.webp:577,486,74,29 characters/hermione/clothes/neckwear/yen_choker/0.webp:579,477,69,29 characters/hermione/clothes/neckwear/yen_choker/extra.webp:579,503,26,32 characters/hermione/clothes/neckwear/yen_choker/outline.webp:577,475,72,60 -characters/hermione/clothes/panties/basic_panties_1/0.webp:459,821,223,113 +characters/hermione/clothes/panties/basic_panties_1/0.webp:459,822,223,112 characters/hermione/clothes/panties/basic_panties_1/1.webp:527,850,19,18 characters/hermione/clothes/panties/basic_panties_1/outline.webp:459,819,225,117 characters/hermione/clothes/panties/basic_panties_1/skin.webp:463,824,208,101 +characters/hermione/clothes/panties/basic_panties_vibrators/0.webp:459,822,223,112 +characters/hermione/clothes/panties/basic_panties_vibrators/1.webp:528,850,17,17 +characters/hermione/clothes/panties/basic_panties_vibrators/outline.webp:458,819,226,117 +characters/hermione/clothes/panties/basic_panties_vibrators/skin.webp:463,824,209,101 characters/hermione/clothes/panties/bikini_panties_1/0.webp:532,898,34,37 characters/hermione/clothes/panties/bikini_panties_1/1.webp:472,849,94,82 characters/hermione/clothes/panties/bikini_panties_1/outline.webp:466,840,203,96 @@ -2517,6 +2542,11 @@ characters/hermione/clothes/stockings/xmas/outline.webp:459,846,228,354 characters/hermione/clothes/stockings/yen_stockings/0.webp:474,1010,214,190 characters/hermione/clothes/stockings/yen_stockings/outline.webp:479,1026,204,174 characters/hermione/clothes/tattoo/10g_tattoo/0.webp:520,843,49,55 +characters/hermione/clothes/tattoo/bb_tattoo/0.webp:602,840,71,91 +characters/hermione/clothes/tattoo/bb_tattoo/1.webp:620,858,38,28 +characters/hermione/clothes/tattoo/bb_tattoo/2.webp:620,875,50,36 +characters/hermione/clothes/tattoo/bb_tattoo/extra.webp:619,858,51,54 +characters/hermione/clothes/tattoo/bb_tattoo/skin.webp:620,858,51,54 characters/hermione/clothes/tattoo/bunny_tattoo1/0.webp:616,874,50,79 characters/hermione/clothes/tattoo/cockhole_tattoo/0.webp:515,847,63,37 characters/hermione/clothes/tattoo/cumhere_tattoo1/0.webp:530,545,130,39 @@ -2728,6 +2758,13 @@ characters/hermione/cum/legs/heavy.webp:457,860,215,340 characters/hermione/cum/legs/light.webp:510,860,146,191 characters/hermione/cum/pussy/heavy.webp:537,923,21,114 characters/hermione/cum/pussy/light.webp:537,923,20,44 +characters/hermione/cum/pussy/underwear_heavy.webp:529,918,35,51 +characters/hermione/cum/pussy/underwear_light.webp:529,918,35,38 +characters/hermione/cum/pussy/vibrator_post.webp:526,895,41,89 +characters/hermione/cum/pussy/vibrator_pre.webp:533,920,32,22 +characters/hermione/cum/pussy/vibrator_squirt.webp:513,895,54,136 +characters/hermione/cum/pussy/vibratorp_heavy.webp:529,911,35,58 +characters/hermione/cum/pussy/vibratorp_light.webp:529,918,35,38 characters/hermione/emote/angry.webp:602,319,45,43 characters/hermione/emote/confused.webp:449,166,129,101 characters/hermione/emote/happy.webp:472,135,131,127 @@ -4183,6 +4220,30 @@ characters/susan/clothes/panties/sport_panties_1/0.webp:454,866,269,157 characters/susan/clothes/panties/sport_panties_1/1.webp:454,846,267,183 characters/susan/clothes/panties/sport_panties_1/outline.webp:452,843,272,187 characters/susan/clothes/panties/sport_panties_1/skin.webp:458,847,240,184 +characters/susan/clothes/robe/robe_school_1/0.webp:417,555,349,645 +characters/susan/clothes/robe/robe_school_1/1.webp:491,512,218,140 +characters/susan/clothes/robe/robe_school_1/extra.webp:517,648,61,13 +characters/susan/clothes/robe/robe_school_1/outline.webp:416,510,352,690 +characters/susan/clothes/robe/robe_school_1/skin.webp:527,532,130,133 +characters/susan/clothes/robe/robe_school_2/0.webp:417,555,349,645 +characters/susan/clothes/robe/robe_school_2/1.webp:491,512,218,140 +characters/susan/clothes/robe/robe_school_2/extra.webp:406,620,262,580 +characters/susan/clothes/robe/robe_school_2/outline.webp:416,510,352,690 +characters/susan/clothes/robe/robe_school_2/skin.webp:504,532,192,668 +characters/susan/clothes/robe/robe_school_3/0.webp:417,555,349,645 +characters/susan/clothes/robe/robe_school_3/1.webp:491,512,218,140 +characters/susan/clothes/robe/robe_school_3/1_back.webp:487,1165,23,35 +characters/susan/clothes/robe/robe_school_3/2.webp:487,1165,23,35 +characters/susan/clothes/robe/robe_school_3/extra.webp:406,648,262,552 +characters/susan/clothes/robe/robe_school_3/outline.webp:416,510,352,690 +characters/susan/clothes/robe/robe_school_3/skin.webp:492,532,204,668 +characters/susan/clothes/robe/robe_school_4/0.webp:455,747,314,453 +characters/susan/clothes/robe/robe_school_4/1.webp:449,735,292,124 +characters/susan/clothes/robe/robe_school_4/1_back.webp:424,997,87,203 +characters/susan/clothes/robe/robe_school_4/extra.webp:483,815,233,45 +characters/susan/clothes/robe/robe_school_4/outline.webp:447,731,322,469 +characters/susan/clothes/robe/robe_school_4/outline_back.webp:425,918,87,282 +characters/susan/clothes/robe/robe_school_4/skin.webp:452,770,261,430 characters/susan/clothes/stockings/short_school_1/0.webp:480,1121,222,79 characters/susan/clothes/stockings/short_school_1/1.webp:469,1078,241,122 characters/susan/clothes/stockings/short_school_1/extra.webp:505,1101,101,90 @@ -4402,6 +4463,11 @@ characters/tonks/clothes/accessory/flower/extra.webp:634,542,72,64 characters/tonks/clothes/accessory/flower/outline.webp:632,541,75,67 characters/tonks/clothes/accessory/neck_towel/0.webp:433,497,265,269 characters/tonks/clothes/accessory/neck_towel/outline.webp:431,494,269,274 +characters/tonks/clothes/accessory/office_pin/0.webp:440,671,46,30 +characters/tonks/clothes/accessory/office_pin/1.webp:451,647,16,27 +characters/tonks/clothes/accessory/office_pin/2.webp:442,671,44,11 +characters/tonks/clothes/accessory/office_pin/extra.webp:441,672,42,25 +characters/tonks/clothes/accessory/office_pin/outline.webp:440,646,47,56 characters/tonks/clothes/accessory/police_badge/0.webp:609,609,56,52 characters/tonks/clothes/accessory/police_badge/outline.webp:608,608,58,54 characters/tonks/clothes/accessory/succubus_tail/0.webp:694,871,142,163 @@ -4423,6 +4489,15 @@ characters/tonks/clothes/bottom/leggings/0.webp:433,818,321,382 characters/tonks/clothes/bottom/leggings/outline.webp:433,815,322,385 characters/tonks/clothes/bottom/leggings_hole/0.webp:433,818,321,382 characters/tonks/clothes/bottom/leggings_hole/outline.webp:433,815,322,385 +characters/tonks/clothes/bottom/mechanic_shorts/0.webp:430,857,276,145 +characters/tonks/clothes/bottom/mechanic_shorts/1.webp:436,851,248,86 +characters/tonks/clothes/bottom/mechanic_shorts/2.webp:568,889,35,35 +characters/tonks/clothes/bottom/mechanic_shorts/3.webp:432,945,278,72 +characters/tonks/clothes/bottom/mechanic_shorts/outline.webp:428,848,284,171 +characters/tonks/clothes/bottom/mechanic_shorts/skin.webp:441,889,248,133 +characters/tonks/clothes/bottom/office/0.webp:428,819,332,381 +characters/tonks/clothes/bottom/office/outline.webp:426,817,336,383 +characters/tonks/clothes/bottom/office/skin.webp:488,822,156,32 characters/tonks/clothes/bottom/police/0.webp:431,823,279,196 characters/tonks/clothes/bottom/police/1.webp:460,823,211,61 characters/tonks/clothes/bottom/police/outline.webp:428,821,286,200 @@ -4515,6 +4590,9 @@ characters/tonks/clothes/gloves/leather_gloves/0_front.webp:433,827,295,99 characters/tonks/clothes/gloves/leather_gloves/extra.webp:433,830,291,89 characters/tonks/clothes/gloves/leather_gloves/outline.webp:432,826,300,101 characters/tonks/clothes/gloves/leather_gloves/outline_front.webp:432,826,300,101 +characters/tonks/clothes/gloves/mechanic_gloves/0.webp:433,818,298,108 +characters/tonks/clothes/gloves/mechanic_gloves/outline.webp:432,748,519,179 +characters/tonks/clothes/gloves/mechanic_gloves/skin.webp:447,842,216,80 characters/tonks/clothes/gloves/succubus_gloves/0.webp:396,539,449,387 characters/tonks/clothes/gloves/succubus_gloves/0_front.webp:396,539,449,387 characters/tonks/clothes/gloves/succubus_gloves/outline.webp:395,615,451,312 @@ -4525,6 +4603,10 @@ characters/tonks/clothes/hair/base/0.webp:482,220,236,248 characters/tonks/clothes/hair/base/1.webp:494,235,205,121 characters/tonks/clothes/hair/base/outline.webp:481,218,239,254 characters/tonks/clothes/hair/base/skin.webp:519,328,98,61 +characters/tonks/clothes/hair/mechanic_hair/0.webp:473,249,217,247 +characters/tonks/clothes/hair/mechanic_hair/1.webp:482,256,198,123 +characters/tonks/clothes/hair/mechanic_hair/outline.webp:472,248,221,255 +characters/tonks/clothes/hair/mechanic_hair/skin.webp:532,336,91,63 characters/tonks/clothes/hair/new/0.webp:475,256,245,235 characters/tonks/clothes/hair/new/0_back.webp:462,399,101,116 characters/tonks/clothes/hair/new/1.webp:477,263,235,139 @@ -4552,6 +4634,12 @@ characters/tonks/clothes/headgear/elf/outline.webp:594,200,207,131 characters/tonks/clothes/headgear/horns/0.webp:474,243,220,98 characters/tonks/clothes/headgear/horns/1.webp:474,243,220,52 characters/tonks/clothes/headgear/horns/outline.webp:472,242,224,101 +characters/tonks/clothes/headgear/mechanic_cap/0.webp:507,263,171,92 +characters/tonks/clothes/headgear/mechanic_cap/1.webp:484,289,161,97 +characters/tonks/clothes/headgear/mechanic_cap/extra.webp:543,294,25,34 +characters/tonks/clothes/headgear/mechanic_cap/mask.webp:0,0,1010,1200 +characters/tonks/clothes/headgear/mechanic_cap/outline.webp:481,261,199,127 +characters/tonks/clothes/headgear/mechanic_cap/skin.webp:514,368,112,40 characters/tonks/clothes/headgear/police/0.webp:450,282,218,127 characters/tonks/clothes/headgear/police/1.webp:469,257,192,74 characters/tonks/clothes/headgear/police/2.webp:477,298,142,29 @@ -4592,10 +4680,9 @@ characters/tonks/clothes/neckwear/bunny_bowtie_1/skin.webp:532,515,93,65 characters/tonks/clothes/neckwear/choker_1/0.webp:574,494,73,34 characters/tonks/clothes/neckwear/choker_1/extra.webp:575,501,52,24 characters/tonks/clothes/neckwear/choker_1/outline.webp:573,492,76,38 -characters/tonks/clothes/neckwear/choker_beads/0.webp:575,502,65,18 -characters/tonks/clothes/neckwear/choker_beads/1.webp:575,505,59,15 -characters/tonks/clothes/neckwear/choker_beads/extra.webp:575,504,59,17 -characters/tonks/clothes/neckwear/choker_beads/outline.webp:575,501,67,20 +characters/tonks/clothes/neckwear/choker_beads/0.webp:575,496,69,27 +characters/tonks/clothes/neckwear/choker_beads/1.webp:572,498,73,21 +characters/tonks/clothes/neckwear/choker_beads/outline.webp:572,495,73,29 characters/tonks/clothes/neckwear/pearls_1/0.webp:564,504,90,37 characters/tonks/clothes/neckwear/pearls_1/extra.webp:564,504,91,38 characters/tonks/clothes/neckwear/pearls_1/outline.webp:562,501,96,44 @@ -4626,6 +4713,9 @@ characters/tonks/clothes/panties/bikini_panties_1_striped/0.webp:475,805,179,165 characters/tonks/clothes/panties/bikini_panties_1_striped/1.webp:475,805,180,165 characters/tonks/clothes/panties/bikini_panties_1_striped/outline.webp:475,803,180,168 characters/tonks/clothes/panties/bikini_panties_1_striped/skin.webp:486,819,154,101 +characters/tonks/clothes/panties/mechanic_bikini/0.webp:460,824,205,147 +characters/tonks/clothes/panties/mechanic_bikini/outline.webp:458,822,210,151 +characters/tonks/clothes/panties/mechanic_bikini/skin.webp:466,832,181,108 characters/tonks/clothes/panties/ribbon/0.webp:487,869,215,179 characters/tonks/clothes/panties/ribbon/extra.webp:487,872,175,175 characters/tonks/clothes/panties/ribbon/outline.webp:485,867,219,181 @@ -4669,13 +4759,19 @@ characters/tonks/clothes/pubes/unshaved/0.webp:514,908,63,53 characters/tonks/clothes/robe/auror_coat/0.webp:396,499,449,701 characters/tonks/clothes/robe/auror_coat/0_back.webp:454,496,218,704 characters/tonks/clothes/robe/auror_coat/0_front.webp:694,736,128,148 -characters/tonks/clothes/robe/auror_coat/1.webp:448,606,213,433 +characters/tonks/clothes/robe/auror_coat/1.webp:472,608,202,461 characters/tonks/clothes/robe/auror_coat/outline.webp:394,497,452,703 characters/tonks/clothes/robe/auror_coat/outline_front.webp:693,736,130,149 +characters/tonks/clothes/robe/auror_coat/skin.webp:526,537,116,107 characters/tonks/clothes/robe/dressing_gown/0.webp:391,522,465,497 characters/tonks/clothes/robe/dressing_gown/1.webp:390,522,466,497 characters/tonks/clothes/robe/dressing_gown/outline.webp:389,519,468,501 characters/tonks/clothes/robe/dressing_gown/skin.webp:442,533,299,493 +characters/tonks/clothes/robe/office/0.webp:392,522,460,461 +characters/tonks/clothes/robe/office/0_back.webp:695,838,56,94 +characters/tonks/clothes/robe/office/1.webp:469,764,279,100 +characters/tonks/clothes/robe/office/outline.webp:390,521,464,464 +characters/tonks/clothes/robe/office/skin.webp:458,530,158,454 characters/tonks/clothes/robe/silk_robe/0.webp:393,507,386,693 characters/tonks/clothes/robe/silk_robe/0_back.webp:563,1016,62,184 characters/tonks/clothes/robe/silk_robe/outline.webp:388,506,395,694 @@ -4709,6 +4805,9 @@ characters/tonks/clothes/stockings/long_striped/1.webp:441,998,310,202 characters/tonks/clothes/stockings/long_striped/extra.webp:441,985,291,215 characters/tonks/clothes/stockings/long_striped/outline.webp:432,932,323,268 characters/tonks/clothes/stockings/long_striped/skin.webp:436,944,253,54 +characters/tonks/clothes/stockings/mechanic_thigh_socks/0.webp:450,999,303,201 +characters/tonks/clothes/stockings/mechanic_thigh_socks/outline.webp:447,995,308,205 +characters/tonks/clothes/stockings/mechanic_thigh_socks/skin.webp:443,1007,260,61 characters/tonks/clothes/stockings/xmas/0.webp:449,847,286,247 characters/tonks/clothes/stockings/xmas/1.webp:456,1054,298,146 characters/tonks/clothes/stockings/xmas/outline.webp:448,846,307,354 @@ -4743,8 +4842,19 @@ characters/tonks/clothes/top/elf_dress/0.webp:423,582,361,416 characters/tonks/clothes/top/elf_dress/extra.webp:423,613,260,384 characters/tonks/clothes/top/elf_dress/outline.webp:422,581,363,418 characters/tonks/clothes/top/elf_dress/skin.webp:447,581,330,418 +characters/tonks/clothes/top/mechanic_vest/0.webp:438,527,277,264 +characters/tonks/clothes/top/mechanic_vest/1.webp:450,525,265,271 +characters/tonks/clothes/top/mechanic_vest/2.webp:498,625,59,108 +characters/tonks/clothes/top/mechanic_vest/outline.webp:435,522,283,276 +characters/tonks/clothes/top/mechanic_vest/skin.webp:493,536,218,271 characters/tonks/clothes/top/nightie_1/0.webp:431,532,302,523 characters/tonks/clothes/top/nightie_1/outline.webp:429,530,305,526 +characters/tonks/clothes/top/office/0.webp:394,494,453,450 +characters/tonks/clothes/top/office/0_front.webp:552,494,106,72 +characters/tonks/clothes/top/office/1.webp:540,566,47,315 +characters/tonks/clothes/top/office/outline.webp:392,519,457,428 +characters/tonks/clothes/top/office/outline_front.webp:549,491,112,77 +characters/tonks/clothes/top/office/skin.webp:489,504,237,445 characters/tonks/clothes/top/police1/0.webp:436,527,275,277 characters/tonks/clothes/top/police1/1.webp:435,498,361,395 characters/tonks/clothes/top/police1/2.webp:548,702,13,107 @@ -5320,6 +5430,39 @@ images/CG/common/bg.webp:0,0,2160,1200 images/CG/common/day_overlay.webp:0,0,3840,2160 images/CG/common/mask.webp:0,0,2160,1200 images/CG/common/night_overlay.webp:0,0,3840,2160 +images/CG/her_flash/public/her_flash_public_background.webp:0,0,2160,1200 +images/CG/her_flash/public/her_flash_public_blush_heavy.webp:1560,239,188,162 +images/CG/her_flash/public/her_flash_public_effects_exclamation.webp:844,19,380,394 +images/CG/her_flash/public/her_flash_public_effects_herquestion.webp:1095,20,457,301 +images/CG/her_flash/public/her_flash_public_effects_question.webp:844,19,380,394 +images/CG/her_flash/public/her_flash_public_effects_questions.webp:844,19,380,394 +images/CG/her_flash/public/her_flash_public_eyebrows_worried.webp:1560,223,155,44 +images/CG/her_flash/public/her_flash_public_eyes_clenched.webp:1568,263,148,29 +images/CG/her_flash/public/her_flash_public_eyes_open_forward.webp:1566,248,157,69 +images/CG/her_flash/public/her_flash_public_eyes_open_left.webp:1566,248,157,69 +images/CG/her_flash/public/her_flash_public_eyes_open_right.webp:1566,248,157,69 +images/CG/her_flash/public/her_flash_public_hermione_pose1.webp:1453,0,707,1200 +images/CG/her_flash/public/her_flash_public_hermione_pose2.webp:112,0,2048,1200 +images/CG/her_flash/public/her_flash_public_hermione_pose3.webp:1453,0,707,1200 +images/CG/her_flash/public/her_flash_public_hermione_pose4.webp:112,0,2048,1200 +images/CG/her_flash/public/her_flash_public_mouth_frown.webp:1610,364,61,26 +images/CG/her_flash/public/her_flash_public_mouth_smile.webp:1607,361,69,28 +images/CG/her_flash/public/her_flash_public_mouth_soft.webp:1620,362,51,36 +images/CG/her_flash/public/her_flash_public_npc_pose1.webp:164,14,945,1186 +images/CG/her_flash/public/her_flash_public_npc_pose2.webp:164,14,945,1186 +images/CG/her_flash/public/her_flash_public_npc_pose3.webp:200,0,886,1200 +images/CG/her_flash/public/her_flash_public_npc_pose4.webp:200,0,886,1200 +images/CG/her_flash/public/her_flash_public_npc_pose5.webp:198,0,890,1200 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_background.webp:0,0,4320,4800 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_feather.webp:294,385,188,442 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione.webp:0,0,4320,4800 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_eyebrows_neutral.webp:2052,609,256,48 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_eyebrows_raised.webp:2052,602,243,52 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_eyes_down.webp:2054,658,240,71 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_eyes_forward.webp:2053,661,237,68 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_hand.webp:769,764,887,497 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_mouth_closed.webp:2051,782,344,204 +images/CG/her_flirt/public/flitwick/her_flirt_public_flitwick_hermione_mouth_open.webp:2048,804,341,210 images/CG/her_intro/bg.webp:0,0,2160,1200 images/CG/her_intro/day_overlay.webp:0,0,3840,2160 images/CG/her_intro/hermione_bendover.webp:1381,333,622,839 @@ -5352,6 +5495,144 @@ images/CG/her_sex/hold_armfix.webp:878,640,1102,1004 images/CG/her_sex/night_overlay.webp:0,0,2500,2550 images/CG/her_sex/open_wide_tongue.webp:542,1616,226,176 images/CG/her_sex/scream.webp:542,1616,226,175 +images/CG/her_vibrators/personal/her_vibrators_personal_background.webp:0,0,2160,1200 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_blush_heavy.webp:1021,154,143,64 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_body.webp:427,22,1068,1097 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_effects_puddle.webp:831,685,467,402 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_effects_wetness.webp:1063,686,68,56 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_effects_wetness_minor.webp:1075,693,39,45 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyebrows_neutral.webp:1022,134,120,16 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyebrows_upset.webp:1033,135,112,23 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyebrows_worried.webp:1024,141,117,20 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_clenched.webp:1033,155,102,20 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_closed.webp:1032,162,103,12 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_narrow_crossed.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_narrow_forward.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_narrow_right.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_open_forward.webp:1028,152,110,26 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_open_right.webp:1028,152,110,26 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_squint_crossed.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_squint_forward.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_squint_right.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_wide_crossed.webp:1028,150,110,29 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_wide_forward.webp:1028,150,110,29 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_eyes_wide_right.webp:1028,150,110,29 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_fringe.webp:876,22,412,367 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_ahegao.webp:1067,208,38,47 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_ahegao_wet.webp:1067,208,38,47 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_angry.webp:1062,208,48,33 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_annoyed.webp:1065,212,40,20 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_horny.webp:1071,212,31,25 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_open.webp:1066,211,37,30 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_shocked.webp:1068,208,36,38 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_mouth_worried.webp:1066,211,37,28 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_shadow.webp:506,582,907,519 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_vibrator_base.webp:933,314,320,353 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_vibrator_eggl.webp:974,333,44,54 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_vibrator_eggr.webp:1154,337,44,53 +images/CG/her_vibrators/personal/hermione1/her_vibrators_personal_hermione1_vibrator_tape.webp:962,340,248,46 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_blush_heavy.webp:1021,154,143,64 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_body.webp:677,22,858,1081 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_effects_puddle.webp:831,685,467,402 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_effects_wetness.webp:1040,660,131,82 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_effects_wetness_minor.webp:1076,645,38,56 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyebrows_neutral.webp:1022,134,120,16 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyebrows_upset.webp:1033,135,112,23 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyebrows_worried.webp:1024,141,117,20 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_clenched.webp:1033,155,102,20 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_closed.webp:1032,162,103,12 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_narrow_crossed.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_narrow_forward.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_narrow_right.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_open_forward.webp:1028,152,110,26 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_open_right.webp:1028,152,110,26 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_squint_crossed.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_squint_forward.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_squint_right.webp:1028,155,110,22 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_wide_crossed.webp:1028,150,110,29 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_wide_forward.webp:1028,150,110,29 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_eyes_wide_right.webp:1028,150,110,29 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_fringe.webp:876,22,412,367 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_ahegao.webp:1067,208,38,47 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_ahegao_wet.webp:1067,208,38,47 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_angry.webp:1062,208,48,33 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_annoyed.webp:1065,212,40,20 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_horny.webp:1071,212,31,25 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_open.webp:1066,211,37,30 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_shocked.webp:1068,208,36,38 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_mouth_worried.webp:1066,211,37,28 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_shadow.webp:728,629,750,477 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_vibrator_base.webp:933,314,369,381 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_vibrator_eggl.webp:974,333,44,54 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_vibrator_eggm.webp:1073,593,45,61 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_vibrator_eggr.webp:1154,337,44,53 +images/CG/her_vibrators/personal/hermione2/her_vibrators_personal_hermione2_vibrator_tape.webp:962,340,248,307 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_blush_heavy.webp:1003,188,134,76 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_body.webp:552,147,1033,923 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_effects_mascara.webp:1011,183,121,78 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_effects_puddle.webp:831,685,467,402 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_effects_squirt.webp:996,331,141,276 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_effects_wetness.webp:1019,511,141,116 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_effects_wetness_minor.webp:1047,508,53,89 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_eyebrows_worried.webp:1017,184,97,26 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_eyes_ahegao.webp:1018,199,100,27 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_eyes_clenched.webp:1017,204,101,21 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_eyes_closed.webp:1016,209,101,14 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_mouth_ahegao.webp:1054,236,33,54 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_mouth_open.webp:1052,238,35,25 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_shadow.webp:595,555,896,529 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_vibrator_base.webp:931,265,343,340 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_vibrator_eggl.webp:933,279,32,35 +images/CG/her_vibrators/personal/hermione3/her_vibrators_personal_hermione3_vibrator_eggr.webp:1169,267,34,34 +images/CG/her_vibrators/public/her_vibrators_public_background.webp:0,0,2160,1200 +images/CG/her_vibrators/public/her_vibrators_public_npc_shock_harry.webp:1887,30,252,218 +images/CG/her_vibrators/public/her_vibrators_public_npc_shock_harry_effect.webp:1596,70,150,140 +images/CG/her_vibrators/public/her_vibrators_public_npc_shock_ron.webp:0,142,280,204 +images/CG/her_vibrators/public/her_vibrators_public_npc_shock_ron_effect.webp:410,57,139,169 +images/CG/her_vibrators/public/her_vibrators_public_npc_sus_ron.webp:0,131,280,222 +images/CG/her_vibrators/public/hermione/her_vibrators_public_blush_heavy.webp:1059,207,144,89 +images/CG/her_vibrators/public/hermione/her_vibrators_public_blush_neutral.webp:1075,233,111,50 +images/CG/her_vibrators/public/hermione/her_vibrators_public_body.webp:965,187,338,1013 +images/CG/her_vibrators/public/hermione/her_vibrators_public_bra.webp:1020,334,219,149 +images/CG/her_vibrators/public/hermione/her_vibrators_public_effects_shaky_legs.webp:964,944,344,92 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyebrows_neutral.webp:1083,210,94,16 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyebrows_surprised.webp:1082,206,95,19 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyebrows_upset.webp:1084,209,93,17 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyebrows_worried.webp:1084,207,93,19 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_ahegao.webp:1088,225,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_base.webp:1088,225,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_big_ahegao.webp:1088,224,86,22 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_big_crossed.webp:1088,224,86,22 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_clenched.webp:1087,225,89,22 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_closed.webp:1087,231,87,13 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_crossed.webp:1088,225,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_down.webp:1088,225,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_forward.webp:1088,225,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_left.webp:1088,225,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_eyes_sad.webp:1088,226,86,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_hair.webp:960,117,353,343 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_ahegao.webp:1116,271,33,47 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_disappointed.webp:1115,276,34,16 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_grossedout1.webp:1116,243,32,59 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_grossedout2.webp:1115,261,34,32 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_lip_bite.webp:1115,274,33,21 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_neutral.webp:1115,277,34,15 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_open.webp:1116,271,34,26 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_shocked.webp:1116,271,33,29 +images/CG/her_vibrators/public/hermione/her_vibrators_public_mouth_upset.webp:1115,276,34,17 +images/CG/her_vibrators/public/hermione/her_vibrators_public_outfit_uniform.webp:935,303,376,897 +images/CG/her_vibrators/public/hermione/her_vibrators_public_panties.webp:996,606,276,167 +images/CG/her_vibrators/public/hermione/her_vibrators_public_tears_ahegao.webp:1090,234,81,31 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_lower_base.webp:1128,611,163,173 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_lower_effect.webp:1101,656,53,70 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_lower_egg.webp:1110,663,180,66 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_lower_tape.webp:1109,662,181,67 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_upper_base.webp:1008,363,252,133 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_upper_effect.webp:1038,372,182,45 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_upper_egg.webp:1022,366,209,124 +images/CG/her_vibrators/public/hermione/her_vibrators_public_vibrator_upper_tape.webp:1022,366,209,124 +images/CG/her_vibrators/public/hermione/her_vibrators_public_wetness_legs.webp:1078,732,97,137 +images/CG/her_vibrators/public/hermione/her_vibrators_public_wetness_vagina.webp:1104,680,55,78 images/CG/herm_boob/1.webp:91,0,903,600 images/CG/herm_boob/10.webp:284,0,710,600 images/CG/herm_boob/11.webp:284,0,710,600 @@ -6385,6 +6666,7 @@ images/misc/drop.webp:178,205,17,56 images/misc/exclamation.webp:6,137,81,103 images/misc/folks.webp:128,40,826,160 images/misc/gameover.webp:313,258,444,342 +images/misc/geniedrawing.webp:216,80,402,732 images/misc/heart.webp:0,0,17,14 images/misc/hearts.webp:4,192,86,71 images/misc/intro/01_01.webp:0,0,1080,600 @@ -6402,6 +6684,7 @@ images/misc/intro/06_01.webp:0,0,1080,600 images/misc/intro/06_02.webp:0,0,1080,600 images/misc/light.webp:0,0,1080,600 images/misc/old.webp:1,1,405,364 +images/misc/paper.webp:0,6,773,831 images/misc/question.webp:23,127,68,128 images/misc/redhead.webp:212,124,173,657 images/misc/smoke.webp:0,440,2160,760 @@ -6417,6 +6700,7 @@ images/misc/tut_04.webp:0,0,800,600 images/misc/tut_05.webp:0,0,800,600 images/misc/tut_06.webp:0,0,800,600 images/misc/tut_07.webp:0,0,800,600 +images/misc/vibrators_floor.webp:0,0,84,33 images/rooms/_bg_/castle.webp:0,0,1080,600 images/rooms/_bg_/corridor.webp:0,0,1080,600 images/rooms/_bg_/custom.webp:0,0,1080,600 @@ -6808,6 +7092,19 @@ images/title/fire05.webp:0,208,697,709 images/title/fire06.webp:0,208,697,709 images/title/fire07.webp:0,208,697,709 images/title/sparkle.webp:0,0,49,50 +images/ui/vibrator_interface/vibrator_interface_background.webp:13,70,845,241 +images/ui/vibrator_interface/vibrator_interface_caption_high.webp:546,13,136,58 +images/ui/vibrator_interface/vibrator_interface_caption_low.webp:212,8,129,60 +images/ui/vibrator_interface/vibrator_interface_caption_medium.webp:347,12,191,85 +images/ui/vibrator_interface/vibrator_interface_emoji_high.webp:489,10,243,262 +images/ui/vibrator_interface/vibrator_interface_emoji_high_disabled.webp:489,10,243,261 +images/ui/vibrator_interface/vibrator_interface_emoji_low.webp:148,10,246,262 +images/ui/vibrator_interface/vibrator_interface_emoji_low_disabled.webp:149,10,245,261 +images/ui/vibrator_interface/vibrator_interface_emoji_medium.webp:318,10,246,262 +images/ui/vibrator_interface/vibrator_interface_emoji_medium_disabled.webp:319,10,245,261 +images/ui/vibrator_interface/vibrator_interface_vibration_high.webp:0,187,867,134 +images/ui/vibrator_interface/vibrator_interface_vibration_low.webp:27,191,823,130 +images/ui/vibrator_interface/vibrator_interface_vibration_medium.webp:0,191,867,130 interface/achievements/glass.webp:6,6,84,84 interface/achievements/glass_iconbox.webp:3,2,43,44 interface/achievements/glass_selected.webp:0,0,84,84 @@ -7033,6 +7330,7 @@ interface/icons/bat_spleen.webp:244,188,464,579 interface/icons/bats_trophy.webp:1,0,769,166 interface/icons/beads.webp:36,58,257,201 interface/icons/bicorn_horn.webp:233,218,484,518 +interface/icons/box-o-fun.webp:14,59,937,871 interface/icons/box_blue_1.webp:44,66,261,231 interface/icons/box_blue_2.webp:34,57,259,225 interface/icons/box_blue_3.webp:34,67,259,215 diff --git a/game/scripts/utility/load_fix.rpy b/game/scripts/utility/load_fix.rpy deleted file mode 100644 index fa56b40e..00000000 --- a/game/scripts/utility/load_fix.rpy +++ /dev/null @@ -1,51 +0,0 @@ - -# Must be appended AFTER update_patcher -init 2 python: - config.load_failed_label = "load_failed" - #config.after_load_callbacks.append(load_fix) - -# load_fix function breaks saves compatiblity in Ren'py 7.4.9 onward, -# in fact, Ren'py will clear its own callstack and find correct label to jump to. - -# init -1 python: -# def load_fix(): -# # Scan the call stack for missing labels -# # If a label is missing, assume a fatal error will occur eventually -# # Then wipe the stack and jump to config.load_failed_label to prevent the error - -# context = renpy.game.context() -# script = renpy.game.script -# for i in xrange(-1, -len(context.return_stack)-1, -1): -# node = None - -# if script.has_label(context.return_stack[i]): -# node = script.lookup(context.return_stack[i]) -# elif script.has_label(context.call_location_stack[i]): -# node = script.lookup(context.call_location_stack[i]).next - -# if node is None: -# # Clean up similar to RollbackLog.load_failed -# while renpy.exports.call_stack_depth(): -# renpy.exports.pop_call() - -# renpy.game.contexts[0].force_checkpoint = True -# renpy.game.contexts[0].goto_label(renpy.config.load_failed_label) - -# raise renpy.game.RestartTopContext() -# return - -label load_failed: - python: - # Clear all screens and stop all sound - renpy.scene("screens") - for c in ["music", "bg_sounds", "weather"]: - renpy.music.stop(c, 0.5) - active_girl = None - - $ renpy.block_rollback() # Prevent rollback to broken past - show screen blktone - "Something went wrong while loading your save, but all is not lost! You will be back in the office with the same progress as when you saved the game. However, you can't rollback to a time before that moment." - hide screen blktone - with d5 - $ renpy.block_rollback() # Prevent rollback to this message - jump main_room diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 618040f9..5e8aa8be 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -53,6 +53,16 @@ init python: def __call__(self): renpy.invoke_in_new_context(updater.update, self.url, simulate=self.simulate, **self.kwargs) + def fix_return_stack(): + for layer in config.layers: + renpy.scene(layer) + + for channel in renpy.audio.audio.channels.keys(): + if isinstance(channel, str) and not channel.startswith("_"): + renpy.music.stop(channel) + + renpy.set_return_stack(("main_room",)) + def version_float(): control, major, minor = config.version.split(" ")[0].split(".") return float("{}.{}{}".format(control, major, minor)) @@ -113,6 +123,8 @@ init python: char.rebuild() + fix_return_stack() + if current > latest: raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest)) @@ -123,6 +135,7 @@ init python: achievements.attempt_repair() renpy.call_in_new_context("modal_popup", "Update Successful", "\nYour save file has been successfully updated to version {{b}}{}{{/b}}.\n\n{}".format(config.version, message), None, "Hurray!") + renpy.block_rollback() return