Transitions

* Apply transitions for dolls only to the doll layer
* Add missing doll transitions for Genie
This commit is contained in:
LoafyLemon 2024-05-21 21:00:35 +01:00
parent 972b9dcd70
commit 2b04947b9f
9 changed files with 10 additions and 19 deletions

View File

@ -40,8 +40,7 @@ init python:
def show(): def show():
astoria.show(force=True) astoria.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes

View File

@ -38,8 +38,7 @@ init python in character:
def show(): def show():
renpy.store.cho.show(force=True) renpy.store.cho.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or renpy.store.d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes

View File

@ -36,6 +36,8 @@ init python:
if renpy.showing("genie", layer=layer): if renpy.showing("genie", layer=layer):
renpy.show(variant, layer=layer, tag="genie", at_list=at_list) renpy.show(variant, layer=layer, tag="genie", at_list=at_list)
renpy.with_statement({"dolls": trans or d2})
if flip is not None: if flip is not None:
states.gen.image.xzoom = -1 if flip else 1 states.gen.image.xzoom = -1 if flip else 1

View File

@ -33,8 +33,7 @@ init python:
def show(): def show():
hermione.show(force=True) hermione.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes

View File

@ -24,8 +24,7 @@ init python:
def show(): def show():
hooch.show(force=True) hooch.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes

View File

@ -36,8 +36,7 @@ init python:
def show(): def show():
luna.show(force=True) luna.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes

View File

@ -56,11 +56,7 @@ init python:
renpy.show(name=tag, at_list=at_list, layer=layer, what=sprite, zorder=states.sna.image.zorder) renpy.show(name=tag, at_list=at_list, layer=layer, what=sprite, zorder=states.sna.image.zorder)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
if trans:
renpy.with_statement(trans)
else:
renpy.with_statement(d2)
if what: if what:
character.snape_say(what, **kwargs) character.snape_say(what, **kwargs)

View File

@ -35,8 +35,7 @@ init python:
def show(): def show():
susan.show(force=True) susan.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes

View File

@ -46,8 +46,7 @@ init python:
def show(): def show():
tonks.show(force=True) tonks.show(force=True)
if not renpy.in_rollback(): renpy.with_statement({"dolls": trans or d2})
renpy.with_statement(trans or d2)
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes