mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'sam/mindflayer-balance' into 'master'
Mindflayer Balance Tweaks See merge request veloren/veloren!2257
This commit is contained in:
commit
b1142a05bf
@ -2,7 +2,7 @@ BasicBeam(
|
||||
buildup_duration: 0.40,
|
||||
recover_duration: 0.50,
|
||||
beam_duration: 1.0,
|
||||
damage: 500,
|
||||
damage: 400,
|
||||
tick_rate: 0.9,
|
||||
range: 22.0,
|
||||
max_angle: 15.0,
|
||||
|
@ -2,7 +2,7 @@ SpinMelee(
|
||||
buildup_duration: 0.5,
|
||||
swing_duration: 0.2,
|
||||
recover_duration: 0.6,
|
||||
base_damage: 100.0,
|
||||
base_damage: 80.0,
|
||||
base_poise_damage: 1.0,
|
||||
knockback: ( strength: 7.0, direction: Towards),
|
||||
range: 16.0,
|
||||
|
13
assets/common/items/npc_armor/biped_large/mindflayer.ron
Normal file
13
assets/common/items/npc_armor/biped_large/mindflayer.ron
Normal file
@ -0,0 +1,13 @@
|
||||
ItemDef(
|
||||
name: "Mindflayer Armor",
|
||||
description: "Worn by mindflayer.",
|
||||
kind: Armor((
|
||||
kind: Chest("Mindflayer"),
|
||||
stats: (
|
||||
protection: Normal(60.0),
|
||||
poise_resilience: Normal(1.0),
|
||||
),
|
||||
)),
|
||||
quality: Legendary,
|
||||
tags: [],
|
||||
)
|
@ -441,7 +441,7 @@ impl Body {
|
||||
biped_large::Species::Wendigo => 2800,
|
||||
biped_large::Species::Troll => 2400,
|
||||
biped_large::Species::Dullahan => 3000,
|
||||
biped_large::Species::Mindflayer => 25000,
|
||||
biped_large::Species::Mindflayer => 12500,
|
||||
biped_large::Species::Tidalwarrior => 2500,
|
||||
biped_large::Species::Yeti => 4000,
|
||||
biped_large::Species::Minotaur => 30000,
|
||||
|
@ -970,7 +970,18 @@ impl LoadoutBuilder {
|
||||
.build(),
|
||||
}
|
||||
} else {
|
||||
LoadoutBuilder::new().active_item(active_item).build()
|
||||
match body {
|
||||
Body::BipedLarge(b) => match b.species {
|
||||
biped_large::Species::Mindflayer => LoadoutBuilder::new()
|
||||
.active_item(active_item)
|
||||
.chest(Some(Item::new_from_asset_expect(
|
||||
"common.items.npc_armor.biped_large.mindflayer",
|
||||
)))
|
||||
.build(),
|
||||
_ => LoadoutBuilder::new().active_item(active_item).build(),
|
||||
},
|
||||
_ => LoadoutBuilder::new().active_item(active_item).build(),
|
||||
}
|
||||
};
|
||||
|
||||
Self(loadout)
|
||||
|
Loading…
Reference in New Issue
Block a user