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

feat: store items as RON files

Browse Source 
When a new item is created, a ron file will be used as a template
This commit is contained in:
timokoesters
2019-10-22 20:18:40 +02:00
parent edd56e2fc0
commit 20248a4818
41 changed files with 364 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/sys/controller.rs
View File

@ -5,7 +5,8 @@ use super::{
use crate::{
comp::{
self, item, projectile, ActionState::*, Body, CharacterState, ControlEvent, Controller,
HealthChange, HealthSource, Item, MovementState::*, PhysicsState, Projectile, Stats, Vel,
HealthChange, HealthSource, ItemKind, MovementState::*, PhysicsState, Projectile, Stats,
Vel,
},
event::{EventBus, LocalEvent, ServerEvent},
};
@ -131,8 +132,8 @@ impl<'a> System<'a> for Sys {
};
}
match stats.equipment.main {
Some(Item::Tool {
match stats.equipment.main.as_ref().map(|i| &i.kind) {
Some(ItemKind::Tool {
kind: item::Tool::Bow,
power,
..
@ -158,7 +159,7 @@ impl<'a> System<'a> for Sys {
hit_wall: vec![projectile::Effect::Stick],
hit_entity: vec![
projectile::Effect::Damage(HealthChange {
amount: -(power as i32),
amount: -(*power as i32),
cause: HealthSource::Attack { by: *uid },
}),
projectile::Effect::Vanish,
@ -170,7 +171,7 @@ impl<'a> System<'a> for Sys {
}
}
}
Some(Item::Tool {
Some(ItemKind::Tool {
kind: item::Tool::Staff,
power,
..
@ -220,7 +221,7 @@ impl<'a> System<'a> for Sys {
hit_wall: vec![projectile::Effect::Vanish],
hit_entity: vec![
projectile::Effect::Damage(HealthChange {
amount: -(power as i32),
amount: -(*power as i32),
cause: HealthSource::Attack { by: *uid },
}),
projectile::Effect::Vanish,
@ -232,7 +233,7 @@ impl<'a> System<'a> for Sys {
}
}
}
Some(Item::Tool { .. }) => {
Some(ItemKind::Tool { .. }) => {
// Melee Attack
if inputs.primary
&& (character.movement == Stand
@ -263,7 +264,7 @@ impl<'a> System<'a> for Sys {
};
}
}
Some(Item::Debug(item::Debug::Boost)) => {
Some(ItemKind::Debug(item::Debug::Boost)) => {
if inputs.primary {
local_emitter.emit(LocalEvent::Boost {
entity,
@ -278,7 +279,7 @@ impl<'a> System<'a> for Sys {
});
}
}
Some(Item::Debug(item::Debug::Possess)) => {
Some(ItemKind::Debug(item::Debug::Possess)) => {
if inputs.primary
&& (character.movement == Stand
|| character.movement == Run