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

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

View File

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

View File

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

View File

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

View File

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