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
06aa7ab70c
veloren/common/src/comp/health.rs

146 lines
4.1 KiB
Rust
Raw Normal View History

Moved common networking code to common/net, clippy fixes
2020-12-13 17:11:55 +00:00
use crate::{comp::Body, uid::Uid, DamageSource};
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
use serde::{Deserialize, Serialize};
fixed Cargo.lock conflict Fixed `crossbeam-queue` being referenced twice in the lockfile
2021-01-07 20:25:12 +00:00
use specs::{Component, DerefFlaggedStorage};
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
use specs_idvs::IdvStorage;
/// Specifies what and how much changed current health
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
pub struct HealthChange {
pub amount: i32,
pub cause: HealthSource,
}
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
pub enum HealthSource {
Addressed comments.
2020-11-05 01:21:42 +00:00
Damage { kind: DamageSource, by: Option<Uid> },
Heal { by: Option<Uid> },
//Attack { by: Uid }, // TODO: Implement weapon
//Projectile { owner: Option<Uid> },
//Explosion { owner: Option<Uid> },
//Energy { owner: Option<Uid> },
//Buff { owner: Option<Uid> },
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
Suicide,
World,
Revive,
Command,
LevelUp,
Item,
Addressed comments.
2020-11-05 01:21:42 +00:00
//Healing { by: Option<Uid> },
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
Unknown,
}
#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
pub struct Health {
base_max: u32,
current: u32,
maximum: u32,
StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified bracket bulldozing, boldly hopefully this should be good? need to rebase real quick please let me be done StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified hopefully this should be good? cargo clippy fmt stuff deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
last_max: u32,
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
pub last_change: (f64, HealthChange),
pub is_dead: bool,
}
impl Health {
Exp floaters. You load in with correct energy and health values now.
2021-01-04 17:16:42 +00:00
pub fn new(body: Body, level: u16) -> Self {
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
let mut health = Health::empty();
health.update_max_hp(Some(body), level);
health.set_to(health.maximum(), HealthSource::Revive);
health
}
pub fn empty() -> Self {
Health {
current: 0,
maximum: 0,
base_max: 0,
StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified bracket bulldozing, boldly hopefully this should be good? need to rebase real quick please let me be done StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified hopefully this should be good? cargo clippy fmt stuff deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
last_max: 0,
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
last_change: (0.0, HealthChange {
amount: 0,
cause: HealthSource::Revive,
}),
is_dead: false,
}
}
pub fn current(&self) -> u32 { self.current }
pub fn maximum(&self) -> u32 { self.maximum }
pub fn set_to(&mut self, amount: u32, cause: HealthSource) {
let amount = amount.min(self.maximum);
self.last_change = (0.0, HealthChange {
amount: amount as i32 - self.current as i32,
cause,
});
self.current = amount;
}
pub fn change_by(&mut self, change: HealthChange) {
self.current = ((self.current as i32 + change.amount).max(0) as u32).min(self.maximum);
self.last_change = (0.0, change);
}
// This function changes the modified max health value, not the base health
// value. The modified health value takes into account buffs and other temporary
// changes to max health.
pub fn set_maximum(&mut self, amount: u32) {
self.maximum = amount;
self.current = self.current.min(self.maximum);
}
// This is private because max hp is based on the level
fn set_base_max(&mut self, amount: u32) {
self.base_max = amount;
self.current = self.current.min(self.maximum);
}
pub fn should_die(&self) -> bool { self.current == 0 }
pub fn revive(&mut self) {
self.set_to(self.maximum(), HealthSource::Revive);
self.is_dead = false;
}
// TODO: Delete this once stat points will be a thing
Exp floaters. You load in with correct energy and health values now.
2021-01-04 17:16:42 +00:00
pub fn update_max_hp(&mut self, body: Option<Body>, level: u16) {
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
if let Some(body) = body {
Exp floaters. You load in with correct energy and health values now.
2021-01-04 17:16:42 +00:00
self.set_base_max(body.base_health() + body.base_health_increase() * level as u32);
self.set_maximum(body.base_health() + body.base_health_increase() * level as u32);
Levling health gives you health. Added combat scaling to UI.
2021-01-07 18:01:16 +00:00
self.change_by(HealthChange {
amount: body.base_health_increase() as i32,
cause: HealthSource::LevelUp,
});
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
}
}
pub fn with_max_health(mut self, amount: u32) -> Self {
self.maximum = amount;
self.current = amount;
self
}
StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified bracket bulldozing, boldly hopefully this should be good? need to rebase real quick please let me be done StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified hopefully this should be good? cargo clippy fmt stuff deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
pub fn last_set(&mut self) { self.last_max = self.maximum }
pub fn reset_max(&mut self) {
self.maximum = self.base_max;
if self.current > self.last_max {
self.current = self.last_max;
self.last_max = self.base_max;
}
}
}
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
impl Component for Health {
fixed Cargo.lock conflict Fixed `crossbeam-queue` being referenced twice in the lockfile
2021-01-07 20:25:12 +00:00
type Storage = DerefFlaggedStorage<Self, IdvStorage<Self>>;
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
}
#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
Addressed comments.
2020-11-01 17:15:46 +00:00
pub struct Dead {
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
pub cause: HealthSource,
}
Addressed comments.
2020-11-01 17:15:46 +00:00
impl Component for Dead {
Separated out health from stats component.
2020-10-31 22:34:08 +00:00
type Storage = IdvStorage<Self>;
}
Reference in New Issue Copy Permalink