use bevy hierarchy system

This commit is contained in:
TotallyNot 2025-11-03 18:54:07 +01:00
parent 35413b563c
commit cfe2631578
Signed by: pyrite
GPG key ID: 7F1BA9170CD35D15
15 changed files with 246 additions and 643 deletions

View file

@ -1,16 +1,13 @@
use std::sync::Mutex;
use bevy_ecs::{prelude::*, query::QuerySingleError, system::SystemParam};
use proxisim_models::{
bundle::{
stat::{
AdditiveBonus, BaselineStat, ClipSize, Clips, CritRate, DamageBonus, Defence,
Dexterity, EffectiveStat, MultiplicativeBonus, SimpleStatBaseline, SimpleStatBonus,
SimpleStatEffective, SimpleStatMarker, Speed, StatMarker, Strength, WeaponAccuracy,
},
weapon::WeaponVerb,
use proxisim_models::bundle::{
stat::{
AdditiveBonus, BaselineStat, ClipSize, Clips, CritRate, DamageBonus, Defence, Dexterity,
EffectiveStat, MultiplicativeBonus, SimpleStatBaseline, SimpleStatBonus,
SimpleStatEffective, SimpleStatMarker, Speed, StatMarker, Strength, WeaponAccuracy,
},
hierarchy::Children,
weapon::WeaponVerb,
};
use crate::{Stages, entity_registry::EntityRegistry};
@ -533,11 +530,11 @@ fn log_stat_changes<Stat: StatMarker>(
) {
for (player, baseline, effective, children) in stat_q.iter() {
let effects_add: Vec<_> = add_q
.iter_many(children.get())
.iter_many(children)
.map(|bonus| (bonus.label, 100.0 * bonus.value))
.collect();
let effects_mult: Vec<_> = mult_q
.iter_many(children.get())
.iter_many(children)
.map(|bonus| (bonus.label, 100.0 * bonus.value))
.collect();
@ -570,7 +567,7 @@ fn log_simple_stat_changes<Stat: SimpleStatMarker>(
{
for (target, baseline, effective, children) in stat_q.iter() {
let bonuses: Vec<_> = bonus_q
.iter_many(children.get())
.iter_many(children)
.map(|bonus| (bonus.label, Stat::denormalise_bonus(bonus.value)))
.collect();