Changeset 2:e6e7b30ecde0

Timestamp:

12/18/10 13:23:48 (5 years ago)

Author:

Olga Zolotareva <olya_zol@òÀæ>

Branch:

default

Message:

modules changed

Files:

• body.py (modified) (3 diffs)
• game.py (modified) (2 diffs)
• user.py (modified) (1 diff)

body.py

@@ -ˆà +1 @@
+import vector
+
 class Body(object):
-        def __init__(self, position, velocity, next_position, radius):
+        def __init__(self, position, velocity, next_position, radius=1):
                 self.position = position
                 self.velocity = velocity
@@ -11 +13 @@
                 self.strength = strength
                 self.turret = turret
-                self.base_orientation = orientation
+                self.base_orientation = base_orientation
                 self.game = game
                 self.user = user
-        def rotate_base(angle):
+        def rotate_base(tank, angle):
                 pass
 
-        def rotate_turret(angle):
+        def rotate_turret(tank, angle):
                 pass
 
-        def accelerate(speed_delta):
+        def accelerate(tank, speed_delta):
                 pass
 
-        def fire():
+        def fire(tank):
                 pass
 
-        def on_tick(other_tanks, bullets):
+        def on_tick(tank,other_tanks, bullets):
                 pass
 
-        def on_spawn():
+        def on_spawn(tank):
                 pass
 
-        def on_death() :
+        def on_death(tank) :
                 pass
         
-        def on_hit(bullet):
+        def on_hit(tank,bullet):
                 pass
 
@@ -41 +43 @@
                 pass
 
-        def on_wall():
+        def on_wall(tank):
                 pass
 

game.py

@@ -6 +6 @@
                 self.height = height
 
-        def step():
-                pass
+        def step(game):
+                game.next_positions()
+                game.check_collisions()
+                game.check_walls()
+                game.update_positions()
+                game.invoke_ticks()
+                game.respawn()
 
-        def next_positions():
-                pass
+        def next_positions(game):
+                delta_t = 1
+                for i in game.bodies:
+                        i.next_position = i.position + i.velocity.mul_v(delta_t)
         
-        def check_collisions():
+
+        def check_collisions(game):
                 pass
 
@@ -21 +29 @@
                         pass
 
-        def check_walls():
-                pass
+        def check_walls(game):
+                for i in game.bodies :
+                        if (i.next_position.x <= 0) or (i.next_position.y <= 0) or (i.next_position.x <= width) or (i.next_position.y >= game.height) :
+                                i.on_wall()
+                
 
-        def update_positions():
-                pass
+        def update_positions(game):
+                for i in game.bodies:
+                        i.position = i.next_position
 
-        def invoke_ticks():
+        def invoke_ticks(game):
                 pass
         
-        def respawn():
-                pass 
-                
+        def respawn(game):                     
+                for i in game.users :
+                        if i.tank.strength == 0 :
+                                i.tank.respawn()
+
+
+ 

user.py

@@ -1 +1 @@
 class User(object):     
 
-        def __init__(self, base_left , base_right, turret_left, turret_right, accelerate, decelerate, fire, tank):
+        def __init__(self, base_left = False , base_right = False, turret_left = False, turret_right = False, accelerate = False, decelerate = False, fire = False, tank = 0):
                 self.base_left = base_left
                 self.base_right = base_right