Change default to running and shift key to walk

Author: jtran

README.md

@@ -18,8 +18,8 @@ cargo run --features bevy/dynamic
 
 Gamepads and keyboard are supported.
 
-- Player 1: WASD keys to move, left shift to run
-- Player 2: Arrow keys to move, right shift to run
+- Player 1: WASD keys to move, left shift to walk
+- Player 2: Arrow keys to move, right shift to walk
 - Escape to exit
 
 ### Building

src/actions.rs

@@ -57,25 +57,25 @@ pub fn handle_movement_input_system(
         if input_actions.is_active(Action::Up, player.id) {
             new_direction = Some(Direction::North);
             new_velocity.y = 1.0;
-            new_state = CharacterState::Walking;
+            new_state = CharacterState::Running;
         }
         if input_actions.is_active(Action::Down, player.id) {
             new_direction = Some(Direction::South);
             new_velocity.y = -1.0;
-            new_state = CharacterState::Walking;
+            new_state = CharacterState::Running;
         }
 
         // Favor facing left or right when two directions are pressed simultaneously
         // by checking left/right after up/down.
         if input_actions.is_active(Action::Left, player.id) {
             new_direction = Some(Direction::West);
             new_velocity.x = -1.0;
-            new_state = CharacterState::Walking;
+            new_state = CharacterState::Running;
         }
         if input_actions.is_active(Action::Right, player.id) {
             new_direction = Some(Direction::East);
             new_velocity.x = 1.0;
-            new_state = CharacterState::Walking;
+            new_state = CharacterState::Running;
         }
 
         // If the user is pressing two directions at once, go diagonally with
@@ -84,14 +84,14 @@ pub fn handle_movement_input_system(
             new_velocity = new_velocity.normalize();
         }
 
-        if input_actions.is_active(Action::Run, player.id) {
-            character.movement_speed = RUN_SPEED;
+        if input_actions.is_active(Action::Walk, player.id) {
+            character.movement_speed = WALK_SPEED;
             new_state = match new_state {
-                CharacterState::Walking => CharacterState::Running,
-                CharacterState::Idle | CharacterState::Running => new_state,
+                CharacterState::Running => CharacterState::Walking,
+                CharacterState::Idle | CharacterState::Walking => new_state,
             }
         } else {
-            character.movement_speed = WALK_SPEED;
+            character.movement_speed = RUN_SPEED;
         }
 
         if let Some(direction) = new_direction {

src/core/input.rs

@@ -24,7 +24,8 @@ pub enum Action {
     Left,
     Right,
 
-    Run,
+    // Walk slowly, instead of running.
+    Walk,
 
     Accept,
 }
@@ -134,7 +135,7 @@ fn action_producer_system(
         input_action_set.activate(Action::Right, 0);
     }
     if keyboard_input.pressed(KeyCode::LShift) {
-        input_action_set.activate(Action::Run, 0);
+        input_action_set.activate(Action::Walk, 0);
     }
 
     if keyboard_input.pressed(KeyCode::Up) {
@@ -150,7 +151,7 @@ fn action_producer_system(
         input_action_set.activate(Action::Right, 1);
     }
     if keyboard_input.pressed(KeyCode::RShift) {
-        input_action_set.activate(Action::Run, 1);
+        input_action_set.activate(Action::Walk, 1);
     }
 
     for (i, gamepad) in gamepad_set.gamepads.iter().cloned().enumerate() {
@@ -196,7 +197,7 @@ fn action_producer_system(
         }
 
         if button_inputs.pressed(GamepadButton(gamepad, GamepadButtonType::West)) {
-            input_action_set.activate(Action::Run, player_num);
+            input_action_set.activate(Action::Walk, player_num);
         }
     }
 }