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

balance pass 2

Browse Source
This commit is contained in:
jshipsey 2021-02-21 00:39:35 -05:00
parent 79ec9115f5
commit 417f4638ed
30 changed files with 59 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/common/abilities/axe/doublestrike.ron
View File

@ -9,9 +9,9 @@ ComboMelee(
knockback: 8.0, knockback: 8.0,
range: 3.5, range: 3.5,
angle: 50.0, angle: 50.0,
base_buildup_duration: 0.3, base_buildup_duration: 0.2,
base_swing_duration: 0.075, base_swing_duration: 0.075,
base_recover_duration: 0.3, base_recover_duration: 0.15,
forward_movement: 0.5, forward_movement: 0.5,
), ),
( (
@ -23,7 +23,7 @@ ComboMelee(
knockback: 12.0, knockback: 12.0,
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.4, base_buildup_duration: 0.25,
base_swing_duration: 0.1, base_swing_duration: 0.1,
base_recover_duration: 0.4, base_recover_duration: 0.4,
forward_movement: 0.25, forward_movement: 0.25,

4
assets/common/abilities/hammer/singlestrike.ron
View File

@ -1,14 +1,14 @@
ComboMelee( ComboMelee(
stage_data: [( stage_data: [(
stage: 1, stage: 1,
base_damage: 130, base_damage: 150,
damage_increase: 10, damage_increase: 10,
base_poise_damage: 0, base_poise_damage: 0,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 10.0, knockback: 10.0,
range: 4.5, range: 4.5,
angle: 50.0, angle: 50.0,
base_buildup_duration: 0.4, base_buildup_duration: 0.3,
base_swing_duration: 0.1, base_swing_duration: 0.1,
base_recover_duration: 0.2, base_recover_duration: 0.2,
forward_movement: 0.0, forward_movement: 0.0,

14
assets/common/abilities/staffsimple/flamethrower.ron Normal file
View File

@ -0,0 +1,14 @@
BasicBeam(
buildup_duration: 0.25,
recover_duration: 0.25,
beam_duration: 1.0,
base_hps: 0,
base_dps: 150,
tick_rate: 3.0,
range: 20.0,
max_angle: 0.1,
lifesteal_eff: 0.0,
energy_regen: 0,
energy_cost: 1,
energy_drain: 350,
)

4
assets/common/abilities/sword/triplestrike.ron
View File

@ -11,7 +11,7 @@ ComboMelee(
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.2, base_buildup_duration: 0.2,
base_swing_duration: 0.075, base_swing_duration: 0.075,
base_recover_duration: 0.2, base_recover_duration: 0.1,
forward_movement: 0.5, forward_movement: 0.5,
), ),
( (
@ -23,7 +23,7 @@ ComboMelee(
knockback: 12.0, knockback: 12.0,
range: 3.5, range: 3.5,
angle: 40.0, angle: 40.0,
base_buildup_duration: 0.15, base_buildup_duration: 0.1,
base_swing_duration: 0.1, base_swing_duration: 0.1,
base_recover_duration: 0.3, base_recover_duration: 0.3,
forward_movement: 0.0, forward_movement: 0.0,

2
assets/common/abilities/weapon_ability_manifest.ron
View File

@ -49,7 +49,7 @@
), ),
StaffSimple: ( StaffSimple: (
primary: "common.abilities.staffsimple.firebomb", primary: "common.abilities.staffsimple.firebomb",
secondary: "common.abilities.staffsimple.firebomb", secondary: "common.abilities.staffsimple.flamethrower",
abilities: [], abilities: [],
), ),
BowSimple: ( BowSimple: (

2
assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Chest("Haniwa"), kind: Chest("Haniwa"),
stats: ( stats: (
protection: Normal(28.0), protection: Normal(23.0),
poise_resilience: Normal(1.0), poise_resilience: Normal(1.0),
), ),
)), )),

2
assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Foot("Haniwa"), kind: Foot("Haniwa"),
stats: ( stats: (
protection: Normal(20.0), protection: Normal(17.0),
poise_resilience: Normal(1.0), poise_resilience: Normal(1.0),
), ),
)), )),

2
assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Hand("Haniwa"), kind: Hand("Haniwa"),
stats: ( stats: (
protection: Normal(20.0), protection: Normal(17.0),
poise_resilience: Normal(1.0), poise_resilience: Normal(1.0),
), ),
)), )),

2
assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Head("Haniwa"), kind: Head("Haniwa"),
stats: ( stats: (
protection: Normal(20.0), protection: Normal(17.0),
poise_resilience: Normal(1.0), poise_resilience: Normal(1.0),
), ),
)), )),

2
assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Pants("Haniwa"), kind: Pants("Haniwa"),
stats: ( stats: (
protection: Normal(20.0), protection: Normal(17.0),
poise_resilience: Normal(1.0), poise_resilience: Normal(1.0),
), ),
)), )),

2
assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
View File

@ -9,7 +9,7 @@ ItemDef(
equip_time_millis: 0, equip_time_millis: 0,
power: 0.7, power: 0.7,
poise_strength: 0.8, poise_strength: 0.8,
speed: 0.5 speed: 0.3
), ),
) )
), ),

4
assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
View File

@ -3,13 +3,13 @@ ItemDef(
description: "eekum bokum", description: "eekum bokum",
kind: Tool( kind: Tool(
( (
kind: Staff, kind: StaffSimple,
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 0.7, power: 0.7,
poise_strength: 0.8, poise_strength: 0.8,
speed: 1.0 speed: 0.5
), ),
) )
), ),

2
assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
View File

@ -9,7 +9,7 @@ ItemDef(
equip_time_millis: 0, equip_time_millis: 0,
power: 0.3, power: 0.3,
poise_strength: 0.8, poise_strength: 0.8,
speed: 0.5 speed: 0.7
), ),
) )
), ),

4
assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
View File

@ -3,13 +3,13 @@ ItemDef(
description: "eekum bokum", description: "eekum bokum",
kind: Tool( kind: Tool(
( (
kind: Staff, kind: StaffSimple,
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 0.3, power: 0.3,
poise_strength: 0.8, poise_strength: 0.8,
speed: 1.0 speed: 0.8
), ),
) )
), ),

4
assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
View File

@ -7,9 +7,9 @@ ItemDef(
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 1.4, power: 1.6,
poise_strength: 0.8, poise_strength: 0.8,
speed: 0.5 speed: 0.3
), ),
) )
), ),

6
assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
View File

@ -3,13 +3,13 @@ ItemDef(
description: "eekum bokum", description: "eekum bokum",
kind: Tool( kind: Tool(
( (
kind: Staff, kind: StaffSimple,
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 1.4, power: 1.8,
poise_strength: 0.8, poise_strength: 0.8,
speed: 1.0 speed: 0.6
), ),
) )
), ),

4
assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
View File

@ -3,13 +3,13 @@ ItemDef(
description: "eekum bokum", description: "eekum bokum",
kind: Tool( kind: Tool(
( (
kind: Staff, kind: StaffSimple,
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 1.7, power: 1.7,
poise_strength: 0.8, poise_strength: 0.8,
speed: 1.0 speed: 0.7
), ),
) )
), ),

4
assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
View File

@ -7,9 +7,9 @@ ItemDef(
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 0.3, power: 1.1,
poise_strength: 0.8, poise_strength: 0.8,
speed: 0.5 speed: 0.3
), ),
) )
), ),

4
assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
View File

@ -3,13 +3,13 @@ ItemDef(
description: "eekum bokum", description: "eekum bokum",
kind: Tool( kind: Tool(
( (
kind: Staff, kind: StaffSimple,
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 1.1, power: 1.1,
poise_strength: 0.8, poise_strength: 0.8,
speed: 1.0 speed: 0.8
), ),
) )
), ),

4
assets/common/items/npc_weapons/hammer/yeti_hammer.ron
View File

@ -6,8 +6,8 @@ ItemDef(
kind: HammerSimple, kind: HammerSimple,
hands: Two, hands: Two,
stats: ( stats: (
equip_time_millis: 500, equip_time_millis: 0,
power: 1.00, power: 2.0,
poise_strength: 1.00, poise_strength: 1.00,
speed: 1.0 speed: 1.0
), ),

2
assets/common/items/npc_weapons/unique/quadlowbeam.ron
View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool( kind: Tool(
( (
kind: Unique(QuadLowBeam), kind: Unique(QuadLowBeam),
hands: Two,
stats: ( stats: (
equip_time_millis: 10, equip_time_millis: 10,
power: 1.00, power: 1.00,
@ -13,4 +14,5 @@ ItemDef(
) )
), ),
quality: Low, quality: Low,
tags: [],
) )

4
common/src/comp/body.rs
View File

@ -374,8 +374,8 @@ impl Body {
biped_small::Species::Gnarling => 300, biped_small::Species::Gnarling => 300,
biped_small::Species::Adlet => 400, biped_small::Species::Adlet => 400,
biped_small::Species::Sahagin => 500, biped_small::Species::Sahagin => 500,
biped_small::Species::Haniwa => 900, biped_small::Species::Haniwa => 700,
biped_small::Species::Myrmidon => 1000, biped_small::Species::Myrmidon => 800,
_ => 600, _ => 600,
}, },
Body::Object(object) => match object { Body::Object(object) => match object {

2
common/src/event.rs
View File

@ -9,7 +9,7 @@ use crate::{
}; };
use comp::{ use comp::{
invite::{InviteKind, InviteResponse}, invite::{InviteKind, InviteResponse},
item::{Item, Reagent}, item::Item,
Ori, Pos, Ori, Pos,
}; };
use specs::Entity as EcsEntity; use specs::Entity as EcsEntity;

1
server/src/events/entity_manipulation.rs
View File

@ -447,6 +447,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
let _ = state let _ = state
.create_object(comp::Pos(pos.0 + Vec3::unit_z() * 0.25), match old_body { .create_object(comp::Pos(pos.0 + Vec3::unit_z() * 0.25), match old_body {
Some(common::comp::Body::Humanoid(_)) => object::Body::Pouch, Some(common::comp::Body::Humanoid(_)) => object::Body::Pouch,
Some(common::comp::Body::BipedSmall(_)) => object::Body::Pouch,
Some(common::comp::Body::Golem(_)) => object::Body::Chest, Some(common::comp::Body::Golem(_)) => object::Body::Chest,
Some(common::comp::Body::BipedLarge(_)) Some(common::comp::Body::BipedLarge(_))
| Some(common::comp::Body::QuadrupedLow(_)) => object::Body::MeatDrop, | Some(common::comp::Body::QuadrupedLow(_)) => object::Body::MeatDrop,

3
server/src/sys/agent.rs
View File

@ -497,8 +497,11 @@ impl<'a> System<'a> for Sys {
}) { }) {
Some(ToolKind::Bow) => Tactic::Bow, Some(ToolKind::Bow) => Tactic::Bow,
Some(ToolKind::Staff) => Tactic::Staff, Some(ToolKind::Staff) => Tactic::Staff,
Some(ToolKind::StaffSimple) => Tactic::Staff,
Some(ToolKind::Hammer) => Tactic::Hammer, Some(ToolKind::Hammer) => Tactic::Hammer,
Some(ToolKind::Sword) => Tactic::Sword, Some(ToolKind::Sword) => Tactic::Sword,
Some(ToolKind::Spear) => Tactic::Sword,
Some(ToolKind::SwordSimple) => Tactic::Sword,
Some(ToolKind::Axe) => Tactic::Axe, Some(ToolKind::Axe) => Tactic::Axe,
Some(ToolKind::Unique(UniqueKind::StoneGolemFist)) => { Some(ToolKind::Unique(UniqueKind::StoneGolemFist)) => {
Tactic::StoneGolemBoss Tactic::StoneGolemBoss

2
voxygen/anim/src/biped_small/alpha.rs
View File

@ -52,7 +52,7 @@ impl Animation for AlphaAnimation {
let speednorm = speed / 9.4; let speednorm = speed / 9.4;
let speednormcancel = 1.0 - speednorm; let speednormcancel = 1.0 - speednorm;
let anim_time = anim_time.min(1.0);
let (move1base, move2base, move3) = match stage_section { let (move1base, move2base, move3) = match stage_section {
Some(StageSection::Buildup) => ((anim_time as f32).sqrt(), 0.0, 0.0), Some(StageSection::Buildup) => ((anim_time as f32).sqrt(), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, (anim_time as f32).powi(4), 0.0), Some(StageSection::Swing) => (1.0, (anim_time as f32).powi(4), 0.0),

2
voxygen/anim/src/biped_small/shoot.rs
View File

@ -111,7 +111,7 @@ impl Animation for ShootAnimation {
next.control.orientation = Quaternion::rotation_x(-0.3 + move1abs * 0.4) next.control.orientation = Quaternion::rotation_x(-0.3 + move1abs * 0.4)
* Quaternion::rotation_y(0.5 * speednorm); * Quaternion::rotation_y(0.5 * speednorm);
}, },
Some(ToolKind::Staff) => { Some(ToolKind::Staff) | Some(ToolKind::StaffSimple) => {
let (move1base, _move2base, move3) = match stage_section { let (move1base, _move2base, move3) = match stage_section {
Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0), Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, (anim_time as f32).powf(0.25), 0.0), Some(StageSection::Swing) => (1.0, (anim_time as f32).powf(0.25), 0.0),

2
voxygen/anim/src/character/mod.rs
View File

@ -117,7 +117,7 @@ impl Skeleton for CharacterSkeleton {
make_bone(control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)), make_bone(control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)),
]; ];
// NOTE: lantern_mat.cols.w = lantern_mat * Vec4::unit_w() // NOTE: lantern_mat.cols.w = lantern_mat * Vec4::unit_w()
(head_mat * lantern_mat.cols.w).xyz() (lantern_mat.cols.w / 13.0).xyz()
} }
} }

2
voxygen/src/scene/figure/load.rs
View File

@ -2495,7 +2495,7 @@ make_vox_spec!(
armor_tail: BipedSmallArmorTailSpec = "voxygen.voxel.biped_small_armor_tail_manifest", armor_tail: BipedSmallArmorTailSpec = "voxygen.voxel.biped_small_armor_tail_manifest",
}, },
|FigureKey { body, extra }, spec| { |FigureKey { body: _, extra }, spec| {
const DEFAULT_LOADOUT: super::cache::CharacterCacheKey = super::cache::CharacterCacheKey { const DEFAULT_LOADOUT: super::cache::CharacterCacheKey = super::cache::CharacterCacheKey {
third_person: None, third_person: None,
tool: None, tool: None,

3
world/src/site/dungeon/mod.rs
View File

@ -883,7 +883,6 @@ impl Floor {
.with_skillset_config( .with_skillset_config(
common::skillset_builder::SkillSetConfig::Outcast, common::skillset_builder::SkillSetConfig::Outcast,
) )
.with_scale(2.0)
.with_main_tool(comp::Item::new_from_asset_expect( .with_main_tool(comp::Item::new_from_asset_expect(
match dynamic_rng.gen_range(0..6) { match dynamic_rng.gen_range(0..6) {
0 => "common.items.weapons.axe.worn_iron_axe-0", 0 => "common.items.weapons.axe.worn_iron_axe-0",
@ -927,7 +926,6 @@ impl Floor {
.with_skillset_config( .with_skillset_config(
common::skillset_builder::SkillSetConfig::Bandit common::skillset_builder::SkillSetConfig::Bandit
) )
.with_scale(2.0)
.with_main_tool(comp::Item::new_from_asset_expect( .with_main_tool(comp::Item::new_from_asset_expect(
match dynamic_rng.gen_range(0..6) { match dynamic_rng.gen_range(0..6) {
0 => "common.items.weapons.axe.steel_axe-0", 0 => "common.items.weapons.axe.steel_axe-0",
@ -1138,7 +1136,6 @@ impl Floor {
.with_skillset_config( .with_skillset_config(
common::skillset_builder::SkillSetConfig::CultistAcolyte common::skillset_builder::SkillSetConfig::CultistAcolyte
) )
.with_scale(2.0)
.with_main_tool(comp::Item::new_from_asset_expect( .with_main_tool(comp::Item::new_from_asset_expect(
match dynamic_rng.gen_range(0..6) { match dynamic_rng.gen_range(0..6) {
0 => "common.items.weapons.axe.malachite_axe-0", 0 => "common.items.weapons.axe.malachite_axe-0",