From 91bb6392bbb9b514cc17f95fc9f5a46c291ab1de Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 29 Apr 2021 13:18:04 -0400 Subject: [PATCH 1/2] Removed old 2h variants of 1h weapons. --- .../items/weapons/axe/worn_iron_axe-0.ron | 18 ---------- .../items/weapons/axe/worn_iron_axe-1.ron | 18 ---------- .../items/weapons/axe/worn_iron_axe-2.ron | 18 ---------- .../items/weapons/axe/worn_iron_axe-3.ron | 18 ---------- .../items/weapons/axe/worn_iron_axe-4.ron | 18 ---------- .../weapons/hammer/worn_iron_hammer-0.ron | 18 ---------- .../weapons/hammer/worn_iron_hammer-1.ron | 18 ---------- .../weapons/hammer/worn_iron_hammer-2.ron | 18 ---------- .../weapons/hammer/worn_iron_hammer-3.ron | 18 ---------- assets/common/loot_tables/villager.ron | 3 +- .../common/loot_tables/weapons/axe/stone.ron | 5 +++ .../common/loot_tables/weapons/axe/wood.ron | 5 +++ .../loot_tables/weapons/axe/worn-iron.ron | 7 ---- .../loot_tables/weapons/hammer/wood.ron | 8 +++++ .../loot_tables/weapons/hammer/worn-iron.ron | 6 ---- assets/common/loot_tables/weapons/tier-0.ron | 4 +-- assets/voxygen/item_image_manifest.ron | 36 ------------------- .../voxygen/voxel/biped_weapon_manifest.ron | 36 ------------------- .../voxel/weapon/axe/2haxe_worn_iron-0.vox | 3 -- .../voxel/weapon/axe/2haxe_worn_iron-1.vox | 3 -- .../voxel/weapon/axe/2haxe_worn_iron-2.vox | 3 -- .../voxel/weapon/axe/2haxe_worn_iron-3.vox | 3 -- .../voxel/weapon/axe/2haxe_worn_iron-4.vox | 3 -- .../voxygen/voxel/weapon/axe_1h/steel-0.vox | 4 +-- .../weapon/hammer/2hhammer_worn_iron-0.vox | 3 -- .../weapon/hammer/2hhammer_worn_iron-1.vox | 3 -- .../weapon/hammer/2hhammer_worn_iron-2.vox | 3 -- .../weapon/hammer/2hhammer_worn_iron-3.vox | 3 -- assets/voxygen/voxel/weapon/hammer/orc-0.vox | 3 -- .../src/migrations/V36__deduplicate_items.sql | 19 ++++++++++ 30 files changed, 43 insertions(+), 282 deletions(-) delete mode 100644 assets/common/items/weapons/axe/worn_iron_axe-0.ron delete mode 100644 assets/common/items/weapons/axe/worn_iron_axe-1.ron delete mode 100644 assets/common/items/weapons/axe/worn_iron_axe-2.ron delete mode 100644 assets/common/items/weapons/axe/worn_iron_axe-3.ron delete mode 100644 assets/common/items/weapons/axe/worn_iron_axe-4.ron delete mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-0.ron delete mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-1.ron delete mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-2.ron delete mode 100644 assets/common/items/weapons/hammer/worn_iron_hammer-3.ron create mode 100644 assets/common/loot_tables/weapons/axe/stone.ron create mode 100644 assets/common/loot_tables/weapons/axe/wood.ron delete mode 100644 assets/common/loot_tables/weapons/axe/worn-iron.ron create mode 100644 assets/common/loot_tables/weapons/hammer/wood.ron delete mode 100644 assets/common/loot_tables/weapons/hammer/worn-iron.ron delete mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox delete mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-1.vox delete mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-2.vox delete mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox delete mode 100644 assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-4.vox delete mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox delete mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox delete mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox delete mode 100644 assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox delete mode 100644 assets/voxygen/voxel/weapon/hammer/orc-0.vox create mode 100644 server/src/migrations/V36__deduplicate_items.sql diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron deleted file mode 100644 index d4593edfa5..0000000000 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron deleted file mode 100644 index cfcaea5f71..0000000000 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron deleted file mode 100644 index cc5445afde..0000000000 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron deleted file mode 100644 index 8b40e8a433..0000000000 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron deleted file mode 100644 index 0f338770d7..0000000000 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron deleted file mode 100644 index 4553141be5..0000000000 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron deleted file mode 100644 index 5f35938485..0000000000 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron deleted file mode 100644 index 2de0f6ee55..0000000000 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron deleted file mode 100644 index 7ca2bce88a..0000000000 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/loot_tables/villager.ron b/assets/common/loot_tables/villager.ron index 844c780773..a97dc022f4 100644 --- a/assets/common/loot_tables/villager.ron +++ b/assets/common/loot_tables/villager.ron @@ -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")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/axe/stone.ron b/assets/common/loot_tables/weapons/axe/stone.ron new file mode 100644 index 0000000000..a0689980f5 --- /dev/null +++ b/assets/common/loot_tables/weapons/axe/stone.ron @@ -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")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/axe/wood.ron b/assets/common/loot_tables/weapons/axe/wood.ron new file mode 100644 index 0000000000..44c8b0a9ff --- /dev/null +++ b/assets/common/loot_tables/weapons/axe/wood.ron @@ -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")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/axe/worn-iron.ron b/assets/common/loot_tables/weapons/axe/worn-iron.ron deleted file mode 100644 index ca15454aac..0000000000 --- a/assets/common/loot_tables/weapons/axe/worn-iron.ron +++ /dev/null @@ -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")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/hammer/wood.ron b/assets/common/loot_tables/weapons/hammer/wood.ron new file mode 100644 index 0000000000..749bf84c53 --- /dev/null +++ b/assets/common/loot_tables/weapons/hammer/wood.ron @@ -0,0 +1,8 @@ +[ + //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")), +] +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/hammer/worn-iron.ron b/assets/common/loot_tables/weapons/hammer/worn-iron.ron deleted file mode 100644 index 66e28f07ab..0000000000 --- a/assets/common/loot_tables/weapons/hammer/worn-iron.ron +++ /dev/null @@ -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")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/tier-0.ron b/assets/common/loot_tables/weapons/tier-0.ron index 8e721ef96d..3b7fa94426 100644 --- a/assets/common/loot_tables/weapons/tier-0.ron +++ b/assets/common/loot_tables/weapons/tier-0.ron @@ -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")), ] \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 94c348a731..ec18da9f45 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -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, diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 27f5b7c0ca..ae60874a09 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox deleted file mode 100644 index febcb11050..0000000000 --- a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53159b66a67f5b6cd6f4650ba69e30c4ac49c6d8af0d1e7bfb647866a2b1e3ec -size 27643 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-1.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-1.vox deleted file mode 100644 index 278e7ed0b9..0000000000 --- a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36e274c626a6ef45e43b6df56300491c5d827fd47a5e04896afd9d7b0b210427 -size 27599 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-2.vox deleted file mode 100644 index 50efd7c681..0000000000 --- a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b501cf5dd7c137fe01fa9a957195a6c02cdd2fbf499f97d7a6526d2cce1a2479 -size 27603 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox deleted file mode 100644 index 7b3777576f..0000000000 --- a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76d86dd874db42726bcadb5f14aac4cfc1bf5baf4b2a24f3b258db514da1f448 -size 27663 diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-4.vox b/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-4.vox deleted file mode 100644 index e9734c04ce..0000000000 --- a/assets/voxygen/voxel/weapon/axe/2haxe_worn_iron-4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04e6c1395118a83c43394dc6d3374d439ebfe74d28e7c0cc7db8583c12ac21db -size 56116 diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox index a22f1c4779..a4741b2655 100644 --- a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox +++ b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd808ffc62e36a7de94a3d7d5a31d4c12a1a1f890c056ac400d0981a1bc32bd1 -size 1880 +oid sha256:e7448f39faf1dd18a55cbe630f1a60a39b2f00c78f61c96c2358c5933138c48b +size 1456 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox deleted file mode 100644 index 89751968ab..0000000000 --- a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df22d293c048fdf992fda94bebc209ab2906e084328edd89d23dfbd061587d12 -size 27867 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox deleted file mode 100644 index ec89f4832a..0000000000 --- a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9d60c1042c4ae220566b0d4b886c695f95282ccdf7cb246fa9561a4ab85bede -size 28023 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox deleted file mode 100644 index bba8fd9594..0000000000 --- a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:075a09c318b305b8b980e1771916d84dbcf3bbc5ba7992b848f4963a17471ccf -size 27731 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox deleted file mode 100644 index de5b65dbc8..0000000000 --- a/assets/voxygen/voxel/weapon/hammer/2hhammer_worn_iron-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c3c88356a634afbd8ca62db501877749c86e3520dfb03110c2fdeceddfb9657 -size 28155 diff --git a/assets/voxygen/voxel/weapon/hammer/orc-0.vox b/assets/voxygen/voxel/weapon/hammer/orc-0.vox deleted file mode 100644 index f03ca4f4be..0000000000 --- a/assets/voxygen/voxel/weapon/hammer/orc-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ed85da5c6bdfb732f8668289abe16b91af608d128599e7471050800390c3c84 -size 1968 diff --git a/server/src/migrations/V36__deduplicate_items.sql b/server/src/migrations/V36__deduplicate_items.sql new file mode 100644 index 0000000000..f3e0c6f244 --- /dev/null +++ b/server/src/migrations/V36__deduplicate_items.sql @@ -0,0 +1,19 @@ +-- 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'; From 7870109856099367874a890cbf9aee2ed4bac512 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 29 Apr 2021 14:03:22 -0400 Subject: [PATCH 2/2] Deduplicated stuff in npc_armor. --- .../common/items/npc_armor/back/backpack.ron | 15 ------- .../items/npc_armor/back/dungeon_purple.ron | 15 ------- .../items/npc_armor/belt/cultist_belt.ron | 15 ------- .../npc_armor/chest/cultist_chest_purple.ron | 15 ------- assets/common/items/npc_armor/chest/plate.ron | 15 ------- .../items/npc_armor/chest/worker_green_0.ron | 15 ------- .../items/npc_armor/chest/worker_green_1.ron | 15 ------- .../items/npc_armor/chest/worker_orange_0.ron | 15 ------- .../items/npc_armor/chest/worker_orange_1.ron | 15 ------- .../items/npc_armor/chest/worker_purple_0.ron | 15 ------- .../items/npc_armor/chest/worker_purple_1.ron | 15 ------- .../items/npc_armor/chest/worker_red_0.ron | 15 ------- .../items/npc_armor/chest/worker_red_1.ron | 15 ------- .../items/npc_armor/chest/worker_yellow_0.ron | 15 ------- .../items/npc_armor/chest/worker_yellow_1.ron | 15 ------- .../items/npc_armor/foot/cultist_boots.ron | 15 ------- .../npc_armor/hand/cultist_hands_purple.ron | 15 ------- .../npc_armor/pants/cultist_legs_purple.ron | 15 ------- assets/common/items/npc_armor/pants/plate.ron | 15 ------- .../shoulder/cultist_shoulder_purple.ron | 15 ------- .../loot_tables/weapons/hammer/wood.ron | 1 - .../src/migrations/V36__deduplicate_items.sql | 41 +++++++++++++++++++ server/src/rtsim/entity.rs | 2 +- 23 files changed, 42 insertions(+), 302 deletions(-) delete mode 100644 assets/common/items/npc_armor/back/backpack.ron delete mode 100644 assets/common/items/npc_armor/back/dungeon_purple.ron delete mode 100644 assets/common/items/npc_armor/belt/cultist_belt.ron delete mode 100644 assets/common/items/npc_armor/chest/cultist_chest_purple.ron delete mode 100644 assets/common/items/npc_armor/chest/plate.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_green_0.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_green_1.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_orange_0.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_orange_1.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_purple_0.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_purple_1.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_red_0.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_red_1.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_yellow_0.ron delete mode 100644 assets/common/items/npc_armor/chest/worker_yellow_1.ron delete mode 100644 assets/common/items/npc_armor/foot/cultist_boots.ron delete mode 100644 assets/common/items/npc_armor/hand/cultist_hands_purple.ron delete mode 100644 assets/common/items/npc_armor/pants/cultist_legs_purple.ron delete mode 100644 assets/common/items/npc_armor/pants/plate.ron delete mode 100644 assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron diff --git a/assets/common/items/npc_armor/back/backpack.ron b/assets/common/items/npc_armor/back/backpack.ron deleted file mode 100644 index d08bdaddd6..0000000000 --- a/assets/common/items/npc_armor/back/backpack.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/back/dungeon_purple.ron b/assets/common/items/npc_armor/back/dungeon_purple.ron deleted file mode 100644 index c95589191f..0000000000 --- a/assets/common/items/npc_armor/back/dungeon_purple.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/belt/cultist_belt.ron b/assets/common/items/npc_armor/belt/cultist_belt.ron deleted file mode 100644 index 7b0abda30c..0000000000 --- a/assets/common/items/npc_armor/belt/cultist_belt.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/cultist_chest_purple.ron b/assets/common/items/npc_armor/chest/cultist_chest_purple.ron deleted file mode 100644 index 095159e682..0000000000 --- a/assets/common/items/npc_armor/chest/cultist_chest_purple.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/plate.ron b/assets/common/items/npc_armor/chest/plate.ron deleted file mode 100644 index f09d6ae8de..0000000000 --- a/assets/common/items/npc_armor/chest/plate.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_green_0.ron b/assets/common/items/npc_armor/chest/worker_green_0.ron deleted file mode 100644 index 33ba7a86f9..0000000000 --- a/assets/common/items/npc_armor/chest/worker_green_0.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_green_1.ron b/assets/common/items/npc_armor/chest/worker_green_1.ron deleted file mode 100644 index 697772c95f..0000000000 --- a/assets/common/items/npc_armor/chest/worker_green_1.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_orange_0.ron b/assets/common/items/npc_armor/chest/worker_orange_0.ron deleted file mode 100644 index d54dca7450..0000000000 --- a/assets/common/items/npc_armor/chest/worker_orange_0.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_orange_1.ron b/assets/common/items/npc_armor/chest/worker_orange_1.ron deleted file mode 100644 index a92f7c59a3..0000000000 --- a/assets/common/items/npc_armor/chest/worker_orange_1.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_purple_0.ron b/assets/common/items/npc_armor/chest/worker_purple_0.ron deleted file mode 100644 index 0e332ada54..0000000000 --- a/assets/common/items/npc_armor/chest/worker_purple_0.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_purple_1.ron b/assets/common/items/npc_armor/chest/worker_purple_1.ron deleted file mode 100644 index feeea0613e..0000000000 --- a/assets/common/items/npc_armor/chest/worker_purple_1.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_red_0.ron b/assets/common/items/npc_armor/chest/worker_red_0.ron deleted file mode 100644 index c5dc3d5019..0000000000 --- a/assets/common/items/npc_armor/chest/worker_red_0.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_red_1.ron b/assets/common/items/npc_armor/chest/worker_red_1.ron deleted file mode 100644 index 9eac995464..0000000000 --- a/assets/common/items/npc_armor/chest/worker_red_1.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_yellow_0.ron b/assets/common/items/npc_armor/chest/worker_yellow_0.ron deleted file mode 100644 index 121af29b35..0000000000 --- a/assets/common/items/npc_armor/chest/worker_yellow_0.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/chest/worker_yellow_1.ron b/assets/common/items/npc_armor/chest/worker_yellow_1.ron deleted file mode 100644 index 561d85f4d5..0000000000 --- a/assets/common/items/npc_armor/chest/worker_yellow_1.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/foot/cultist_boots.ron b/assets/common/items/npc_armor/foot/cultist_boots.ron deleted file mode 100644 index a61d5adf16..0000000000 --- a/assets/common/items/npc_armor/foot/cultist_boots.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/hand/cultist_hands_purple.ron b/assets/common/items/npc_armor/hand/cultist_hands_purple.ron deleted file mode 100644 index dfa37f71bf..0000000000 --- a/assets/common/items/npc_armor/hand/cultist_hands_purple.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/pants/cultist_legs_purple.ron b/assets/common/items/npc_armor/pants/cultist_legs_purple.ron deleted file mode 100644 index 3fe3eea349..0000000000 --- a/assets/common/items/npc_armor/pants/cultist_legs_purple.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/pants/plate.ron b/assets/common/items/npc_armor/pants/plate.ron deleted file mode 100644 index cdad145aba..0000000000 --- a/assets/common/items/npc_armor/pants/plate.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron deleted file mode 100644 index ccff4f1e5b..0000000000 --- a/assets/common/items/npc_armor/shoulder/cultist_shoulder_purple.ron +++ /dev/null @@ -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: [], -) diff --git a/assets/common/loot_tables/weapons/hammer/wood.ron b/assets/common/loot_tables/weapons/hammer/wood.ron index 749bf84c53..aaf5ae10b9 100644 --- a/assets/common/loot_tables/weapons/hammer/wood.ron +++ b/assets/common/loot_tables/weapons/hammer/wood.ron @@ -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")), -] ] \ No newline at end of file diff --git a/server/src/migrations/V36__deduplicate_items.sql b/server/src/migrations/V36__deduplicate_items.sql index f3e0c6f244..ad2d489f75 100644 --- a/server/src/migrations/V36__deduplicate_items.sql +++ b/server/src/migrations/V36__deduplicate_items.sql @@ -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'; \ No newline at end of file diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index f01813c6db..1e299d62c5 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -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",