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

Merge branch 'sam/fix-oob-index' into 'master'

Browse Source 
Small fixes

See merge request veloren/veloren!2527
This commit is contained in:
Marcel 2021-06-29 11:58:02 +00:00
commit fefedacf20
2 changed files with 157 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/events/entity_manipulation.rs
View File

@ -138,12 +138,13 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
} }
}; };
// Push an outcome // Push an outcome if entity is has a character state (entities that don't have
// one, we probably don't care about emitting death outcome)
if state if state
.ecs() .ecs()
.read_storage::<comp::Projectile>() .read_storage::<comp::CharacterState>()
.get(entity) .get(entity)
.is_none() .is_some()
{ {
if let Some(pos) = state.ecs().read_storage::<Pos>().get(entity) { if let Some(pos) = state.ecs().read_storage::<Pos>().get(entity) {
state state

198
voxygen/src/scene/figure/mod.rs
View File

@ -1338,26 +1338,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
match s.stage { match s.stage {
1 => anim::character::AlphaAnimation::update_skeleton( 1 => anim::character::AlphaAnimation::update_skeleton(
@ -1664,26 +1660,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
{ {
anim::quadruped_small::AlphaAnimation::update_skeleton( anim::quadruped_small::AlphaAnimation::update_skeleton(
@ -1955,26 +1947,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
match s.stage { match s.stage {
1 => anim::quadruped_medium::AlphaAnimation::update_skeleton( 1 => anim::quadruped_medium::AlphaAnimation::update_skeleton(
@ -2315,26 +2303,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
match s.stage { match s.stage {
1 => anim::quadruped_low::AlphaAnimation::update_skeleton( 1 => anim::quadruped_low::AlphaAnimation::update_skeleton(
@ -2917,26 +2901,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
match s.stage { match s.stage {
1 => anim::biped_small::AlphaAnimation::update_skeleton( 1 => anim::biped_small::AlphaAnimation::update_skeleton(
@ -3178,26 +3158,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
match s.stage { match s.stage {
1 => anim::theropod::AlphaAnimation::update_skeleton( 1 => anim::theropod::AlphaAnimation::update_skeleton(
@ -3406,26 +3382,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
anim::bird_large::AlphaAnimation::update_skeleton( anim::bird_large::AlphaAnimation::update_skeleton(
@ -4049,26 +4021,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
match s.stage { match s.stage {
1 => anim::biped_large::AlphaAnimation::update_skeleton( 1 => anim::biped_large::AlphaAnimation::update_skeleton(
@ -4409,26 +4377,22 @@ impl FigureMgr {
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_time = s.timer.as_secs_f32(); let stage_time = s.timer.as_secs_f32();
let stage_progress = match s.stage_section { let stage_progress =
if let Some(stage) = s.static_data.stage_data.get(stage_index) {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time / stage.base_buildup_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_buildup_duration
.as_secs_f32()
}, },
StageSection::Swing => { StageSection::Swing => {
stage_time stage_time / stage.base_swing_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_swing_duration
.as_secs_f32()
}, },
StageSection::Recover => { StageSection::Recover => {
stage_time stage_time / stage.base_recover_duration.as_secs_f32()
/ s.static_data.stage_data[stage_index]
.base_recover_duration
.as_secs_f32()
}, },
_ => 0.0, _ => 0.0,
}
} else {
0.0
}; };
anim::golem::AlphaAnimation::update_skeleton( anim::golem::AlphaAnimation::update_skeleton(