Change names of items with the same vox descriptor

| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |

assets/common/item_i18n_manifest.ron

@@ -590,25 +590,25 @@
         ): "object-key_rusty-0",
         Simple(
             "common.items.keys.quarry_keys.ancient",
-        ): "object-key_rusty-0-ancient",
+        ): "object-key_quarry_ancient",
         Simple(
             "common.items.keys.quarry_keys.backdoor",
-        ): "object-key_rusty-0-backdoor",
+        ): "object-key_quarry_backdoor",
         Simple(
             "common.items.keys.quarry_keys.cyclops_eye",
-        ): "sprite-crafting_ing-animal_misc-grim_eyeball",
+        ): "sprite-crafting_ing-animal_misc-cyclops_eyeball",
         Simple(
             "common.items.keys.quarry_keys.flamekeeper_left",
-        ): "items-keeper_goggle",
+        ): "object-key_quarry_keeper_goggle_left",
         Simple(
             "common.items.keys.quarry_keys.flamekeeper_right",
-        ): "items-keeper_goggle-flamekeeper_right",
+        ): "object-key_quarry_keeper_goggle_right",
         Simple(
             "common.items.keys.quarry_keys.overseer",
-        ): "object-key_rusty-0-overseer",
+        ): "object-key_quarry_overseer",
         Simple(
             "common.items.keys.quarry_keys.smelting",
-        ): "object-key_rusty-0-smelting",
+        ): "object-key_quarry_smelting",
         Simple(
             "common.items.weapons.shield.shield_1",
         ): "weapon-shield-wood-0",
@@ -650,10 +650,10 @@
         ): "weapon-staff-laevateinn",
         Simple(
             "common.items.weapons.staff.staff_1",
-        ): "weapon-staff-firestaff_starter",
+        ): "weapon-staff-firestaff_humble_stick",
         Simple(
             "common.items.weapons.staff.starter_staff",
-        ): "weapon-staff-firestaff_starter-starter_staff",
+        ): "weapon-staff-firestaff_starter",
         Simple(
             "common.items.weapons.empty.empty",
         ): "common-items-weapons-empty-empty",
@@ -734,7 +734,7 @@
         ): "weapon-hammer-2hhammer_mjolnir",
         Simple(
             "common.items.weapons.hammer.starter_hammer",
-        ): "weapon-hammer-2hhammer_rusty-starter_hammer",
+        ): "weapon-hammer-2hhammer_starter",
         Simple(
             "common.items.armor.hide.carapace.back",
         ): "armor-hide-carapace-back",
@@ -1145,31 +1145,31 @@
         ): "armor-misc-chest-shirt_white",
         Simple(
             "common.items.armor.misc.chest.worker_orange_0",
-        ): "armor-misc-chest-worker_green-worker_orange_0",
+        ): "armor-misc-chest-worker_orange_0",
         Simple(
             "common.items.armor.misc.chest.worker_orange_1",
-        ): "armor-misc-chest-shirt_white-worker_orange_1",
+        ): "armor-misc-chest-worker_orange_1",
         Simple(
             "common.items.armor.misc.chest.worker_purple_0",
-        ): "armor-misc-chest-worker_green-worker_purple_0",
+        ): "armor-misc-chest-worker_purple_0",
         Simple(
             "common.items.armor.misc.chest.worker_purple_1",
-        ): "armor-misc-chest-shirt_white-worker_purple_1",
+        ): "armor-misc-chest-worker_purple_1",
         Simple(
             "common.items.armor.misc.chest.worker_purple_brown",
         ): "armor-misc-chest-worker_purp_brown",
         Simple(
             "common.items.armor.misc.chest.worker_red_0",
-        ): "armor-misc-chest-worker_green-worker_red_0",
+        ): "armor-misc-chest-worker_red_0",
         Simple(
             "common.items.armor.misc.chest.worker_red_1",
-        ): "armor-misc-chest-shirt_white-worker_red_1",
+        ): "armor-misc-chest-worker_red_1",
         Simple(
             "common.items.armor.misc.chest.worker_yellow_0",
-        ): "armor-misc-chest-worker_green-worker_yellow_0",
+        ): "armor-misc-chest-worker_yellow_0",
         Simple(
             "common.items.armor.misc.chest.worker_yellow_1",
-        ): "armor-misc-chest-shirt_white-worker_yellow_1",
+        ): "armor-misc-chest-worker_yellow_1",
         Simple(
             "common.items.armor.misc.ring.amethyst",
         ): "armor-misc-ring-amethyst",
@@ -1238,7 +1238,7 @@
         ): "armor-misc-back-admin",
         Simple(
             "common.items.armor.misc.back.backpack",
-        ): "armor-misc-back-backpack-backpack",
+        ): "armor-misc-back-backpack-traveler",
         Simple(
             "common.items.armor.misc.back.dungeon_purple",
         ): "armor-misc-back-dungeon_purple",
@@ -1874,10 +1874,10 @@
         ): "armor-ferocious-shoulder",
         Simple(
             "common.items.debug.admin",
-        ): "armor-tabard_admin-admin",
+        ): "armor-tabard-admin_tabard",
         Simple(
             "common.items.debug.admin_back",
-        ): "armor-misc-back-admin-admin_back",
+        ): "armor-misc-back-admin_back",
         Simple(
             "common.items.debug.admin_black_hole",
         ): "armor-misc-bag-admin_black_hole",
@@ -1886,34 +1886,34 @@
         ): "weapon-tool-broom_belzeshrub_purple",
         Simple(
             "common.items.debug.admin_sword",
-        ): "weapon-sword-frost-1-admin_sword",
+        ): "weapon-sword-frost-admin_sword",
         Simple(
             "common.items.debug.cultist_belt",
-        ): "armor-velorite_battlemage-belt-cultist_belt",
+        ): "armor-velorite-belt",
         Simple(
             "common.items.debug.cultist_boots",
-        ): "armor-velorite_battlemage-foot-cultist_boots",
+        ): "armor-velorite-boots",
         Simple(
             "common.items.debug.cultist_chest_blue",
-        ): "armor-velorite_battlemage-chest-cultist_chest_blue",
+        ): "armor-velorite-chest",
         Simple(
             "common.items.debug.cultist_hands_blue",
-        ): "armor-velorite_battlemage-hand-cultist_hands_blue",
+        ): "armor-velorite-hands",
         Simple(
             "common.items.debug.cultist_legs_blue",
-        ): "armor-velorite_battlemage-pants-cultist_legs_blue",
+        ): "armor-velorite-legs",
         Simple(
             "common.items.debug.cultist_shoulder_blue",
-        ): "armor-velorite_battlemage-shoulder-cultist_shoulder_blue",
+        ): "armor-velorite-shoulder",
         Simple(
             "common.items.debug.dungeon_purple",
-        ): "armor-velorite_battlemage-back-dungeon_purple",
+        ): "armor-velorite-back",
         Simple(
             "common.items.debug.golden_cheese",
         ): "object-item_cheese",
         Simple(
             "common.items.debug.velorite_bow_debug",
-        ): "weapon-bow-velorite-velorite_bow_debug",
+        ): "weapon-bow-velorite-debug",
         Simple(
             "common.items.utility.bomb",
         ): "object-bomb",
@@ -2080,7 +2080,7 @@
         ): "common-items-mineral-stone-basalt",
         Simple(
             "common.items.mineral.stone.coal",
-        ): "sprite-mineral-ore-coal",
+        ): "sprite-mineral-stone-coal",
         Simple(
             "common.items.mineral.stone.granite",
         ): "common-items-mineral-stone-granite",
@@ -2092,7 +2092,7 @@
         ): "sprite-mineral-ore-bloodstone",
         Simple(
             "common.items.mineral.ore.coal",
-        ): "sprite-mineral-ore-coal-coal",
+        ): "sprite-mineral-ore-coal",
         Simple(
             "common.items.mineral.ore.cobalt",
         ): "sprite-mineral-ore-cobalt",
@@ -2939,7 +2939,7 @@
         ): "sprite-crafting_ing-animal_misc-fur",
         Simple(
             "common.items.crafting_ing.animal_misc.grim_eyeball",
-        ): "sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball",
+        ): "sprite-crafting_ing-animal_misc-grim_eyeball",
         Simple(
             "common.items.crafting_ing.animal_misc.icy_fang",
         ): "object-ice_shard",
@@ -3017,16 +3017,16 @@
         ): "object-potion_agility",
         Simple(
             "common.items.consumable.potion_big",
-        ): "object-potion_red-potion_big",
+        ): "object-potion_big",
         Simple(
             "common.items.consumable.potion_combustion",
         ): "object-potion_combustion",
         Simple(
             "common.items.consumable.potion_med",
-        ): "object-potion_red-potion_med",
+        ): "object-potion_med",
         Simple(
             "common.items.consumable.potion_minor",
-        ): "object-potion_red-potion_minor",
+        ): "object-potion_minor",
         Simple(
             "common.items.lantern.black_0",
         ): "lantern-black-0",
@@ -3092,7 +3092,7 @@
         ): "sprite-flowers-flax",
         Simple(
             "common.items.flowers.yellow",
-        ): "sprite-flowers-sunflower_1-yellow",
+        ): "sprite-flowers-yellow",
         ModularWeaponComponent(
             (
                 "common.items.modular.weapon.primary.axe.labrys",

assets/voxygen/i18n/en/item/armor.ftl

@@ -414,31 +414,31 @@ armor-misc-chest-worker_green = Green Worker Shirt
 armor-misc-chest-shirt_white = Green Worker Shirt
     .desc = Was used by a farmer, until recently.
 
-armor-misc-chest-worker_green-worker_orange_0 = Orange Worker Shirt
+armor-misc-chest-worker_orange_0 = Orange Worker Shirt
     .desc = Was used by a farmer, until recently.
 
-armor-misc-chest-shirt_white-worker_orange_1 = Orange Worker Shirt
+armor-misc-chest-worker_orange_1 = Orange Worker Shirt
     .desc = Was used by a farmer, until recently.
 
-armor-misc-chest-worker_green-worker_purple_0 = Purple Worker Shirt
+armor-misc-chest-worker_purple_0 = Purple Worker Shirt
     .desc = Resilient and reliable.
 
-armor-misc-chest-shirt_white-worker_purple_1 = Purple Worker Shirt
+armor-misc-chest-worker_purple_1 = Purple Worker Shirt
     .desc = Was used by a farmer, until recently.
 
 armor-misc-chest-worker_purp_brown = Purple Worker Shirt
     .desc = Resilient and reliable.
 
-armor-misc-chest-worker_green-worker_red_0 = Red Worker Shirt
+armor-misc-chest-worker_red_0 = Red Worker Shirt
     .desc = Was used by a farmer, until recently.
 
-armor-misc-chest-shirt_white-worker_red_1 = Red Worker Shirt
+armor-misc-chest-worker_red_1 = Red Worker Shirt
     .desc = Was used by a farmer, until recently.
 
-armor-misc-chest-worker_green-worker_yellow_0 = Yellow Worker Shirt
+armor-misc-chest-worker_yellow_0 = Yellow Worker Shirt
     .desc = Was used by a farmer, until recently.
 
-armor-misc-chest-shirt_white-worker_yellow_1 = Yellow Worker Shirt
+armor-misc-chest-worker_yellow_1 = Yellow Worker Shirt
     .desc = Was used by a farmer, until recently.
 
 armor-misc-ring-amethyst = Amethyst Ring
@@ -511,7 +511,7 @@ armor-misc-back-admin = Admin's Cape
         With great power comes
         great responsibility.
 
-armor-misc-back-backpack-backpack = Traveler's Backpack
+armor-misc-back-backpack-traveler = Traveler's Backpack
     .desc = Comfortable and with enough capacity, its a hoarder's best friend.
 
 armor-misc-back-dungeon_purple = Purple Cultist Cape
@@ -1048,12 +1048,12 @@ armor-ferocious-pants = Ferocious Shorts
 armor-ferocious-shoulder = Ferocious Guards
     .desc = The dark side of nature
 
-armor-tabard_admin-admin = Admin's Tabard
+armor-tabard-admin_tabard = Admin's Tabard
     .desc = 
         With great power comes
         great responsibility.
 
-armor-misc-back-admin-admin_back = Admin's Cape
+armor-misc-back-admin_back = Admin's Cape
     .desc = 
         With great power comes
         great responsibility.
@@ -1061,25 +1061,25 @@ armor-misc-back-admin-admin_back = Admin's Cape
 armor-misc-bag-admin_black_hole = Admin's Black Hole
     .desc = They say it will fit anything.
 
-armor-velorite_battlemage-belt-cultist_belt = Velorite Belt
+armor-velorite-belt = Velorite Belt
     .desc = {""}
 
-armor-velorite_battlemage-foot-cultist_boots = Velorite Boots
+armor-velorite-boots = Velorite Boots
     .desc = {""}
 
-armor-velorite_battlemage-chest-cultist_chest_blue = Velorite Chest
+armor-velorite-chest = Velorite Chest
     .desc = {""}
 
-armor-velorite_battlemage-hand-cultist_hands_blue = Velorite Gloves
+armor-velorite-hands = Velorite Gloves
     .desc = {""}
 
-armor-velorite_battlemage-pants-cultist_legs_blue = Velorite Skirt
+armor-velorite-legs = Velorite Skirt
     .desc = {""}
 
-armor-velorite_battlemage-shoulder-cultist_shoulder_blue = Velorite Mantle
+armor-velorite-shoulder = Velorite Mantle
     .desc = {""}
 
-armor-velorite_battlemage-back-dungeon_purple = Velorite Admin Cape
+armor-velorite-back = Velorite Admin Cape
     .desc = Where did I put my banhammer again?
 
 armor-misc-head-woolly_wintercap = Woolly Wintercap

assets/voxygen/i18n/en/item/items.ftl

@@ -12,8 +12,8 @@
 ### If you really want to translate items, start with some subset you know is
 ### actually used by players.
 
-items-keeper_goggle = Left Goggle-Glass
+object-key_quarry_keeper_goggle_left = Left Goggle-Glass
     .desc = Looks like it could open a door...
 
-items-keeper_goggle-flamekeeper_right = Right Goggle-Glass
+object-key_quarry_keeper_goggle_right = Right Goggle-Glass
     .desc = Looks like it could open a door...

assets/voxygen/i18n/en/item/object.ftl

@@ -24,16 +24,16 @@ object-key_glass = Glass Key
 object-key_rusty-0 = Rusty Tower Key
     .desc = Smells like magic with a bit of... cheese?
 
-object-key_rusty-0-ancient = Ancient Key
+object-key_quarry_ancient = Ancient Key
     .desc = If you are lucky it works one more time before breaking.
 
-object-key_rusty-0-backdoor = Backdoor Key
+object-key_quarry_backdoor = Backdoor Key
     .desc = If you are lucky it works one more time before breaking.
 
-object-key_rusty-0-overseer = Overseer Key
+object-key_quarry_overseer = Overseer Key
     .desc = If you are lucky it works one more time before breaking.
 
-object-key_rusty-0-smelting = Smelting Room Key
+object-key_quarry_smelting = Smelting Room Key
     .desc = If you are lucky it works one more time before breaking.
 
 object-item_cheese = Golden Cheese
@@ -142,16 +142,16 @@ object-curious_potion = Curious Potion
 object-potion_agility = Potion of Agility
     .desc = Fly, you fools!
 
-object-potion_red-potion_big = Large Potion
+object-potion_big = Large Potion
     .desc = Precious medicine, it makes for the largest rejuvenative flask yet.
 
 object-potion_combustion = Potion of Combustion
     .desc = Sets the user ablaze
 
-object-potion_red-potion_med = Medium Potion
+object-potion_med = Medium Potion
     .desc = An innovative invention from an apothecary, better than its smaller precursors.
 
-object-potion_red-potion_minor = Minor Potion
+object-potion_minor = Minor Potion
     .desc = A small potion concocted from apples and honey.
 
 object-burning_charm = Blazing Charm

assets/voxygen/i18n/en/item/sprite.ftl

@@ -12,7 +12,7 @@
 ### If you really want to translate items, start with some subset you know is
 ### actually used by players.
 
-sprite-crafting_ing-animal_misc-grim_eyeball = Cyclops Eye
+sprite-crafting_ing-animal_misc-cyclops_eyeball = Cyclops Eye
     .desc = Looks like it could open an ancient mechanism.
 
 sprite-carrot-carrot = Carrot
@@ -78,13 +78,13 @@ sprite-food-meat-tough_raw = Raw Tough Meat
 sprite-grass-grass_long_5 = Long Grass
     .desc = Greener than an orc's snout.
 
-sprite-mineral-ore-coal = Coal
+sprite-mineral-stone-coal = Coal
     .desc = A combustible black rock that happens to be really good at burning.
 
 sprite-mineral-ore-bloodstone = Bloodstone Ore
     .desc = A deep red ore, it reminds you of blood.
 
-sprite-mineral-ore-coal-coal = Coal
+sprite-mineral-ore-coal = Coal
     .desc = A dark, combustible energy source.
 
 sprite-mineral-ore-cobalt = Cobalt Ore
@@ -291,7 +291,7 @@ sprite-crafting_ing-animal_misc-claw = Predator Claw
 sprite-crafting_ing-animal_misc-fur = Soft Fur
     .desc = Soft fur from an animal.
 
-sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball = Grim Eyeball
+sprite-crafting_ing-animal_misc-grim_eyeball = Grim Eyeball
     .desc = Casts a petrifying gaze.
 
 sprite-crafting_ing-animal_misc-large_horn = Large Horn
@@ -375,5 +375,5 @@ sprite-flowers-sunflower_1 = Sunflower
 sprite-flowers-flax = Wild Flax
     .desc = Could be used to spin some simple cloth.
 
-sprite-flowers-sunflower_1-yellow = Yellow Flower
+sprite-flowers-yellow = Yellow Flower
     .desc = Glows like the sun.

assets/voxygen/i18n/en/item/weapon.ftl

@@ -51,10 +51,10 @@ weapon-staff-firestaff_cultist = Cultist Staff
 weapon-staff-laevateinn = Laevateinn
     .desc = Can shatter the gate of death
 
-weapon-staff-firestaff_starter = Humble Stick
+weapon-staff-firestaff_humble_stick = Humble Stick
     .desc = Walking stick with a sharpened end.
 
-weapon-staff-firestaff_starter-starter_staff = Gnarled Rod
+weapon-staff-firestaff_starter = Gnarled Rod
     .desc = Smells like resin and magic.
 
 weapon-sword-caladbolg = Caladbolg
@@ -129,7 +129,7 @@ weapon-hammer-2hhammer_rusty = Crude Mallet
 weapon-hammer-2hhammer_mjolnir = Mjolnir
     .desc = It's crackling with lightning.
 
-weapon-hammer-2hhammer_rusty-starter_hammer = Sturdy Old Hammer
+weapon-hammer-2hhammer_starter = Sturdy Old Hammer
     .desc = 'Property of...' The rest is missing.
 
 weapon-tool-broom_belzeshrub_purple = Belzeshrub the Broom-God
@@ -137,10 +137,10 @@ weapon-tool-broom_belzeshrub_purple = Belzeshrub the Broom-God
         You can hear him giggle whenever
         you hit the ground a bit too hard...
 
-weapon-sword-frost-1-admin_sword = Admin Greatsword
+weapon-sword-frost-admin_sword = Admin Greatsword
     .desc = Shouldn't this be a hammer?
 
-weapon-bow-velorite-velorite_bow_debug = Admin Velorite Bow
+weapon-bow-velorite-debug = Admin Velorite Bow
     .desc = Infused with Velorite power.
 
 weapon-projectile-fireworks_blue-0 = Firework Blue