Merge branch 'reduce-duplication-in-asset-identifiers' into 'master'

Reduce duplication in glider asset identifiers

Closes #942

See merge request veloren/veloren!2876

assets/common/loadout/default.ron

@@ -5,5 +5,5 @@
     Armor(Feet): Item("common.items.armor.misc.foot.sandals"),
 
     Lantern: Item("common.items.lantern.black_0"),
-    Glider: Item("common.items.glider.glider_cloverleaf"),
+    Glider: Item("common.items.glider.cloverleaf"),
 })

assets/common/loadout/dungeon/tier-5/beastmaster.ron

@@ -13,5 +13,5 @@
         (2.0, None),
     ]),
 
-    Glider: Item("common.items.glider.glider_blue"),
+    Glider: Item("common.items.glider.blue"),
 })

assets/common/loadout/dungeon/tier-5/cultist.ron

@@ -13,7 +13,7 @@
         (2.0, None),
     ]),
 
-    Glider: Item("common.items.glider.glider_purp"),
+    Glider: Item("common.items.glider.skullgrin"),
 
     ActiveMainhand: Choice([
         (2.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),

assets/common/loadout/test.ron

@@ -24,7 +24,7 @@
     // Misc
     Lantern: Item("common.items.lantern.black_0"),
     Armor(Tabard): Item("common.items.debug.admin"),
-    Glider: Item("common.items.glider.glider_basic_red"),
+    Glider: Item("common.items.glider.basic_red"),
     Armor(Bag1): Item("common.items.armor.misc.bag.tiny_leather_pouch"),
     Armor(Bag2): Item("common.items.armor.misc.bag.tiny_leather_pouch"),
     Armor(Bag3): Item("common.items.armor.misc.bag.tiny_leather_pouch"),

assets/common/loot_tables/cave_large.ron

@@ -3,10 +3,10 @@
     (0.25, Item("common.items.armor.misc.neck.plain_1")),
     (1.5, LootTable("common.loot_tables.materials.common")),
     (3.5, LootTable("common.loot_tables.materials.underground")),
-    (0.1, Item("common.items.glider.glider_blue")),
-    (0.05, Item("common.items.glider.glider_morpho")),
-    (0.05, Item("common.items.glider.glider_monarch")),
-    (0.05, Item("common.items.glider.glider_moth")),
+    (0.1, Item("common.items.glider.blue")),
+    (0.05, Item("common.items.glider.morpho")),
+    (0.05, Item("common.items.glider.monarch")),
+    (0.05, Item("common.items.glider.moth")),
     (0.05, Item("common.items.armor.misc.ring.gold")),
     (0.1, Item("common.items.lantern.geode_purp")),
     (2.0, LootTable("common.loot_tables.weapons.tier-3")),

assets/common/loot_tables/dungeon/tier-5/boss.ron

@@ -8,7 +8,7 @@
     (1.0, LootTable("common.loot_tables.weapons.cave")),
     // Rare misc items
     (1.0, Item("common.items.boss_drops.lantern")),
-    (1.0, Item("common.items.glider.glider_purp")),
+    (1.0, Item("common.items.glider.skullgrin")),
     // Legendary weapons
     (1.0, LootTable("common.loot_tables.weapons.legendary")),
     // Crafting material

assets/common/loot_tables/dungeon/tier-5/miniboss.ron

@@ -8,5 +8,5 @@
     // Cosmetic items
     (1.0, Item("common.items.armor.misc.back.dungeon_purple")),
     (1.0, Item("common.items.armor.misc.ring.skull")),
-    (1.0, Item("common.items.glider.glider_blue")),
+    (1.0, Item("common.items.glider.blue")),
 ]

assets/common/recipe_book.ron

@@ -430,7 +430,7 @@
         is_recycling: false,
     ),
     "Plain Cloth Glider": (
-        output: ("common.items.glider.glider_basic_white", 1),
+        output: ("common.items.glider.basic_white", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
             (Item("common.items.crafting_ing.leather.leather_strips"), 5),
@@ -442,7 +442,7 @@
         is_recycling: false,
     ),
     "Red Cloth Glider": (
-        output: ("common.items.glider.glider_basic_red", 1),
+        output: ("common.items.glider.basic_red", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
             (Item("common.items.crafting_ing.cloth.linen_red"), 10),
@@ -454,7 +454,7 @@
         is_recycling: false,
     ),
     "Leaves Glider": (
-        output: ("common.items.glider.glider_leaves", 1),
+        output: ("common.items.glider.leaves", 1),
         inputs: [
             (Item("common.items.crafting_ing.twigs"), 5),
             (Item("common.items.crafting_ing.leather.thick_leather"), 4),
@@ -467,7 +467,7 @@
         is_recycling: false,
     ),
     "Sand Raptor Wings": (
-        output: ("common.items.glider.glider_sandraptor", 1),
+        output: ("common.items.glider.sandraptor", 1),
         inputs: [
             (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 5),
@@ -480,7 +480,7 @@
         is_recycling: false,
     ),
     "Snow Raptor Wings": (
-        output: ("common.items.glider.glider_snowraptor", 1),
+        output: ("common.items.glider.snowraptor", 1),
         inputs: [
             (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 5),
@@ -494,7 +494,7 @@
         is_recycling: false,
     ),
     "Wood Raptor Wings": (
-        output: ("common.items.glider.glider_woodraptor", 1),
+        output: ("common.items.glider.woodraptor", 1),
         inputs: [
             (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
             (Item("common.items.crafting_ing.twigs"), 5),

assets/common/trading/collection.ron

@@ -9,11 +9,11 @@
 [
     /// Non-craftable gliders
     // Butterfly gliders
-    (5, Item("common.items.glider.glider_morpho")),
-    (5, Item("common.items.glider.glider_monarch")),
-    (5, Item("common.items.glider.glider_moth")),
+    (5, Item("common.items.glider.morpho")),
+    (5, Item("common.items.glider.monarch")),
+    (5, Item("common.items.glider.moth")),
     // Skullgrin
-    (2, Item("common.items.glider.glider_purp")),
+    (2, Item("common.items.glider.skullgrin")),
 
     /// Lanterns
     (5, Item("common.items.lantern.geode_purp")),

assets/voxygen/item_image_manifest.ron

@@ -2686,51 +2686,51 @@
     ),
     // Gliders
     Glider("Starter"): VoxTrans(
-        "voxel.glider.glider_starter",
+        "voxel.glider.starter",
         (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
     ),
     Glider("PlainCloth"): VoxTrans(
-        "voxel.glider.glider_basic_white",
+        "voxel.glider.basic_white",
         (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
     ),
     Glider("RedCloth"): VoxTrans(
-        "voxel.glider.glider_basic_red",
+        "voxel.glider.basic_red",
         (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
     ),
     Glider("Blue0"): VoxTrans(
-        "voxel.glider.glider_blue",
+        "voxel.glider.blue",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("ButterflyMorpho"): VoxTrans(
-        "voxel.glider.glider_butterfly1",
+        "voxel.glider.butterfly1",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("ButterflyMonarch"): VoxTrans(
-        "voxel.glider.glider_butterfly2",
+        "voxel.glider.butterfly2",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("MothLuna"): VoxTrans(
-        "voxel.glider.glider_moth",
+        "voxel.glider.moth",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("SandRaptor"): VoxTrans(
-        "voxel.glider.glider_sandraptor",
+        "voxel.glider.sandraptor",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("SnowRaptor"): VoxTrans(
-        "voxel.glider.glider_snowraptor",
+        "voxel.glider.snowraptor",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("WoodRaptor"): VoxTrans(
-        "voxel.glider.glider_woodraptor",
+        "voxel.glider.woodraptor",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("Purple0"): VoxTrans(
-        "voxel.glider.glider_cultists",
+        "voxel.glider.cultists",
         (5.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     Glider("Leaves"): VoxTrans(
-        "voxel.glider.glider_leaves",
+        "voxel.glider.leaves",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
     // Debug Items

assets/voxygen/voxel/humanoid_glider_manifest.ron

@@ -5,51 +5,51 @@
     ),
     map: {
         "Starter": (
-            vox_spec: ("glider.glider_starter", (-15.0, -5.0, 0.0)),
+            vox_spec: ("glider.starter", (-15.0, -5.0, 0.0)),
             color: None
         ),   
         "PlainCloth": (
-            vox_spec: ("glider.glider_basic_white", (-25.0, -20.0, 0.0)),
+            vox_spec: ("glider.basic_white", (-25.0, -20.0, 0.0)),
             color: None
         ),   
         "RedCloth": (
-            vox_spec: ("glider.glider_basic_red", (-25.0, -20.0, 0.0)),
+            vox_spec: ("glider.basic_red", (-25.0, -20.0, 0.0)),
             color: None
         ),   
         "Blue0": (
-            vox_spec: ("glider.glider_blue", (-26.0, -26.0, 0.0)),
+            vox_spec: ("glider.blue", (-26.0, -26.0, 0.0)),
             color: None
         ),
         "ButterflyMorpho": (
-            vox_spec: ("glider.glider_butterfly1", (-26.0, -13.0, 0.0)),
+            vox_spec: ("glider.butterfly1", (-26.0, -13.0, 0.0)),
             color: None
         ),
         "ButterflyMonarch": (
-            vox_spec: ("glider.glider_butterfly2", (-26.0, -13.0, 0.0)),
+            vox_spec: ("glider.butterfly2", (-26.0, -13.0, 0.0)),
             color: None
         ),        
         "MothLuna": (
-            vox_spec: ("glider.glider_moth", (-26.0, -22.0, 0.0)),
+            vox_spec: ("glider.moth", (-26.0, -22.0, 0.0)),
             color: None
         ),        
         "SandRaptor": (
-            vox_spec: ("glider.glider_sandraptor", (-26.0, -25.0, 0.0)),
+            vox_spec: ("glider.sandraptor", (-26.0, -25.0, 0.0)),
             color: None    
         ),   
         "SnowRaptor": (
-            vox_spec: ("glider.glider_snowraptor", (-26.0, -25.0, 0.0)),
+            vox_spec: ("glider.snowraptor", (-26.0, -25.0, 0.0)),
             color: None    
         ),     
         "WoodRaptor": (
-            vox_spec: ("glider.glider_woodraptor", (-26.0, -25.0, 0.0)),
+            vox_spec: ("glider.woodraptor", (-26.0, -25.0, 0.0)),
             color: None    
         ),   
         "Purple0": (
-            vox_spec: ("glider.glider_cultists", (-26.0, -26.0, 0.0)),
+            vox_spec: ("glider.cultists", (-26.0, -26.0, 0.0)),
             color: None
         ),
         "Leaves": (
-            vox_spec: ("glider.glider_leaves", (-26.0, -26.0, 0.0)),
+            vox_spec: ("glider.leaves", (-26.0, -26.0, 0.0)),
             color: None
         ),
     },

server/src/migrations/V44__reduce_asset_duplication.sql

@@ -0,0 +1,14 @@
+-- Update asset names
+
+UPDATE item SET item_definition_id = 'common.items.glider.basic_white' WHERE item_definition_id = 'common.items.glider.glider_basic_white';
+UPDATE item SET item_definition_id = 'common.items.glider.basic_red' WHERE item_definition_id = 'common.items.glider.glider_basic_red';
+UPDATE item SET item_definition_id = 'common.items.glider.blue' WHERE item_definition_id = 'common.items.glider.glider_blue';
+UPDATE item SET item_definition_id = 'common.items.glider.cloverleaf' WHERE item_definition_id = 'common.items.glider.glider_cloverleaf';
+UPDATE item SET item_definition_id = 'common.items.glider.leaves' WHERE item_definition_id = 'common.items.glider.glider_leaves';
+UPDATE item SET item_definition_id = 'common.items.glider.monarch' WHERE item_definition_id = 'common.items.glider.glider_monarch';
+UPDATE item SET item_definition_id = 'common.items.glider.morpho' WHERE item_definition_id = 'common.items.glider.glider_morpho';
+UPDATE item SET item_definition_id = 'common.items.glider.moth' WHERE item_definition_id = 'common.items.glider.glider_moth';
+UPDATE item SET item_definition_id = 'common.items.glider.skullgrin' WHERE item_definition_id = 'common.items.glider.glider_purp';
+UPDATE item SET item_definition_id = 'common.items.glider.sandraptor' WHERE item_definition_id = 'common.items.glider.glider_sandraptor';
+UPDATE item SET item_definition_id = 'common.items.glider.snowraptor' WHERE item_definition_id = 'common.items.glider.glider_snowraptor';
+UPDATE item SET item_definition_id = 'common.items.glider.woodraptor' WHERE item_definition_id = 'common.items.glider.glider_woodraptor';