forked from Cavemanon/SnootGame
Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts: # game/script.rpy
This commit is contained in:
@ -29,9 +29,8 @@ init python:
|
||||
# allows playing looped ambience alongside music
|
||||
renpy.music.register_channel("ambient","sfx",True,tight=True)
|
||||
renpy.music.register_channel("ambient1","sfx",True,tight=True)
|
||||
#for issue #13 not finalized
|
||||
#if persistent.scroll == True:
|
||||
# config.keymap['dismiss'].append('mousedown_5')
|
||||
if persistent.scroll == True:
|
||||
config.keymap['dismiss'].append('mousedown_4')
|
||||
|
||||
transform randPosition:
|
||||
alpha 0.0
|
||||
@ -104,21 +103,6 @@ image ctc_mid_marker:
|
||||
linear 0.5 alpha 0
|
||||
repeat
|
||||
|
||||
# image ctc_end_marker:
|
||||
# "pickicon"
|
||||
# xalign 0.9 yalign 0.98
|
||||
# pause 0.5
|
||||
# xalign 0.92
|
||||
# pause 0.5
|
||||
# repeat
|
||||
# image ctc_mid_marker:
|
||||
# "pickicon"
|
||||
# xalign 0.9 yalign 0.98
|
||||
# pause 0.5
|
||||
# xalign 0.92
|
||||
# pause 0.5
|
||||
# repeat
|
||||
|
||||
#Characters
|
||||
define base = Character (ctc="ctc_end_marker", ctc_pause="ctc_mid_marker", ctc_timedpause=Null(), ctc_position="fixed") # try to remember some of the basics of CTC
|
||||
define I = Character(kind=base) # for internal dialogue i.e narration. Required for CTC indicators working with Anon's thoughts
|
||||
|
Reference in New Issue
Block a user