From 9aff8075930f048689c2fe13a78f1f75f53f9d43 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 2 Apr 2024 16:18:18 +0100 Subject: [PATCH] Bug fixes * Fixed inconsistent spacing * Fixed inconsistent state var access --- game/scripts/animations/ani_genie.rpy | 4 +-- .../events/favors/inspect_her_body_tier2.rpy | 2 +- .../characters/hermione/events/tentacles.rpy | 26 +++++++++---------- .../scripts/characters/snape/events/intro.rpy | 8 +++--- game/scripts/chibis/classes.rpy | 10 +++---- game/scripts/events/ending.rpy | 2 +- game/scripts/interface/parcel.rpy | 2 +- game/scripts/script.rpy | 4 +-- game/scripts/utility/engine.rpy | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/game/scripts/animations/ani_genie.rpy b/game/scripts/animations/ani_genie.rpy index f1ce3a78..af055844 100644 --- a/game/scripts/animations/ani_genie.rpy +++ b/game/scripts/animations/ani_genie.rpy @@ -273,10 +273,10 @@ image ch_gen dick_out: "characters/genie/chibis/jerk_off/dick_out.webp" image ch_gen dick_out_normal: - "characters/genie/chibis/jerk_off/dick_out_normal.webp" + "characters/genie/chibis/jerk_off/dick_out_normal.webp" image ch_gen dick_out_shocked: - "characters/genie/chibis/jerk_off/dick_out_shocked.webp" + "characters/genie/chibis/jerk_off/dick_out_shocked.webp" # Masturbating while standing #TODO Genie's standing jerk off chibis don't stand level with the others. Fix this and check/correct relevant events diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy index aa0b5ab1..2defd5de 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy @@ -813,7 +813,7 @@ label cc_pf_strip_T2_intro_E3: cho @ cheeks blush "Does Granger do these sorts of things for you too?" ("soft", "base", "worried", "mid") - # Remove skirt. + # Remove skirt. if cho.is_worn("bottom"): play sound "sounds/cloth_sound3.ogg" hide cho_main diff --git a/game/scripts/characters/hermione/events/tentacles.rpy b/game/scripts/characters/hermione/events/tentacles.rpy index c10ba8f1..5be634bf 100644 --- a/game/scripts/characters/hermione/events/tentacles.rpy +++ b/game/scripts/characters/hermione/events/tentacles.rpy @@ -13,20 +13,20 @@ label tentacle_scene_intro: $ d_flag_03 = False label .spell: if d_flag_01 and d_flag_02 and d_flag_03: - jump .after_spell + jump .after_spell menu: - "\"Open Sesame!\"" if not d_flag_01: - $ d_flag_01 = True - gen "...{w=0.8} Guess not..." ("base", xpos="far_left", ypos="head") - jump .spell - "\"Hocus Pocus!\"" if not d_flag_02: - $ d_flag_02 = True - gen "...{w=0.8} Damn..." ("base", xpos="far_left", ypos="head") - jump .spell - "\"Abracadabra!\"" if not d_flag_03: - $ d_flag_03 = True - gen "...{w=0.8} ..." ("base", xpos="far_left", ypos="head") - jump .spell + "\"Open Sesame!\"" if not d_flag_01: + $ d_flag_01 = True + gen "...{w=0.8} Guess not..." ("base", xpos="far_left", ypos="head") + jump .spell + "\"Hocus Pocus!\"" if not d_flag_02: + $ d_flag_02 = True + gen "...{w=0.8} Damn..." ("base", xpos="far_left", ypos="head") + jump .spell + "\"Abracadabra!\"" if not d_flag_03: + $ d_flag_03 = True + gen "...{w=0.8} ..." ("base", xpos="far_left", ypos="head") + jump .spell label .after_spell: gen "Work, you stupid scroll, or I'll throw you in the fire!" ("angry", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/snape/events/intro.rpy b/game/scripts/characters/snape/events/intro.rpy index 4329070a..d2d183e6 100644 --- a/game/scripts/characters/snape/events/intro.rpy +++ b/game/scripts/characters/snape/events/intro.rpy @@ -611,8 +611,8 @@ label snape_intro_E4: sna "......................." ("snape_01") sna "Yeah, right..." ("snape_01") "\"I don't have a brother, Severus.\"": - sna "........................" ("snape_01") - sna "You may not have one, but the real Albus Dumbledore does." ("snape_01") + sna "........................" ("snape_01") + sna "You may not have one, but the real Albus Dumbledore does." ("snape_01") "-Use magic to get the right answer-": nar "You use your phenomenal cosmic powers to peek into the very fabric of the universe and get the correct answer." gen "My little brother Aberforth? Why would I miss him?" ("base", xpos="far_left", ypos="head") @@ -640,8 +640,8 @@ label snape_intro_E4: "\"A week or so...\"": sna "*Hmm*.... A week, huh..." ("snape_01") "\"Could be months...\"": - sna "That long?" ("snape_01") - sna "Now isn't that just \"perfect\"?" ("snape_01") + sna "That long?" ("snape_01") + sna "Now isn't that just \"perfect\"?" ("snape_01") "\"I have no clue...\"": sna "....................." ("snape_01") sna "Splendid..." ("snape_31") diff --git a/game/scripts/chibis/classes.rpy b/game/scripts/chibis/classes.rpy index 2e8abea5..de3ea8d4 100644 --- a/game/scripts/chibis/classes.rpy +++ b/game/scripts/chibis/classes.rpy @@ -81,13 +81,13 @@ init -1 python: Actions are defined in the `actions` dict as a tuple: (special, transform, move_action|loop_time). * `special` (bool) specifies whether layer images should come from a folder with the same name as the action. - This can be useful to prevent repetitive code in update callbacks. + This can be useful to prevent repetitive code in update callbacks. * `transform` (string) is the name of the transform that is used for this action. - It will be combined with a base transform. + It will be combined with a base transform. * `move_action` (string) if set, it's the action that will be used when the chibi starts moving after the current action. - It should not be set for move actions. + It should not be set for move actions. * `loop_time` (float) if set, it's the time in seconds for one animation loop of this action. Used to calculate movement time. - It should only be set for move actions. Set to zero to disable time adjustments. + It should only be set for move actions. Set to zero to disable time adjustments. Layers: A chibi is made up of one or more named layers. These are cleared on update and should be set by a callback function. @@ -95,7 +95,7 @@ init -1 python: * A layer can be set to either a filename or any kind of displayable. * When setting an image filename, this class will look for it in `image_path` (or `image_path/action` if the action is special). * Adding `~` as a prefix to a filename will ignore the special action folder. - This can be useful for images that are compatible with multiple actions. + This can be useful for images that are compatible with multiple actions. * Layers are updated whenever the action changes by calling `update_callback`, which is expected to set the layers again. """ diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy index 3783d2bb..7b6a4f1d 100644 --- a/game/scripts/events/ending.rpy +++ b/game/scripts/events/ending.rpy @@ -348,7 +348,7 @@ label ball_ending_E1: play music "music/Plaint.ogg" fadein 1 fadeout 1 #SAD CREDITS MUSIC. if_changed centered """{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n - {size=+5}{color=#cbcbcb}This is ending \"00\" out of \"02\".{/color}{/size}{#LINT_IGNORE}""" + {size=+5}{color=#cbcbcb}This is ending \"00\" out of \"02\".{/color}{/size}{#LINT_IGNORE}""" centered "{size=+7}{color=#cbcbcb}Thank you for playing!{/color}{/size}\n\n{#LINT_IGNORE}" diff --git a/game/scripts/interface/parcel.rpy b/game/scripts/interface/parcel.rpy index f82778df..ce45f199 100644 --- a/game/scripts/interface/parcel.rpy +++ b/game/scripts/interface/parcel.rpy @@ -2,7 +2,7 @@ init python: class Parcel(object): """ contents - Contents of the parcel, has to be a list of tuples - containing an item object and integer quantity [ (lollipop_ITEM, 5) ]. + containing an item object and integer quantity [ (lollipop_ITEM, 5) ]. wait - Wait time required for the item to be delivered. label - Call label called after the parcel was opened. func - A setup function called before the parcel contents is being shown to the player. diff --git a/game/scripts/script.rpy b/game/scripts/script.rpy index 20093d43..041ac48d 100644 --- a/game/scripts/script.rpy +++ b/game/scripts/script.rpy @@ -79,8 +79,8 @@ label start_dev: states.paperwork_unlocked = True - store.states.lun.ev.intro.e1_complete = True - store.states.lun.ev.intro.e2_complete = True + states.lun.ev.intro.e1_complete = True + states.lun.ev.intro.e2_complete = True for i in mirror.items: i.unlocked = True diff --git a/game/scripts/utility/engine.rpy b/game/scripts/utility/engine.rpy index 7e0803df..85d24745 100644 --- a/game/scripts/utility/engine.rpy +++ b/game/scripts/utility/engine.rpy @@ -297,7 +297,7 @@ init -100 python: for slot in cls.__dict__.get("__slots__", ()): if slot.startswith("__") and not slot.endswith("__"): raise ValueError("slotted_object __slots__ can not be mangled. " - "If you need it, mangle it by yourself.") + "If you need it, mangle it by yourself.") def _clean(self): rv = object.__reduce_ex__(self, 2)[2]