forked from SilverStudioGames/WTS
Bug fixes
* Fixed name conflict within screen scopes (pickling error) * Fixed expression editor error
This commit is contained in:
parent
640ff67bca
commit
2f74221abb
@ -89,7 +89,7 @@ init python:
|
||||
|
||||
if not silent:
|
||||
renpy.play('sounds/achievement.ogg')
|
||||
renpy.show_screen("achievement_window", string=persistent.achievements[id][1], title="Achievement unlocked!", icon=persistent.achievements[id][4])
|
||||
renpy.show_screen("achievement_window", msg=persistent.achievements[id][1], title="Achievement unlocked!", icon=persistent.achievements[id][4])
|
||||
|
||||
def lock(self, id):
|
||||
self.achievements[id][3] = False
|
||||
@ -119,14 +119,14 @@ default achievements = Achievements()
|
||||
|
||||
###
|
||||
|
||||
label popup(string="", title="", icon=None, xpos=0, ypos=60, sound=True, soundfile='sounds/achievement.ogg'):
|
||||
label popup(msg="", title="", icon=None, xpos=0, ypos=60, sound=True, soundfile='sounds/achievement.ogg'):
|
||||
if sound:
|
||||
play sound soundfile
|
||||
hide screen achievement_window
|
||||
show screen achievement_window(string=string, title=title, icon=icon, xpos=xpos, ypos=ypos)
|
||||
show screen achievement_window(msg=msg, title=title, icon=icon, xpos=xpos, ypos=ypos)
|
||||
return
|
||||
|
||||
screen achievement_window(string="", title="", icon=None, xpos=0, ypos=60):
|
||||
screen achievement_window(msg="", title="", icon=None, xpos=0, ypos=60):
|
||||
tag popup_window
|
||||
layer "interface"
|
||||
|
||||
@ -160,7 +160,7 @@ screen achievement_window(string="", title="", icon=None, xpos=0, ypos=60):
|
||||
spacing 10
|
||||
xalign 0.5
|
||||
text title size 18 xalign 0.5 xanchor 0.5
|
||||
text string size 14 xalign 0.5 xanchor 0.5
|
||||
text msg size 14 xalign 0.5 xanchor 0.5
|
||||
timer 6.0 action Hide("achievement_window")
|
||||
|
||||
transform rotate_circular():
|
||||
|
@ -7,7 +7,7 @@ transform popup_animation(time=4.0, xx=-200):
|
||||
pause time
|
||||
linear 0.5 xoffset absolute(xx)
|
||||
|
||||
screen popup_window(string="", xpos=0, ypos=60):
|
||||
screen popup_window(msg="", xpos=0, ypos=60):
|
||||
tag popup_window
|
||||
zorder 100
|
||||
|
||||
@ -18,7 +18,7 @@ screen popup_window(string="", xpos=0, ypos=60):
|
||||
at popup_animation
|
||||
pos (xpos, ypos)
|
||||
|
||||
text string align (0.5, 0.5) size 12
|
||||
text msg align (0.5, 0.5) size 12
|
||||
|
||||
label give_reward(text="You found something!", gift="interface/icons/box_blue_2.webp", sound=True):
|
||||
if sound:
|
||||
|
@ -76,7 +76,7 @@ init python:
|
||||
args = node.arguments
|
||||
|
||||
if not args:
|
||||
args = ArgumentInfo(contents, None, None)
|
||||
args = renpy.ast.ArgumentInfo(contents, None, None)
|
||||
node.arguments = args
|
||||
else:
|
||||
if args.starred_indexes or args.doublestarred_indexes:
|
||||
|
Loading…
Reference in New Issue
Block a user