From c1e95a843895dd75a19e141845f1bc4fd68475f6 Mon Sep 17 00:00:00 2001 From: GManon Date: Fri, 28 Oct 2022 01:16:43 -0300 Subject: [PATCH] Changes --- README.md | 6 ++---- game/music_screen.rpy | 18 +++++++++--------- game/python-packages/ost.py | 8 ++++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 15a550e..c58478e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# Snoot Game +The OST player comes from here https://github.com/GanstaKingofSA/RenPy-Universal-Player -

Contributing

-

Find an issue and start working. Creating issues is very helpful. Simply emailing patches/updated versions of the script works too. All PRs/Contributions to the main code should go to the patch branch and NOT master as to leave master a stable branch. 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.

-

It should be noted that any non-contributor sourced assets for the game MUST be under some form of free licensing that is compatable with the CC-BY-SA 4.0 (Listed in this link as BY-SA) 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.

+The license is the MIT License, so this should be free to use. \ No newline at end of file diff --git a/game/music_screen.rpy b/game/music_screen.rpy index d56b0c2..7b89a2e 100644 --- a/game/music_screen.rpy +++ b/game/music_screen.rpy @@ -78,10 +78,10 @@ screen music_room(): style_prefix "music_room" - add gui.main_menu_background + add "gui/programmerart.jpg" - frame: - style "music_room_frame" + # frame: + # style "music_room_frame" side "c l": @@ -104,11 +104,11 @@ screen music_room(): SetVariable("ost.game_soundtrack", st), SetVariable("ost.pausedstate", False), Play("music_room", st.path, loop=ost.loopSong, - fadein=2.0)] + fadein=0)] else: action [SetVariable("ost.game_soundtrack", st), 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 @@ -211,10 +211,10 @@ screen music_room(): add "readablePos" add "readableDur" - text "Ren'Py Universal Player v[ost.version]": - xalign 1.0 yalign 1.0 - xoffset -10 yoffset -10 - size gui.notify_text_size + # text "Ren'Py Universal Player v[ost.version]": + # xalign 1.0 yalign 1.0 + # xoffset -10 yoffset -10 + # size gui.notify_text_size if not config.developer: add "rpa_map_warning" xpos 0.23 ypos 0.85 xsize 950 diff --git a/game/python-packages/ost.py b/game/python-packages/ost.py index 5cac015..4f96ff4 100644 --- a/game/python-packages/ost.py +++ b/game/python-packages/ost.py @@ -318,13 +318,13 @@ def current_music_pause(): if not music.is_playing(channel='music_room'): return 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: game_soundtrack_pause = ("" + game_soundtrack.path) - music.stop(channel='music_room',fadeout=2.0) + music.stop(channel='music_room',fadeout=0) def current_music_play(): ''' @@ -336,9 +336,9 @@ def current_music_play(): pausedstate = False 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: - 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(): '''