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

Merge branch 'sam/fix-assets-update' into 'master'

Browse Source 
Fix merge of assets update branch

See merge request veloren/veloren!1500
This commit is contained in:
Samuel Keiffer 2020-11-10 23:10:36 +00:00
commit c087b74a8d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/weapons/dagger/basic_0.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Opens letters quickly.", description: "Opens letters quickly.",
kind: Tool( kind: Tool(
( (
kind: Dagger("BasicDagger0"), kind: Dagger,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 1.80 power: 1.80

2
assets/common/items/weapons/dagger/cultist_0.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.", description: "This belonged to an evil Cult Leader.",
kind: Tool( kind: Tool(
( (
kind: Dagger("CultDagger0"), kind: Dagger,
stats: ( stats: (
equip_time_millis: 0, equip_time_millis: 0,
power: 2.00 power: 2.00

2
assets/common/items/weapons/sword/frost_cleaver_2h-0.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Radiates a freezing aura.", description: "Radiates a freezing aura.",
kind: Tool( kind: Tool(
( (
kind: Sword("FrostCleaver0"), kind: Sword,
stats: ( stats: (
equip_time_millis: 500, equip_time_millis: 500,
power: 1.70), power: 1.70),

2
assets/common/items/weapons/sword/frost_cleaver_2h-1.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Forged from a single piece\nof eternal ice.", description: "Forged from a single piece\nof eternal ice.",
kind: Tool( kind: Tool(
( (
kind: Sword("FrostCleaver1"), kind: Sword,
stats: ( stats: (
equip_time_millis: 500, equip_time_millis: 500,
power: 1.95), power: 1.95),