bb

config.txt

@@ -1,6 +1,6 @@
-default_song = Casio_SK-1
+default_song = default
 theme = default
 title = default
 bpm = 90
 volume = 10
-song_dir = /home/pi/zpc_ct/user/songs/drum_machines/
+song_dir = /home/pi/zpc_ct/user/songs/

lib/StatesDefender.py

@@ -153,8 +153,19 @@ class Player:
 
 		elif self.o.keyState[1] == 1 or self.o.keyState[2] == 1:
 			self.game.bullets.append(Bullet(self.o, self.game, self.posx))
+
+
+			self.o.defender_sounds[0].set_volume(self.o.volume / 16)
 			pygame.mixer.Sound.play(self.o.defender_sounds[0])
 
+
+
+			# if self.file != None:
+			# 	if vol != 0:
+			# 		vol = (vol / 16) * (self.volume / 16) * (self.o.volume / 16)
+			# 		self.mixerSound.set_volume(vol)
+			# 	pygame.mixer.Sound.play(self.mixerSound)  
+
 class Bullet:
 	def __init__(self, o, game, x):
 		self.o = o
@@ -206,6 +217,7 @@ class Enemy:
 
 		if self.posy > self.o.height:
 			self.game.enemies.remove(self)
+			self.o.defender_sounds[2].set_volume(self.o.volume / 16)
 			pygame.mixer.Sound.play(self.o.defender_sounds[2])
 			self.game.game_over = True
 
@@ -229,6 +241,7 @@ class Enemy:
 					if b in self.game.bullets:
 						self.game.bullets.remove(b)
 					self.die()
+					self.o.defender_sounds[1].set_volume(self.o.volume / 16)
 					pygame.mixer.Sound.play(self.o.defender_sounds[1])
 
 	def die(self):

lib/menus.py

@@ -532,17 +532,17 @@ def menu2_actions_sample(self, o):
 def menu2_actions_pattern(self, o):
 	if o.keyState[17] == 2:
 		if o.keyState[0] == 1:
-			print('copy')
+			#print('copy')
 			o.patternClipboard = []
 			for s in o.soundSlots:
 				notes = []
 				for i in s.notes[o.ePattern]:
 					notes.append([i[0], i[1]])
 				o.patternClipboard.append(notes)
-				print('adding to clip ', notes)
+				#print('adding to clip ', notes)
 			
 		elif o.keyState[1] == 1:
-			print('paste')
+			#print('paste')
 			if o.patternClipboard != []:
 				p = 0
 				for s in o.soundSlots:
@@ -551,14 +551,15 @@ def menu2_actions_pattern(self, o):
 						i[0] = o.patternClipboard[p][n][0]
 						i[1] = o.patternClipboard[p][n][1]
 						n += 1
-					print('added ', o.patternClipboard[p])
+					#print('added ', o.patternClipboard[p])
 					p += 1
 			else:
-				print('nothing to paste')
+				pass
+				#print('nothing to paste')
 			
 		elif o.keyState[2] == 1:
-			print('clear')
-			print(o.soundSlots[o.eSound].notes[o.ePattern])
+			#print('clear')
+			#print(o.soundSlots[o.eSound].notes[o.ePattern])
 			for s in o.soundSlots:
 				for i in s.notes[o.ePattern]:
 					i[0] = 0

lib/sSelectFolder.py

@@ -168,7 +168,7 @@ class SelectFolder(State):
 		# 		if _iter < (len(self.menu)):
 		# 			al.append(self.menu[_iter])
 				
-				_iter += 1
+		#		_iter += 1
 		elif self.cur_el == 1:
 			al.append(self.menu[self.cur_el - 1])
 			al.append(self.menu[self.cur_el])