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

Damage increase, remove lines

Browse Source
This commit is contained in:
AdamWhitehurst 2020-03-15 07:26:42 -06:00
parent 52059d83d3
commit 7520798567
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,6 @@ impl CharacterBehavior for Data {
if new_stage_time_active < self.buildup_duration { if new_stage_time_active < self.buildup_duration {
// If the player is pressing primary btn // If the player is pressing primary btn
if data.inputs.primary.is_just_pressed() { if data.inputs.primary.is_just_pressed() {
println!("Failed");
// They failed, go back to `Wielding` // They failed, go back to `Wielding`
update.character = CharacterState::Wielding(wielding::Data { tool: self.tool }); update.character = CharacterState::Wielding(wielding::Data { tool: self.tool });
} }
@ -62,7 +61,7 @@ impl CharacterBehavior for Data {
else if !self.stage_exhausted { else if !self.stage_exhausted {
// Swing hits // Swing hits
data.updater.insert(data.entity, Attacking { data.updater.insert(data.entity, Attacking {
base_damage: self.tool.base_damage, base_damage: self.tool.base_damage * (self.stage as u32 + 1),
applied: false, applied: false,
hit_count: 0, hit_count: 0,
}); });
@ -85,7 +84,6 @@ impl CharacterBehavior for Data {
{ {
// Try to transition to next stage // Try to transition to next stage
if data.inputs.primary.is_just_pressed() { if data.inputs.primary.is_just_pressed() {
println!("Transition");
update.character = CharacterState::TimedCombo(Data { update.character = CharacterState::TimedCombo(Data {
tool: self.tool, tool: self.tool,
stage: self.stage + 1, stage: self.stage + 1,
@ -98,7 +96,6 @@ impl CharacterBehavior for Data {
// Player didn't click this frame // Player didn't click this frame
else { else {
// Update state // Update state
println!("Missed");
update.character = CharacterState::TimedCombo(Data { update.character = CharacterState::TimedCombo(Data {
tool: self.tool, tool: self.tool,
stage: self.stage, stage: self.stage,
@ -129,7 +126,6 @@ impl CharacterBehavior for Data {
// Subtract energy on successful hit // Subtract energy on successful hit
if let Some(attack) = data.attacking { if let Some(attack) = data.attacking {
if attack.applied && attack.hit_count > 0 { if attack.applied && attack.hit_count > 0 {
println!("Hit");
data.updater.remove::<Attacking>(data.entity); data.updater.remove::<Attacking>(data.entity);
update.energy.change_by(100, EnergySource::HitEnemy); update.energy.change_by(100, EnergySource::HitEnemy);
} }