From 8f74f5eaafb74be55355a41786bab09961559316 Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Wed, 5 Oct 2005 04:57:15 +0000 Subject: [PATCH] trying to get strafing working again for pirates battle --- direct/src/controls/BattleWalker.py | 6 ++++-- direct/src/controls/ControlManager.py | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/direct/src/controls/BattleWalker.py b/direct/src/controls/BattleWalker.py index ca6d2722cb..3695aa7589 100755 --- a/direct/src/controls/BattleWalker.py +++ b/direct/src/controls/BattleWalker.py @@ -42,7 +42,7 @@ class BattleWalker(GravityWalker.GravityWalker): reverse = inputState.isSet("reverse") turnLeft = inputState.isSet("turnLeft") turnRight = inputState.isSet("turnRight") - slide = 0 #hack -- was: inputState.isSet("slide") + slide = inputState.isSet("slide") jump = inputState.isSet("jump") # Determine what the speeds are based on the buttons: self.advanceSpeed=(forward and self.avatarControlForwardSpeed or @@ -51,7 +51,8 @@ class BattleWalker(GravityWalker.GravityWalker): self.advanceSpeed*=2.0 #*# # Should fSlide be renamed slideButton? self.slideSpeed=.15*(turnLeft and -self.avatarControlForwardSpeed or - turnRight and self.avatarControlForwardSpeed) + turnRight and self.avatarControlForwardSpeed) + print 'slideSpeed: ', self.slideSpeed self.rotationSpeed=0 self.speed=0 @@ -119,6 +120,7 @@ class BattleWalker(GravityWalker.GravityWalker): if self.moving: distance = dt * self.speed slideDistance = dt * self.slideSpeed + print 'slideDistance: ', slideDistance rotation = dt * self.rotationSpeed # Take a step in the direction of our previous heading. diff --git a/direct/src/controls/ControlManager.py b/direct/src/controls/ControlManager.py index 4cb7223a74..987f549d77 100755 --- a/direct/src/controls/ControlManager.py +++ b/direct/src/controls/ControlManager.py @@ -122,6 +122,22 @@ class ControlManager: inputState.watch("turnRight", "alt-d", "d-up") inputState.watch("turnRight", "control-alt-d", "d-up") inputState.watch("turnRight", "shift-d", "d-up") + + inputState.watch("slideLeft", "q", "q-up") + inputState.watch("slideLeft", "control-q", "q-up") + inputState.watch("slideLeft", "shift-control-q", "q-up") + inputState.watch("slideLeft", "alt-q", "q-up") + inputState.watch("slideLeft", "control-alt-q", "q-up") + inputState.watch("slideLeft", "shift-q", "q-up") + + inputState.watch("slideRight", "e", "e-up") + inputState.watch("slideRight", "control-e", "e-up") + inputState.watch("slideRight", "shift-control-e", "e-up") + inputState.watch("slideRight", "alt-e", "e-up") + inputState.watch("slideRight", "control-alt-e", "e-up") + inputState.watch("slideRight", "shift-e", "e-up") + + def add(self, controls, name="basic"): """