Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Bug fixes

Browse Source 
* Fixed name conflict within screen scopes (pickling error)
* Fixed expression editor error
This commit is contained in:
LoafyLemon 2023-06-28 17:47:38 +01:00
parent 640ff67bca
commit 2f74221abb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
game/scripts/interface/achievements.rpy
View File

@ -89,7 +89,7 @@ init python:
if not silent: if not silent:
renpy.play('sounds/achievement.ogg') 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): def lock(self, id):
self.achievements[id][3] = False 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: if sound:
play sound soundfile play sound soundfile
hide screen achievement_window 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 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 tag popup_window
layer "interface" layer "interface"
@ -160,7 +160,7 @@ screen achievement_window(string="", title="", icon=None, xpos=0, ypos=60):
spacing 10 spacing 10
xalign 0.5 xalign 0.5
text title size 18 xalign 0.5 xanchor 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") timer 6.0 action Hide("achievement_window")
transform rotate_circular(): transform rotate_circular():

4
game/scripts/interface/popup.rpy
View File

@ -7,7 +7,7 @@ transform popup_animation(time=4.0, xx=-200):
pause time pause time
linear 0.5 xoffset absolute(xx) 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 tag popup_window
zorder 100 zorder 100
@ -18,7 +18,7 @@ screen popup_window(string="", xpos=0, ypos=60):
at popup_animation at popup_animation
pos (xpos, ypos) 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): label give_reward(text="You found something!", gift="interface/icons/box_blue_2.webp", sound=True):
if sound: if sound:

2
game/scripts/utility/editor.rpy
View File

@ -76,7 +76,7 @@ init python:
args = node.arguments args = node.arguments
if not args: if not args:
args = ArgumentInfo(contents, None, None) args = renpy.ast.ArgumentInfo(contents, None, None)
node.arguments = args node.arguments = args
else: else:
if args.starred_indexes or args.doublestarred_indexes: if args.starred_indexes or args.doublestarred_indexes: