forked from Cavemanon/SnootGame
Changes
This commit is contained in:
@ -1,5 +1,3 @@
|
|||||||
# Snoot Game
|
The OST player comes from here https://github.com/GanstaKingofSA/RenPy-Universal-Player
|
||||||
|
|
||||||
<h1>Contributing</h1>
|
The license is the MIT License, so this should be free to use.
|
||||||
<p>Find an issue and start working. Creating issues is very helpful. Simply emailing patches/updated versions of the script works too. <b>All PRs/Contributions to the main code should go to the patch branch and NOT master as to leave master a stable branch</b>. All contributions belong to you, but are licensed under the GNU AGPL v3 and are adherent to the GPL-Exception in the root of the project file.</p>
|
|
||||||
<p>It should be noted that any non-contributor sourced assets for the game MUST be under some form of free licensing that is <a href=https://creativecommons.org/share-your-work/licensing-considerations/compatible-licenses/>compatable with the CC-BY-SA 4.0 (Listed in this link as BY-SA)</a> for it to be added to the game. This includes audio, images, other bits of code, and other copyrightable assets. Compatable licenses include, but aren't limited to, CC-BY, Public Domain, CC-BY-SA 4.0, CC-BY-SA 3.0, The Free Art license, or any other license that is permissive in how it is used.</p>
|
|
@ -78,10 +78,10 @@ screen music_room():
|
|||||||
|
|
||||||
style_prefix "music_room"
|
style_prefix "music_room"
|
||||||
|
|
||||||
add gui.main_menu_background
|
add "gui/programmerart.jpg"
|
||||||
|
|
||||||
frame:
|
# frame:
|
||||||
style "music_room_frame"
|
# style "music_room_frame"
|
||||||
|
|
||||||
side "c l":
|
side "c l":
|
||||||
|
|
||||||
@ -104,11 +104,11 @@ screen music_room():
|
|||||||
SetVariable("ost.game_soundtrack", st),
|
SetVariable("ost.game_soundtrack", st),
|
||||||
SetVariable("ost.pausedstate", False),
|
SetVariable("ost.pausedstate", False),
|
||||||
Play("music_room", st.path, loop=ost.loopSong,
|
Play("music_room", st.path, loop=ost.loopSong,
|
||||||
fadein=2.0)]
|
fadein=0)]
|
||||||
else:
|
else:
|
||||||
action [SetVariable("ost.game_soundtrack", st),
|
action [SetVariable("ost.game_soundtrack", st),
|
||||||
SetVariable("ost.pausedstate", False),
|
SetVariable("ost.pausedstate", False),
|
||||||
Play("music_room", st.path, loop=ost.loopSong, fadein=2.0)]
|
Play("music_room", st.path, loop=ost.loopSong, fadein=0)]
|
||||||
|
|
||||||
vbar value YScrollValue("vpo") xpos 1.0 ypos 20
|
vbar value YScrollValue("vpo") xpos 1.0 ypos 20
|
||||||
|
|
||||||
@ -211,10 +211,10 @@ screen music_room():
|
|||||||
add "readablePos"
|
add "readablePos"
|
||||||
add "readableDur"
|
add "readableDur"
|
||||||
|
|
||||||
text "Ren'Py Universal Player v[ost.version]":
|
# text "Ren'Py Universal Player v[ost.version]":
|
||||||
xalign 1.0 yalign 1.0
|
# xalign 1.0 yalign 1.0
|
||||||
xoffset -10 yoffset -10
|
# xoffset -10 yoffset -10
|
||||||
size gui.notify_text_size
|
# size gui.notify_text_size
|
||||||
|
|
||||||
if not config.developer:
|
if not config.developer:
|
||||||
add "rpa_map_warning" xpos 0.23 ypos 0.85 xsize 950
|
add "rpa_map_warning" xpos 0.23 ypos 0.85 xsize 950
|
||||||
|
@ -318,13 +318,13 @@ def current_music_pause():
|
|||||||
if not music.is_playing(channel='music_room'):
|
if not music.is_playing(channel='music_room'):
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
soundtrack_position = music.get_pos(channel = 'music_room') + 1.6
|
soundtrack_position = music.get_pos(channel = 'music_room')
|
||||||
|
|
||||||
if soundtrack_position is not None:
|
if soundtrack_position is not None:
|
||||||
game_soundtrack_pause = ("<from " + str(soundtrack_position) + ">"
|
game_soundtrack_pause = ("<from " + str(soundtrack_position) + ">"
|
||||||
+ game_soundtrack.path)
|
+ game_soundtrack.path)
|
||||||
|
|
||||||
music.stop(channel='music_room',fadeout=2.0)
|
music.stop(channel='music_room',fadeout=0)
|
||||||
|
|
||||||
def current_music_play():
|
def current_music_play():
|
||||||
'''
|
'''
|
||||||
@ -336,9 +336,9 @@ def current_music_play():
|
|||||||
pausedstate = False
|
pausedstate = False
|
||||||
|
|
||||||
if not game_soundtrack_pause:
|
if not game_soundtrack_pause:
|
||||||
music.play(game_soundtrack.path, channel = 'music_room', fadein=2.0)
|
music.play(game_soundtrack.path, channel = 'music_room', fadein=0)
|
||||||
else:
|
else:
|
||||||
music.play(game_soundtrack_pause, channel = 'music_room', fadein=2.0)
|
music.play(game_soundtrack_pause, channel = 'music_room', fadein=0)
|
||||||
|
|
||||||
def current_music_forward():
|
def current_music_forward():
|
||||||
'''
|
'''
|
||||||
|
Reference in New Issue
Block a user