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

tweaks to starter weapons and secondary components w/start of entity balancing

Browse Source
This commit is contained in:
UncomfySilence 2024-02-20 16:17:18 +01:00
parent d7af58aefd
commit 3b7a9b38af
24 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/custom/arthropods/weevil/singlestrike.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Bash(
damage: 7,
damage: 3.0,
poise: 12,
knockback: 3,
energy_regen: 0,

4
assets/common/items/modular/weapon/secondary/axe/long.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Axe,
stats: (
equip_time_secs: 1.1,
power: 1.1,
power: 1.15,
effect_power: 1.1,
speed: 0.9,
speed: 0.8,
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,

4
assets/common/items/modular/weapon/secondary/axe/medium.ron
View File

@ -8,9 +8,9 @@ ItemDef(
equip_time_secs: 1.0,
power: 1.0,
effect_power: 1.0,
speed: 0.9,
speed: 1.0,
range: 1.0,
energy_efficiency: 0.9,
energy_efficiency: 1.0,
buff_strength: 1.0,
),
hand_restriction: None,

2
assets/common/items/modular/weapon/secondary/axe/short.ron
View File

@ -6,7 +6,7 @@ ItemDef(
toolkind: Axe,
stats: (
equip_time_secs: 0.9,
power: 0.9,
power: 0.85,
effect_power: 0.9,
speed: 1.1,
range: 0.9,

6
assets/common/items/modular/weapon/secondary/bow/long.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Bow,
stats: (
equip_time_secs: 1.0,
power: 1.25,
equip_time_secs: 1.1,
power: 1.15,
effect_power: 1.1,
speed: 0.8,
range: 1.2,
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,
),

8
assets/common/items/modular/weapon/secondary/bow/short.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Bow,
stats: (
equip_time_secs: 1.0,
power: 0.8,
equip_time_secs: 0.9,
power: 0.85,
effect_power: 0.9,
speed: 1.2,
range: 0.85,
speed: 1.1,
range: 0.9,
energy_efficiency: 1.1,
buff_strength: 0.9,
),

6
assets/common/items/modular/weapon/secondary/hammer/long.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Hammer,
stats: (
equip_time_secs: 1.0,
power: 1.25,
equip_time_secs: 1.1,
power: 1.15,
effect_power: 1.1,
speed: 0.8,
range: 1.2,
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,
),

4
assets/common/items/modular/weapon/secondary/hammer/medium.ron
View File

@ -8,9 +8,9 @@ ItemDef(
equip_time_secs: 1.0,
power: 1.0,
effect_power: 1.0,
speed: 0.9,
speed: 1.0,
range: 1.0,
energy_efficiency: 0.9,
energy_efficiency: 1.0,
buff_strength: 1.0,
),
hand_restriction: None,

8
assets/common/items/modular/weapon/secondary/hammer/short.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Hammer,
stats: (
equip_time_secs: 1.0,
power: 0.8,
equip_time_secs: 0.9,
power: 0.85,
effect_power: 0.9,
speed: 1.2,
range: 0.85,
speed: 1.1,
range: 0.9,
energy_efficiency: 1.1,
buff_strength: 0.9,
),

6
assets/common/items/modular/weapon/secondary/sceptre/heavy.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Sceptre,
stats: (
equip_time_secs: 1.0,
power: 1.25,
equip_time_secs: 1.1,
power: 1.15,
effect_power: 1.1,
speed: 0.8,
range: 1.2,
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,
),

8
assets/common/items/modular/weapon/secondary/sceptre/light.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Sceptre,
stats: (
equip_time_secs: 1.0,
power: 0.8,
equip_time_secs: 0.9,
power: 0.85,
effect_power: 0.9,
speed: 1.2,
range: 0.85,
speed: 1.1,
range: 0.9,
energy_efficiency: 1.1,
buff_strength: 0.9,
),

6
assets/common/items/modular/weapon/secondary/staff/heavy.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Staff,
stats: (
equip_time_secs: 1.0,
power: 1.25,
equip_time_secs: 1.1,
power: 1.15,
effect_power: 1.1,
speed: 0.8,
range: 1.2,
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,
),

8
assets/common/items/modular/weapon/secondary/staff/light.ron
View File

@ -5,11 +5,11 @@ ItemDef(
ToolSecondaryComponent(
toolkind: Staff,
stats: (
equip_time_secs: 1.0,
power: 0.8,
equip_time_secs: 0.9,
power: 0.85,
effect_power: 0.9,
speed: 1.2,
range: 0.85,
speed: 1.1,
range: 0.9,
energy_efficiency: 1.1,
buff_strength: 0.9,
),

4
assets/common/items/modular/weapon/secondary/sword/long.ron
View File

@ -6,9 +6,9 @@ ItemDef(
toolkind: Sword,
stats: (
equip_time_secs: 1.1,
power: 1.1,
power: 1.15,
effect_power: 1.1,
speed: 0.9,
speed: 0.8,
range: 1.1,
energy_efficiency: 0.9,
buff_strength: 1.1,

2
assets/common/items/modular/weapon/secondary/sword/short.ron
View File

@ -6,7 +6,7 @@ ItemDef(
toolkind: Sword,
stats: (
equip_time_secs: 0.9,
power: 0.9,
power: 0.85,
effect_power: 0.9,
speed: 1.1,
range: 0.9,

2
assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.01,
power: 0.2,
power: 0.1,
effect_power: 0.4,
speed: 0.54,
range: 1.0,

10
assets/common/items/weapons/axe/starter_axe.ron
View File

@ -5,13 +5,13 @@ ItemDef(
kind: Axe,
hands: Two,
stats: (
equip_time_secs: 0.3,
power: 0.5,
equip_time_secs: 0.4,
power: 0.55,
effect_power: 1.0,
speed: 1.0,
speed: 0.75,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
energy_efficiency: 0.75,
buff_strength: 0.75,
),
)),
quality: Low,

10
assets/common/items/weapons/bow/starter.ron
View File

@ -6,12 +6,12 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 0.45,
effect_power: 0.3,
speed: 0.95,
power: 0.55,
effect_power: 1.0,
speed: 0.75,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 0.9,
energy_efficiency: 0.75,
buff_strength: 0.75,
),
)),
quality: Low,

12
assets/common/items/weapons/hammer/starter_hammer.ron
View File

@ -5,13 +5,13 @@ ItemDef(
kind: Hammer,
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 0.45,
equip_time_secs: 0.4,
power: 0.55,
effect_power: 1.0,
speed: 0.95,
range: 0.95,
energy_efficiency: 1.0,
buff_strength: 0.9,
speed: 0.75,
range: 1.0,
energy_efficiency: 0.75,
buff_strength: 0.75,
),
)),
quality: Low,

12
assets/common/items/weapons/staff/starter_staff.ron
View File

@ -5,13 +5,13 @@ ItemDef(
kind: Staff,
hands: Two,
stats: (
equip_time_secs: 0.3,
power: 0.45,
equip_time_secs: 0.4,
power: 0.55,
effect_power: 1.0,
speed: 0.95,
range: 0.95,
energy_efficiency: 1.0,
buff_strength: 0.95,
speed: 0.75,
range: 1.0,
energy_efficiency: 0.75,
buff_strength: 0.75,
),
)),
quality: Low,

10
assets/common/items/weapons/sword/starter.ron
View File

@ -5,13 +5,13 @@ ItemDef(
kind: Sword,
hands: Two,
stats: (
equip_time_secs: 0.3,
power: 0.6,
equip_time_secs: 0.4,
power: 0.55,
effect_power: 1.0,
speed: 0.8,
speed: 0.75,
range: 1.0,
energy_efficiency: 0.9,
buff_strength: 1.1,
energy_efficiency: 0.75,
buff_strength: 0.75,
),
)),
quality: Low,

14
assets/common/items/weapons/sword_1h/starter.ron
View File

@ -5,13 +5,13 @@ ItemDef(
kind: Sword,
hands: One,
stats: (
equip_time_secs: 0.3,
power: 0.4,
effect_power: 1.0,
speed: 1.2,
range: 1.0,
energy_efficiency: 1.1,
buff_strength: 0.9,
equip_time_secs: 0.4,
power: 0.4675,
effect_power: 0.9,
speed: 0.825,
range: 0.9,
energy_efficiency: 0.825,
buff_strength: 0.675,
),
)),
quality: Low,

9
common/src/comp/inventory/loadout_builder.rs
View File

@ -625,10 +625,11 @@ fn default_main_tool(body: &Body) -> Item {
quadruped_medium::Species::Cattle => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.quadmedbasicgentle",
)),
quadruped_medium::Species::Highland
| quadruped_medium::Species::Yak => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.quadruped_medium.highland",
)),
quadruped_medium::Species::Highland | quadruped_medium::Species::Yak => {
Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.quadruped_medium.highland",
))
},
quadruped_medium::Species::Frostfang => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.frostfang",
)),

4
common/src/states/utils.rs
View File

@ -43,8 +43,8 @@ pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0;
impl Body {
pub fn base_accel(&self) -> f32 {
match self {
// Note: Entities have been slowed down relative to humanoid speeds, but it may be worth reverting/increasing
// speed once we've established slower AI.
// Note: Entities have been slowed down relative to humanoid speeds, but it may be worth
// reverting/increasing speed once we've established slower AI.
Body::Humanoid(_) => 100.0,
Body::QuadrupedSmall(body) => match body.species {
quadruped_small::Species::Turtle => 30.0,