Changeset 16:c71c27b09bc7

Timestamp:

12/20/10 04:35:08 (5 years ago)

Author:

Peter Zotov <whitequark@���>

Branch:

default

Children:

17:ce43bb4acf82, 32:803f8353f38f

Message:

Fixed and updated overall repository format.

Removed CR's. Changed encoding to UTF-8.
Removed trailing whitespace and unified the rest.
Removed test code from vector.py.

Files:

• body.py (modified) (5 diffs, 1 prop)
• game.py (modified) (2 diffs, 1 prop)
• user.py (modified) (1 diff, 1 prop)
• vector.py (modified) (4 diffs, 1 prop)

body.py

@@ -12 +12 @@
                 self.velocity = velocity
                 self.radius = radius
-        
 
 class Tank(Body):
@@ -22 +21 @@
                 self.base_orientation = 1       # 1 or -1
                 self.user = user
-                user.tank = self # �������놃�冒 ����ᆃ �� User
-
+                user.tank = self # �������������Ϻ��� �������� �� User
 
         def rotate_base(tank, angle): 
@@ -33 +31 @@
         def accelerate(self, speed_delta):
                 self.velocity.rho += speed_delta * delta_t
-                if self.velocity.rho > max_velocity:
+                if self.velocity.rho > max_velocity :
                         self.velocity.rho = max_velocity
 
@@ -40 +38 @@
 
         def on_tick(self,other_tanks, bullets):
-                if self.user.base_left == True:
+                if self.user.base_left == True :
                         self.rotate_base(delta_phi)
-                if self.user.base_right == True:
+                if self.user.base_right == True :
                         self.rotate_base(-1*delta_phi)
-                if self.user.accelerate == True:
+                if self.user.accelerate == True :
                         self.accelerate(speed_delta)
 
@@ -50 +48 @@
                 pass
 
-        def on_death(self) :
+        def on_death(self):
                 pass
-        
+
         def on_hit(self,bullet):
                 pass

game.py

@@ -19 +19 @@
         def next_positions(game):
                 delta_t = 1
-                for i in game.bodies:
+                for i in game.bodies :
                         i.next_position = i.position + i.velocity*(delta_t)
-        
 
         def check_collisions(game):
@@ -36 +35 @@
                         if ((i.next_position.x - i.radius) <= 0) or ((i.next_position.y - i.radius) <= 0) or ((i.next_position.x + i.radius) >= game.width) or ((i.next_position.y + i.radius) >= game.height) :
                                 i.on_wall()
-                
 
         def update_positions(game):
-                for i in game.bodies:
+                for i in game.bodies :
                         i.position = i.next_position
 
         def invoke_ticks(game):
-                for i in game.users:
+                for i in game.users :
                         i.tank.on_tick(other_tanks,bullets)
         
-        def respawn(game):                     
+        def respawn(game):
                 for i in game.users :
                         if i.tank.strength == 0 :

user.py

@@ -1 +1 @@
 class User(object):     
 
-        def __init__(self, base_left = False , base_right = False, turret_left = False, turret_right = False, accelerate = False, decelerate = False, fire = False, tank = 0):
+        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