Browse Source

trying to get strafing working again for pirates battle

Joe Shochet 20 years ago
parent
commit
8f74f5eaaf
2 changed files with 20 additions and 2 deletions
  1. 4 2
      direct/src/controls/BattleWalker.py
  2. 16 0
      direct/src/controls/ControlManager.py

+ 4 - 2
direct/src/controls/BattleWalker.py

@@ -42,7 +42,7 @@ class BattleWalker(GravityWalker.GravityWalker):
         reverse = inputState.isSet("reverse")
         reverse = inputState.isSet("reverse")
         turnLeft = inputState.isSet("turnLeft")
         turnLeft = inputState.isSet("turnLeft")
         turnRight = inputState.isSet("turnRight")
         turnRight = inputState.isSet("turnRight")
-        slide = 0 #hack -- was: inputState.isSet("slide")
+        slide = inputState.isSet("slide")
         jump = inputState.isSet("jump")
         jump = inputState.isSet("jump")
         # Determine what the speeds are based on the buttons:
         # Determine what the speeds are based on the buttons:
         self.advanceSpeed=(forward and self.avatarControlForwardSpeed or 
         self.advanceSpeed=(forward and self.avatarControlForwardSpeed or 
@@ -51,7 +51,8 @@ class BattleWalker(GravityWalker.GravityWalker):
             self.advanceSpeed*=2.0 #*#
             self.advanceSpeed*=2.0 #*#
         # Should fSlide be renamed slideButton?
         # Should fSlide be renamed slideButton?
         self.slideSpeed=.15*(turnLeft and -self.avatarControlForwardSpeed or 
         self.slideSpeed=.15*(turnLeft and -self.avatarControlForwardSpeed or 
-                            turnRight and self.avatarControlForwardSpeed)
+                             turnRight and self.avatarControlForwardSpeed)
+        print 'slideSpeed: ', self.slideSpeed
         self.rotationSpeed=0
         self.rotationSpeed=0
         self.speed=0
         self.speed=0
         
         
@@ -119,6 +120,7 @@ class BattleWalker(GravityWalker.GravityWalker):
         if self.moving:
         if self.moving:
             distance = dt * self.speed
             distance = dt * self.speed
             slideDistance = dt * self.slideSpeed
             slideDistance = dt * self.slideSpeed
+            print 'slideDistance: ', slideDistance
             rotation = dt * self.rotationSpeed
             rotation = dt * self.rotationSpeed
 
 
             # Take a step in the direction of our previous heading.
             # Take a step in the direction of our previous heading.

+ 16 - 0
direct/src/controls/ControlManager.py

@@ -122,6 +122,22 @@ class ControlManager:
             inputState.watch("turnRight", "alt-d", "d-up")
             inputState.watch("turnRight", "alt-d", "d-up")
             inputState.watch("turnRight", "control-alt-d", "d-up")
             inputState.watch("turnRight", "control-alt-d", "d-up")
             inputState.watch("turnRight", "shift-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"):
     def add(self, controls, name="basic"):
         """
         """