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

Campfire heals pets when owner sits

Browse Source
This commit is contained in:
ubruntu 2022-02-22 09:23:07 +00:00 committed by Marcel
parent 423ee8d14b
commit 6d795b6ecd
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/systems/src/aura.rs
View File

@ -163,12 +163,28 @@ fn activate_aura(
let should_activate = match aura.aura_kind {
AuraKind::Buff { kind, source, .. } => {
let conditions_held = match kind {
BuffKind::CampfireHeal => read_data
.char_states
.get(target)
.map_or(false, |target_state| {
target_state.is_sitting() && health.current() < health.maximum()
}),
BuffKind::CampfireHeal => {
// true if sitting or if owned and owner is sitting + not full health
health.current() < health.maximum()
&& (read_data
.char_states
.get(target)
.map_or(false, CharacterState::is_sitting)
|| read_data
.alignments
.get(target)
.and_then(|alignment| match alignment {
Alignment::Owned(uid) => Some(uid),
_ => None,
})
.and_then(|uid| {
read_data
.uid_allocator
.retrieve_entity_internal((*uid).into())
})
.and_then(|owner| read_data.char_states.get(owner))
.map_or(false, CharacterState::is_sitting))
},
// Add other specific buff conditions here
_ => true,
};