Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make charging take a discrete amount of energy and change energy

Browse Source 
regeneration to use floats so it is smoother and tickrate-independent.
This commit is contained in:
Joseph Gerardot
2019-11-21 19:53:28 -05:00
committed by Pfauenauge90
parent b4337e57aa
commit c10c31043c
4 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/sys/controller.rs
View File

@ -2,8 +2,8 @@ use super::movement::ROLL_DURATION;
use crate::{
comp::{
self, item, projectile, ActionState, ActionState::*, Body, CharacterState, ControlEvent,
Controller, ControllerInputs, HealthChange, HealthSource, ItemKind, Mounting,
MovementState, MovementState::*, PhysicsState, Projectile, Stats, Vel,
Controller, ControllerInputs, Energy, EnergySource, HealthChange, HealthSource, ItemKind,
Mounting, MovementState, MovementState::*, PhysicsState, Projectile, Stats, Vel,
},
event::{Emitter, EventBus, LocalEvent, ServerEvent},
state::DeltaTime,
@ -16,6 +16,8 @@ use specs::{
use std::time::Duration;
use vek::*;
const CHARGE_COST: i32 = 50;
/// # Controller System
/// #### Responsible for validating controller inputs and setting new Character States
/// ----
@ -247,6 +249,7 @@ impl<'a> System<'a> for Sys {
WriteStorage<'a, Controller>,
WriteStorage<'a, CharacterState>,
ReadStorage<'a, Stats>,
WriteStorage<'a, Energy>,
ReadStorage<'a, Body>,
ReadStorage<'a, Vel>,
ReadStorage<'a, PhysicsState>,
@ -264,6 +267,7 @@ impl<'a> System<'a> for Sys {
mut controllers,
mut character_states,
stats,
mut energies,
bodies,
velocities,
physics_states,
@ -273,12 +277,13 @@ impl<'a> System<'a> for Sys {
) {
let mut server_emitter = server_bus.emitter();
let mut local_emitter = local_bus.emitter();
for (entity, uid, controller, mut character, stats, body, vel, physics, mount) in (
for (entity, uid, controller, mut character, stats, energy, body, vel, physics, mount) in (
&entities,
&uids,
&mut controllers,
&mut character_states,
&stats,
&mut energies,
&bodies,
&velocities,
&physics_states,
@ -579,9 +584,14 @@ impl<'a> System<'a> for Sys {
// Try to charge
if inputs.charge.is_pressed() && !inputs.charge.is_held_down() {
character.action = Charge {
time_left: Duration::from_millis(250),
};
if energy
.try_change_by(-CHARGE_COST, EnergySource::CastSpell)
.is_ok()
{
character.action = Charge {
time_left: Duration::from_millis(250),
}
}
continue;
}