tanchiki
changeset 46:dba440ba9a00 new
Bugfixed: constant names for tank movement; added the tank to the game
| author | Daniil Alexeyevsky <me.dendik@gmail.com> |
|---|---|
| date | Mon, 20 Dec 2010 20:37:54 +0300 |
| parents | 1d0efaea3702 |
| children | 3f2ae407ae0c |
| files | tk_ui.py |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line diff
1.1 --- a/tk_ui.py Mon Dec 20 20:28:00 2010 +0300 1.2 +++ b/tk_ui.py Mon Dec 20 20:37:54 2010 +0300 1.3 @@ -4,7 +4,7 @@ 1.4 import body 1.5 from game import Game 1.6 from user import User 1.7 -from vector import Vector, null 1.8 +from vector import Vector 1.9 1.10 game_size = 100, 100 1.11 keys = { 1.12 @@ -29,17 +29,17 @@ 1.13 1.14 def on_tick(self, tanks, bullets): 1.15 if self.user.base_left: 1.16 - self.rotate_base(game.delta_phi) 1.17 + self.rotate_base(body.base_angle) 1.18 if self.user.base_right: 1.19 - self.rotate_base(-game.delta_phi) 1.20 + self.rotate_base(-body.base_angle) 1.21 if self.user.turret_left: 1.22 - self.rotate_turret(game.delta_phi) 1.23 + self.rotate_turret(body.turret_angle) 1.24 if self.user.turret_right: 1.25 - self.rotate_turret(-game.delta_phi) 1.26 + self.rotate_turret(-body.turret_angle) 1.27 if self.user.accelerate: 1.28 - self.accelerate(game.speed_delta) 1.29 + self.accelerate(body.speed_delta) 1.30 if self.user.decelerate: 1.31 - self.accelerate(-game.speed_delta) 1.32 + self.accelerate(-body.speed_delta) 1.33 if self.user.fire: 1.34 self.fire() 1.35 1.36 @@ -53,8 +53,9 @@ 1.37 def init_game(self): 1.38 self.user = User(keys) 1.39 w, h = game_size 1.40 - self.game = Game([], [self.user], w, h) 1.41 - tank = Tank(null, self.user, self.game) 1.42 + game = self.game = Game([], [self.user], w, h) 1.43 + tank = Tank(Vector(50, 50), self.user, self.game) 1.44 + game.bodies.append(tank) 1.45 1.46 def init_ui(self): 1.47 root = self.root = tk.Tk()