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

Initial

Browse Source
This commit is contained in:
uniior 2024-02-16 17:08:25 -03:00 committed by UncomfySilence
parent 9031ac922a
commit e720ee834e
30 changed files with 55 additions and 45 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: 9.5,
damage: 7,
poise: 12,
knockback: 3,
energy_regen: 0,

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

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 0.6,
recover_duration: 0.9,
projectile: Pebble(
damage: 8,
damage: 6,
knockback: 2,
),
projectile_body: Object(Pebble),

2
assets/common/abilities/custom/asp/singlestrike.ron
View File

@ -16,7 +16,7 @@ ComboMelee2(
hit_timing: 0.5,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.1)),
swing: Some(Forward(0.05)),
),
ori_modifier: 0.55,
),

6
assets/common/abilities/custom/quadlowbasic/triplestrike.ron
View File

@ -4,7 +4,7 @@ ComboMelee2(
melee_constructor: (
kind: Slash(
damage: 36,
poise: 0,
poise: 24,
knockback: 3,
energy_regen: 0,
),
@ -24,7 +24,7 @@ ComboMelee2(
melee_constructor: (
kind: Stab(
damage: 18,
poise: 12,
poise: 18,
knockback: 15,
energy_regen: 0,
),
@ -44,7 +44,7 @@ ComboMelee2(
melee_constructor: (
kind: Bash(
damage: 28,
poise: 40,
poise: 28,
knockback: 3,
energy_regen: 0,
),

8
assets/common/abilities/custom/quadmedquick/dash.ron
View File

@ -2,16 +2,16 @@ DashMelee(
energy_cost: 0,
melee_constructor: (
kind: Bash(
damage: 15.0,
poise: 28.0,
damage: 11.0,
poise: 20.0,
knockback: 3.0,
energy_regen: 0.0,
),
scaled: Some((
kind: Bash(
damage: 4.0,
poise: 28.0,
knockback: 7.0,
poise: 20.0,
knockback: 6.0,
energy_regen: 0.0,
))),
range: 2.0,

12
assets/common/abilities/custom/quadmedquick/triplestrike.ron
View File

@ -3,8 +3,8 @@ ComboMelee2(
(
melee_constructor: (
kind: Bash(
damage: 20,
poise: 15,
damage: 14,
poise: 12,
knockback: 5,
energy_regen: 0,
),
@ -23,8 +23,8 @@ ComboMelee2(
(
melee_constructor: (
kind: Bash(
damage: 20,
poise: 17,
damage: 14,
poise: 12,
knockback: 5,
energy_regen: 0,
),
@ -43,8 +43,8 @@ ComboMelee2(
(
melee_constructor: (
kind: Bash(
damage: 20,
poise: 20,
damage: 14,
poise: 14,
knockback: 5,
energy_regen: 0,
),

4
assets/common/abilities/custom/theropodbasic/singlestrike.ron
View File

@ -11,10 +11,10 @@ ComboMelee2(
range: 5.5,
angle: 60.0,
),
buildup_duration: 0.5,
buildup_duration: 0.7,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 0.3,
recover_duration: 0.5,
movement: (
swing: Some(Forward(0.25)),
),

2
assets/common/abilities/custom/treant_sapling/shockwave.ron
View File

@ -1,6 +1,6 @@
Shockwave(
energy_cost: 0.0,
buildup_duration: 1.6,
buildup_duration: 2.3,
swing_duration: 0.1,
recover_duration: 2.3,
damage: 8.0,

2
assets/common/items/npc_armor/quadruped_small/hyena.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(56.0)),
protection: Some(Normal(48.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),

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.35,
power: 0.2,
effect_power: 0.4,
speed: 0.54,
range: 1.0,

2
assets/common/items/npc_weapons/unique/quadruped_small/hyena.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.01,
power: 1.77,
power: 1.5,
effect_power: 1.0,
speed: 1.5,
range: 1.3,

2
assets/common/items/weapons/axe/malachite_axe-0.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 1.75,
power: 1.45,
effect_power: 1.3,
speed: 0.8,
range: 1.0,

2
assets/common/items/weapons/axe/parashu.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 3.0,
power: 2.25,
effect_power: 1.2,
speed: 0.7,
range: 1.0,

2
assets/common/items/weapons/bow/sagitta.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 3.0,
power: 2.25,
effect_power: 1.0,
speed: 0.6,
range: 1.0,

2
assets/common/items/weapons/bow/velorite.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 1.75,
power: 1.45,
effect_power: 1.0,
speed: 0.65,
range: 1.0,

2
assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 1.75,
power: 1.45,
effect_power: 1.0,
speed: 0.65,
range: 1.0,

2
assets/common/items/weapons/hammer/mjolnir.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 3.0,
power: 2.25,
effect_power: 1.0,
speed: 0.6,
range: 1.0,

2
assets/common/items/weapons/sceptre/caduceus.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 3.0,
power: 2.25,
effect_power: 1.0,
speed: 0.6,
range: 1.0,

2
assets/common/items/weapons/sceptre/root_evil.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 1.75,
power: 1.45,
effect_power: 1.0,
speed: 0.65,
range: 1.0,

2
assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 1.75,
power: 1.45,
effect_power: 1.5,
speed: 0.65,
range: 1.0,

2
assets/common/items/weapons/staff/cultist_staff.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.3,
power: 1.75,
power: 1.45,
effect_power: 1.0,
speed: 0.65,
range: 1.0,

2
assets/common/items/weapons/staff/laevateinn.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.6,
power: 3.0,
power: 2.25,
effect_power: 1.0,
speed: 0.6,
range: 1.0,

2
assets/common/items/weapons/sword/caladbolg.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 3.0,
power: 2.25,
effect_power: 1.2,
speed: 0.7,
range: 1.0,

2
assets/common/items/weapons/sword/cultist.ron
View File

@ -6,7 +6,7 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 1.75,
power: 1.45,
effect_power: 0.7,
speed: 0.8,
range: 1.0,

4
assets/common/recipe_book.ron
View File

@ -270,14 +270,14 @@
"iron_ingot": (
output: ("common.items.mineral.ingot.iron", 1),
inputs: [
(Item("common.items.mineral.ore.iron"), 2, false),
(Item("common.items.mineral.ore.iron"), 1, false),
],
craft_sprite: Some(Forge),
),
"cobalt_ingot": (
output: ("common.items.mineral.ingot.cobalt", 1),
inputs: [
(Item("common.items.mineral.ore.cobalt"), 2, false),
(Item("common.items.mineral.ore.cobalt"), 1, false),
],
craft_sprite: Some(Forge),
),

3
common/src/comp/agent.rs
View File

@ -361,7 +361,8 @@ impl<'a> From<&'a Body> for Psyche {
| biped_small::Species::Flamekeeper
| biped_small::Species::Irrwurz
| biped_small::Species::ShamanicSpirit
| biped_small::Species::Jiangshi => 0.0,
| biped_small::Species::Jiangshi
| biped_small::Species::Bushly => 0.0,
_ => 0.5,
},

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

@ -833,10 +833,13 @@ impl Body {
quadruped_small::Species::Cat => 25,
quadruped_small::Species::Dog => 30,
quadruped_small::Species::Fox => 15,
quadruped_small::Species::Goat => 15,
quadruped_small::Species::Hare => 15,
quadruped_small::Species::Jackalope => 30,
quadruped_small::Species::Pig => 15,
quadruped_small::Species::Quokka => 10,
quadruped_small::Species::Rabbit => 10,
quadruped_small::Species::Raccoon => 15,
quadruped_small::Species::Seal => 15,
quadruped_small::Species::TreantSapling => 55,
quadruped_small::Species::Sheep => 30,
@ -876,7 +879,7 @@ impl Body {
quadruped_medium::Species::Grolgar => 320,
quadruped_medium::Species::Hirdrasil => 850,
quadruped_medium::Species::Mammoth => 740,
quadruped_medium::Species::Ngoubou => 370,
quadruped_medium::Species::Ngoubou => 450,
quadruped_medium::Species::Roshwalr => 500,
_ => 100,
},
@ -1013,9 +1016,9 @@ impl Body {
quadruped_low::Species::Lavadrake => 460,
quadruped_low::Species::Maneater => 800,
quadruped_low::Species::Mossdrake => 720,
quadruped_low::Species::Rocksnapper => 280,
quadruped_low::Species::Reefsnapper => 290,
quadruped_low::Species::Rootsnapper => 300,
quadruped_low::Species::Rocksnapper => 480,
quadruped_low::Species::Reefsnapper => 490,
quadruped_low::Species::Rootsnapper => 500,
quadruped_low::Species::Sandshark => 550,
// T3B
quadruped_low::Species::Basilisk => 1300,
@ -1201,6 +1204,12 @@ impl Body {
quadruped_low::Species::HermitAlligator => 2.0,
_ => 1.0,
},
Body::FishMedium(_) => 0.6,
Body::FishSmall(_) => 0.6,
Body::Crustacean(b) => match b.species {
crustacean::Species::Crab => 0.6,
_ => 1.0,
},
_ => 1.0,
}
}

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

@ -622,8 +622,7 @@ fn default_main_tool(body: &Body) -> Item {
quadruped_medium::Species::Roshwalr => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.roshwalr",
)),
quadruped_medium::Species::Highland
| quadruped_medium::Species::Cattle
quadruped_medium::Species::Cattle
| quadruped_medium::Species::Yak => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.quadmedbasicgentle",
)),

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

@ -679,7 +679,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Moose, _) => 0.95,
(Snowleopard, _) => 0.95,
(Mammoth, _) => 3.0,
(Ngoubou, _) => 1.0,
(Ngoubou, _) => 1.2,
(Akhlut, _) => 1.4,
(Bristleback, _) => 1.1,
(ClaySteed, _) => 1.75,

1
voxygen/anim/src/quadruped_small/mod.rs
View File

@ -309,6 +309,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Hare, _) => 0.65,
(Seal, _) => 0.9,
(MossySnail, _) => 1.0,
(Hyena, _) => 0.95,
_ => 0.8,
},
tempo: match (body.species, body.body_type) {