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
9c565dadc5
veloren/common/src/comp/ability.rs

2363 lines
91 KiB
Rust
Raw Normal View History

Update timed combo, add CharacerBehavior trait
2020-03-14 18:50:07 +00:00
use crate::{
Abilities are now loaded from .ron files.
2020-11-11 01:49:05 +00:00
assets::{self, Asset},
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
combat::{self, CombatEffect, DamageKind, Knockback},
Add lights and gravity again
2020-03-24 19:31:54 +00:00
comp::{
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
self, aura, beam, buff,
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
inventory::{
item::{
Addressed further review.
2021-11-12 03:37:37 +00:00
tool::{AbilityItem, Stats, ToolKind},
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
ItemKind,
},
slot::EquipSlot,
Inventory,
},
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
projectile::ProjectileConstructor,
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
skillset::{
skills::{self, Skill, SKILL_MODIFIERS},
SkillSet,
},
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
Body, CharacterState, LightEmitter, StateUpdate,
Add lights and gravity again
2020-03-24 19:31:54 +00:00
},
Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.
2020-10-07 02:32:57 +00:00
states::{
Move Systems out of common into `common_sys` This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
2020-12-01 00:28:00 +00:00
behavior::JoinData,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
utils::{AbilityInfo, StageSection},
Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.
2020-10-07 02:32:57 +00:00
*,
},
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
terrain::SpriteKind,
Update timed combo, add CharacerBehavior trait
2020-03-14 18:50:07 +00:00
};
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
use hashbrown::HashMap;
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
use serde::{Deserialize, Serialize};
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
use specs::{Component, DerefFlaggedStorage};
use specs_idvs::IdvStorage;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
use std::{convert::TryFrom, time::Duration};
Ability comps and sys
2020-01-01 17:16:29 +00:00
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
pub const MAX_ABILITIES: usize = 5;
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
pub type AuxiliaryKey = (Option<ToolKind>, Option<ToolKind>);
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
Ability pool updates after switching weapons now.
2021-11-10 00:51:06 +00:00
// TODO: Potentially look into storing previous ability sets for weapon
// combinations and automatically reverting back to them on switching to that
// set of weapons. Consider after UI is set up and people weigh in on memory
// considerations.
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
#[derive(Serialize, Deserialize, Debug, Clone)]
Addressed further review.
2021-11-12 03:37:37 +00:00
pub struct ActiveAbilities {
Addressed review feedback.
2021-11-11 22:55:14 +00:00
pub primary: PrimaryAbility,
pub secondary: SecondaryAbility,
pub movement: MovementAbility,
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
pub auxiliary_sets: HashMap<AuxiliaryKey, [AuxiliaryAbility; MAX_ABILITIES]>,
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
}
Addressed further review.
2021-11-12 03:37:37 +00:00
impl Component for ActiveAbilities {
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
type Storage = DerefFlaggedStorage<Self, IdvStorage<Self>>;
}
Addressed further review.
2021-11-12 03:37:37 +00:00
impl Default for ActiveAbilities {
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
fn default() -> Self {
Self {
Addressed review feedback.
2021-11-11 22:55:14 +00:00
primary: PrimaryAbility::Tool,
secondary: SecondaryAbility::Tool,
movement: MovementAbility::Species,
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
auxiliary_sets: HashMap::new(),
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
}
}
}
Addressed further review.
2021-11-12 03:37:37 +00:00
impl ActiveAbilities {
Persistence of auxiliary abilities.
2021-11-27 04:19:46 +00:00
pub fn new(auxiliary_sets: HashMap<AuxiliaryKey, [AuxiliaryAbility; MAX_ABILITIES]>) -> Self {
ActiveAbilities {
auxiliary_sets,
..Self::default()
}
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
}
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
pub fn change_ability(
&mut self,
slot: usize,
auxiliary_key: AuxiliaryKey,
new_ability: AuxiliaryAbility,
Ability sets now start with non-empty defaults.
2021-11-28 04:32:24 +00:00
inventory: Option<&Inventory>,
skill_set: Option<&SkillSet>,
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
) {
let auxiliary_set = self
.auxiliary_sets
.entry(auxiliary_key)
Ability sets now start with non-empty defaults.
2021-11-28 04:32:24 +00:00
.or_insert(Self::default_ability_set(inventory, skill_set));
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
if let Some(ability) = auxiliary_set.get_mut(slot) {
Addressed review feedback.
2021-11-11 22:55:14 +00:00
*ability = new_ability;
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
}
}
Ability sets now start with non-empty defaults.
2021-11-28 04:32:24 +00:00
pub fn auxiliary_set(
&self,
inv: Option<&Inventory>,
skill_set: Option<&SkillSet>,
) -> [AuxiliaryAbility; MAX_ABILITIES] {
let tool_kind = |slot| {
inv.and_then(|inv| inv.equipped(slot))
.and_then(|item| match item.kind() {
ItemKind::Tool(tool) => Some(tool.kind),
_ => None,
})
};
let aux_key = (
tool_kind(EquipSlot::ActiveMainhand),
tool_kind(EquipSlot::ActiveOffhand),
);
self.auxiliary_sets
.get(&aux_key)
.copied()
.unwrap_or_else(|| Self::default_ability_set(inv, skill_set))
}
pub fn get_ability(
&self,
input: AbilityInput,
inventory: Option<&Inventory>,
skill_set: Option<&SkillSet>,
) -> Ability {
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
match input {
Addressed review feedback.
2021-11-11 22:55:14 +00:00
AbilityInput::Primary => self.primary.into(),
AbilityInput::Secondary => self.secondary.into(),
AbilityInput::Movement => self.movement.into(),
Ability sets now start with non-empty defaults.
2021-11-28 04:32:24 +00:00
AbilityInput::Auxiliary(index) => self
.auxiliary_set(inventory, skill_set)
.get(index)
.copied()
.map(|a| a.into())
Addressed review feedback.
2021-11-11 22:55:14 +00:00
.unwrap_or(Ability::Empty),
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
}
}
Addressed review feedback.
2021-11-11 22:55:14 +00:00
/// Returns the CharacterAbility from an ability input, and also whether the
/// ability was from a weapon wielded in the offhand
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
pub fn activate_ability(
&self,
Addressed review feedback.
2021-11-11 22:55:14 +00:00
input: AbilityInput,
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
inv: Option<&Inventory>,
skill_set: &SkillSet,
Addressed further review.
2021-11-12 03:37:37 +00:00
body: Option<&Body>,
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
// bool is from_offhand
) -> Option<(CharacterAbility, bool)> {
Ability sets now start with non-empty defaults.
2021-11-28 04:32:24 +00:00
let ability = self.get_ability(input, inv, Some(skill_set));
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
let ability_set = |equip_slot| {
inv.and_then(|inv| inv.equipped(equip_slot))
.map(|i| &i.item_config_expect().abilities)
};
let scale_ability = |ability: CharacterAbility, equip_slot| {
let tool_kind =
inv.and_then(|inv| inv.equipped(equip_slot))
.and_then(|item| match &item.kind {
ItemKind::Tool(tool) => Some(tool.kind),
_ => None,
});
ability.adjusted_by_skills(skill_set, tool_kind)
};
Addressed further review.
2021-11-12 03:37:37 +00:00
let unwrap_ability = |(skill_req, ability): &(Option<Skill>, AbilityItem)| {
(*skill_req, ability.ability.clone())
};
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
let unlocked = |(s, a): (Option<Skill>, CharacterAbility)| {
// If there is a skill requirement and the skillset does not contain the
// required skill, return None
s.map_or(true, |s| skill_set.has_skill(s)).then_some(a)
};
match ability {
Ability::ToolPrimary => ability_set(EquipSlot::ActiveMainhand)
Addressed further review.
2021-11-12 03:37:37 +00:00
.map(|abilities| abilities.primary.ability.clone())
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
.map(|ability| (scale_ability(ability, EquipSlot::ActiveMainhand), false)),
Ability::ToolSecondary => ability_set(EquipSlot::ActiveOffhand)
Addressed further review.
2021-11-12 03:37:37 +00:00
.map(|abilities| abilities.secondary.ability.clone())
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
.map(|ability| (scale_ability(ability, EquipSlot::ActiveOffhand), true))
Addressed review feedback.
2021-11-11 22:55:14 +00:00
.or_else(|| {
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
ability_set(EquipSlot::ActiveMainhand)
Addressed further review.
2021-11-12 03:37:37 +00:00
.map(|abilities| abilities.secondary.ability.clone())
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
.map(|ability| (scale_ability(ability, EquipSlot::ActiveMainhand), false))
}),
Addressed further review.
2021-11-12 03:37:37 +00:00
Ability::SpeciesMovement => matches!(body, Some(Body::Humanoid(_)))
.then(CharacterAbility::default_roll)
.map(|ability| (ability.adjusted_by_skills(skill_set, None), false)),
Addressed review feedback.
2021-11-11 22:55:14 +00:00
Ability::MainWeaponAux(index) => ability_set(EquipSlot::ActiveMainhand)
Addressed further review.
2021-11-12 03:37:37 +00:00
.and_then(|abilities| abilities.abilities.get(index).map(unwrap_ability))
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
.and_then(unlocked)
.map(|ability| (scale_ability(ability, EquipSlot::ActiveMainhand), false)),
Addressed review feedback.
2021-11-11 22:55:14 +00:00
Ability::OffWeaponAux(index) => ability_set(EquipSlot::ActiveOffhand)
Addressed further review.
2021-11-12 03:37:37 +00:00
.and_then(|abilities| abilities.abilities.get(index).map(unwrap_ability))
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
.and_then(unlocked)
.map(|ability| (scale_ability(ability, EquipSlot::ActiveOffhand), true)),
Ability::Empty => None,
}
}
Initial UI work
2021-11-14 03:47:18 +00:00
pub fn iter_unlocked_abilities<'a>(
inv: Option<&'a Inventory>,
skill_set: Option<&'a SkillSet>,
equip_slot: EquipSlot,
) -> impl Iterator<Item = usize> + 'a {
inv.and_then(|inv| inv.equipped(equip_slot))
.into_iter()
.flat_map(|i| &i.item_config_expect().abilities.abilities)
.enumerate()
.filter_map(move |(i, (skill, _))| {
skill
.map_or(true, |s| skill_set.map_or(false, |ss| ss.has_skill(s)))
.then_some(i)
Addressed review feedback.
2021-11-11 22:55:14 +00:00
})
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
}
Initial UI work
2021-11-14 03:47:18 +00:00
Addressed MR comments.
2022-01-14 17:45:54 +00:00
fn default_ability_set<'a>(
Ability sets now start with non-empty defaults.
2021-11-28 04:32:24 +00:00
inv: Option<&'a Inventory>,
skill_set: Option<&'a SkillSet>,
) -> [AuxiliaryAbility; MAX_ABILITIES] {
let mut iter = Self::iter_unlocked_abilities(inv, skill_set, EquipSlot::ActiveMainhand)
.map(AuxiliaryAbility::MainWeapon)
.chain(
Self::iter_unlocked_abilities(inv, skill_set, EquipSlot::ActiveOffhand)
.map(AuxiliaryAbility::OffWeapon),
);
Addressed MR comments.
2022-01-14 17:45:54 +00:00
[(); MAX_ABILITIES].map(|()| iter.next().unwrap_or(AuxiliaryAbility::Empty))
Added in-memory persistence of ability sets per weapon kind pair.
2021-11-26 04:30:28 +00:00
}
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
}
Addressed review feedback.
2021-11-11 22:55:14 +00:00
pub enum AbilityInput {
Primary,
Secondary,
Movement,
Auxiliary(usize),
}
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
pub enum Ability {
ToolPrimary,
ToolSecondary,
SpeciesMovement,
Addressed review feedback.
2021-11-11 22:55:14 +00:00
MainWeaponAux(usize),
OffWeaponAux(usize),
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
Empty,
/* For future use
* ArmorAbility(usize), */
}
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
impl Ability {
Addressed review feedback.
2021-11-11 22:55:14 +00:00
pub fn ability_id(self, inv: Option<&Inventory>) -> Option<&str> {
Addressed further review.
2021-11-12 03:37:37 +00:00
let ability_set = |equip_slot| {
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
inv.and_then(|inv| inv.equipped(equip_slot))
Addressed further review.
2021-11-12 03:37:37 +00:00
.map(|i| &i.item_config_expect().abilities)
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
};
match self {
Addressed further review.
2021-11-12 03:37:37 +00:00
Ability::ToolPrimary => ability_set(EquipSlot::ActiveMainhand)
.map(|abilities| abilities.primary.id.as_str()),
Ability::ToolSecondary => ability_set(EquipSlot::ActiveOffhand)
.map(|abilities| abilities.secondary.id.as_str())
Addressed review feedback.
2021-11-11 22:55:14 +00:00
.or_else(|| {
Addressed further review.
2021-11-12 03:37:37 +00:00
ability_set(EquipSlot::ActiveMainhand)
.map(|abilities| abilities.secondary.id.as_str())
Addressed review feedback.
2021-11-11 22:55:14 +00:00
}),
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
Ability::SpeciesMovement => None, // TODO: Make not None
Addressed further review.
2021-11-12 03:37:37 +00:00
Ability::MainWeaponAux(index) => {
ability_set(EquipSlot::ActiveMainhand).and_then(|abilities| {
abilities
.abilities
.get(index)
.map(|(_, ability)| ability.id.as_str())
})
},
Ability::OffWeaponAux(index) => {
ability_set(EquipSlot::ActiveOffhand).and_then(|abilities| {
abilities
.abilities
.get(index)
.map(|(_, ability)| ability.id.as_str())
})
},
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
Ability::Empty => None,
}
}
Addressed review feedback.
2021-11-11 22:55:14 +00:00
}
Added some client methods for changing abilities to hook into.
2021-11-11 03:24:08 +00:00
Addressed review feedback.
2021-11-11 22:55:14 +00:00
#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
pub enum PrimaryAbility {
Tool,
Empty,
}
impl From<PrimaryAbility> for Ability {
fn from(primary: PrimaryAbility) -> Self {
match primary {
PrimaryAbility::Tool => Ability::ToolPrimary,
PrimaryAbility::Empty => Ability::Empty,
}
}
}
#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
pub enum SecondaryAbility {
Tool,
Empty,
}
impl From<SecondaryAbility> for Ability {
fn from(primary: SecondaryAbility) -> Self {
match primary {
SecondaryAbility::Tool => Ability::ToolSecondary,
SecondaryAbility::Empty => Ability::Empty,
}
}
}
#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
pub enum MovementAbility {
Species,
Empty,
}
impl From<MovementAbility> for Ability {
fn from(primary: MovementAbility) -> Self {
match primary {
MovementAbility::Species => Ability::SpeciesMovement,
MovementAbility::Empty => Ability::Empty,
}
}
}
#[derive(Copy, Clone, Serialize, Deserialize, Debug, PartialEq)]
pub enum AuxiliaryAbility {
MainWeapon(usize),
OffWeapon(usize),
Empty,
}
impl From<AuxiliaryAbility> for Ability {
fn from(primary: AuxiliaryAbility) -> Self {
match primary {
AuxiliaryAbility::MainWeapon(i) => Ability::MainWeaponAux(i),
AuxiliaryAbility::OffWeapon(i) => Ability::OffWeaponAux(i),
AuxiliaryAbility::Empty => Ability::Empty,
Added some client methods for changing abilities to hook into.
2021-11-11 03:24:08 +00:00
}
}
Abilities can now be referred to by the asset id.
2021-11-10 22:25:37 +00:00
}
Target the specific attack types, to handle TripeStrike etc... Removed the Axe sfx until the animations show the swing
2020-04-04 07:48:17 +00:00
#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug, Serialize, Deserialize)]
pub enum CharacterAbilityType {
BasicMelee,
BasicRanged,
Boost,
Fixed clippy errors and added SFX
2020-10-14 22:30:58 +00:00
ChargedMelee(StageSection),
Bow charged shot attack
2020-07-26 03:06:53 +00:00
ChargedRanged,
Fixed clippy errors and added SFX
2020-10-14 22:30:58 +00:00
DashMelee(StageSection),
Target the specific attack types, to handle TripeStrike etc... Removed the Axe sfx until the animations show the swing
2020-04-04 07:48:17 +00:00
BasicBlock,
Addressed second round of feedback.
2020-09-13 01:33:46 +00:00
ComboMelee(StageSection, u32),
Fixed clippy errors and added SFX
2020-10-14 22:30:58 +00:00
LeapMelee(StageSection),
SpinMelee(StageSection),
Initial implementation of new staff abilities.
2020-10-04 01:24:15 +00:00
Shockwave,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
BasicBeam,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
RepeaterRanged,
Adds sfx for Sceptre aura
2021-03-17 23:54:49 +00:00
BasicAura,
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
SelfBuff,
Target the specific attack types, to handle TripeStrike etc... Removed the Axe sfx until the animations show the swing
2020-04-04 07:48:17 +00:00
}
impl From<&CharacterState> for CharacterAbilityType {
fn from(state: &CharacterState) -> Self {
match state {
CharacterState::BasicMelee(_) => Self::BasicMelee,
CharacterState::BasicRanged(_) => Self::BasicRanged,
CharacterState::Boost(_) => Self::Boost,
Fixed clippy errors and added SFX
2020-10-14 22:30:58 +00:00
CharacterState::DashMelee(data) => Self::DashMelee(data.stage_section),
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
CharacterState::BasicBlock(_) => Self::BasicBlock,
Fixed clippy errors and added SFX
2020-10-14 22:30:58 +00:00
CharacterState::LeapMelee(data) => Self::LeapMelee(data.stage_section),
Addressed second round of feedback.
2020-09-13 01:33:46 +00:00
CharacterState::ComboMelee(data) => Self::ComboMelee(data.stage_section, data.stage),
Fixed clippy errors and added SFX
2020-10-14 22:30:58 +00:00
CharacterState::SpinMelee(data) => Self::SpinMelee(data.stage_section),
CharacterState::ChargedMelee(data) => Self::ChargedMelee(data.stage_section),
Bow charged shot attack
2020-07-26 03:06:53 +00:00
CharacterState::ChargedRanged(_) => Self::ChargedRanged,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
CharacterState::Shockwave(_) => Self::Shockwave,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
CharacterState::BasicBeam(_) => Self::BasicBeam,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
CharacterState::RepeaterRanged(_) => Self::RepeaterRanged,
Adds sfx for Sceptre aura
2021-03-17 23:54:49 +00:00
CharacterState::BasicAura(_) => Self::BasicAura,
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
CharacterState::SelfBuff(_) => Self::SelfBuff,
Target the specific attack types, to handle TripeStrike etc... Removed the Axe sfx until the animations show the swing
2020-04-04 07:48:17 +00:00
_ => Self::BasicMelee,
}
}
}
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
Make abilities depend on weapon
2020-03-14 15:40:29 +00:00
pub enum CharacterAbility {
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
BasicMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
buildup_duration: f32,
swing_duration: f32,
recover_duration: f32,
base_damage: f32,
base_poise_damage: f32,
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-05-24 00:45:22 +00:00
knockback: Knockback,
Better staff M1, random +1 damage, better attackrange,angle impl
2020-03-22 15:25:47 +00:00
range: f32,
max_angle: f32,
Crippling strike now functional. Crippled debuff added.
2021-04-16 17:44:11 +00:00
damage_effect: Option<CombatEffect>,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind,
Add some ability costs
2020-03-12 14:36:02 +00:00
},
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
BasicRanged {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
buildup_duration: f32,
recover_duration: f32,
Added projectile constructor. Removed a bunch of cloning.
2020-11-09 04:04:51 +00:00
projectile: ProjectileConstructor,
feat: fireball explosions
2020-03-22 19:39:50 +00:00
projectile_body: Body,
Add lights and gravity again
2020-03-24 19:31:54 +00:00
projectile_light: Option<LightEmitter>,
Projectile speed is no longer hard-coded.
2020-08-06 18:17:38 +00:00
projectile_speed: f32,
Reworked bow
2021-05-16 03:09:39 +00:00
num_projectiles: u32,
Made new skills for reworked bow. Created migration to reset bow skills.
2021-05-22 05:05:27 +00:00
projectile_spread: f32,
feat: fireball explosions
2020-03-22 19:39:50 +00:00
},
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
RepeaterRanged {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
buildup_duration: f32,
shoot_duration: f32,
recover_duration: f32,
Reworked bow
2021-05-16 03:09:39 +00:00
max_speed: f32,
half_speed_at: u32,
Added projectile constructor. Removed a bunch of cloning.
2020-11-09 04:04:51 +00:00
projectile: ProjectileConstructor,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
projectile_body: Body,
projectile_light: Option<LightEmitter>,
projectile_speed: f32,
},
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
Boost {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
movement_duration: f32,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
only_up: bool,
Fixed boost having ridiculous velocity.
2021-03-26 20:11:25 +00:00
speed: f32,
max_exit_velocity: f32,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
},
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
DashMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
base_damage: f32,
scaled_damage: f32,
base_poise_damage: f32,
scaled_poise_damage: f32,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
base_knockback: f32,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback: f32,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
range: f32,
angle: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_drain: f32,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
forward_speed: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: f32,
charge_duration: f32,
swing_duration: f32,
recover_duration: f32,
Add ori_modifier for DashMelee and nerf it * 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-15 20:57:22 +00:00
ori_modifier: f32,
Overhauled dash melee.
2021-04-18 22:09:57 +00:00
charge_through: bool,
Addressed first round of feedback on sword overhaul.
2020-09-12 16:46:21 +00:00
is_interruptible: bool,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: Option<CombatEffect>,
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
},
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
BasicBlock {
buildup_duration: f32,
recover_duration: f32,
max_angle: f32,
block_strength: f32,
Parrying
2021-04-13 05:46:42 +00:00
energy_cost: f32,
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
},
Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.
2020-11-05 18:28:18 +00:00
Roll {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
buildup_duration: f32,
movement_duration: f32,
recover_duration: f32,
Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.
2020-11-05 18:28:18 +00:00
roll_strength: f32,
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
immune_melee: bool,
Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.
2020-11-05 18:28:18 +00:00
},
Initial implementation of combo melee attack.
2020-09-04 01:54:59 +00:00
ComboMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
stage_data: Vec<combo_melee::Stage<f32>>,
initial_energy_gain: f32,
max_energy_gain: f32,
energy_increase: f32,
Attack speed now scales with combo in combo melee.
2020-09-11 19:24:55 +00:00
speed_increase: f32,
max_speed_increase: f32,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scales_from_combo: u32,
Addressed first round of feedback on sword overhaul.
2020-09-12 16:46:21 +00:00
is_interruptible: bool,
ori addition to combomelee
2021-04-30 02:59:29 +00:00
ori_modifier: f32,
update triple_strike
2020-03-19 22:40:03 +00:00
},
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
LeapMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
buildup_duration: f32,
movement_duration: f32,
swing_duration: f32,
recover_duration: f32,
base_damage: f32,
base_poise_damage: f32,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
range: f32,
max_angle: f32,
Addressed comments
2020-09-25 05:51:26 +00:00
knockback: f32,
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
forward_leap_strength: f32,
vertical_leap_strength: f32,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: Option<CombatEffect>,
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
},
Spin attack for axe
2020-07-08 19:58:41 +00:00
SpinMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: f32,
swing_duration: f32,
recover_duration: f32,
base_damage: f32,
base_poise_damage: f32,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
knockback: Knockback,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
range: f32,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
damage_effect: Option<CombatEffect>,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
is_infinite: bool,
Addressed comments.
2021-01-21 22:45:03 +00:00
movement_behavior: spin_melee::MovementBehavior,
Made 3rd ability interruptible. Final balance tweaks.
2020-09-20 17:23:33 +00:00
is_interruptible: bool,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
forward_speed: f32,
num_spins: u32,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
specifier: Option<spin_melee::FrontendSpecifier>,
Mindflayer can now lifesteal off of its own minions
2021-03-24 16:49:58 +00:00
target: Option<combat::GroupTarget>,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind,
Spin attack for axe
2020-07-08 19:58:41 +00:00
},
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
ChargedMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
energy_drain: f32,
initial_damage: f32,
scaled_damage: f32,
initial_poise_damage: f32,
scaled_poise_damage: f32,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
initial_knockback: f32,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback: f32,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
range: f32,
max_angle: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
charge_duration: f32,
swing_duration: f32,
Moved hit timer to charged melee and adjusted for tail slap
2020-11-18 19:35:43 +00:00
hit_timing: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
recover_duration: f32,
Particles for frenzy buff and ground cleave.
2021-04-28 04:23:28 +00:00
specifier: Option<charged_melee::FrontendSpecifier>,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: Option<CombatEffect>,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
},
Bow charged shot attack
2020-07-26 03:06:53 +00:00
ChargedRanged {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
energy_drain: f32,
Reworked bow
2021-05-16 03:09:39 +00:00
initial_regen: f32,
scaled_regen: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
initial_damage: f32,
scaled_damage: f32,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
initial_knockback: f32,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: f32,
charge_duration: f32,
recover_duration: f32,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
projectile_body: Body,
projectile_light: Option<LightEmitter>,
Projectile speed is no longer hard-coded.
2020-08-06 18:17:38 +00:00
initial_projectile_speed: f32,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_projectile_speed: f32,
Implemented bow skill tree.
2020-12-23 02:28:55 +00:00
move_speed: f32,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
},
Initial implementation of new staff abilities.
2020-10-04 01:24:15 +00:00
Shockwave {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: f32,
buildup_duration: f32,
swing_duration: f32,
recover_duration: f32,
damage: f32,
poise_damage: f32,
Transitioned knockback to an enum.
2020-10-18 18:21:58 +00:00
knockback: Knockback,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
shockwave_angle: f32,
Addressed playtesting feedback.
2020-10-12 22:55:55 +00:00
shockwave_vertical_angle: f32,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
shockwave_speed: f32,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
shockwave_duration: f32,
Addressed comments
2020-09-19 16:55:31 +00:00
requires_ground: bool,
Balance tweaks to staff abilities.
2020-10-09 17:42:15 +00:00
move_efficiency: f32,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind,
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-05-29 22:27:55 +00:00
specifier: comp::shockwave::FrontendSpecifier,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: Option<CombatEffect>,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
},
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
BasicBeam {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: f32,
recover_duration: f32,
beam_duration: f32,
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
damage: f32,
Tick rate now exposed as a variable.
2020-08-31 21:55:38 +00:00
tick_rate: f32,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
range: f32,
max_angle: f32,
Added cursed flame attack to mindflayer
2021-03-20 17:29:57 +00:00
damage_effect: Option<CombatEffect>,
Various fixes to object animation, cleanup
2021-01-30 14:14:25 +00:00
energy_regen: f32,
energy_drain: f32,
Load ori_rate for BasicBeam from assets + make fire turret ori_rate slower
2021-06-18 17:30:12 +00:00
ori_rate: f32,
Particles for lifesteal beam. Changed how frontend recognized beams.
2021-03-03 04:56:09 +00:00
specifier: beam::FrontendSpecifier,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
},
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
BasicAura {
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
buildup_duration: f32,
cast_duration: f32,
recover_duration: f32,
targets: combat::GroupTarget,
aura: aura::AuraBuffConstructor,
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
aura_duration: f32,
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
range: f32,
energy_cost: f32,
Add healing aura for sceptre M2
2021-07-10 07:10:31 +00:00
scales_with_combo: bool,
Removed references to Healing Beam, which Healing Aura is replacing
2021-07-11 04:39:11 +00:00
specifier: aura::Specifier,
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
},
Added dimensional door ability for mindflayer
2021-03-21 03:28:13 +00:00
Blink {
buildup_duration: f32,
recover_duration: f32,
max_range: f32,
},
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
BasicSummon {
buildup_duration: f32,
cast_duration: f32,
recover_duration: f32,
summon_amount: u32,
Tornado summoning attack
2021-06-03 22:42:50 +00:00
summon_distance: (f32, f32),
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
summon_info: basic_summon::SummonInfo,
Tornado summoning attack
2021-06-03 22:42:50 +00:00
duration: Option<Duration>,
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
},
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
SelfBuff {
buildup_duration: f32,
cast_duration: f32,
recover_duration: f32,
buff_kind: buff::BuffKind,
buff_strength: f32,
buff_duration: Option<f32>,
energy_cost: f32,
},
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
SpriteSummon {
buildup_duration: f32,
cast_duration: f32,
recover_duration: f32,
sprite: SpriteKind,
summon_distance: (f32, f32),
Added sparseness field to sprite summon.
2021-06-22 04:12:39 +00:00
sparseness: f64,
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
},
Ability comps and sys
2020-01-01 17:16:29 +00:00
}
Abilities are now loaded from .ron files.
2020-11-11 01:49:05 +00:00
impl Default for CharacterAbility {
fn default() -> Self {
CharacterAbility::BasicMelee {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
energy_cost: 0.0,
buildup_duration: 0.25,
swing_duration: 0.25,
recover_duration: 0.5,
base_damage: 10.0,
base_poise_damage: 0.0,
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-05-24 00:45:22 +00:00
knockback: Knockback {
strength: 0.0,
direction: combat::KnockbackDir::Away,
},
Abilities are now loaded from .ron files.
2020-11-11 01:49:05 +00:00
range: 3.5,
max_angle: 15.0,
Crippling strike now functional. Crippled debuff added.
2021-04-16 17:44:11 +00:00
damage_effect: None,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: DamageKind::Crushing,
Abilities are now loaded from .ron files.
2020-11-11 01:49:05 +00:00
}
}
}
impl Asset for CharacterAbility {
Use assets_manager to load assets
2020-12-12 22:14:24 +00:00
type Loader = assets::RonLoader;
Abilities are now loaded from .ron files.
2020-11-11 01:49:05 +00:00
cargo fmt
2020-12-13 01:09:57 +00:00
const EXTENSION: &'static str = "ron";
Abilities are now loaded from .ron files.
2020-11-11 01:49:05 +00:00
}
Add ability requirements system
2020-03-17 14:01:41 +00:00
impl CharacterAbility {
clean up based on pr review comment
2020-03-21 22:55:20 +00:00
/// Attempts to fulfill requirements, mutating `update` (taking energy) if
/// applicable.
pub fn requirements_paid(&self, data: &JoinData, update: &mut StateUpdate) -> bool {
Add ability requirements system
2020-03-17 14:01:41 +00:00
match self {
Changed roll movement.
2020-11-05 20:22:30 +00:00
CharacterAbility::Roll { energy_cost, .. } => {
Ensnaring vines now ensnare you.
2021-06-20 03:51:04 +00:00
data.physics.on_ground.is_some()
Food now applies buff at end of state. Rolling and poise states now cancel the potion buff. UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state. Rolling can no cancel item use. Rolling now checks for move_dir instead of velocity.
2021-06-27 03:42:44 +00:00
&& data.inputs.move_dir.magnitude_squared() > 0.25
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
&& update.energy.try_change_by(-*energy_cost).is_ok()
feat: fireball explosions
2020-03-22 19:39:50 +00:00
},
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
CharacterAbility::DashMelee { energy_cost, .. }
| CharacterAbility::BasicMelee { energy_cost, .. }
| CharacterAbility::BasicRanged { energy_cost, .. }
| CharacterAbility::SpinMelee { energy_cost, .. }
| CharacterAbility::ChargedRanged { energy_cost, .. }
| CharacterAbility::ChargedMelee { energy_cost, .. }
| CharacterAbility::Shockwave { energy_cost, .. }
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
| CharacterAbility::BasicBlock { energy_cost, .. }
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
| CharacterAbility::SelfBuff { energy_cost, .. } => {
update.energy.try_change_by(-*energy_cost).is_ok()
},
Reworked bow
2021-05-16 03:09:39 +00:00
// Consumes energy within state, so value only checked before entering state
CharacterAbility::RepeaterRanged { energy_cost, .. } => {
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
update.energy.current() >= *energy_cost
Leaps now require a non-negative vertical velocity to use.
2020-10-17 16:29:15 +00:00
},
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
CharacterAbility::LeapMelee { energy_cost, .. } => {
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
update.vel.0.z >= 0.0 && update.energy.try_change_by(-*energy_cost).is_ok()
Leaps now require a non-negative vertical velocity to use.
2020-10-17 16:29:15 +00:00
},
Add healing aura for sceptre M2
2021-07-10 07:10:31 +00:00
CharacterAbility::BasicAura {
energy_cost,
scales_with_combo,
..
} => {
((*scales_with_combo && data.combo.counter() > 0) | !*scales_with_combo)
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
&& update.energy.try_change_by(-*energy_cost).is_ok()
Add healing aura for sceptre M2
2021-07-10 07:10:31 +00:00
},
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
CharacterAbility::ComboMelee { .. }
| CharacterAbility::Boost { .. }
| CharacterAbility::BasicBeam { .. }
| CharacterAbility::Blink { .. }
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
| CharacterAbility::BasicSummon { .. }
| CharacterAbility::SpriteSummon { .. } => true,
Add ability requirements system
2020-03-17 14:01:41 +00:00
}
}
Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.
2020-11-06 01:22:26 +00:00
Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts
2021-01-08 19:12:09 +00:00
pub fn default_roll() -> CharacterAbility {
Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.
2020-11-06 01:22:26 +00:00
CharacterAbility::Roll {
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
energy_cost: 12.0,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: 0.05,
Flattened roll progression.
2021-04-05 21:50:53 +00:00
movement_duration: 0.33,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
recover_duration: 0.125,
Flattened roll progression.
2021-04-05 21:50:53 +00:00
roll_strength: 2.0,
Unlock dodge roll iframes and staff explosion by default.
2021-04-17 23:45:43 +00:00
immune_melee: true,
Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.
2020-11-06 01:22:26 +00:00
}
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
pub fn default_block() -> CharacterAbility {
CharacterAbility::BasicBlock {
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 13:16:26 +00:00
buildup_duration: 0.25,
recover_duration: 0.2,
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
max_angle: 60.0,
block_strength: 0.5,
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 13:16:26 +00:00
energy_cost: 2.5,
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
}
}
update toolchain to `nightly-2021-12-19`
2021-12-21 20:19:23 +00:00
#[must_use]
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
pub fn adjusted_by_stats(mut self, stats: Stats) -> Self {
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
use CharacterAbility::*;
match self {
BasicMelee {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
ref mut swing_duration,
ref mut recover_duration,
ref mut base_damage,
Poise stats
2020-12-16 23:30:33 +00:00
ref mut base_poise_damage,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
knockback: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut range,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
max_angle: _,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
damage_kind: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*swing_duration /= stats.speed;
*recover_duration /= stats.speed;
*base_damage *= stats.power;
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-11 04:22:00 +00:00
*base_poise_damage *= stats.effect_power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*range *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
BasicRanged {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
ref mut recover_duration,
ref mut projectile,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
projectile_body: _,
projectile_light: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut projectile_speed,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
num_projectiles: _,
projectile_spread: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*recover_duration /= stats.speed;
*projectile = projectile.modified_projectile(stats.power, 1_f32, 1_f32);
*projectile_speed *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
RepeaterRanged {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
ref mut shoot_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
max_speed: _,
half_speed_at: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut projectile,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
projectile_body: _,
projectile_light: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut projectile_speed,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*shoot_duration /= stats.speed;
*recover_duration /= stats.speed;
*projectile = projectile.modified_projectile(stats.power, 1_f32, 1_f32);
*projectile_speed *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
Boost {
ref mut movement_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
only_up: _,
Fixed boost having ridiculous velocity.
2021-03-26 20:11:25 +00:00
speed: ref mut boost_speed,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
max_exit_velocity: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*movement_duration /= stats.speed;
*boost_speed *= stats.power;
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
DashMelee {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut base_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
ref mut scaled_damage,
Poise stats
2020-12-16 23:30:33 +00:00
ref mut base_poise_damage,
ref mut scaled_poise_damage,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
base_knockback: _,
scaled_knockback: _,
ref mut range,
angle: _,
ref mut energy_drain,
forward_speed: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
charge_duration: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut swing_duration,
ref mut recover_duration,
Add ori_modifier for DashMelee and nerf it * 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-15 20:57:22 +00:00
ori_modifier: _,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
charge_through: _,
is_interruptible: _,
damage_kind: _,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*base_damage *= stats.power;
*scaled_damage *= stats.power;
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-11 04:22:00 +00:00
*base_poise_damage *= stats.effect_power;
*scaled_poise_damage *= stats.effect_power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*swing_duration /= stats.speed;
*recover_duration /= stats.speed;
*range *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
*energy_drain /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
BasicBlock {
ref mut buildup_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
// Do we want angle to be adjusted by range?
max_angle: _,
// Block strength explicitly not modified by power, that will be a separate stat
block_strength: _,
ref mut energy_cost,
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*recover_duration /= stats.speed;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
},
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
Roll {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
ref mut movement_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
roll_strength: _,
immune_melee: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*movement_duration /= stats.speed;
*recover_duration /= stats.speed;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
ComboMelee {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut stage_data,
initial_energy_gain: _,
max_energy_gain: _,
energy_increase: _,
speed_increase: _,
max_speed_increase: _,
scales_from_combo: _,
is_interruptible: _,
ori_modifier: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
*stage_data = stage_data
.iter_mut()
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
.map(|s| s.adjusted_by_stats(stats))
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
.collect();
},
LeapMelee {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
movement_duration: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut swing_duration,
ref mut recover_duration,
ref mut base_damage,
Poise stats
2020-12-16 23:30:33 +00:00
ref mut base_poise_damage,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut range,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
max_angle: _,
knockback: _,
forward_leap_strength: _,
vertical_leap_strength: _,
damage_kind: _,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*swing_duration /= stats.speed;
*recover_duration /= stats.speed;
*base_damage *= stats.power;
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-11 04:22:00 +00:00
*base_poise_damage *= stats.effect_power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*range *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
SpinMelee {
ref mut buildup_duration,
ref mut swing_duration,
ref mut recover_duration,
ref mut base_damage,
Poise stats
2020-12-16 23:30:33 +00:00
ref mut base_poise_damage,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
knockback: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut range,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
is_infinite: _,
movement_behavior: _,
is_interruptible: _,
forward_speed: _,
num_spins: _,
specifier: _,
target: _,
damage_kind: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*swing_duration /= stats.speed;
*recover_duration /= stats.speed;
*base_damage *= stats.power;
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-11 04:22:00 +00:00
*base_poise_damage *= stats.effect_power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*range *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
ChargedMelee {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
ref mut energy_drain,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut initial_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
ref mut scaled_damage,
Poise stats
2020-12-16 23:30:33 +00:00
ref mut initial_poise_damage,
ref mut scaled_poise_damage,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
initial_knockback: _,
scaled_knockback: _,
ref mut range,
max_angle: _,
charge_duration: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut swing_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
hit_timing: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
specifier: _,
damage_kind: _,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*initial_damage *= stats.power;
*scaled_damage *= stats.power;
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-11 04:22:00 +00:00
*initial_poise_damage *= stats.effect_power;
*scaled_poise_damage *= stats.effect_power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*swing_duration /= stats.speed;
*recover_duration /= stats.speed;
*range *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
*energy_drain /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
ChargedRanged {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
ref mut energy_drain,
initial_regen: _,
scaled_regen: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut initial_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
ref mut scaled_damage,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
initial_knockback: _,
scaled_knockback: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
charge_duration: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
projectile_body: _,
projectile_light: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut initial_projectile_speed,
ref mut scaled_projectile_speed,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
move_speed: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*initial_damage *= stats.power;
*scaled_damage *= stats.power;
*buildup_duration /= stats.speed;
*recover_duration /= stats.speed;
*initial_projectile_speed *= stats.range;
*scaled_projectile_speed *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
*energy_drain /= stats.energy_efficiency;
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
Shockwave {
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut buildup_duration,
ref mut swing_duration,
ref mut recover_duration,
ref mut damage,
Poise stats
2020-12-16 23:30:33 +00:00
ref mut poise_damage,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
knockback: _,
shockwave_angle: _,
shockwave_vertical_angle: _,
shockwave_speed: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut shockwave_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
requires_ground: _,
move_efficiency: _,
damage_kind: _,
specifier: _,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*swing_duration /= stats.speed;
*recover_duration /= stats.speed;
*damage *= stats.power;
Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.
2021-07-11 04:22:00 +00:00
*poise_damage *= stats.effect_power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*shockwave_duration *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
BasicBeam {
ref mut buildup_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut beam_duration,
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
ref mut damage,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
ref mut tick_rate,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut range,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
max_angle: _,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
ref mut damage_effect,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
energy_regen: _,
ref mut energy_drain,
ori_rate: _,
specifier: _,
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*recover_duration /= stats.speed;
*damage *= stats.power;
*tick_rate *= stats.speed;
*range *= stats.range;
// Duration modified to keep velocity constant
*beam_duration *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_drain /= stats.energy_efficiency;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
if let Some(CombatEffect::Buff(combat::CombatBuff {
kind: _,
dur_secs: _,
strength,
chance: _,
})) = damage_effect
{
*strength *= stats.buff_strength;
}
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
},
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
BasicAura {
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
ref mut buildup_duration,
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
ref mut cast_duration,
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
targets: _,
aura:
aura::AuraBuffConstructor {
kind: _,
ref mut strength,
duration: _,
category: _,
},
aura_duration: _,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut range,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
ref mut energy_cost,
Add healing aura for sceptre M2
2021-07-10 07:10:31 +00:00
scales_with_combo: _,
specifier: _,
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*cast_duration /= stats.speed;
*recover_duration /= stats.speed;
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
// Do we want to make buff_strength affect this instead of power?
// Look into during modular weapon transition
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*strength *= stats.power;
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*range *= stats.range;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
},
Added dimensional door ability for mindflayer
2021-03-21 03:28:13 +00:00
Blink {
ref mut buildup_duration,
ref mut recover_duration,
Added range stat to weapons.
2021-07-06 01:32:12 +00:00
ref mut max_range,
Added dimensional door ability for mindflayer
2021-03-21 03:28:13 +00:00
} => {
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*recover_duration /= stats.speed;
*max_range *= stats.range;
Added dimensional door ability for mindflayer
2021-03-21 03:28:13 +00:00
},
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
BasicSummon {
ref mut buildup_duration,
ref mut cast_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
summon_amount: _,
summon_distance: (ref mut inner_dist, ref mut outer_dist),
summon_info: _,
duration: _,
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
} => {
// TODO: Figure out how/if power should affect this
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*cast_duration /= stats.speed;
*recover_duration /= stats.speed;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*inner_dist *= stats.range;
*outer_dist *= stats.range;
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
},
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
SelfBuff {
ref mut buildup_duration,
ref mut cast_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
buff_kind: _,
ref mut buff_strength,
buff_duration: _,
ref mut energy_cost,
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
} => {
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
// Do we want to make buff_strength affect this instead of power?
// Look into during modular weapon transition
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buff_strength *= stats.power;
*buildup_duration /= stats.speed;
*cast_duration /= stats.speed;
*recover_duration /= stats.speed;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*energy_cost /= stats.energy_efficiency;
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
},
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
SpriteSummon {
ref mut buildup_duration,
ref mut cast_duration,
ref mut recover_duration,
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
sprite: _,
summon_distance: (ref mut inner_dist, ref mut outer_dist),
sparseness: _,
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
} => {
// TODO: Figure out how/if power should affect this
Addressed review comments. Removed individual stat assignments.
2021-07-06 20:07:15 +00:00
*buildup_duration /= stats.speed;
*cast_duration /= stats.speed;
*recover_duration /= stats.speed;
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-07 03:51:30 +00:00
*inner_dist *= stats.range;
*outer_dist *= stats.range;
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
},
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-13 03:24:19 +00:00
}
self
}
Graying out skills with insufficient energy no longer dependent on hard-coded values
2020-11-27 16:27:09 +00:00
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
pub fn get_energy_cost(&self) -> f32 {
Graying out skills with insufficient energy no longer dependent on hard-coded values
2020-11-27 16:27:09 +00:00
use CharacterAbility::*;
match self {
BasicMelee { energy_cost, .. }
| BasicRanged { energy_cost, .. }
| RepeaterRanged { energy_cost, .. }
| DashMelee { energy_cost, .. }
| Roll { energy_cost, .. }
| LeapMelee { energy_cost, .. }
| SpinMelee { energy_cost, .. }
| ChargedMelee { energy_cost, .. }
| ChargedRanged { energy_cost, .. }
| Shockwave { energy_cost, .. }
Parrying
2021-04-13 05:46:42 +00:00
| BasicAura { energy_cost, .. }
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
| BasicBlock { energy_cost, .. }
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
| SelfBuff { energy_cost, .. } => *energy_cost,
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
BasicBeam { energy_drain, .. } => {
if *energy_drain > f32::EPSILON {
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
1.0
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
} else {
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
0.0
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
}
},
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
Boost { .. }
| ComboMelee { .. }
| Blink { .. }
| BasicSummon { .. }
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
| SpriteSummon { .. } => 0.0,
Graying out skills with insufficient energy no longer dependent on hard-coded values
2020-11-27 16:27:09 +00:00
}
}
Added sword skill tree
2020-12-07 03:35:29 +00:00
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#[must_use = "method returns new ability and doesn't mutate the original value"]
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
pub fn adjusted_by_skills(mut self, skillset: &SkillSet, tool: Option<ToolKind>) -> Self {
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
match tool {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
Some(ToolKind::Sword) => self.adjusted_by_sword_skills(skillset),
Some(ToolKind::Axe) => self.adjusted_by_axe_skills(skillset),
Some(ToolKind::Hammer) => self.adjusted_by_hammer_skills(skillset),
Some(ToolKind::Bow) => self.adjusted_by_bow_skills(skillset),
Some(ToolKind::Staff) => self.adjusted_by_staff_skills(skillset),
Some(ToolKind::Sceptre) => self.adjusted_by_sceptre_skills(skillset),
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
Some(ToolKind::Pick) => self.adjusted_by_mining_skills(skillset),
None => self.adjusted_by_general_skills(skillset),
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
Some(_) => {},
Added sword skill tree
2020-12-07 03:35:29 +00:00
}
self
}
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_mining_skills(&mut self, skillset: &SkillSet) {
Ability pool mostly functional.
2021-11-09 17:56:07 +00:00
use skills::MiningSkill::Speed;
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
if let CharacterAbility::BasicMelee {
ref mut buildup_duration,
ref mut swing_duration,
ref mut recover_duration,
..
} = self
{
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Skill::Pick(Speed)) {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.mining_tree;
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let speed = modifiers.speed.powi(level.into());
*buildup_duration /= speed;
*swing_duration /= speed;
*recover_duration /= speed;
}
}
}
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_general_skills(&mut self, skillset: &SkillSet) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
if let CharacterAbility::Roll {
ref mut energy_cost,
ref mut roll_strength,
ref mut movement_duration,
..
} = self
{
use skills::RollSkill::{Cost, Duration, Strength};
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.general_tree.roll;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Skill::Roll(Cost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Skill::Roll(Strength)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*roll_strength *= modifiers.strength.powi(level.into());
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Skill::Roll(Duration)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*movement_duration *= modifiers.duration.powi(level.into());
}
}
}
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_sword_skills(&mut self, skillset: &SkillSet) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#![allow(clippy::enum_glob_use)]
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
use skills::{Skill::Sword, SwordSkill::*};
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
match self {
CharacterAbility::ComboMelee {
ref mut is_interruptible,
ref mut speed_increase,
ref mut max_speed_increase,
ref stage_data,
ref mut max_energy_gain,
ref mut scales_from_combo,
..
} => {
*is_interruptible = skillset.has_skill(Sword(InterruptingAttacks));
if skillset.has_skill(Sword(TsCombo)) {
Addressed some review.
2021-12-01 04:12:02 +00:00
let speed_segments = f32::from(Sword(TsSpeed).max_level()) + 1.0;
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let speed_level = f32::from(skillset.skill_level(Sword(TsSpeed)).unwrap_or(0));
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*speed_increase = (speed_level + 1.0) / speed_segments;
*max_speed_increase = (speed_level + 1.0) / speed_segments;
} else {
*speed_increase = 0.0;
*max_speed_increase = 0.0;
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
}
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let energy_level = skillset.skill_level(Sword(TsRegen)).unwrap_or(0);
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
let stages = u16::try_from(stage_data.len())
.expect("number of stages can't be more than u16");
*max_energy_gain *= f32::from((energy_level + 1) * stages - 1)
* f32::from(stages - 1)
Addressed some review.
2021-12-01 04:12:02 +00:00
/ f32::from(Sword(TsRegen).max_level() + 1);
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
*scales_from_combo = skillset.skill_level(Sword(TsDamage)).unwrap_or(0).into();
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
CharacterAbility::DashMelee {
ref mut is_interruptible,
ref mut energy_cost,
ref mut energy_drain,
ref mut base_damage,
ref mut scaled_damage,
ref mut forward_speed,
ref mut charge_through,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.sword_tree.dash;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*is_interruptible = skillset.has_skill(Sword(InterruptingAttacks));
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(DCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(DDrain)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_drain *= modifiers.energy_drain.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(DDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*base_damage *= modifiers.base_damage.powi(level.into());
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(DScaling)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*scaled_damage *= modifiers.scaled_damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
if skillset.has_skill(Sword(DSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*forward_speed *= modifiers.forward_speed;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
*charge_through = skillset.has_skill(Sword(DChargeThrough));
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
CharacterAbility::SpinMelee {
ref mut is_interruptible,
ref mut base_damage,
ref mut swing_duration,
ref mut energy_cost,
ref mut num_spins,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.sword_tree.spin;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*is_interruptible = skillset.has_skill(Sword(InterruptingAttacks));
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(SDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*base_damage *= modifiers.base_damage.powi(level.into());
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(SSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*swing_duration *= modifiers.swing_duration.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sword(SCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let spin_level = skillset.skill_level(Sword(SSpins)).unwrap_or(0);
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*num_spins = u32::from(spin_level) * modifiers.num + 1;
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
_ => {},
}
}
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_axe_skills(&mut self, skillset: &SkillSet) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#![allow(clippy::enum_glob_use)]
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
use skills::{AxeSkill::*, Skill::Axe};
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
match self {
CharacterAbility::ComboMelee {
ref mut speed_increase,
ref mut max_speed_increase,
ref mut stage_data,
ref mut max_energy_gain,
ref mut scales_from_combo,
..
} => {
if !skillset.has_skill(Axe(DsCombo)) {
stage_data.pop();
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
let speed_segments = f32::from(Axe(DsSpeed).max_level());
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let speed_level = f32::from(skillset.skill_level(Axe(DsSpeed)).unwrap_or(0));
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*speed_increase *= speed_level / speed_segments;
*max_speed_increase *= speed_level / speed_segments;
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let energy_level = skillset.skill_level(Axe(DsRegen)).unwrap_or(0);
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
let stages = u16::try_from(stage_data.len())
.expect("number of stages can't be more than u16");
*max_energy_gain *= f32::from((energy_level + 1) * stages - 1).max(1.0)
* f32::from(stages - 1).max(1.0)
Addressed some review.
2021-12-01 04:12:02 +00:00
/ f32::from(Axe(DsRegen).max_level() + 1);
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
*scales_from_combo = skillset.skill_level(Axe(DsDamage)).unwrap_or(0).into();
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
CharacterAbility::SpinMelee {
ref mut base_damage,
ref mut swing_duration,
ref mut energy_cost,
ref mut is_infinite,
ref mut movement_behavior,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.axe_tree.spin;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*is_infinite = skillset.has_skill(Axe(SInfinite));
*movement_behavior = if skillset.has_skill(Axe(SHelicopter)) {
spin_melee::MovementBehavior::AxeHover
} else {
spin_melee::MovementBehavior::ForwardGround
};
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(SDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*base_damage *= modifiers.base_damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(SSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*swing_duration *= modifiers.swing_duration.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(SCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
}
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
CharacterAbility::LeapMelee {
ref mut base_damage,
ref mut knockback,
ref mut energy_cost,
ref mut forward_leap_strength,
ref mut vertical_leap_strength,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.axe_tree.leap;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(LDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*base_damage *= modifiers.base_damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(LKnockback)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*knockback *= modifiers.knockback.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(LCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Axe(LDistance)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let strength = modifiers.leap_strength;
*forward_leap_strength *= strength.powi(level.into());
*vertical_leap_strength *= strength.powi(level.into());
Sceptre skill tree and migration.
2021-03-07 02:16:35 +00:00
}
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
_ => {},
}
}
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_hammer_skills(&mut self, skillset: &SkillSet) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#![allow(clippy::enum_glob_use)]
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
use skills::{HammerSkill::*, Skill::Hammer};
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
match self {
CharacterAbility::ComboMelee {
ref mut speed_increase,
ref mut max_speed_increase,
ref mut stage_data,
ref mut max_energy_gain,
ref mut scales_from_combo,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.hammer_tree.single_strike;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(SsKnockback)) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*stage_data = (*stage_data)
.iter()
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
.map(|s| s.modify_strike(modifiers.knockback.powi(level.into())))
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
.collect::<Vec<_>>();
}
Addressed some review.
2021-12-01 04:12:02 +00:00
let speed_segments = f32::from(Hammer(SsSpeed).max_level());
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let speed_level = f32::from(skillset.skill_level(Hammer(SsSpeed)).unwrap_or(0));
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*speed_increase *= speed_level / speed_segments;
*max_speed_increase *= speed_level / speed_segments;
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let energy_level = skillset.skill_level(Hammer(SsRegen)).unwrap_or(0);
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
let stages = u16::try_from(stage_data.len())
.expect("number of stages can't be more than u16");
*max_energy_gain *= f32::from((energy_level + 1) * stages)
Addressed some review.
2021-12-01 04:12:02 +00:00
/ f32::from((Hammer(SsRegen).max_level() + 1) * stages);
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
*scales_from_combo = skillset.skill_level(Hammer(SsDamage)).unwrap_or(0).into();
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
},
CharacterAbility::ChargedMelee {
ref mut scaled_damage,
ref mut scaled_knockback,
ref mut energy_drain,
ref mut charge_duration,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.hammer_tree.charged;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(CDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*scaled_damage *= modifiers.scaled_damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(CKnockback)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*scaled_knockback *= modifiers.scaled_knockback.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(CDrain)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_drain *= modifiers.energy_drain.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(CSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let charge_time = 1.0 / modifiers.charge_rate;
*charge_duration *= charge_time.powi(level.into());
Mining skill tree.
2021-06-09 05:14:20 +00:00
}
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
CharacterAbility::LeapMelee {
ref mut base_damage,
ref mut knockback,
ref mut energy_cost,
ref mut forward_leap_strength,
ref mut vertical_leap_strength,
ref mut range,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.hammer_tree.leap;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(LDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*base_damage *= modifiers.base_damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(LKnockback)) {
Inline skills::Boost to voxygen code
2021-08-24 20:00:03 +00:00
*knockback *= modifiers.knockback.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(LCost)) {
Inline skills::Boost to voxygen code
2021-08-24 20:00:03 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(LDistance)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let strength = modifiers.leap_strength;
*forward_leap_strength *= strength.powi(level.into());
*vertical_leap_strength *= strength.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Hammer(LRange)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*range += modifiers.range * f32::from(level);
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
_ => {},
}
}
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_bow_skills(&mut self, skillset: &SkillSet) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#![allow(clippy::enum_glob_use)]
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
use skills::{BowSkill::*, Skill::Bow};
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let projectile_speed_modifier = SKILL_MODIFIERS.bow_tree.universal.projectile_speed;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
match self {
CharacterAbility::ChargedRanged {
ref mut initial_damage,
ref mut scaled_damage,
ref mut initial_regen,
ref mut scaled_regen,
ref mut initial_knockback,
ref mut scaled_knockback,
ref mut move_speed,
ref mut initial_projectile_speed,
ref mut scaled_projectile_speed,
ref mut charge_duration,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.bow_tree.charged;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(ProjSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let projectile_speed_scaling = projectile_speed_modifier.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*initial_projectile_speed *= projectile_speed_scaling;
*scaled_projectile_speed *= projectile_speed_scaling;
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(CDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let damage_scaling = modifiers.damage_scaling.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*initial_damage *= damage_scaling;
*scaled_damage *= damage_scaling;
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(CRegen)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let regen_scaling = modifiers.regen_scaling.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*initial_regen *= regen_scaling;
*scaled_regen *= regen_scaling;
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(CKnockback)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let knockback_scaling = modifiers.knockback_scaling.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*initial_knockback *= knockback_scaling;
*scaled_knockback *= knockback_scaling;
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(CSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let charge_time = 1.0 / modifiers.charge_rate;
*charge_duration *= charge_time.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(CMove)) {
Inline skills::Boost to voxygen code
2021-08-24 20:00:03 +00:00
*move_speed *= modifiers.move_speed.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
CharacterAbility::RepeaterRanged {
ref mut energy_cost,
ref mut projectile,
ref mut max_speed,
ref mut projectile_speed,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.bow_tree.repeater;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(ProjSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*projectile_speed *= projectile_speed_modifier.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(RDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let power = modifiers.power.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*projectile = projectile.modified_projectile(power, 1_f32, 1_f32);
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(RCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(RSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*max_speed *= modifiers.max_speed.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
CharacterAbility::BasicRanged {
ref mut projectile,
ref mut energy_cost,
ref mut num_projectiles,
ref mut projectile_spread,
ref mut projectile_speed,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.bow_tree.shotgun;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(ProjSpeed)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*projectile_speed *= projectile_speed_modifier.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(SDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let power = modifiers.power.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*projectile = projectile.modified_projectile(power, 1_f32, 1_f32);
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(SCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(SArrows)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*num_projectiles += u32::from(level) * modifiers.num_projectiles;
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Bow(SSpread)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*projectile_spread *= modifiers.spread.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
_ => {},
}
}
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_staff_skills(&mut self, skillset: &SkillSet) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#![allow(clippy::enum_glob_use)]
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
use skills::{Skill::Staff, StaffSkill::*};
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
match self {
CharacterAbility::BasicRanged {
ref mut projectile, ..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.staff_tree.fireball;
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2021-12-02 04:38:33 +00:00
let damage_level = skillset.skill_level(Staff(BDamage)).unwrap_or(0);
let regen_level = skillset.skill_level(Staff(BRegen)).unwrap_or(0);
let range_level = skillset.skill_level(Staff(BRadius)).unwrap_or(0);
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let power = modifiers.power.powi(damage_level.into());
Inline skills::Boost to voxygen code
2021-08-24 20:00:03 +00:00
let regen = modifiers.regen.powi(regen_level.into());
let range = modifiers.range.powi(range_level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*projectile = projectile.modified_projectile(power, regen, range);
},
CharacterAbility::BasicBeam {
ref mut damage,
ref mut range,
ref mut energy_drain,
ref mut beam_duration,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.staff_tree.flamethrower;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(FDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*damage *= modifiers.damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(FRange)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let range_mod = modifiers.range.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*range *= range_mod;
// Duration modified to keep velocity constant
*beam_duration *= range_mod;
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(FDrain)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_drain *= modifiers.energy_drain.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(FVelocity)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let velocity_increase = modifiers.velocity.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
let duration_mod = 1.0 / (1.0 + velocity_increase);
*beam_duration *= duration_mod;
}
},
CharacterAbility::Shockwave {
ref mut damage,
ref mut knockback,
ref mut shockwave_duration,
ref mut energy_cost,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.staff_tree.shockwave;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(SDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*damage *= modifiers.damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(SKnockback)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let knockback_mod = modifiers.knockback.powi(level.into());
*knockback = knockback.modify_strength(knockback_mod);
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(SRange)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*shockwave_duration *= modifiers.duration.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Staff(SCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
_ => {},
}
}
#[warn(clippy::pedantic)]
Split skillset and skills into separate files.
2021-10-17 04:28:39 +00:00
fn adjusted_by_sceptre_skills(&mut self, skillset: &SkillSet) {
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
#![allow(clippy::enum_glob_use)]
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
use skills::{SceptreSkill::*, Skill::Sceptre};
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
match self {
CharacterAbility::BasicBeam {
ref mut damage,
ref mut range,
ref mut beam_duration,
ref mut damage_effect,
ref mut energy_regen,
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.sceptre_tree.beam;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(LDamage)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*damage *= modifiers.damage.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(LRange)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
let range_mod = modifiers.range.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
*range *= range_mod;
// Duration modified to keep velocity constant
*beam_duration *= range_mod;
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(LRegen)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_regen *= modifiers.energy_regen.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let (Ok(level), Some(CombatEffect::Lifesteal(ref mut lifesteal))) =
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
(skillset.skill_level(Sceptre(LLifesteal)), damage_effect)
remove CharacterAbility::Climb
2021-03-20 23:35:34 +00:00
{
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*lifesteal *= modifiers.lifesteal.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
CharacterAbility::BasicAura {
ref mut aura,
ref mut range,
ref mut energy_cost,
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
specifier: aura::Specifier::HealingAura,
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.sceptre_tree.healing_aura;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(HHeal)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
aura.strength *= modifiers.strength.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(HDuration)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
if let Some(ref mut duration) = aura.duration {
*duration *= modifiers.duration.powi(level.into());
remove CharacterAbility::Climb
2021-03-20 23:35:34 +00:00
}
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(HRange)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*range *= modifiers.range.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(HCost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
},
CharacterAbility::BasicAura {
ref mut aura,
ref mut range,
ref mut energy_cost,
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
specifier: aura::Specifier::WardingAura,
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
..
} => {
Move to one SKILL_MODIFIERS constant
2021-08-22 10:50:01 +00:00
let modifiers = SKILL_MODIFIERS.sceptre_tree.warding_aura;
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(AStrength)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
aura.strength *= modifiers.strength.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(ADuration)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
if let Some(ref mut duration) = aura.duration {
*duration *= modifiers.duration.powi(level.into());
remove CharacterAbility::Climb
2021-03-20 23:35:34 +00:00
}
move climbing skill adjustment into climb module
2021-03-20 23:22:04 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(ARange)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*range *= modifiers.range.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
Addressed some review.
2021-12-01 04:12:02 +00:00
if let Ok(level) = skillset.skill_level(Sceptre(ACost)) {
SkillTreeModifiers data structs
2021-08-16 17:43:57 +00:00
*energy_cost *= modifiers.energy_cost.powi(level.into());
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
}
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
},
Split adjusted_by_skills by toolkind
2021-08-16 09:16:20 +00:00
_ => {},
Added sword skill tree
2020-12-07 03:35:29 +00:00
}
}
Add ability requirements system
2020-03-17 14:01:41 +00:00
}
Relocated BasicAura's combo reading to its static data
2021-07-21 03:15:38 +00:00
impl From<(&CharacterAbility, AbilityInfo, &JoinData<'_>)> for CharacterState {
fn from((ability, ability_info, data): (&CharacterAbility, AbilityInfo, &JoinData)) -> Self {
Make abilities depend on weapon
2020-03-14 15:40:29 +00:00
match ability {
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
CharacterAbility::BasicMelee {
Make abilities depend on weapon
2020-03-14 15:40:29 +00:00
buildup_duration,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
swing_duration,
Make abilities depend on weapon
2020-03-14 15:40:29 +00:00
recover_duration,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
base_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage,
Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.
2020-08-05 22:49:04 +00:00
knockback,
Better staff M1, random +1 damage, better attackrange,angle impl
2020-03-22 15:25:47 +00:00
range,
max_angle,
Crippling strike now functional. Crippled debuff added.
2021-04-16 17:44:11 +00:00
damage_effect,
Healing staff
2020-03-24 21:03:11 +00:00
energy_cost: _,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
} => CharacterState::BasicMelee(basic_melee::Data {
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
static_data: basic_melee::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
swing_duration: Duration::from_secs_f32(*swing_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
base_damage: *base_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage: *base_poise_damage,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
knockback: *knockback,
range: *range,
max_angle: *max_angle,
Crippling strike now functional. Crippled debuff added.
2021-04-16 17:44:11 +00:00
damage_effect: *damage_effect,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: *damage_kind,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Make abilities depend on weapon
2020-03-14 15:40:29 +00:00
exhausted: false,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
}),
CharacterAbility::BasicRanged {
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
buildup_duration,
Make abilities depend on weapon
2020-03-14 15:40:29 +00:00
recover_duration,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
projectile,
projectile_body,
Add lights and gravity again
2020-03-24 19:31:54 +00:00
projectile_light,
Projectile speed is no longer hard-coded.
2020-08-06 18:17:38 +00:00
projectile_speed,
Better climbing, fireball impl
2020-03-24 19:09:23 +00:00
energy_cost: _,
Reworked bow
2021-05-16 03:09:39 +00:00
num_projectiles,
Made new skills for reworked bow. Created migration to reset bow skills.
2021-05-22 05:05:27 +00:00
projectile_spread,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
} => CharacterState::BasicRanged(basic_ranged::Data {
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
static_data: basic_ranged::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Added projectile constructor. Removed a bunch of cloning.
2020-11-09 04:04:51 +00:00
projectile: *projectile,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
projectile_body: *projectile_body,
projectile_light: *projectile_light,
projectile_speed: *projectile_speed,
Reworked bow
2021-05-16 03:09:39 +00:00
num_projectiles: *num_projectiles,
Made new skills for reworked bow. Created migration to reset bow skills.
2021-05-22 05:05:27 +00:00
projectile_spread: *projectile_spread,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
exhausted: false,
Update timed combo, add CharacerBehavior trait
2020-03-14 18:50:07 +00:00
}),
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
CharacterAbility::Boost {
movement_duration,
only_up,
Fixed boost having ridiculous velocity.
2021-03-26 20:11:25 +00:00
speed,
max_exit_velocity,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
} => CharacterState::Boost(boost::Data {
static_data: boost::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
movement_duration: Duration::from_secs_f32(*movement_duration),
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
only_up: *only_up,
Fixed boost having ridiculous velocity.
2021-03-26 20:11:25 +00:00
speed: *speed,
max_exit_velocity: *max_exit_velocity,
Support for canceling an input. Boost state hooked up to system.
2021-03-12 04:53:25 +00:00
ability_info,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
},
timer: Duration::default(),
Readd ranged and debug boost. Add bouncing while running in first person
2020-03-16 11:32:57 +00:00
}),
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
CharacterAbility::DashMelee {
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
energy_cost: _,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
base_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage,
Poise stats
2020-12-16 23:30:33 +00:00
scaled_poise_damage,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
base_knockback,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
range,
angle,
energy_drain,
forward_speed,
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
buildup_duration,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
charge_duration,
Added swing duration to dash melee. Added framework for animation to be added.
2020-09-11 19:56:04 +00:00
swing_duration,
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
recover_duration,
Add ori_modifier for DashMelee and nerf it * 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-15 20:57:22 +00:00
ori_modifier,
Overhauled dash melee.
2021-04-18 22:09:57 +00:00
charge_through,
Addressed first round of feedback on sword overhaul.
2020-09-12 16:46:21 +00:00
is_interruptible,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect,
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
} => CharacterState::DashMelee(dash_melee::Data {
Dash melee now works as desired.
2020-09-11 13:59:45 +00:00
static_data: dash_melee::StaticData {
base_damage: *base_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_damage: *scaled_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage: *base_poise_damage,
Poise stats
2020-12-16 23:30:33 +00:00
scaled_poise_damage: *scaled_poise_damage,
Dash melee now works as desired.
2020-09-11 13:59:45 +00:00
base_knockback: *base_knockback,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback: *scaled_knockback,
Dash melee now works as desired.
2020-09-11 13:59:45 +00:00
range: *range,
angle: *angle,
energy_drain: *energy_drain,
forward_speed: *forward_speed,
Overhauled dash melee.
2021-04-18 22:09:57 +00:00
charge_through: *charge_through,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
charge_duration: Duration::from_secs_f32(*charge_duration),
swing_duration: Duration::from_secs_f32(*swing_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Add ori_modifier for DashMelee and nerf it * 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-15 20:57:22 +00:00
ori_modifier: *ori_modifier,
Addressed first round of feedback on sword overhaul.
2020-09-12 16:46:21 +00:00
is_interruptible: *is_interruptible,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: *damage_effect,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: *damage_kind,
Dash melee now works as desired.
2020-09-11 13:59:45 +00:00
},
Tweaked dash melee some more.
2020-10-18 16:46:28 +00:00
auto_charge: false,
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
timer: Duration::default(),
Overhauled dash melee.
2021-04-18 22:09:57 +00:00
charge_end_timer: Duration::from_secs_f32(*charge_duration),
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
stage_section: StageSection::Buildup,
Dash melee now works as desired.
2020-09-11 13:59:45 +00:00
exhausted: false,
Add dash ability to sword M2
2020-03-16 15:34:53 +00:00
}),
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
CharacterAbility::BasicBlock {
buildup_duration,
recover_duration,
max_angle,
block_strength,
Make parrying refund the block stamina cost and cancel the recover animation
2021-08-31 06:47:37 +00:00
energy_cost,
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
} => CharacterState::BasicBlock(basic_block::Data {
static_data: basic_block::StaticData {
buildup_duration: Duration::from_secs_f32(*buildup_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
max_angle: *max_angle,
block_strength: *block_strength,
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-14 02:16:01 +00:00
energy_cost: *energy_cost,
Melee weapons can now block.
2021-04-10 03:40:20 +00:00
ability_info,
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
}),
Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.
2020-11-05 18:28:18 +00:00
CharacterAbility::Roll {
energy_cost: _,
buildup_duration,
movement_duration,
recover_duration,
roll_strength,
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
immune_melee,
Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.
2020-11-05 18:28:18 +00:00
} => CharacterState::Roll(roll::Data {
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
static_data: roll::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
movement_duration: Duration::from_secs_f32(*movement_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.
2020-11-05 18:28:18 +00:00
roll_strength: *roll_strength,
General combat skill tree. UI for general skill tree
2020-12-31 18:37:25 +00:00
immune_melee: *immune_melee,
If roll input remains held, allows you to keep rolling and stay in roll state. You can now jump to interrupt the recovery portion of roll. Jumping out of roll slightly increases jump strength.
2021-03-22 22:47:13 +00:00
ability_info,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Balancing
2020-03-26 13:46:08 +00:00
was_wielded: false, // false by default. utils might set it to true
Sneak with weapons drawn
2021-10-05 00:15:58 +00:00
is_sneaking: false,
Re-allowed for what stage you were on to persist through a roll
2021-02-28 00:09:51 +00:00
was_combo: None,
Finish state struct data refactor
2020-03-14 21:17:27 +00:00
}),
Initial implementation of combo melee attack.
2020-09-04 01:54:59 +00:00
CharacterAbility::ComboMelee {
stage_data,
initial_energy_gain,
max_energy_gain,
energy_increase,
Attack speed now scales with combo in combo melee.
2020-09-11 19:24:55 +00:00
speed_increase,
max_speed_increase,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scales_from_combo,
Addressed first round of feedback on sword overhaul.
2020-09-12 16:46:21 +00:00
is_interruptible,
ori addition to combomelee
2021-04-30 02:59:29 +00:00
ori_modifier,
Initial implementation of combo melee attack.
2020-09-04 01:54:59 +00:00
} => CharacterState::ComboMelee(combo_melee::Data {
Addressed comments
2020-09-21 22:38:01 +00:00
static_data: combo_melee::StaticData {
num_stages: stage_data.len() as u32,
Fixed tests. Addressed comments.
2020-11-13 03:50:40 +00:00
stage_data: stage_data.iter().map(|stage| stage.to_duration()).collect(),
Addressed comments
2020-09-21 22:38:01 +00:00
initial_energy_gain: *initial_energy_gain,
max_energy_gain: *max_energy_gain,
energy_increase: *energy_increase,
speed_increase: 1.0 - *speed_increase,
Added sword skill tree
2020-12-07 03:35:29 +00:00
max_speed_increase: *max_speed_increase,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scales_from_combo: *scales_from_combo,
Addressed comments
2020-09-21 22:38:01 +00:00
is_interruptible: *is_interruptible,
ori addition to combomelee
2021-04-30 02:59:29 +00:00
ori_modifier: *ori_modifier as f32,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Addressed comments
2020-09-21 22:38:01 +00:00
},
Introduce hit_timing for combo_melee bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing poise damage of hammer from 25 to 20
2021-06-11 19:00:06 +00:00
exhausted: false,
Initial implementation of combo melee attack.
2020-09-04 01:54:59 +00:00
stage: 1,
timer: Duration::default(),
Initial implementation of new dash melee.
2020-09-10 02:58:28 +00:00
stage_section: StageSection::Buildup,
add triple strike timing
2020-03-27 17:40:15 +00:00
}),
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
CharacterAbility::LeapMelee {
energy_cost: _,
buildup_duration,
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
movement_duration,
swing_duration,
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
recover_duration,
base_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage,
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
knockback,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
range,
max_angle,
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
forward_leap_strength,
vertical_leap_strength,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect,
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
} => CharacterState::LeapMelee(leap_melee::Data {
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
static_data: leap_melee::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
movement_duration: Duration::from_secs_f32(*movement_duration),
swing_duration: Duration::from_secs_f32(*swing_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
base_damage: *base_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage: *base_poise_damage,
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
knockback: *knockback,
range: *range,
max_angle: *max_angle,
forward_leap_strength: *forward_leap_strength,
vertical_leap_strength: *vertical_leap_strength,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: *damage_effect,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: *damage_kind,
Added keyframes to leap melee.
2020-09-28 23:55:38 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.
2020-07-03 15:40:12 +00:00
exhausted: false,
}),
Spin attack for axe
2020-07-08 19:58:41 +00:00
CharacterAbility::SpinMelee {
buildup_duration,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
swing_duration,
Spin attack for axe
2020-07-08 19:58:41 +00:00
recover_duration,
base_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
base_poise_damage,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
knockback,
range,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
damage_effect,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
energy_cost,
is_infinite,
Addressed comments.
2021-01-21 22:45:03 +00:00
movement_behavior,
Made 3rd ability interruptible. Final balance tweaks.
2020-09-20 17:23:33 +00:00
is_interruptible,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
forward_speed,
num_spins,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
specifier,
Mindflayer can now lifesteal off of its own minions
2021-03-24 16:49:58 +00:00
target,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind,
Spin attack for axe
2020-07-08 19:58:41 +00:00
} => CharacterState::SpinMelee(spin_melee::Data {
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
static_data: spin_melee::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
swing_duration: Duration::from_secs_f32(*swing_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
base_damage: *base_damage,
Poise stats
2020-12-16 23:30:33 +00:00
base_poise_damage: *base_poise_damage,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
knockback: *knockback,
range: *range,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
damage_effect: *damage_effect,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
energy_cost: *energy_cost,
is_infinite: *is_infinite,
Addressed comments.
2021-01-21 22:45:03 +00:00
movement_behavior: *movement_behavior,
Made 3rd ability interruptible. Final balance tweaks.
2020-09-20 17:23:33 +00:00
is_interruptible: *is_interruptible,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
forward_speed: *forward_speed,
num_spins: *num_spins,
Mindflayer can now lifesteal off of its own minions
2021-03-24 16:49:58 +00:00
target: *target,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Added necrotic vortex attack to mindflayer
2021-03-21 00:41:56 +00:00
specifier: *specifier,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: *damage_kind,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
},
timer: Duration::default(),
Mindflayer balance tweaks.
2021-03-29 14:44:46 +00:00
consecutive_spins: 1,
Initial implementation of spin attack for sword.
2020-09-17 01:31:27 +00:00
stage_section: StageSection::Buildup,
Modified how spin melee functions.
2020-09-18 19:27:02 +00:00
exhausted: false,
Spin attack for axe
2020-07-08 19:58:41 +00:00
}),
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
CharacterAbility::ChargedMelee {
Responded to testing feedback
2020-10-06 05:21:22 +00:00
energy_cost,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
energy_drain,
initial_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
initial_poise_damage,
Poise stats
2020-12-16 23:30:33 +00:00
scaled_poise_damage,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
initial_knockback,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
charge_duration,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
swing_duration,
Moved hit timer to charged melee and adjusted for tail slap
2020-11-18 19:35:43 +00:00
hit_timing,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
recover_duration,
range,
max_angle,
Particles for frenzy buff and ground cleave.
2021-04-28 04:23:28 +00:00
specifier,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
} => CharacterState::ChargedMelee(charged_melee::Data {
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
static_data: charged_melee::StaticData {
Responded to testing feedback
2020-10-06 05:21:22 +00:00
energy_cost: *energy_cost,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
energy_drain: *energy_drain,
initial_damage: *initial_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_damage: *scaled_damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
initial_poise_damage: *initial_poise_damage,
Poise stats
2020-12-16 23:30:33 +00:00
scaled_poise_damage: *scaled_poise_damage,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
initial_knockback: *initial_knockback,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback: *scaled_knockback,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
range: *range,
max_angle: *max_angle,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
charge_duration: Duration::from_secs_f32(*charge_duration),
swing_duration: Duration::from_secs_f32(*swing_duration),
Moved hit timer to charged melee and adjusted for tail slap
2020-11-18 19:35:43 +00:00
hit_timing: *hit_timing,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
recover_duration: Duration::from_secs_f32(*recover_duration),
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: *damage_effect,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Particles for frenzy buff and ground cleave.
2021-04-28 04:23:28 +00:00
specifier: *specifier,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: *damage_kind,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
},
Fixed errors from transitioning some states to keyframes.
2020-09-29 00:38:35 +00:00
stage_section: StageSection::Charge,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
timer: Duration::default(),
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
exhausted: false,
Added keyframes to charged melee.
2020-09-28 01:58:49 +00:00
charge_amount: 0.0,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
}),
Bow charged shot attack
2020-07-26 03:06:53 +00:00
CharacterAbility::ChargedRanged {
energy_cost: _,
energy_drain,
Reworked bow
2021-05-16 03:09:39 +00:00
initial_regen,
scaled_regen,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
initial_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_damage,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
initial_knockback,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
buildup_duration,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
charge_duration,
recover_duration,
projectile_body,
projectile_light,
Projectile speed is no longer hard-coded.
2020-08-06 18:17:38 +00:00
initial_projectile_speed,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_projectile_speed,
Implemented bow skill tree.
2020-12-23 02:28:55 +00:00
move_speed,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
} => CharacterState::ChargedRanged(charged_ranged::Data {
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
static_data: charged_ranged::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
charge_duration: Duration::from_secs_f32(*charge_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
energy_drain: *energy_drain,
Reworked bow
2021-05-16 03:09:39 +00:00
initial_regen: *initial_regen,
scaled_regen: *scaled_regen,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
initial_damage: *initial_damage,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_damage: *scaled_damage,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
initial_knockback: *initial_knockback,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_knockback: *scaled_knockback,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
projectile_body: *projectile_body,
projectile_light: *projectile_light,
initial_projectile_speed: *initial_projectile_speed,
Modified how most abilites that could scale were scaled.
2020-12-08 04:00:24 +00:00
scaled_projectile_speed: *scaled_projectile_speed,
Implemented bow skill tree.
2020-12-23 02:28:55 +00:00
move_speed: *move_speed,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Added keyframes to all states that were lacking them.
2020-10-17 02:29:14 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Bow charged shot attack
2020-07-26 03:06:53 +00:00
exhausted: false,
}),
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
CharacterAbility::RepeaterRanged {
Reworked bow
2021-05-16 03:09:39 +00:00
energy_cost,
Added keyframes to repeater ranged.
2020-09-28 02:38:23 +00:00
buildup_duration,
shoot_duration,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
recover_duration,
Reworked bow
2021-05-16 03:09:39 +00:00
max_speed,
half_speed_at,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
projectile,
projectile_body,
projectile_light,
projectile_speed,
} => CharacterState::RepeaterRanged(repeater_ranged::Data {
Added keyframes to repeater ranged.
2020-09-28 02:38:23 +00:00
static_data: repeater_ranged::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
shoot_duration: Duration::from_secs_f32(*shoot_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Reworked bow
2021-05-16 03:09:39 +00:00
energy_cost: *energy_cost,
// 1.0 is subtracted as 1.0 is added in state file
max_speed: *max_speed - 1.0,
half_speed_at: *half_speed_at,
Added projectile constructor. Removed a bunch of cloning.
2020-11-09 04:04:51 +00:00
projectile: *projectile,
Added keyframes to repeater ranged.
2020-09-28 02:38:23 +00:00
projectile_body: *projectile_body,
projectile_light: *projectile_light,
projectile_speed: *projectile_speed,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Added keyframes to repeater ranged.
2020-09-28 02:38:23 +00:00
},
timer: Duration::default(),
Reworked bow
2021-05-16 03:09:39 +00:00
stage_section: StageSection::Buildup,
projectiles_fired: 0,
speed: 1.0,
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-09-21 04:16:52 +00:00
}),
Initial implementation of new staff abilities.
2020-10-04 01:24:15 +00:00
CharacterAbility::Shockwave {
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
energy_cost: _,
buildup_duration,
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
swing_duration,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
recover_duration,
damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
poise_damage,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
knockback,
shockwave_angle,
Addressed playtesting feedback.
2020-10-12 22:55:55 +00:00
shockwave_vertical_angle,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
shockwave_speed,
shockwave_duration,
Addressed comments
2020-09-19 16:55:31 +00:00
requires_ground,
Balance tweaks to staff abilities.
2020-10-09 17:42:15 +00:00
move_efficiency,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind,
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-05-29 22:27:55 +00:00
specifier,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect,
Initial implementation of new staff abilities.
2020-10-04 01:24:15 +00:00
} => CharacterState::Shockwave(shockwave::Data {
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
static_data: shockwave::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
swing_duration: Duration::from_secs_f32(*swing_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
damage: *damage,
Initial broken implementation of poise Character movement no longer broken.
2020-12-05 18:23:45 +00:00
poise_damage: *poise_damage,
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
knockback: *knockback,
shockwave_angle: *shockwave_angle,
Addressed playtesting feedback.
2020-10-12 22:55:55 +00:00
shockwave_vertical_angle: *shockwave_vertical_angle,
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
shockwave_speed: *shockwave_speed,
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
shockwave_duration: Duration::from_secs_f32(*shockwave_duration),
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
requires_ground: *requires_ground,
Balance tweaks to staff abilities.
2020-10-09 17:42:15 +00:00
move_efficiency: *move_efficiency,
Added buff strength stat to weapons.
2021-07-10 16:04:12 +00:00
damage_effect: *damage_effect,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Add `DamageKind`, and make piercing damage partially ignore damage resistence. - Tweak bow/staff M1 stats.
2021-05-06 18:50:16 +00:00
damage_kind: *damage_kind,
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-05-29 22:27:55 +00:00
specifier: *specifier,
Ai for staff-wielding enemies. Keyframes for shockwave state.
2020-10-08 02:12:44 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Started to implement shockwave system.
2020-08-08 20:53:55 +00:00
}),
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
CharacterAbility::BasicBeam {
buildup_duration,
recover_duration,
Added beam system. Added collision code for spherical wedge/cylinder detection.
2020-09-05 16:27:36 +00:00
beam_duration,
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
damage,
Tick rate now exposed as a variable.
2020-08-31 21:55:38 +00:00
tick_rate,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
range,
max_angle,
Added cursed flame attack to mindflayer
2021-03-20 17:29:57 +00:00
damage_effect,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
energy_regen,
Separated out energy cost for healing so it's not based off of the energy regen from dealing damage.
2020-09-15 23:39:19 +00:00
energy_drain,
Load ori_rate for BasicBeam from assets + make fire turret ori_rate slower
2021-06-18 17:30:12 +00:00
ori_rate,
Particles for lifesteal beam. Changed how frontend recognized beams.
2021-03-03 04:56:09 +00:00
specifier,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
} => CharacterState::BasicBeam(basic_beam::Data {
Added keyframe support to basic beam state. Addressed some comments.
2020-09-25 20:02:30 +00:00
static_data: basic_beam::StaticData {
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
beam_duration: Duration::from_secs_f32(*beam_duration),
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
damage: *damage,
Added keyframe support to basic beam state. Addressed some comments.
2020-09-25 20:02:30 +00:00
tick_rate: *tick_rate,
range: *range,
max_angle: *max_angle,
Added cursed flame attack to mindflayer
2021-03-20 17:29:57 +00:00
damage_effect: *damage_effect,
Added keyframe support to basic beam state. Addressed some comments.
2020-09-25 20:02:30 +00:00
energy_regen: *energy_regen,
energy_drain: *energy_drain,
Added AbilityInfo struct to attack states
2021-02-14 06:01:53 +00:00
ability_info,
Load ori_rate for BasicBeam from assets + make fire turret ori_rate slower
2021-06-18 17:30:12 +00:00
ori_rate: *ori_rate,
Particles for lifesteal beam. Changed how frontend recognized beams.
2021-03-03 04:56:09 +00:00
specifier: *specifier,
Added keyframe support to basic beam state. Addressed some comments.
2020-09-25 20:02:30 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Initial implementation for beam attack.
2020-08-27 00:08:29 +00:00
}),
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
CharacterAbility::BasicAura {
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
buildup_duration,
cast_duration,
recover_duration,
targets,
aura,
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
aura_duration,
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
range,
energy_cost: _,
Add healing aura for sceptre M2
2021-07-10 07:10:31 +00:00
scales_with_combo,
specifier,
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
} => CharacterState::BasicAura(basic_aura::Data {
static_data: basic_aura::StaticData {
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
buildup_duration: Duration::from_secs_f32(*buildup_duration),
cast_duration: Duration::from_secs_f32(*cast_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
targets: *targets,
aura: *aura,
Aura duration separated from cast duration in aura state Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura
2021-03-06 21:29:00 +00:00
aura_duration: Duration::from_secs_f32(*aura_duration),
New abilities for sceptre are done
2021-03-01 20:44:29 +00:00
range: *range,
ability_info,
Add healing aura for sceptre M2
2021-07-10 07:10:31 +00:00
scales_with_combo: *scales_with_combo,
Used integer types to store combo values
2021-07-21 23:46:14 +00:00
combo_at_cast: data.combo.counter(),
Particles for lifesteal beam. Changed how frontend recognized beams.
2021-03-03 04:56:09 +00:00
specifier: *specifier,
Added healing beam character state. This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-02 19:26:45 +00:00
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
}),
Added dimensional door ability for mindflayer
2021-03-21 03:28:13 +00:00
CharacterAbility::Blink {
buildup_duration,
recover_duration,
max_range,
} => CharacterState::Blink(blink::Data {
static_data: blink::StaticData {
buildup_duration: Duration::from_secs_f32(*buildup_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
max_range: *max_range,
ability_info,
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
}),
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
CharacterAbility::BasicSummon {
buildup_duration,
cast_duration,
recover_duration,
summon_amount,
Tornado summoning attack
2021-06-03 22:42:50 +00:00
summon_distance,
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
summon_info,
Tornado summoning attack
2021-06-03 22:42:50 +00:00
duration,
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
} => CharacterState::BasicSummon(basic_summon::Data {
static_data: basic_summon::StaticData {
buildup_duration: Duration::from_secs_f32(*buildup_duration),
cast_duration: Duration::from_secs_f32(*cast_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
summon_amount: *summon_amount,
Tornado summoning attack
2021-06-03 22:42:50 +00:00
summon_distance: *summon_distance,
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
summon_info: *summon_info,
ability_info,
Tornado summoning attack
2021-06-03 22:42:50 +00:00
duration: *duration,
Added summon minions ability to mindflayer
2021-03-21 05:53:39 +00:00
},
summon_count: 0,
timer: Duration::default(),
stage_section: StageSection::Buildup,
}),
Added frenzy ability to minotaur. Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.
2021-04-24 19:01:36 +00:00
CharacterAbility::SelfBuff {
buildup_duration,
cast_duration,
recover_duration,
buff_kind,
buff_strength,
buff_duration,
energy_cost: _,
} => CharacterState::SelfBuff(self_buff::Data {
static_data: self_buff::StaticData {
buildup_duration: Duration::from_secs_f32(*buildup_duration),
cast_duration: Duration::from_secs_f32(*cast_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
buff_kind: *buff_kind,
buff_strength: *buff_strength,
buff_duration: buff_duration.map(Duration::from_secs_f32),
ability_info,
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
}),
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
CharacterAbility::SpriteSummon {
buildup_duration,
cast_duration,
recover_duration,
sprite,
summon_distance,
Added sparseness field to sprite summon.
2021-06-22 04:12:39 +00:00
sparseness,
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
} => CharacterState::SpriteSummon(sprite_summon::Data {
static_data: sprite_summon::StaticData {
buildup_duration: Duration::from_secs_f32(*buildup_duration),
cast_duration: Duration::from_secs_f32(*cast_duration),
recover_duration: Duration::from_secs_f32(*recover_duration),
sprite: *sprite,
summon_distance: *summon_distance,
Added sparseness field to sprite summon.
2021-06-22 04:12:39 +00:00
sparseness: *sparseness,
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
ability_info,
},
timer: Duration::default(),
stage_section: StageSection::Buildup,
Vines now ensnare you by applying a buff.
2021-06-20 05:37:22 +00:00
achieved_radius: summon_distance.0.floor() as i32 - 1,
Slightly functional sprite summon.
2021-06-19 18:53:23 +00:00
}),
fix: jumping and attacking
2020-02-03 10:54:50 +00:00
}
}
}
Reference in New Issue Copy Permalink