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

fix rebase

Browse Source
This commit is contained in:
scott-c
2020-08-04 20:17:50 +08:00
parent bb8ba75287
commit cc36e9c300
1 changed files with 65 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
common/src/comp/inventory/item/tool.rs
View File

@ -2,8 +2,7 @@
// version in voxygen\src\meta.rs in order to reset save files to being empty // version in voxygen\src\meta.rs in order to reset save files to being empty
use crate::comp::{ use crate::comp::{
body::object, projectile, Body, CharacterAbility, Gravity, HealthChange, HealthSource, body::object, projectile, Body, CharacterAbility, Gravity, LightEmitter, Projectile,
LightEmitter, Projectile,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::time::Duration; use std::time::Duration;
@ -194,7 +193,6 @@ impl Tool {
recover_duration: Duration::from_millis(500), recover_duration: Duration::from_millis(500),
projectile_body: Body::Object(object::Body::Arrow), projectile_body: Body::Object(object::Body::Arrow),
projectile_light: None, projectile_light: None,
projectile_gravity: Some(Gravity(0.05)),
}, },
], ],
Dagger(_) => vec![ Dagger(_) => vec![
@ -263,17 +261,7 @@ impl Tool {
col: (0.85, 0.5, 0.11).into(), col: (0.85, 0.5, 0.11).into(),
..Default::default() ..Default::default()
}), }),
projectile::Effect::RewardEnergy(150),
projectile::Effect::Vanish,
],
time_left: Duration::from_secs(20),
owner: None,
},
projectile_body: Body::Object(object::Body::BoltFire),
projectile_light: Some(LightEmitter {
col: (0.85, 0.5, 0.11).into(),
..Default::default()
}),
projectile_gravity: None, projectile_gravity: None,
}, },
BasicRanged { BasicRanged {
@ -283,11 +271,15 @@ impl Tool {
recover_duration: Duration::from_millis(50), recover_duration: Duration::from_millis(50),
projectile: Projectile { projectile: Projectile {
hit_solid: vec![ hit_solid: vec![
projectile::Effect::Explode { power: 1.4 }, projectile::Effect::Explode {
power: 1.4 * self.base_power(),
},
projectile::Effect::Vanish, projectile::Effect::Vanish,
], ],
hit_entity: vec![ hit_entity: vec![
projectile::Effect::Explode { power: 1.4 }, projectile::Effect::Explode {
power: 1.4 * self.base_power(),
},
projectile::Effect::Vanish, projectile::Effect::Vanish,
], ],
time_left: Duration::from_secs(20), time_left: Duration::from_secs(20),
@ -298,27 +290,12 @@ impl Tool {
col: (1.0, 0.75, 0.11).into(), col: (1.0, 0.75, 0.11).into(),
..Default::default() ..Default::default()
}), }),
projectile_gravity: None, projectile_gravity: None,
}, },
], ]
Staff(StaffKind::Sceptre) => vec![ }
BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(300),
base_healthchange: -1,
range: 10.0,
max_angle: 45.0,
}, },
BasicMelee {
energy_cost: 350,
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(1000),
base_healthchange: 15,
range: 10.0,
max_angle: 45.0,
},
],
Shield(_) => vec![ Shield(_) => vec![
BasicMelee { BasicMelee {
energy_cost: 0, energy_cost: 0,
@ -337,6 +314,24 @@ impl Tool {
duration: Duration::from_millis(50), duration: Duration::from_millis(50),
only_up: false, only_up: false,
}, },
CharacterAbility::Boost {
duration: Duration::from_millis(50),
only_up: true,
},
BasicRanged {
energy_cost: 0,
holdable: false,
prepare_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(10),
projectile: Projectile {
hit_solid: vec![projectile::Effect::Stick],
hit_entity: vec![
projectile::Effect::Stick,
projectile::Effect::Possess,
],
time_left: Duration::from_secs(10),
owner: None,
},
projectile_body: Body::Object(object::Body::ArrowSnake), projectile_body: Body::Object(object::Body::ArrowSnake),
projectile_light: Some(LightEmitter { projectile_light: Some(LightEmitter {
col: (0.0, 1.0, 0.33).into(), col: (0.0, 1.0, 0.33).into(),
@ -344,7 +339,10 @@ impl Tool {
}), }),
projectile_gravity: None, projectile_gravity: None,
}, },
], ]
} else {
vec![]
}
}, },
Empty => vec![BasicMelee { Empty => vec![BasicMelee {
energy_cost: 0, energy_cost: 0,