Fixes leather sets

assets/common/items/armor/leather/belt.ron

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Leather Belt",
-    description: "A belt made from simple leather.",
-    kind: Armor((
-        kind: Belt("Leather"),
-        stats: (
-            protection: Normal(1.0),
-            poise_resilience: Normal(1.0),
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/leather/chest.ron

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Leather Cuirass",
-    description: "A cuirass made of simple leather.",
-    kind: Armor((
-        kind: Chest("Leather"),
-        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(8.0),
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/leather/foot.ron

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Leather Boots",
-    description: "Boots made of simple leather.",
-    kind: Armor((
-        kind: Foot("Leather"),
-        stats: (
-            protection: Normal(2.0),
-            poise_resilience: Normal(3.0),
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/leather/hand.ron

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Leather Gloves",
-    description: "Gloves made of simple leather.",
-    kind: Armor((
-        kind: Hand("Leather"),
-        stats: (
-            protection: Normal(4.0),
-            poise_resilience: Normal(5.0),
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/leather/pants.ron

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Leather Leg Armour",
-    description: "Leg armour made of simple leather.",
-    kind: Armor((
-        kind: Pants("Leather"),
-        stats: (
-            protection: Normal(8.0),
-            poise_resilience: Normal(4.0),
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/leather/shoulder.ron

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Leather Shoulder Pad",
-    description: "A simple shoulder pad made of leather.",
-    kind: Armor((
-        kind: Shoulder("Leather"),
-        stats: (
-            protection: Normal(6.0),
-            poise_resilience: Normal(2.0),
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/loot_tables/loot_table_armor_light.ron

@@ -1,21 +1,21 @@
 [
     // belts
     (0.50, "common.items.armor.swift.belt"),
-    (0.50, "common.items.armor.leather.belt"),
+    (0.50, "common.items.armor.agile.belt"),
     // chests
     (0.50, "common.items.armor.swift.chest"),
-    (0.50, "common.items.armor.leather.chest"),
+    (0.50, "common.items.armor.agile.chest"),
     // shoes
     (0.50, "common.items.armor.swift.foot"),
-    (0.50, "common.items.armor.leather.foot"),
+    (0.50, "common.items.armor.agile.foot"),
     // pants
     (0.33, "common.items.armor.swift.pants"),
-    (0.33, "common.items.armor.leather.pants"),
+    (0.33, "common.items.armor.agile.pants"),
     (0.33, "common.items.armor.misc.pants.hunting"),
     // shoulders
     (0.10, "common.items.armor.misc.shoulder.leather_strip"),
     (0.20, "common.items.armor.swift.shoulder"),
-    (0.20, "common.items.armor.leather.shoulder"),
+    (0.20, "common.items.armor.agile.shoulder"),
     (0.20, "common.items.armor.agile.shoulder"),
     (0.07, "common.items.armor.misc.shoulder.leather_iron_0"),
     (0.07, "common.items.armor.misc.shoulder.leather_iron_1"),
@@ -23,5 +23,5 @@
     (0.07, "common.items.armor.misc.shoulder.leather_iron_3"),
     //gloves
     (0.50, "common.items.armor.swift.hand"),
-    (0.50, "common.items.armor.leather.hand"),
+    (0.50, "common.items.armor.agile.hand"),
 ]

assets/common/loot_tables/loot_table_cultists.ron

@@ -42,21 +42,21 @@
     //Light Armour
     // belts
     (0.50, "common.items.armor.swift.belt"),
-    (0.50, "common.items.armor.leather.belt"),
+    (0.50, "common.items.armor.agile.belt"),
     // chests
     (0.50, "common.items.armor.swift.chest"),
-    (0.50, "common.items.armor.leather.chest"),
+    (0.50, "common.items.armor.agile.chest"),
     // shoes
     (0.50, "common.items.armor.swift.foot"),
-    (0.50, "common.items.armor.leather.foot"),
+    (0.50, "common.items.armor.agile.foot"),
     // pants
     (0.33, "common.items.armor.swift.pants"),
-    (0.33, "common.items.armor.leather.pants"),
+    (0.33, "common.items.armor.agile.pants"),
     (0.33, "common.items.armor.misc.pants.hunting"),
     // shoulders
     (0.6, "common.items.armor.misc.shoulder.leather_strip"),
     (0.4, "common.items.armor.swift.shoulder"),
-    (0.4, "common.items.armor.leather.shoulder"),
+    (0.4, "common.items.armor.agile.shoulder"),
     (0.4, "common.items.armor.misc.shoulder.leather_3"),
     (0.3, "common.items.armor.misc.shoulder.leather_iron_0"),
     (0.3, "common.items.armor.misc.shoulder.leather_iron_1"),
@@ -64,7 +64,7 @@
     (0.3, "common.items.armor.misc.shoulder.leather_iron_3"),
     //gloves
     (0.50, "common.items.armor.swift.hand"),
-    (0.50, "common.items.armor.leather.hand"),    
+    (0.50, "common.items.armor.agile.hand"),    
     //backpack
     (0.001, "common.items.armor.misc.back.backpack"),
     (0.1, "common.items.armor.misc.bag.heavy_seabag"),

assets/voxygen/item_image_manifest.ron

@@ -1257,11 +1257,6 @@
         "voxel.armor.swift.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    //Leather Armor
-    Armor(Shoulder("Leather")): VoxTrans(
-        "voxel.armor.leather.shoulder",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
     //Agile Armor
     Armor(Chest("Agile")): VoxTrans(
         "voxel.armor.agile.chest",

assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron

@@ -61,16 +61,6 @@
                 color: None
             )
         ),
-        "Leather": (
-            left: (
-                vox_spec: ("armor.leather.shoulder", (-3.6, -4.5, 0.0)),
-                color: None
-            ),
-            right: (
-                vox_spec: ("armor.leather.shoulder", (-2.6, -4.5, 0.0)),
-                color: None
-            )
-        ),
         "ClothPurple": (
             left: (
                 vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)),

server/src/migrations/2021-03-02-182544_fix_leather_set/down.sql

@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`

server/src/migrations/2021-03-02-182544_fix_leather_set/up.sql

@@ -0,0 +1,12 @@
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.belt' WHERE item_definition_id = 'common.items.armor.leather.belt';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.chest' WHERE item_definition_id = 'common.items.armor.leather.chest';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.foot' WHERE item_definition_id = 'common.items.armor.leather.foot';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.hand' WHERE item_definition_id = 'common.items.armor.leather.hand';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.pants' WHERE item_definition_id = 'common.items.armor.leather.pants';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.shoulder' WHERE item_definition_id = 'common.items.armor.leather.shoulder';