Changed music offset default value

WilliamQiufeng · Jan 19, 2020 · 5c80b0e · 5c80b0e
1 parent 22ece8c
commit 5c80b0e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/muser/assets/resources.pyxres b/muser/assets/resources.pyxres
diff --git a/muser/game/casts.py b/muser/game/casts.py
@@ -75,6 +75,7 @@ def increaseLevel(obj, inc):
         def select(obj):
             obj.finished = True
         def __init__(self):
+            self.volume = 0.0
             self.selection = 0
             self.level_selection = 0
             self.finished = False
@@ -86,13 +87,21 @@ def __init__(self):
             print(self.sheets)
             self.update_meta()
         def update_meta(self):
+            self.volume = 0.0
             self.level_selection = 0
             self.sheet = SheetReader.from_sheets(self.sheets[self.selection])
             self.music_source = self.sheet[self.level_selection].data["music"]
             pygame.mixer.music.stop()
             pygame.mixer.music.load(self.music_source)
             pygame.mixer.music.play()
         def update(self):
+            if self.volume >= 1.0:
+                self.volume = 1.0
+            else:
+                self.volume += 0.01
+                if self.volume > 1.0:
+                    self.volume = 1.0
+                pygame.mixer.music.set_volume(self.volume)
             for btn in Casts.LevelSelection.BUTTONS:
                 btn.update()
         def draw(self):

diff --git a/muser/game/frames.py b/muser/game/frames.py
@@ -143,7 +143,7 @@ class LevelSelection:
         PLAY_PRESSED = Frame(16, 64, 16, 16)
     class PlayThrough:
         # DIRECTIONS = [Frame(1 + x * 8, 5, 6, 6) for x in range(4)]
-        DIRECTIONS = [ArrowFrame(x, 6, 6) for x in range(4)]
+        DIRECTIONS = [ArrowFrame(x) for x in range(4)]
         ARROW_FADE = [Frame(56 + 8 * x, 4, 8, 8) for x in range(4)]
         INDICATOR_CIRCLE = Frame(32, 48, 32, 32)
         # INDICATOR_RES = [Frame(x * 8, 16, 8, 8) for x in range(5)]

diff --git a/muser/main.py b/muser/main.py
@@ -2,7 +2,8 @@
 import pyxel
 import game_config as game_config
 pyxel.init(256, 256,
-           caption="Muser", scale=48, fps=game_config.GLOB_CONFIG.fps)
+           caption="Muser", scale=48,
+            fps=game_config.GLOB_CONFIG.fps)
 
 print("Window loaded")
 pyxel.load(f"{game_config.GLOB_CONFIG.assets.root}/resources.pyxres")

diff --git a/muser/sheet/gen/meta_input.py b/muser/sheet/gen/meta_input.py
@@ -52,7 +52,7 @@ def proc(self):
             indexes = sheet["indexes"]
             effect_pool = sheet["effect_pool"] if "effect_pool" in sheet.keys() else []
             effects = sheet["effects"] if "effects" in sheet.keys() else []
-            music_offset = sheet["music_offset"] if "music_offset" in sheet.keys() else 0
+            music_offset = sheet["music_offset"] if "music_offset" in sheet.keys() else 2000
             mtas = MidiToAbsSheet(
                 abs_midi, tempo_index, indexes, music_offset, False)
             abs_sheet = mtas.to_abs_sheet({