Bug fixes

* Fixed inconsistent spacing
* Fixed inconsistent state var access
This commit is contained in:
LoafyLemon 2024-04-02 16:18:18 +01:00
parent 908beae5d3
commit 9aff807593
9 changed files with 30 additions and 30 deletions

View File

@ -273,10 +273,10 @@ image ch_gen dick_out:
"characters/genie/chibis/jerk_off/dick_out.webp" "characters/genie/chibis/jerk_off/dick_out.webp"
image ch_gen dick_out_normal: 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: 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 # Masturbating while standing
#TODO Genie's standing jerk off chibis don't stand level with the others. Fix this and check/correct relevant events #TODO Genie's standing jerk off chibis don't stand level with the others. Fix this and check/correct relevant events

View File

@ -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") 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"): if cho.is_worn("bottom"):
play sound "sounds/cloth_sound3.ogg" play sound "sounds/cloth_sound3.ogg"
hide cho_main hide cho_main

View File

@ -13,20 +13,20 @@ label tentacle_scene_intro:
$ d_flag_03 = False $ d_flag_03 = False
label .spell: label .spell:
if d_flag_01 and d_flag_02 and d_flag_03: if d_flag_01 and d_flag_02 and d_flag_03:
jump .after_spell jump .after_spell
menu: menu:
"\"Open Sesame!\"" if not d_flag_01: "\"Open Sesame!\"" if not d_flag_01:
$ d_flag_01 = True $ d_flag_01 = True
gen "...{w=0.8} Guess not..." ("base", xpos="far_left", ypos="head") gen "...{w=0.8} Guess not..." ("base", xpos="far_left", ypos="head")
jump .spell jump .spell
"\"Hocus Pocus!\"" if not d_flag_02: "\"Hocus Pocus!\"" if not d_flag_02:
$ d_flag_02 = True $ d_flag_02 = True
gen "...{w=0.8} Damn..." ("base", xpos="far_left", ypos="head") gen "...{w=0.8} Damn..." ("base", xpos="far_left", ypos="head")
jump .spell jump .spell
"\"Abracadabra!\"" if not d_flag_03: "\"Abracadabra!\"" if not d_flag_03:
$ d_flag_03 = True $ d_flag_03 = True
gen "...{w=0.8} ..." ("base", xpos="far_left", ypos="head") gen "...{w=0.8} ..." ("base", xpos="far_left", ypos="head")
jump .spell jump .spell
label .after_spell: label .after_spell:
gen "Work, you stupid scroll, or I'll throw you in the fire!" ("angry", xpos="far_left", ypos="head") gen "Work, you stupid scroll, or I'll throw you in the fire!" ("angry", xpos="far_left", ypos="head")

View File

@ -611,8 +611,8 @@ label snape_intro_E4:
sna "......................." ("snape_01") sna "......................." ("snape_01")
sna "Yeah, right..." ("snape_01") sna "Yeah, right..." ("snape_01")
"\"I don't have a brother, Severus.\"": "\"I don't have a brother, Severus.\"":
sna "........................" ("snape_01") sna "........................" ("snape_01")
sna "You may not have one, but the real Albus Dumbledore does." ("snape_01") sna "You may not have one, but the real Albus Dumbledore does." ("snape_01")
"-Use magic to get the right answer-": "-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." 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") 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...\"": "\"A week or so...\"":
sna "*Hmm*.... A week, huh..." ("snape_01") sna "*Hmm*.... A week, huh..." ("snape_01")
"\"Could be months...\"": "\"Could be months...\"":
sna "That long?" ("snape_01") sna "That long?" ("snape_01")
sna "Now isn't that just \"perfect\"?" ("snape_01") sna "Now isn't that just \"perfect\"?" ("snape_01")
"\"I have no clue...\"": "\"I have no clue...\"":
sna "....................." ("snape_01") sna "....................." ("snape_01")
sna "Splendid..." ("snape_31") sna "Splendid..." ("snape_31")

View File

@ -81,13 +81,13 @@ init -1 python:
Actions are defined in the `actions` dict as a tuple: (special, transform, move_action|loop_time). 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. * `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. * `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. * `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. * `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: 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. 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. * 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). * 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. * 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. * Layers are updated whenever the action changes by calling `update_callback`, which is expected to set the layers again.
""" """

View File

@ -348,7 +348,7 @@ label ball_ending_E1:
play music "music/Plaint.ogg" fadein 1 fadeout 1 #SAD CREDITS MUSIC. if_changed 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 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}" centered "{size=+7}{color=#cbcbcb}Thank you for playing!{/color}{/size}\n\n{#LINT_IGNORE}"

View File

@ -2,7 +2,7 @@ init python:
class Parcel(object): class Parcel(object):
""" """
contents - Contents of the parcel, has to be a list of tuples 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. wait - Wait time required for the item to be delivered.
label - Call label called after the parcel was opened. label - Call label called after the parcel was opened.
func - A setup function called before the parcel contents is being shown to the player. func - A setup function called before the parcel contents is being shown to the player.

View File

@ -79,8 +79,8 @@ label start_dev:
states.paperwork_unlocked = True states.paperwork_unlocked = True
store.states.lun.ev.intro.e1_complete = True states.lun.ev.intro.e1_complete = True
store.states.lun.ev.intro.e2_complete = True states.lun.ev.intro.e2_complete = True
for i in mirror.items: for i in mirror.items:
i.unlocked = True i.unlocked = True

View File

@ -297,7 +297,7 @@ init -100 python:
for slot in cls.__dict__.get("__slots__", ()): for slot in cls.__dict__.get("__slots__", ()):
if slot.startswith("__") and not slot.endswith("__"): if slot.startswith("__") and not slot.endswith("__"):
raise ValueError("slotted_object __slots__ can not be mangled. " 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): def _clean(self):
rv = object.__reduce_ex__(self, 2)[2] rv = object.__reduce_ex__(self, 2)[2]