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

Tweaking timed_combo

Browse Source
This commit is contained in:
AdamWhitehurst 2020-03-14 13:04:04 -06:00
parent 6fc94c22ba
commit ee706fa32a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/inventory/item.rs
View File

@ -38,8 +38,8 @@ impl ToolData {
match self.kind {
Sword(_) => vec![TimedCombo {
buildup_duration: Duration::from_millis(1000),
recover_duration: Duration::from_millis(500),
buildup_duration: Duration::from_millis(500),
recover_duration: Duration::from_millis(1000),
tool: *self,
}],
Axe => vec![BasicAttack {

7
common/src/states/timed_combo.rs
View File

@ -37,13 +37,12 @@ impl CharacterBehavior for State {
.checked_add(Duration::from_secs_f32(data.dt.0))
.unwrap_or(Duration::default());
println!("Stage {:?}", self.stage);
if self.stage < 3 {
// Build up window
if new_stage_time_active < self.buildup_duration {
// If the player is pressing primary btn
if data.inputs.primary.is_just_pressed() {
println!("Failed");
// They failed, go back to `Wielding`
update.character = CharacterState::Wielding { tool: self.tool };
}
@ -86,6 +85,7 @@ impl CharacterBehavior for State {
{
// Try to transition to next stage
if data.inputs.primary.is_just_pressed() {
println!("Transition");
update.character = CharacterState::TimedCombo(State {
tool: self.tool,
stage: self.stage + 1,
@ -98,6 +98,7 @@ impl CharacterBehavior for State {
// Player didn't click this frame
else {
// Update state
println!("Missed");
update.character = CharacterState::TimedCombo(State {
tool: self.tool,
stage: self.stage,
@ -118,6 +119,7 @@ impl CharacterBehavior for State {
}
// Made three successful hits!
else {
println!("Success!");
// Back to `Wielding`
update.character = CharacterState::Wielding { tool: self.tool };
// Make sure attack component is removed
@ -127,6 +129,7 @@ impl CharacterBehavior for State {
// Subtract energy on successful hit
if let Some(attack) = data.attacking {
if attack.applied && attack.hit_count > 0 {
println!("Hit");
data.updater.remove::<Attacking>(data.entity);
update.energy.change_by(100, EnergySource::HitEnemy);
}