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

Increases base damage of husk attack, rename some cultist weapons

Browse Source
This commit is contained in:
Snowram 2021-06-25 20:00:04 +02:00
parent ef6d6563ea
commit 379e755006
12 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/abilities/custom/husk_brute/chargedmelee.ron
View File

@ -1,8 +1,8 @@
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
initial_damage: 0,
scaled_damage: 500,
initial_damage: 50,
scaled_damage: 450,
initial_poise_damage: 50,
scaled_poise_damage: 150,
initial_knockback: 0.0,

4
assets/common/abilities/custom/minotaur/cleave.ron
View File

@ -1,8 +1,8 @@
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
initial_damage: 0,
scaled_damage: 500,
initial_damage: 50,
scaled_damage: 450,
initial_poise_damage: 50,
scaled_poise_damage: 150,
initial_knockback: 0.0,

6
assets/common/entity/dungeon/tier-5/warlock.ron
View File

@ -5,11 +5,11 @@ EntityConfig (
loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
main_tool: Some(Choice([
(1.5, Some(Item("common.items.weapons.staff.bipedlarge-cultist_staff"))),
(1.0, Some(Item("common.items.weapons.bow.bipedlarge-velorite"))),
(1.5, Some(Item("common.items.npc_weapons.staff.bipedlarge-cultist"))),
(1.0, Some(Item("common.items.npc_weapons.bow.bipedlarge-velorite"))),
])),
second_tool: None,
loadout_asset: None,
skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"),
skillset_asset: None,
)

6
assets/common/entity/dungeon/tier-5/warlord.ron
View File

@ -5,11 +5,11 @@ EntityConfig (
loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
main_tool: Some(Choice([
(1.5, Some(Item("common.items.weapons.sword.bipedlarge-cultist"))),
(1.0, Some(Item("common.items.weapons.hammer.bipedlarge-cultist_purp_2h-0"))),
(1.5, Some(Item("common.items.npc_weapons.sword.bipedlarge-cultist"))),
(1.0, Some(Item("common.items.npc_weapons.hammer.bipedlarge-cultist"))),
])),
second_tool: None,
loadout_asset: None,
skillset_asset: Some("common.skillset.dungeon.tier-5.warlord"),
skillset_asset: None,
)

2
assets/common/items/weapons/bow/bipedlarge-velorite.ron → assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Velorite Bow (bipedlarge)",
name: "Giant Velorite Bow",
description: "Infused with Velorite power.",
kind: Tool((
kind: Bow,

2
assets/common/items/weapons/hammer/bipedlarge-cultist_purp_2h-0.ron → assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Magical Cultist Warhammer (bipedlarge)",
name: "Giant Cultist Warhammer",
description: "This belonged to an evil Cult Leader.",
kind: Tool((
kind: Hammer,

2
assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron → assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Cultist Staff (bipedlarge)",
name: "Giant Cultist Staff",
description: "The fire gives off no heat.",
kind: Tool((
kind: Staff,

2
assets/common/items/weapons/sword/bipedlarge-cultist.ron → assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Magical Cultist Greatsword (bipedlarge)",
name: "Giant Cultist Greatsword",
description: "This belonged to an evil Cult Leader.",
kind: Tool((
kind: Sword,

13
assets/common/skillset/dungeon/tier-5/sword_simple.ron
View File

@ -1,13 +0,0 @@
([
Group(Weapon(Sword)),
// TripleStrike
Skill((Sword(TsCombo), None)),
Skill((Sword(TsDamage), Some(1))),
Skill((Sword(TsRegen), Some(1))),
// Dash
Skill((Sword(DDamage), Some(1))),
Skill((Sword(DCost), Some(1))),
Skill((Sword(DDrain), Some(1))),
])

5
assets/common/skillset/dungeon/tier-5/warlord.ron
View File

@ -1,5 +0,0 @@
([
// Just gather everything
Tree("common.skillset.dungeon.tier-5.sword_simple"),
Tree("common.skillset.dungeon.tier-5.hammer"),
])

8
assets/voxygen/voxel/biped_weapon_manifest.ron
View File

@ -1074,19 +1074,19 @@
vox_spec: ("weapon.hammer.2hhammer_oni_red", (-3.0, -4.5, -12.0)),
color: None
),
"common.items.weapons.sword.bipedlarge-cultist": (
"common.items.npc_weapons.sword.bipedlarge-cultist": (
vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
color: None
),
"common.items.weapons.hammer.bipedlarge-cultist_purp_2h-0": (
"common.items.npc_weapons.hammer.bipedlarge-cultist": (
vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)),
color: None
),
"common.items.weapons.bow.bipedlarge-velorite": (
"common.items.npc_weapons.bow.bipedlarge-velorite": (
vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
color: None
),
"common.items.weapons.staff.bipedlarge-cultist_staff": (
"common.items.npc_weapons.staff.bipedlarge-cultist": (
vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
color: None
),

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

@ -302,10 +302,10 @@ fn default_main_tool(body: &Body) -> Item {
"common.items.npc_weapons.hammer.oni_red_hammer",
)),
(biped_large::Species::Cultistwarlord, _) => Some(Item::new_from_asset_expect(
"common.items.weapons.sword.bipedlarge-cultist",
"common.items.npc_weapons.sword.bipedlarge-cultist",
)),
(biped_large::Species::Cultistwarlock, _) => Some(Item::new_from_asset_expect(
"common.items.weapons.staff.bipedlarge-cultist_staff",
"common.items.npc_weapons.staff.bipedlarge-cultist",
)),
(biped_large::Species::Huskbrute, _) => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.husk_brute",