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/deduplicate-items' into 'master'

Browse Source 
Sam/deduplicate items

See merge request veloren/veloren!2225
This commit is contained in:
Samuel Keiffer 2021-04-29 20:11:43 +00:00
commit 4f5f15979a
51 changed files with 84 additions and 583 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: [],
)

18
assets/common/items/weapons/axe/worn_iron_axe-0.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Dwarven Axe",
description: "Rough cut axe of dwarven origin, it's very old, but still usable.",
kind: Tool((
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.4,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0703125,
crit_mult: 2.015873,
)),
)),
quality: Low,
tags: [],
)

18
assets/common/items/weapons/axe/worn_iron_axe-1.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Elven Axe",
description: "Light elven axe, scratched from eons of use. Still usable in some manner.",
kind: Tool((
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.4,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0703125,
crit_mult: 2.015873,
)),
)),
quality: Low,
tags: [],
)

18
assets/common/items/weapons/axe/worn_iron_axe-2.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Human Axe",
description: "There's nothing too remarkable about this old axe.",
kind: Tool((
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.4,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0703125,
crit_mult: 2.015873,
)),
)),
quality: Low,
tags: [],
)

18
assets/common/items/weapons/axe/worn_iron_axe-3.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Orcish Axe",
description: "Rough cut iron makes it hard to tell that this axe is even used, other than how old it feels.",
kind: Tool((
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.4,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0703125,
crit_mult: 2.015873,
)),
)),
quality: Low,
tags: [],
)

18
assets/common/items/weapons/axe/worn_iron_axe-4.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Beetle Axe",
description: "An axe formed with the intent of making the blade seem like a beetle. With how brittle it has gotten over the years, one would be mistaken in thinking it was made from beetle shell.",
kind: Tool((
kind: Axe,
hands: Two,
stats: Direct((
equip_time_secs: 0.4,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0703125,
crit_mult: 2.015873,
)),
)),
quality: Low,
tags: [],
)

18
assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Dwarven Hammer",
description: "While the dwarves excel at rough hewn weapons, this one has seen its fair share of battles, might still serve well enough for a few more.",
kind: Tool((
kind: Hammer,
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12242647,
crit_mult: 1.6864007,
)),
)),
quality: Common,
tags: [],
)

18
assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Elven Hammer",
description: "Elven hammers are lighter than most. This one has seen its fair share of wear and tear.",
kind: Tool((
kind: Hammer,
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.9,
poise_strength: 1.0,
speed: 0.9,
crit_chance: 0.12242647,
crit_mult: 1.6864007,
)),
)),
quality: Common,
tags: [],
)

18
assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Human Mace",
description: "An unremarkable mace, that has seen a lot of use.",
kind: Tool((
kind: Hammer,
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.7,
poise_strength: 1.0,
speed: 1.1,
crit_chance: 0.12242647,
crit_mult: 1.6864007,
)),
)),
quality: Common,
tags: [],
)

18
assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
View File

@ -1,18 +0,0 @@
ItemDef(
name: "Worn Orcish Hammer",
description: "A heavy orc crafted hammer, missing chunks from heavy use.",
kind: Tool((
kind: Hammer,
hands: Two,
stats: Direct((
equip_time_secs: 0.5,
power: 0.8,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12242647,
crit_mult: 1.6864007,
)),
)),
quality: Common,
tags: [],
)

3
assets/common/loot_tables/villager.ron
View File

@ -12,7 +12,8 @@
(0.25, LootTable("common.loot_tables.food.prepared")),
// Weapons
(0.5, LootTable("common.loot_tables.weapons.sword.wood")),
(0.5, LootTable("common.loot_tables.weapons.hammer.stone")),
(0.5, LootTable("common.loot_tables.weapons.axe.wood")),
(0.5, LootTable("common.loot_tables.weapons.hammer.wood")),
(0.5, LootTable("common.loot_tables.weapons.bow.rawwood")),
(0.5, LootTable("common.loot_tables.weapons.starter")),
]

5
assets/common/loot_tables/weapons/axe/stone.ron Normal file
View File

@ -0,0 +1,5 @@
[
//1h
(1.0, Item("common.items.weapons.axe_1h.stone-0")),
(1.0, Item("common.items.weapons.axe_1h.stone-1")),
]

5
assets/common/loot_tables/weapons/axe/wood.ron Normal file
View File

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

7
assets/common/loot_tables/weapons/axe/worn-iron.ron
View File

@ -1,7 +0,0 @@
[
(1.0, Item("common.items.weapons.axe.worn_iron_axe-0")),
(1.0, Item("common.items.weapons.axe.worn_iron_axe-1")),
(1.0, Item("common.items.weapons.axe.worn_iron_axe-2")),
(1.0, Item("common.items.weapons.axe.worn_iron_axe-3")),
(1.0, Item("common.items.weapons.axe.worn_iron_axe-4")),
]

7
assets/common/loot_tables/weapons/hammer/wood.ron Normal file
View File

@ -0,0 +1,7 @@
[
//2h
(1.0, Item("common.items.weapons.hammer.wood_hammer-0")),
//1h
(1.0, Item("common.items.weapons.hammer_1h.wood-0")),
(1.0, Item("common.items.weapons.hammer_1h.wood-1")),
]

6
assets/common/loot_tables/weapons/hammer/worn-iron.ron
View File

@ -1,6 +0,0 @@
[
(1.0, Item("common.items.weapons.hammer.worn_iron_hammer-0")),
(1.0, Item("common.items.weapons.hammer.worn_iron_hammer-1")),
(1.0, Item("common.items.weapons.hammer.worn_iron_hammer-2")),
(1.0, Item("common.items.weapons.hammer.worn_iron_hammer-3")),
]

4
assets/common/loot_tables/weapons/tier-0.ron
View File

@ -1,7 +1,7 @@
[
(1.0, LootTable("common.loot_tables.weapons.sword.stone")),
(1.0, LootTable("common.loot_tables.weapons.axe.worn-iron")),
(1.0, LootTable("common.loot_tables.weapons.hammer.worn-iron")),
(1.0, LootTable("common.loot_tables.weapons.axe.stone")),
(1.0, LootTable("common.loot_tables.weapons.hammer.stone")),
(1.0, LootTable("common.loot_tables.weapons.bow.wood")),
(1.0, LootTable("common.loot_tables.weapons.staff.wood")),
]

36
assets/voxygen/item_image_manifest.ron
View File

@ -474,26 +474,6 @@
"voxel.weapon.axe.2haxe_orc-0",
(1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.13,
),
Tool("common.items.weapons.axe.worn_iron_axe-0"): VoxTrans(
"voxel.weapon.axe.2haxe_worn_iron-0",
(1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.axe.worn_iron_axe-1"): VoxTrans(
"voxel.weapon.axe.2haxe_worn_iron-1",
(1.0, 0.5, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.axe.worn_iron_axe-2"): VoxTrans(
"voxel.weapon.axe.2haxe_worn_iron-2",
(1.0, 0.8, 0.0), (-135.0, 90.0, 0.0), 1.15,
),
Tool("common.items.weapons.axe.worn_iron_axe-3"): VoxTrans(
"voxel.weapon.axe.2haxe_worn_iron-3",
(1.0, 0.5, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.axe.worn_iron_axe-4"): VoxTrans(
"voxel.weapon.axe.2haxe_worn_iron-4",
(1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
),
Tool("common.items.weapons.axe.bronze_axe-0"): VoxTrans(
"voxel.weapon.axe.2haxe_bronze-0",
(1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
@ -708,22 +688,6 @@
"voxel.weapon.hammer.2hhammer_stone-3",
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.hammer.worn_iron_hammer-0"): VoxTrans(
"voxel.weapon.hammer.2hhammer_worn_iron-0",
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.hammer.worn_iron_hammer-1"): VoxTrans(
"voxel.weapon.hammer.2hhammer_worn_iron-1",
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.hammer.worn_iron_hammer-2"): VoxTrans(
"voxel.weapon.hammer.2hhammer_worn_iron-2",
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.hammer.worn_iron_hammer-3"): VoxTrans(
"voxel.weapon.hammer.2hhammer_worn_iron-3",
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
),
Tool("common.items.weapons.hammer.bronze_hammer-0"): VoxTrans(
"voxel.weapon.hammer.2hhammer_bronze-0",
(2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,

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

@ -261,26 +261,6 @@
vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -6.0, -4.5)),
color: None
),
"common.items.weapons.axe.worn_iron_axe-0": (
vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.axe.worn_iron_axe-1": (
vox_spec: ("weapon.axe.2haxe_worn_iron-1", (-1.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.axe.worn_iron_axe-2": (
vox_spec: ("weapon.axe.2haxe_worn_iron-2", (-1.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.axe.worn_iron_axe-3": (
vox_spec: ("weapon.axe.2haxe_worn_iron-3", (-1.5, -8.0, -4.0)),//offcenterY
color: None
),
"common.items.weapons.axe.worn_iron_axe-4": (
vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -6.0, -5.5)),
color: None
),
"common.items.weapons.axe.bronze_axe-0": (
vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -7.0, -4.5)),
color: None
@ -499,22 +479,6 @@
vox_spec: ("weapon.hammer.2hhammer_stone-3", (-2.5, -6.5, -5.0)),
color: None
),
"common.items.weapons.hammer.worn_iron_hammer-0": (
vox_spec: ("weapon.hammer.2hhammer_worn_iron-0", (-2.5, -4.5, -4.0)),
color: None
),
"common.items.weapons.hammer.worn_iron_hammer-1": (
vox_spec: ("weapon.hammer.2hhammer_worn_iron-1", (-2.5, -4.5, -3.0)),
color: None
),
"common.items.weapons.hammer.worn_iron_hammer-2": (
vox_spec: ("weapon.hammer.2hhammer_worn_iron-2", (-2.5, -3.5, -3.0)),
color: None
),
"common.items.weapons.hammer.worn_iron_hammer-3": (
vox_spec: ("weapon.hammer.2hhammer_worn_iron-3", (-2.5, -4.5, -3.0)),
color: None
),
"common.items.weapons.hammer.bronze_hammer-0": (
vox_spec: ("weapon.hammer.2hhammer_bronze-0", (-2.5, -6.5, -5.0)),
color: None

BIN
assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-1.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-2.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-4.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/axe_1h/steel-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/hammer/orc-0.vox (Stored with Git LFS)
View File

Binary file not shown.

60
server/src/migrations/V36__deduplicate_items.sql Normal file
View File

@ -0,0 +1,60 @@
-- Replaces 2h weapons that were made into 1h versions
UPDATE item
SET item_definition_id = 'common.items.weapons.axe_1h.iron-3' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-0';
UPDATE item
SET item_definition_id = 'common.items.weapons.axe_1h.iron-0' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-1';
UPDATE item
SET item_definition_id = 'common.items.weapons.axe_1h.bronze-0' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-2';
UPDATE item
SET item_definition_id = 'common.items.weapons.axe_1h.steel-1' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-3';
UPDATE item
SET item_definition_id = 'common.items.weapons.axe_1h.iron-1' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-4';
UPDATE item
SET item_definition_id = 'common.items.weapons.hammer_1h.stone-1' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-0';
UPDATE item
SET item_definition_id = 'common.items.weapons.hammer_1h.iron-0' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-1';
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",