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

added white firework

Browse Source
This commit is contained in:
Sarra 2021-03-07 03:59:04 -05:00
parent db3bc1b9bb
commit ab12df50cc
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/comp/body/object.rs
View File

@ -237,6 +237,7 @@ impl Body {
Reagent::Green => Body::FireworkGreen,
Reagent::Purple => Body::FireworkPurple,
Reagent::Red => Body::FireworkRed,
Reagent::White => Body::FireworkWhite,
Reagent::Yellow => Body::FireworkYellow,
}
}

11
server/src/events/inventory_manip.rs
View File

@ -644,18 +644,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
let mut new_entity = state
.create_object(Default::default(), match kind {
item::Throwable::Bomb => comp::object::Body::Bomb,
<<<<<<< HEAD
item::Throwable::Firework(reagent) => comp::object::Body::for_firework(reagent),
=======
item::Throwable::Firework(reagent) => match reagent {
item::Reagent::Blue => comp::object::Body::FireworkBlue,
item::Reagent::Green => comp::object::Body::FireworkGreen,
item::Reagent::Purple => comp::object::Body::FireworkPurple,
item::Reagent::Red => comp::object::Body::FireworkRed,
item::Reagent::White => comp::object::Body::FireworkWhite,
item::Reagent::Yellow => comp::object::Body::FireworkYellow,
},
>>>>>>> added a white firework
item::Throwable::TrainingDummy => comp::object::Body::TrainingDummy,
})
.with(comp::Pos(pos.0 + Vec3::unit_z() * 0.25))