Updated libstormgames. Volume keys now require alt, alt+pageup, alt+pagedown, etc.
This commit is contained in:
Submodule libstormgames updated: 17e100a90b...b479811a98
BIN
sounds/music_menu.ogg
(Stored with Git LFS)
Normal file
BIN
sounds/music_menu.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -138,4 +138,5 @@ class Catapult(Object):
|
|||||||
pumpkin.stop_sound(self.sounds, player.xPos)
|
pumpkin.stop_sound(self.sounds, player.xPos)
|
||||||
pumpkin.isActive = False
|
pumpkin.isActive = False
|
||||||
self.activePumpkins.remove(pumpkin)
|
self.activePumpkins.remove(pumpkin)
|
||||||
self.sounds['player_takes_damage'].play()
|
if not player.isInvincible:
|
||||||
|
self.sounds['player_takes_damage'].play()
|
||||||
|
@@ -50,7 +50,12 @@ class WickedQuest:
|
|||||||
player = self.currentLevel.player
|
player = self.currentLevel.player
|
||||||
currentTime = pygame.time.get_ticks()
|
currentTime = pygame.time.get_ticks()
|
||||||
|
|
||||||
# Update running state
|
# Update running and ducking states
|
||||||
|
if keys[pygame.K_s] and not player.isDucking:
|
||||||
|
player.duck()
|
||||||
|
elif not keys[pygame.K_s] and player.isDucking:
|
||||||
|
player.stand()
|
||||||
|
|
||||||
player.isRunning = keys[pygame.K_SPACE]
|
player.isRunning = keys[pygame.K_SPACE]
|
||||||
|
|
||||||
# Get current speed (handles both running and jumping)
|
# Get current speed (handles both running and jumping)
|
||||||
@@ -146,6 +151,7 @@ class WickedQuest:
|
|||||||
if key not in ['Total time', 'levelsCompleted']: # Skip these
|
if key not in ['Total time', 'levelsCompleted']: # Skip these
|
||||||
report.append(f"Total {key}: {self.currentLevel.player.stats.get_total_stat(key)}")
|
report.append(f"Total {key}: {self.currentLevel.player.stats.get_total_stat(key)}")
|
||||||
|
|
||||||
|
cut_scene(self.sounds, "game_over")
|
||||||
display_text(report)
|
display_text(report)
|
||||||
|
|
||||||
def game_loop(self):
|
def game_loop(self):
|
||||||
@@ -160,20 +166,26 @@ class WickedQuest:
|
|||||||
# Game volume controls
|
# Game volume controls
|
||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
if event.type == pygame.KEYDOWN:
|
if event.type == pygame.KEYDOWN:
|
||||||
|
# Check for Alt modifier
|
||||||
|
mods = pygame.key.get_mods()
|
||||||
|
alt_pressed = mods & pygame.KMOD_ALT
|
||||||
|
|
||||||
if event.key == pygame.K_ESCAPE:
|
if event.key == pygame.K_ESCAPE:
|
||||||
return
|
return
|
||||||
if event.key == pygame.K_PAGEUP:
|
# Volume controls (require Alt)
|
||||||
adjust_master_volume(0.1)
|
elif alt_pressed:
|
||||||
elif event.key == pygame.K_PAGEDOWN:
|
if event.key == pygame.K_PAGEUP:
|
||||||
adjust_master_volume(-0.1)
|
adjust_master_volume(0.1)
|
||||||
elif event.key == pygame.K_HOME:
|
elif event.key == pygame.K_PAGEDOWN:
|
||||||
adjust_bgm_volume(0.1)
|
adjust_master_volume(-0.1)
|
||||||
elif event.key == pygame.K_END:
|
elif event.key == pygame.K_HOME:
|
||||||
adjust_bgm_volume(-0.1)
|
adjust_bgm_volume(0.1)
|
||||||
elif event.key == pygame.K_INSERT:
|
elif event.key == pygame.K_END:
|
||||||
adjust_sfx_volume(0.1)
|
adjust_bgm_volume(-0.1)
|
||||||
elif event.key == pygame.K_DELETE:
|
elif event.key == pygame.K_INSERT:
|
||||||
adjust_sfx_volume(-0.1)
|
adjust_sfx_volume(0.1)
|
||||||
|
elif event.key == pygame.K_DELETE:
|
||||||
|
adjust_sfx_volume(-0.1)
|
||||||
|
|
||||||
# Update game state
|
# Update game state
|
||||||
self.currentLevel.player.update(currentTime)
|
self.currentLevel.player.update(currentTime)
|
||||||
|
Reference in New Issue
Block a user