evan/ludum-dare-48
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/movement_tweaks' into ouchies

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 18:11:45 -04:00
commit e8317e0619
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/logic/ingame/playerlogic.rs
View File

@ -5,13 +5,13 @@ use crate::{
pallette::{TRANSLUCENT_WHITE_128, TRANSLUCENT_WHITE_64, TRANSLUCENT_WHITE_96}, pallette::{TRANSLUCENT_WHITE_128, TRANSLUCENT_WHITE_64, TRANSLUCENT_WHITE_96},
}; };
const NORMAL_PLAYER_SPEED: i32 = 3; const NORMAL_PLAYER_SPEED: i32 = 1;
const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2; const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
const CAMERA_FOLLOW_SPEED: f32 = 0.7; const CAMERA_FOLLOW_SPEED: f32 = 0.7;
const TURN_SPEED: f32 = 0.15; const TURN_SPEED: f32 = 0.15;
const BOOST_DECREASE_PER_SECOND: f32 = 0.65; const BOOST_DECREASE_PER_SECOND: f32 = 0.65;
const BOOST_REGEN_PER_SECOND: f32 = 0.25; const BOOST_REGEN_PER_SECOND: f32 = 0.25;
const BREATH_DECREASE_PER_SECOND: f32 = 0.01; const BREATH_DECREASE_PER_SECOND: f32 = 0.02;
pub fn update_player_movement( pub fn update_player_movement(
draw_handle: &mut RaylibDrawHandle, draw_handle: &mut RaylibDrawHandle,
@ -128,7 +128,14 @@ pub fn update_player_movement(
// Handle flippers doing a speed increase // Handle flippers doing a speed increase
if game_core.player.inventory.flippers.is_some() { if game_core.player.inventory.flippers.is_some() {
speed_multiplier = speed_multiplier * game_core.player.inventory.flippers.as_ref().unwrap().speed_increase; speed_multiplier = speed_multiplier
* game_core
.player
.inventory
.flippers
.as_ref()
.unwrap()
.speed_increase;
} }
// Update the player's breath // Update the player's breath
@ -136,30 +143,39 @@ pub fn update_player_movement(
(game_core.player.breath_percent - BREATH_DECREASE_PER_SECOND * dt as f32).clamp(0.0, 1.0); (game_core.player.breath_percent - BREATH_DECREASE_PER_SECOND * dt as f32).clamp(0.0, 1.0);
// Only do this if the mouse is far enough away // Only do this if the mouse is far enough away
let player_real_movement = game_core.player.direction * speed_multiplier;
let player_stunned = game_core.player.stun_timer > 0.0; let player_stunned = game_core.player.stun_timer > 0.0;
if raw_movement_direction.distance_to(Vector2::zero()) > game_core.player.size.y / 2.0 || player_stunned{ let mut player_real_movement = game_core.player.direction * speed_multiplier;
game_core.player.is_moving = true; if raw_movement_direction.distance_to(Vector2::zero()) > game_core.player.size.y / 2.0 {
game_core.player.position += player_real_movement; if game_core.player.is_moving {
// move in x
game_core.player.position.x += player_real_movement.x;
// Check for any collisions // Check for any collisions
for collider in game_core.world.colliders.iter() { for collider in game_core.world.colliders.iter() {
if game_core.player.collides_with_rec(collider) { if game_core.player.collides_with_rec(collider) {
game_core.player.is_moving = false; game_core.player.position.x -= player_real_movement.x;
break; player_real_movement.x = 0.0;
break;
}
}
// move in y
game_core.player.position.y += player_real_movement.y;
// Check for any collisions
for collider in game_core.world.colliders.iter() {
if game_core.player.collides_with_rec(collider) {
game_core.player.position.y -= player_real_movement.y;
player_real_movement.y = 0.0;
break;
}
} }
} }
}
if !game_core.player.is_moving { // Handle updating the stun timer
game_core.player.position -= player_real_movement; if player_stunned {
} game_core.player.stun_timer -= dt;
} else {
game_core.player.is_moving = false;
// Handle updating the stun timer
if player_stunned {
game_core.player.stun_timer -= dt;
}
} }
// Move the camera to follow the player // Move the camera to follow the player
@ -183,4 +199,3 @@ pub fn update_player_movement(
// game_core.master_camera.target.y = -100.0; // game_core.master_camera.target.y = -100.0;
// } // }
} }

5
src/player.rs
View File

@ -18,6 +18,7 @@ pub struct Player {
pub position: Vector2, pub position: Vector2,
pub direction: Vector2, pub direction: Vector2,
pub size: Vector2, pub size: Vector2,
pub radius: f32,
pub coins: u32, pub coins: u32,
pub boost_percent: f32, pub boost_percent: f32,
pub breath_percent: f32, pub breath_percent: f32,
@ -35,6 +36,8 @@ impl Player {
boost_percent: 1.0, boost_percent: 1.0,
size: Vector2 { x: 11.0, y: 21.0 }, size: Vector2 { x: 11.0, y: 21.0 },
breath_percent: 1.0, breath_percent: 1.0,
is_moving: true,
radius: 4.5,
position: spawn.clone(), position: spawn.clone(),
..Default::default() ..Default::default()
} }
@ -68,7 +71,7 @@ impl Player {
// || rectangle.check_collision_point_rec(top_right_corner) // || rectangle.check_collision_point_rec(top_right_corner)
// || rectangle.check_collision_point_rec(bottom_left_corner); // || rectangle.check_collision_point_rec(bottom_left_corner);
return rectangle.check_collision_circle_rec(self.position, (self.size.y * 0.5) / 2.0); return rectangle.check_collision_circle_rec(self.position, self.radius);
} }
/// Stun the player /// Stun the player