Changeset 54:5cb3fef573f6

Timestamp:

12/25/10 01:51:31 (5 years ago)

Author:

Olga Zolotareva <olya_zol@òÀæ>

Branch:

new

Tags:

tip

Message:

UI for two users

Files:

• body.py (modified) (2 diffs)
• game.py (modified) (5 diffs)
• tk_ui.py (modified) (4 diffs)
• user.py (modified) (1 diff)

body.py

@@ -53 +53 @@
 
         def accelerate(self, speed_delta):
-                print 'speed_delta', speed_delta        #test
                 self.velocity += self.base_orientation*speed_delta*delta_t
                 if abs(self.velocity) > max_velocity:
@@ -78 +77 @@
         def on_collision(self, other):
                 pass
+        #       self.velocity , other.velocity =  self.velocity + other.velocity , other.velocity + self.velocity
 
         def on_wall(self):

game.py

@@ -24 +24 @@
                 self.respawn()
                 self.update_velocities()
-                for i in self.bodies :
-                        print i
-                #       print 'next position' , i.next_position 
-                        print 'update_position' ,  i.position
-                        print 'velocity'  , i.velocity
-                        print 'velocity.rho', i.velocity.rho    # test
-                        if isinstance(i,body.Tank) == True:
-                                print 'base_orientation' , i.base_orientation
-                        print '\n'
+        #       for i in self.bodies :
+        #               print i                                                 # test
+        #               print 'next position' , i.next_position                 # test 
+        #               print 'update_position' ,  i.position                   # test
+        #               print 'velocity'  , i.velocity                          # test
+        #               print 'velocity.rho', i.velocity.rho                    # test
+        #               if isinstance(i,body.Tank) == True:                     # test
+        #                       print 'base_orientation' , i.base_orientation   # test
+        #               print '\n'
 
         def update_velocities(self):
@@ -56 +56 @@
                 if (abs(body1.next_position - body2.next_position) <= (body1.radius + body2.radius)):
                         if (body1 != body2):
-                                print 'collision' 
                                 return True
                         else :
@@ -68 +67 @@
                                 body1.on_collision(body2)
                         else :
-                                body1.on_hit()
+                                body1.on_hit(body2)
                                 body1.on_death()
+                                self.bodies.remove(body2)
                 else :
                         if isinstance(body2, body.Tank) == True :
-                                body2.on_hit()
+                                body2.on_hit(body2)
                                 body2.on_death()
+                                self.bodies.remove(body1)
 
         def check_walls(self):
@@ -94 +95 @@
                         if i.tank.strength == 0 :
                                 i.tank.on_spawn()
-                                print 'respawn'
-                                print i.tank.strength , i.tank.position
                                 i.tank.strength = 1
                                 i.tank.velocity = vector.null
@@ -101 +100 @@
                                 i.tank.position.y = random.randint(i.tank.radius , height - i.tank.radius)
                                 i.tank.velocity = vector.null 
-                                print i.tank.strength , i.tank.position
 
  

tk_ui.py

@@ -9 +9 @@
 
 game_size = 500, 500
-keys = {
+keys1 = {
         'ocircumflex': 'base_left', 
         'acircumflex': 'base_right',
@@ -18 +18 @@
         'division': 'fire',
 }
+        
+keys2 = {
+        'icircumflex': 'base_left', 
+        'adiaeresis': 'base_right',
+        'atilde': 'turret_left',
+        'ugrave': 'turret_right',
+        'oslash': 'accelerate',
+        'ediaeresis': 'decelerate',
+        'udiaeresis': 'fire',
+}
 
 welcome = """Press F5 to start
 
 Keys are:
+
+
+User 1 :
+
 a, d -- turn tank
 q, e -- turn muzzle
 w, s -- change speed
-x -- fire"""
+x -- fire
+
+User 2 :
+ 
+j, l -- turn tank
+u, o -- turn muzzle
+i, k -- change speed
+m -- fire       
+"""
 
 class Tank(BaseTank):
@@ -53 +75 @@
 
         def init_game(self):
-                self.user = User(keys)
+                self.user1 = User(keys1)
+                self.user2 = User(keys2)
                 w, h = game_size 
-                game = self.game = Game([], [self.user], w, h)
-                tank = Tank(Vector(*game_size) * 0.5, self.user, self.game)
-                game.bodies.append(tank)
+                game = self.game = Game([], [self.user1, self.user2], w, h)
+                tank1 = Tank(Vector(*game_size) * 0.5,  self.user1, self.game)
+                tank2 = Tank(Vector(*game_size) * 0.5,  self.user2, self.game)
+                game.bodies.append(tank1)
+                game.bodies.append(tank2)
 
         def init_ui(self):
@@ -79 +104 @@
                 if ev.keysym == "F5":
                         self.step()
-                self.user.on_key(ev.keysym, True)
+                self.user1.on_key(ev.keysym, True)
+                self.user2.on_key(ev.keysym, True)
 
         def on_keyrelease(self, ev):
-                self.user.on_key(ev.keysym, False)
+                self.user1.on_key(ev.keysym, False)
+                self.user2.on_key(ev.keysym, False)
 
         def step(self):

user.py

@@ -18 +18 @@
                 else:
                         action = self.keyset[key]
-                        print 'action=', action
                         if hasattr(self, action) and action not in ['tank', 'keyset']:
                                 setattr(self, action, value)