forked from SilverStudioGames/WTS
Bug fixes
* Default renderer to Auto for compatibility reasons * Fixed animation assignments for dolls * Fixed missing side images for non-doll speakers
This commit is contained in:
parent
56ccffb8a2
commit
bf5710bf10
@ -99,10 +99,7 @@ init python:
|
|||||||
astoria.set_emote(emote)
|
astoria.set_emote(emote)
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
astoria.animation = animation
|
astoria.animation = animation
|
||||||
else:
|
|
||||||
astoria.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -97,10 +97,7 @@ init python in character:
|
|||||||
renpy.store.cho.set_emote(emote)
|
renpy.store.cho.set_emote(emote)
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
renpy.store.cho.animation = animation
|
renpy.store.cho.animation = animation
|
||||||
else:
|
|
||||||
renpy.store.cho.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -89,10 +89,7 @@ init python:
|
|||||||
hermione.set_emote(emote)
|
hermione.set_emote(emote)
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
hermione.animation = animation
|
hermione.animation = animation
|
||||||
else:
|
|
||||||
hermione.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -39,10 +39,7 @@ init python:
|
|||||||
hooch.set_emote(emote)
|
hooch.set_emote(emote)
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
hooch.animation = animation
|
hooch.animation = animation
|
||||||
else:
|
|
||||||
hooch.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -96,10 +96,7 @@ init python:
|
|||||||
luna.set_emote(emote)
|
luna.set_emote(emote)
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
luna.animation = animation
|
luna.animation = animation
|
||||||
else:
|
|
||||||
luna.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -36,10 +36,7 @@ init python:
|
|||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
snape_animation = animation
|
snape_animation = animation
|
||||||
else:
|
|
||||||
snape_animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
@ -53,7 +50,12 @@ init python:
|
|||||||
if wand:
|
if wand:
|
||||||
sprite = Fixed(sprite, "characters/snape/main/wand.webp")
|
sprite = Fixed(sprite, "characters/snape/main/wand.webp")
|
||||||
|
|
||||||
renpy.show(name=tag, at_list=[base_transform] + snape_animation, layer=layer, what=sprite, zorder=snape_zorder)
|
at_list = [base_transform]
|
||||||
|
|
||||||
|
if animation:
|
||||||
|
at_list.append(snape_animation)
|
||||||
|
|
||||||
|
renpy.show(name=tag, at_list=at_list, layer=layer, what=sprite, zorder=snape_zorder)
|
||||||
|
|
||||||
if not renpy.in_rollback():
|
if not renpy.in_rollback():
|
||||||
if trans:
|
if trans:
|
||||||
|
@ -94,10 +94,7 @@ init python:
|
|||||||
susan.set_emote(emote)
|
susan.set_emote(emote)
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
susan.animation = animation
|
susan.animation = animation
|
||||||
else:
|
|
||||||
susan.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -122,10 +122,7 @@ init python:
|
|||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if animation != False:
|
if animation != False:
|
||||||
if isinstance(animation, list):
|
|
||||||
tonks.animation = animation
|
tonks.animation = animation
|
||||||
else:
|
|
||||||
tonks.animation = [animation]
|
|
||||||
redraw = True
|
redraw = True
|
||||||
|
|
||||||
if flip != None:
|
if flip != None:
|
||||||
|
@ -16,7 +16,7 @@ init python:
|
|||||||
# Image properties
|
# Image properties
|
||||||
self.zorder = 15
|
self.zorder = 15
|
||||||
self.layer = "screens"
|
self.layer = "screens"
|
||||||
self.animation = []
|
self.animation = None
|
||||||
self.tag = get_character_tag(name)
|
self.tag = get_character_tag(name)
|
||||||
|
|
||||||
# Transform properties
|
# Transform properties
|
||||||
@ -53,9 +53,6 @@ init python:
|
|||||||
at_list = [base_transform]
|
at_list = [base_transform]
|
||||||
|
|
||||||
if animation:
|
if animation:
|
||||||
if isinstance(animation, list):
|
|
||||||
at_list += animation
|
|
||||||
else:
|
|
||||||
at_list.append(animation)
|
at_list.append(animation)
|
||||||
|
|
||||||
renpy.show(name=self.tag, at_list=at_list, layer=self.layer, what=self.get_image(), zorder=self.zorder)
|
renpy.show(name=self.tag, at_list=at_list, layer=self.layer, what=self.get_image(), zorder=self.zorder)
|
||||||
|
@ -29,8 +29,8 @@ screen say(who, what, side_image=None, icon=None):
|
|||||||
if not renpy.get_screen("choice"):
|
if not renpy.get_screen("choice"):
|
||||||
use invisible_button(action=Function(ui.saybehavior), keysym="dismiss")
|
use invisible_button(action=Function(ui.saybehavior), keysym="dismiss")
|
||||||
|
|
||||||
#if side_image:
|
if side_image:
|
||||||
add SideImage()
|
add side_image yalign 1.0 yanchor 1.0 zoom 0.5
|
||||||
|
|
||||||
window id "window":
|
window id "window":
|
||||||
style gui.theme("say_window")
|
style gui.theme("say_window")
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
default preferences.text_cps = 40
|
default preferences.text_cps = 40
|
||||||
default preferences.afm_time = 15
|
default preferences.afm_time = 15
|
||||||
default preferences.pad_enabled = False
|
default preferences.pad_enabled = False
|
||||||
default preferences.renderer = "gl2"
|
default preferences.renderer = "auto"
|
||||||
default preferences.gl_powersave = False
|
default preferences.gl_powersave = False
|
||||||
default preferences.audio_when_minimized = False
|
default preferences.audio_when_minimized = False
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user