Reorganize client and server modules. Add temporary music for client.

.gitignore

@@ -0,0 +1 @@
+*.pyc

game/manager.py → client/manager.py

@@ -14,14 +14,18 @@ def __init__(self,*args,**kwargs):
 		self.game_objects = [] #gameobject pool
 		self.widgets = [] #gui pool
 		self.labels = [] #label pool
+		self.audio = None
+
 		self.window = None
 		self.active = True
 		self.visible = False
+
 		self.state = Resources.states['TITLE']
 		self.focus = None
 		self.set_focus(self.find_widget('text_ip'))
 		self.my_connection = Connection()
 
+	#State transitions
 	def switch_to_setup(self,batch):
 		bg = self.find_widget('my_bg')
 		bg.set_image(Resources.sprites['setup_bg'])
@@ -60,9 +64,12 @@ def set_player_data(self):
 			text_port = self.find_widget('text_port')
 			text_name = self.find_widget('text_name')
 
-			ip_address = '127.0.0.1'#text_ip.document.text
-			port_num = 8080#int(text_port.document.text)
+			#ip_address = '127.0.0.1'#text_ip.document.text
+			#port_num = 8080#int(text_port.document.text)
+			ip_address = text_ip.text
+			port_num = text_port.text
 			name = text_name.document.text
+
 			self.my_connection.connect_client((ip_address,port_num))
 
 			#attributes
@@ -103,6 +110,7 @@ def set_player_data(self):
 	def switch_to_end(self):
 		pass
 
+	#Utilities
 	def set_player_names(self):
 		pass
 
@@ -262,6 +270,7 @@ def delete_widgets_by_batch(self,batch):
 	def on_mouse_motion(self,x,y,dx,dy):
 		self.window.set_mouse_cursor(None)
 
+	#Game Logic
 	def update(self,dt):
 		if self.state == Resources.states['GAME']:
 			player_attr = self.my_connection.receive_message()

game_push.py → client_push.py

@@ -29,6 +29,7 @@
 
 my_bg = Background(name = 'my_bg',
 				img =  Resources.sprites['title_bg'])
+my_music = Resources.audio['ost']
 
 @game_window.event
 def on_draw():
@@ -57,6 +58,8 @@ def update(dt):
 
 #<-- States -->
 def title_screen():
+	my_music.play()
+
 	# Instantiation section #
 	play_button = Button(name = 'start_button',
 						curr_state = 'TITLE',
@@ -269,6 +272,7 @@ def main():
 	game_screen()
 	end_screen()
 
+	manager.audio = my_music
 	manager.add_widget(my_bg)
 	game_window.push_handlers(manager)
 	#Pyglet Settings

game/resources.py

@@ -1,5 +1,6 @@
 from pyglet.graphics import Batch
 from pyglet import image
+from pyglet import media
 from pyglet import window
 from os.path import join
 
@@ -41,6 +42,12 @@ class Resources:
 	# End of Batches
 
 	# Declare all of your assets here #
+	audio = {}
+	sfx_path = './assets/sfx'
+
+	#Sound Effects
+	audio['ost'] 					= media.load(join(sfx_path,"ost.mp3"))
+
 	sprites = {}
 	res_path = './assets/img'