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

Addressed comments

Browse Source 
Fixed audio test
This commit is contained in:
Sam 2021-02-19 19:41:07 -05:00
parent cfadd6da04
commit eaf3e02e39
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
View File

@ -173,91 +173,91 @@
), ),
// 1h Swords // 1h Swords
"common.items.weapons.sword_1h.bloodsteel-0": ( "common.items.weapons.sword_1h.bloodsteel-0": (
vox_spec: ("voxel.weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.bloodsteel-1": ( "common.items.weapons.sword_1h.bloodsteel-1": (
vox_spec: ("voxel.weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.bloodsteel-2": ( "common.items.weapons.sword_1h.bloodsteel-2": (
vox_spec: ("voxel.weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.bronze-0": ( "common.items.weapons.sword_1h.bronze-0": (
vox_spec: ("voxel.weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.bronze-1": ( "common.items.weapons.sword_1h.bronze-1": (
vox_spec: ("voxel.weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.bronze-2": ( "common.items.weapons.sword_1h.bronze-2": (
vox_spec: ("voxel.weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.cobalt-0": ( "common.items.weapons.sword_1h.cobalt-0": (
vox_spec: ("voxel.weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.cobalt-1": ( "common.items.weapons.sword_1h.cobalt-1": (
vox_spec: ("voxel.weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.cobalt-2": ( "common.items.weapons.sword_1h.cobalt-2": (
vox_spec: ("voxel.weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.cobalt-3": ( "common.items.weapons.sword_1h.cobalt-3": (
vox_spec: ("voxel.weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.iron-0": ( "common.items.weapons.sword_1h.iron-0": (
vox_spec: ("voxel.weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.iron-1": ( "common.items.weapons.sword_1h.iron-1": (
vox_spec: ("voxel.weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.iron-2": ( "common.items.weapons.sword_1h.iron-2": (
vox_spec: ("voxel.weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.iron-3": ( "common.items.weapons.sword_1h.iron-3": (
vox_spec: ("voxel.weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.iron-4": ( "common.items.weapons.sword_1h.iron-4": (
vox_spec: ("voxel.weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.obsidian-0": ( "common.items.weapons.sword_1h.obsidian-0": (
vox_spec: ("voxel.weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.orichalcum-0": ( "common.items.weapons.sword_1h.orichalcum-0": (
vox_spec: ("voxel.weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.orichalcum-1": ( "common.items.weapons.sword_1h.orichalcum-1": (
vox_spec: ("voxel.weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.steel-0": ( "common.items.weapons.sword_1h.steel-0": (
vox_spec: ("voxel.weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.steel-1": ( "common.items.weapons.sword_1h.steel-1": (
vox_spec: ("voxel.weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.steel-2": ( "common.items.weapons.sword_1h.steel-2": (
vox_spec: ("voxel.weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
"common.items.weapons.sword_1h.steel-3": ( "common.items.weapons.sword_1h.steel-3": (
vox_spec: ("voxel.weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)), vox_spec: ("weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)),
color: None color: None
), ),
// Axes // Axes

1
common/net/src/msg/client.rs
View File

@ -58,7 +58,6 @@ pub enum ClientGeneral {
Character(CharacterId), Character(CharacterId),
Spectate, Spectate,
//Only in game //Only in game
// Large enum variant allowed for clippy because of this
ControllerInputs(Box<comp::ControllerInputs>), ControllerInputs(Box<comp::ControllerInputs>),
ControlEvent(comp::ControlEvent), ControlEvent(comp::ControlEvent),
ControlAction(comp::ControlAction), ControlAction(comp::ControlAction),

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

@ -136,7 +136,7 @@ pub struct AbilitySet<T> {
impl AbilitySet<CharacterAbility> { impl AbilitySet<CharacterAbility> {
pub fn modified_by_tool(self, tool: &Tool) -> Self { pub fn modified_by_tool(self, tool: &Tool) -> Self {
let stats: Stats = Stats::from(tool); let stats = Stats::from(tool);
self.map(|a| a.adjusted_by_stats(stats.power, stats.poise_strength, stats.speed)) self.map(|a| a.adjusted_by_stats(stats.power, stats.poise_strength, stats.speed))
} }
} }

8
voxygen/src/audio/sfx/event_mapper/combat/tests.rs
View File

@ -78,7 +78,7 @@ fn maps_basic_melee() {
knockback: 0.0, knockback: 0.0,
range: 1.0, range: 1.0,
max_angle: 1.0, max_angle: 1.0,
ability_info: empty_info(), ability_info: empty_ability_info(),
}, },
timer: Duration::default(), timer: Duration::default(),
stage_section: states::utils::StageSection::Buildup, stage_section: states::utils::StageSection::Buildup,
@ -132,7 +132,7 @@ fn matches_ability_stage() {
max_speed_increase: 0.8, max_speed_increase: 0.8,
scales_from_combo: 2, scales_from_combo: 2,
is_interruptible: true, is_interruptible: true,
ability_info: empty_info(), ability_info: empty_ability_info(),
}, },
stage: 1, stage: 1,
combo: 0, combo: 0,
@ -191,7 +191,7 @@ fn ignores_different_ability_stage() {
max_speed_increase: 0.8, max_speed_increase: 0.8,
scales_from_combo: 2, scales_from_combo: 2,
is_interruptible: true, is_interruptible: true,
ability_info: empty_info(), ability_info: empty_ability_info(),
}, },
stage: 1, stage: 1,
combo: 0, combo: 0,
@ -217,7 +217,7 @@ fn ignores_different_ability_stage() {
} }
fn empty_ability_info() -> states::utils::AbilityInfo { fn empty_ability_info() -> states::utils::AbilityInfo {
Self { states::utils::AbilityInfo {
tool: None, tool: None,
hand: None, hand: None,
key: states::utils::AbilityKey::Mouse1, key: states::utils::AbilityKey::Mouse1,