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

Add some ability costs

Browse Source
This commit is contained in:
Adam Whitehurst 2020-03-12 07:36:02 -07:00
parent 990ea5c5a2
commit 68dd8c578f
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/comp/ability.rs
View File

@ -2,14 +2,20 @@ use specs::{Component, DenseVecStorage, FlaggedStorage, HashMapStorage};
#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)] #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)]
pub enum AbilityState { pub enum AbilityState {
BasicAttack, BasicAttack {
/// Amount of energy required to use ability
cost: i32,
},
BasicBlock, BasicBlock,
Roll, Roll,
ChargeAttack, ChargeAttack,
TimedCombo, TimedCombo {
/// Amount of energy required to use ability
cost: i32,
},
} }
impl Default for AbilityState { impl Default for AbilityState {
fn default() -> Self { Self::BasicAttack } fn default() -> Self { Self::BasicAttack { cost: -100 } }
} }
impl Component for AbilityState { impl Component for AbilityState {
@ -27,7 +33,7 @@ pub struct AbilityPool {
impl Default for AbilityPool { impl Default for AbilityPool {
fn default() -> Self { fn default() -> Self {
Self { Self {
primary: Some(AbilityState::BasicAttack), primary: Some(AbilityState::default()),
// primary: Some(AbilityState::TimedCombo), // primary: Some(AbilityState::TimedCombo),
secondary: Some(AbilityState::BasicBlock), secondary: Some(AbilityState::BasicBlock),
block: None, block: None,

25
common/src/states/utils.rs
View File

@ -192,7 +192,7 @@ pub fn handle_primary_input(data: &JoinData, update: &mut StateUpdate) {
/// Attempts to go into `ability_pool.primary` if is `Some()` on `AbilityPool` /// Attempts to go into `ability_pool.primary` if is `Some()` on `AbilityPool`
pub fn attempt_primary_ability(data: &JoinData, update: &mut StateUpdate) { pub fn attempt_primary_ability(data: &JoinData, update: &mut StateUpdate) {
if let Some(ability_state) = data.ability_pool.primary { if let Some(ability_state) = data.ability_pool.primary {
update.character = ability_to_character_state(data, ability_state); update.character = ability_to_character_state(data, update, ability_state);
} }
} }
@ -209,7 +209,7 @@ pub fn handle_secondary_input(data: &JoinData, update: &mut StateUpdate) {
/// Attempts to go into `ability_pool.secondary` if is `Some()` on `AbilityPool` /// Attempts to go into `ability_pool.secondary` if is `Some()` on `AbilityPool`
pub fn attempt_seconday_ability(data: &JoinData, update: &mut StateUpdate) { pub fn attempt_seconday_ability(data: &JoinData, update: &mut StateUpdate) {
if let Some(ability_state) = data.ability_pool.secondary { if let Some(ability_state) = data.ability_pool.secondary {
update.character = ability_to_character_state(data, ability_state); update.character = ability_to_character_state(data, update, ability_state);
} }
} }
@ -233,7 +233,7 @@ pub fn handle_dodge_input(data: &JoinData, update: &mut StateUpdate) {
pub fn attempt_dodge_ability(data: &JoinData, update: &mut StateUpdate) { pub fn attempt_dodge_ability(data: &JoinData, update: &mut StateUpdate) {
if let Some(ability_state) = data.ability_pool.dodge { if let Some(ability_state) = data.ability_pool.dodge {
update.character = ability_to_character_state(data, ability_state); update.character = ability_to_character_state(data, update, ability_state);
} }
} }
@ -242,17 +242,22 @@ pub fn attempt_dodge_ability(data: &JoinData, update: &mut StateUpdate) {
/// Maps from `AbilityState`s to `CharacterStates`s. Also handles intializing /// Maps from `AbilityState`s to `CharacterStates`s. Also handles intializing
/// the new `CharacterState` /// the new `CharacterState`
pub fn ability_to_character_state(data: &JoinData, ability_state: AbilityState) -> CharacterState { pub fn ability_to_character_state(
data: &JoinData,
update: &mut StateUpdate,
ability_state: AbilityState,
) -> CharacterState {
match ability_state { match ability_state {
AbilityState::BasicAttack { .. } => { AbilityState::BasicAttack { cost, .. } => {
if let Some(tool) = unwrap_tool_data(data) { if let Some(tool) = unwrap_tool_data(data) {
CharacterState::BasicAttack { if update.energy.try_change_by(cost, EnergySource::HitEnemy).is_ok() {
return CharacterState::BasicAttack {
exhausted: false, exhausted: false,
remaining_duration: tool.attack_duration(), remaining_duration: tool.attack_duration(),
} };
} else {
*data.character
} }
}
*data.character
}, },
AbilityState::BasicBlock { .. } => CharacterState::BasicBlock {}, AbilityState::BasicBlock { .. } => CharacterState::BasicBlock {},
AbilityState::Roll { .. } => CharacterState::Roll { AbilityState::Roll { .. } => CharacterState::Roll {