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

Deduplicated stuff in npc_armor.

Browse Source
This commit is contained in:
Sam 2021-04-29 14:03:22 -04:00
parent 91bb6392bb
commit 7870109856
23 changed files with 42 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/common/items/npc_armor/back/backpack.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Rugged Backpack",
description: "Keeps all your stuff together.",
kind: Armor(
(
kind: Back("Backpack"),
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),
quality: Moderate,
tags: [],
)

15
assets/common/items/npc_armor/back/dungeon_purple.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Cultist Cape",
description: "Smells like dark magic and candles.",
kind: Armor(
(
kind: Back("DungeonPurple"),
stats: (
protection: Normal(1.0),
poise_resilience: Normal(0.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/belt/cultist_belt.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Cultist Belt",
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Belt("Cultist"),
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/cultist_chest_purple.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Cultist Chest",
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Chest("Cultist"),
stats: (
protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/plate.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Iron Chestplate",
description: "A chestplate forged from iron.",
kind: Armor(
(
kind: Chest("Plate"),
stats: (
protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_green_0.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Green Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerGreen0"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_green_1.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Green Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerGreen1"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_orange_0.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Orange Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerOrange0"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_orange_1.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Orange Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerOrange1"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_purple_0.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerPurple0"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_purple_1.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerPurple1"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_red_0.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Red Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerRed0"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_red_1.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Red Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerRed1"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_yellow_0.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Yellow Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerYellow0"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/chest/worker_yellow_1.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Yellow Worker Shirt",
description: "Was used by a farmer, until recently.",
kind: Armor(
(
kind: Chest("WorkerYellow1"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(80.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/foot/cultist_boots.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Cultist Boots",
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Foot("Cultist"),
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/hand/cultist_hands_purple.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Cultist Gloves",
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Hand("Cultist"),
stats: (
protection: Normal(2.0),
poise_resilience: Normal(2.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/pants/cultist_legs_purple.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Cultist Skirt",
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Pants("Cultist"),
stats: (
protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/pants/plate.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Iron Legguards",
description: "Greaves forged from iron.",
kind: Armor(
(
kind: Pants("Plate"),
stats: (
protection: Normal(10.0),
poise_resilience: Normal(10.0),
),
)
),
quality: Low,
tags: [],
)

15
assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron
View File

@ -1,15 +0,0 @@
ItemDef(
name: "Purple Cultist Mantle",
description: "Ceremonial attire used by members.",
kind: Armor(
(
kind: Shoulder("Cultist"),
stats: (
protection: Normal(5.0),
poise_resilience: Normal(5.0),
),
)
),
quality: Low,
tags: [],
)

1
assets/common/loot_tables/weapons/hammer/wood.ron
View File

@ -4,5 +4,4 @@
//1h
(1.0, Item("common.items.weapons.hammer_1h.wood-0")),
(1.0, Item("common.items.weapons.hammer_1h.wood-1")),
]
]

41
server/src/migrations/V36__deduplicate_items.sql
View File

@ -17,3 +17,44 @@ UPDATE item
SET item_definition_id = 'common.items.weapons.hammer_1h.iron-1' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-2';
UPDATE item
SET item_definition_id = 'common.items.weapons.hammer_1h.bronze-0' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-3';
-- Deduplicates npc armor duplicates
UPDATE item
SET item_definition_id = 'common.items.armor.misc.back.backpack' WHERE item_definition_id = 'common.items.npc_armor.back.backpack';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.back.dungeon_purple' WHERE item_definition_id = 'common.items.npc_armor.back.dungeon_purple';
UPDATE item
SET item_definition_id = 'common.items.armor.cultist.belt' WHERE item_definition_id = 'common.items.npc_armor.belt.cultist_belt';
UPDATE item
SET item_definition_id = 'common.items.armor.cultist.chest' WHERE item_definition_id = 'common.items.npc_armor.chest.cultist_chest_purple';
UPDATE item
SET item_definition_id = 'common.items.armor.plate.chest' WHERE item_definition_id = 'common.items.npc_armor.chest.plate';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_green_0' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_green_0';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_green_1' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_green_1';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_orange_0' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_orange_0';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_orange_1' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_orange_1';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_purple_0' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_purple_0';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_purple_1' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_purple_1';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_red_0' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_red_0';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_red_1' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_red_1';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_yellow_0' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_yellow_0';
UPDATE item
SET item_definition_id = 'common.items.armor.misc.chest.worker_yellow_1' WHERE item_definition_id = 'common.items.npc_armor.chest.worker_yellow_1';
UPDATE item
SET item_definition_id = 'common.items.armor.cultist.foot' WHERE item_definition_id = 'common.items.npc_armor.foot.cultist_boots';
UPDATE item
SET item_definition_id = 'common.items.armor.cultist.hand' WHERE item_definition_id = 'common.items.npc_armor.hand.cultist_hands_purple';
UPDATE item
SET item_definition_id = 'common.items.armor.cultist.pants' WHERE item_definition_id = 'common.items.npc_armor.pants.cultist_legs_purple';
UPDATE item
SET item_definition_id = 'common.items.armor.plate.pants' WHERE item_definition_id = 'common.items.npc_armor.pants.plate';
UPDATE item
SET item_definition_id = 'common.items.armor.cultist.shoulder' WHERE item_definition_id = 'common.items.npc_armor.pants.cultist_shoulder_purple';

2
server/src/rtsim/entity.rs
View File

@ -94,7 +94,7 @@ impl Entity {
"common.items.armor.agile.back",
)),
1 => Some(comp::Item::new_from_asset_expect(
"common.items.npc_armor.back.backpack",
"common.items.armor.misc.back.backpack",
)),
2 => Some(comp::Item::new_from_asset_expect(
"common.items.npc_armor.back.backpack_blue",