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

Prevent transition if failed hit

Browse Source
This commit is contained in:
AdamWhitehurst 2020-03-26 14:44:39 -07:00
parent 0446a56f00
commit 7f1a90ae27
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/states/triple_strike.rs
View File

@ -51,7 +51,7 @@ impl CharacterBehavior for Data {
.unwrap_or(Duration::default()); .unwrap_or(Duration::default());
// If player stops holding input, don't go to the next stage // If player stops holding input, don't go to the next stage
let should_transition = data.inputs.primary.is_pressed() && self.should_transition; let mut should_transition = data.inputs.primary.is_pressed() && self.should_transition;
if !self.initialized { if !self.initialized {
update.vel.0 = Vec3::zero(); update.vel.0 = Vec3::zero();
@ -61,6 +61,21 @@ impl CharacterBehavior for Data {
} }
let initialized = true; let initialized = true;
// Handle hit applied
if let Some(attack) = data.attacking {
if attack.applied {
if attack.hit_count > 0 {
// Take energy on successful hit
update.energy.change_by(100, EnergySource::HitEnemy);
} else {
// Prevent transition on failure
should_transition = false;
}
// Always remove component
data.updater.remove::<Attacking>(data.entity);
}
}
// Handling movement // Handling movement
if stage_time_active < Duration::from_millis(STAGE_DURATION / 3) { if stage_time_active < Duration::from_millis(STAGE_DURATION / 3) {
let adjusted_accel = match (self.stage, data.physics.touch_entity.is_none()) { let adjusted_accel = match (self.stage, data.physics.touch_entity.is_none()) {