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

Fixes leather sets

Browse Source
This commit is contained in:
Snowram 2021-03-02 18:37:26 +01:00
parent c74cdaeb65
commit 2b7b9f887b
13 changed files with 25 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/common/items/armor/leather/belt.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Leather Belt",
description: "A belt made from simple leather.",
kind: Armor((
kind: Belt("Leather"),
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)),
quality: Common,
tags: [],
)

13
assets/common/items/armor/leather/chest.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Leather Cuirass",
description: "A cuirass made of simple leather.",
kind: Armor((
kind: Chest("Leather"),
stats: (
protection: Normal(10.0),
poise_resilience: Normal(8.0),
),
)),
quality: Moderate,
tags: [],
)

13
assets/common/items/armor/leather/foot.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Leather Boots",
description: "Boots made of simple leather.",
kind: Armor((
kind: Foot("Leather"),
stats: (
protection: Normal(2.0),
poise_resilience: Normal(3.0),
),
)),
quality: Common,
tags: [],
)

13
assets/common/items/armor/leather/hand.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Leather Gloves",
description: "Gloves made of simple leather.",
kind: Armor((
kind: Hand("Leather"),
stats: (
protection: Normal(4.0),
poise_resilience: Normal(5.0),
),
)),
quality: Common,
tags: [],
)

13
assets/common/items/armor/leather/pants.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Leather Leg Armour",
description: "Leg armour made of simple leather.",
kind: Armor((
kind: Pants("Leather"),
stats: (
protection: Normal(8.0),
poise_resilience: Normal(4.0),
),
)),
quality: Common,
tags: [],
)

13
assets/common/items/armor/leather/shoulder.ron
View File

@ -1,13 +0,0 @@
ItemDef(
name: "Leather Shoulder Pad",
description: "A simple shoulder pad made of leather.",
kind: Armor((
kind: Shoulder("Leather"),
stats: (
protection: Normal(6.0),
poise_resilience: Normal(2.0),
),
)),
quality: Common,
tags: [],
)

12
assets/common/loot_tables/loot_table_armor_light.ron
View File

@ -1,21 +1,21 @@
[
// belts
(0.50, "common.items.armor.swift.belt"),
(0.50, "common.items.armor.leather.belt"),
(0.50, "common.items.armor.agile.belt"),
// chests
(0.50, "common.items.armor.swift.chest"),
(0.50, "common.items.armor.leather.chest"),
(0.50, "common.items.armor.agile.chest"),
// shoes
(0.50, "common.items.armor.swift.foot"),
(0.50, "common.items.armor.leather.foot"),
(0.50, "common.items.armor.agile.foot"),
// pants
(0.33, "common.items.armor.swift.pants"),
(0.33, "common.items.armor.leather.pants"),
(0.33, "common.items.armor.agile.pants"),
(0.33, "common.items.armor.misc.pants.hunting"),
// shoulders
(0.10, "common.items.armor.misc.shoulder.leather_strip"),
(0.20, "common.items.armor.swift.shoulder"),
(0.20, "common.items.armor.leather.shoulder"),
(0.20, "common.items.armor.agile.shoulder"),
(0.20, "common.items.armor.agile.shoulder"),
(0.07, "common.items.armor.misc.shoulder.leather_iron_0"),
(0.07, "common.items.armor.misc.shoulder.leather_iron_1"),
@ -23,5 +23,5 @@
(0.07, "common.items.armor.misc.shoulder.leather_iron_3"),
//gloves
(0.50, "common.items.armor.swift.hand"),
(0.50, "common.items.armor.leather.hand"),
(0.50, "common.items.armor.agile.hand"),
]

12
assets/common/loot_tables/loot_table_cultists.ron
View File

@ -42,21 +42,21 @@
//Light Armour
// belts
(0.50, "common.items.armor.swift.belt"),
(0.50, "common.items.armor.leather.belt"),
(0.50, "common.items.armor.agile.belt"),
// chests
(0.50, "common.items.armor.swift.chest"),
(0.50, "common.items.armor.leather.chest"),
(0.50, "common.items.armor.agile.chest"),
// shoes
(0.50, "common.items.armor.swift.foot"),
(0.50, "common.items.armor.leather.foot"),
(0.50, "common.items.armor.agile.foot"),
// pants
(0.33, "common.items.armor.swift.pants"),
(0.33, "common.items.armor.leather.pants"),
(0.33, "common.items.armor.agile.pants"),
(0.33, "common.items.armor.misc.pants.hunting"),
// shoulders
(0.6, "common.items.armor.misc.shoulder.leather_strip"),
(0.4, "common.items.armor.swift.shoulder"),
(0.4, "common.items.armor.leather.shoulder"),
(0.4, "common.items.armor.agile.shoulder"),
(0.4, "common.items.armor.misc.shoulder.leather_3"),
(0.3, "common.items.armor.misc.shoulder.leather_iron_0"),
(0.3, "common.items.armor.misc.shoulder.leather_iron_1"),
@ -64,7 +64,7 @@
(0.3, "common.items.armor.misc.shoulder.leather_iron_3"),
//gloves
(0.50, "common.items.armor.swift.hand"),
(0.50, "common.items.armor.leather.hand"),
(0.50, "common.items.armor.agile.hand"),
//backpack
(0.001, "common.items.armor.misc.back.backpack"),
(0.1, "common.items.armor.misc.bag.heavy_seabag"),

5
assets/voxygen/item_image_manifest.ron
View File

@ -1257,11 +1257,6 @@
"voxel.armor.swift.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Leather Armor
Armor(Shoulder("Leather")): VoxTrans(
"voxel.armor.leather.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Agile Armor
Armor(Chest("Agile")): VoxTrans(
"voxel.armor.agile.chest",

BIN
assets/voxygen/voxel/armor/leather/shoulder.vox (Stored with Git LFS)
View File

Binary file not shown.

10
assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
View File

@ -61,16 +61,6 @@
color: None
)
),
"Leather": (
left: (
vox_spec: ("armor.leather.shoulder", (-3.6, -4.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.leather.shoulder", (-2.6, -4.5, 0.0)),
color: None
)
),
"ClothPurple": (
left: (
vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)),

1
server/src/migrations/2021-03-02-182544_fix_leather_set/down.sql Normal file
View File

@ -0,0 +1 @@
-- This file should undo anything in `up.sql`

12
server/src/migrations/2021-03-02-182544_fix_leather_set/up.sql Normal file
View File

@ -0,0 +1,12 @@
UPDATE item
SET item_definition_id = 'common.items.armor.agile.belt' WHERE item_definition_id = 'common.items.armor.leather.belt';
UPDATE item
SET item_definition_id = 'common.items.armor.agile.chest' WHERE item_definition_id = 'common.items.armor.leather.chest';
UPDATE item
SET item_definition_id = 'common.items.armor.agile.foot' WHERE item_definition_id = 'common.items.armor.leather.foot';
UPDATE item
SET item_definition_id = 'common.items.armor.agile.hand' WHERE item_definition_id = 'common.items.armor.leather.hand';
UPDATE item
SET item_definition_id = 'common.items.armor.agile.pants' WHERE item_definition_id = 'common.items.armor.leather.pants';
UPDATE item
SET item_definition_id = 'common.items.armor.agile.shoulder' WHERE item_definition_id = 'common.items.armor.leather.shoulder';