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

handle attacking the jellyfish

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 17:06:13 -04:00
parent a3d79a5ebc
commit c0d147681b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ pub fn update_player_movement(
let user_request_action = draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_RIGHT_BUTTON); let user_request_action = draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_RIGHT_BUTTON);
if user_request_action { if user_request_action {
game_core.player.begin_attack(); game_core.player.begin_attack(&mut game_core.world);
} }
// Move the player in their direction // Move the player in their direction

13
src/player.rs
View File

@ -1,6 +1,6 @@
use raylib::prelude::*; use raylib::prelude::*;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use crate::{gamecore::{GameCore, GameProgress}, items::{AirBag, Flashlight, Flippers, StunGun}, lib::utils::{calculate_linear_slide}, pallette::{TRANSLUCENT_WHITE_64, TRANSLUCENT_WHITE_96}, resources::GlobalResources, world::World}; use crate::{entities::enemy::base::EnemyBase, gamecore::{GameCore, GameProgress}, items::{AirBag, Flashlight, Flippers, StunGun}, lib::utils::{calculate_linear_slide}, pallette::{TRANSLUCENT_WHITE_64, TRANSLUCENT_WHITE_96}, resources::GlobalResources, world::World};
const AOE_RING_MAX_RADIUS: f32 = 60.0; const AOE_RING_MAX_RADIUS: f32 = 60.0;
const STUN_ATTACK_TIME: f64 = 0.75; const STUN_ATTACK_TIME: f64 = 0.75;
@ -77,9 +77,18 @@ impl Player {
} }
/// Try to attack with the stun gun /// Try to attack with the stun gun
pub fn begin_attack(&mut self) { pub fn begin_attack(&mut self, world: &mut World) {
if self.inventory.stun_gun.is_some() && self.stun_timer == 0.0 { if self.inventory.stun_gun.is_some() && self.stun_timer == 0.0 {
self.attacking_timer = self.inventory.stun_gun.as_ref().unwrap().duration; self.attacking_timer = self.inventory.stun_gun.as_ref().unwrap().duration;
// Stun everything in reach
let stun_reach = self.inventory.stun_gun.as_ref().unwrap().range;
for jellyfish in world.jellyfish.iter_mut() {
if jellyfish.position.distance_to(self.position).abs() <= stun_reach {
jellyfish.handle_getting_attacked();
}
}
} }
} }