Merge branch 'armor-org' into 'master'

armor org

See merge request veloren/veloren!1835

assets/common/items/armor/agile/back.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Cape",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Back("Short2"),
+        kind: Back("Agile"),
         stats: (
             protection: Normal(0.2),
             poise_resilience: Normal(0.1),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Belt",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Belt("Leather2"),
+        kind: Belt("Agile"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Chest",
     description: "Tightly packed pieces of leather to endure all weather.",
     kind: Armor((
-        kind: Chest("Leather2"),
+        kind: Chest("Agile"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(3.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Kickers",
     description: "\'Tightly packed pieces of leather to endure all weather.",
     kind: Armor((
-        kind: Foot("Leather2"),
+        kind: Foot("Agile"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Gauntlets",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Hand("Leather2"),
+        kind: Hand("Agile"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(4.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Pantalons",
     description: "\'Tightly packed pieces of leather to endure all weather.\'",
     kind: Armor((
-        kind: Pants("Leather2"),
+        kind: Pants("Agile"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(3.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Agile Guards",
     description: "Tightly packed pieces of leather to endure all weather.",
     kind: Armor((
-        kind: Shoulder("Leather2"),
+        kind: Shoulder("Agile"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(4.0),

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

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Purple Cultist Chest",
-    description: "Ceremonial attire used by members.",
-    kind: Armor((
-        kind: Chest("CultistPurple"),
-        stats: (
-            protection: Normal(30.0),
-            poise_resilience: Normal(15.0),
-        ),
-    )),
-    quality: Epic,
-    tags: [],
-)

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Belt",
     description: "A stylish rough fabric belt, dyed blue.",
     kind: Armor((
-        kind: Belt("ClothBlue0"),
+        kind: Belt("ClothBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Chest",
     description: "A stylish rough fabric surcoat, dyed blue.",
     kind: Armor((
-        kind: Chest("ClothBlue0"),
+        kind: Chest("ClothBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Boots",
     description: "Cobbled rough fabric boots, dyed blue.",
     kind: Armor((
-        kind: Foot("ClothBlue0"),
+        kind: Foot("ClothBlue"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Wrists",
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed blue.",
     kind: Armor((
-        kind: Hand("ClothBlue0"),
+        kind: Hand("ClothBlue"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Linen Skirt",
     description: "A stylish, rough fabric skirt, dyed blue.",
     kind: Armor((
-        kind: Pants("ClothBlue0"),
+        kind: Pants("ClothBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Belt",
     description: "A stylish rough fabric belt, dyed green.",
     kind: Armor((
-        kind: Belt("ClothGreen0"),
+        kind: Belt("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Chest",
     description: "A stylish rough fabric surcoat, dyed green.",
     kind: Armor((
-        kind: Chest("ClothGreen0"),
+        kind: Chest("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Boots",
     description: "Cobbled rough fabric boots, dyed green.",
     kind: Armor((
-        kind: Foot("ClothGreen0"),
+        kind: Foot("ClothGreen"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Wrists",
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed green.",
     kind: Armor((
-        kind: Hand("ClothGreen0"),
+        kind: Hand("ClothGreen"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Skirt",
     description: "A stylish, rough fabric skirt, dyed green.",
     kind: Armor((
-        kind: Pants("ClothGreen0"),
+        kind: Pants("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Green Linen Coat",
     description: "A rough fabric coat, dyed green.",
     kind: Armor((
-        kind: Shoulder("ClothGreen0"),
+        kind: Shoulder("ClothGreen"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Belt",
     description: "A stylish rough fabric belt, dyed purple.",
     kind: Armor((
-        kind: Belt("ClothPurple0"),
+        kind: Belt("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Chest",
     description: "A stylish rough fabric surcoat, dyed purple.",
     kind: Armor((
-        kind: Chest("ClothPurple0"),
+        kind: Chest("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Boots",
     description: "Cobbled rough fabric boots, dyed purple.",
     kind: Armor((
-        kind: Foot("ClothPurple0"),
+        kind: Foot("ClothPurple"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

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

@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Purple Silk Wrists",
+    name: "Purple Linen Wrists",
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed purple.",
     kind: Armor((
-        kind: Hand("ClothPurple0"),
+        kind: Hand("ClothPurple"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Skirt",
     description: "A stylish, rough fabric skirt, dyed purple.",
     kind: Armor((
-        kind: Pants("ClothPurple0"),
+        kind: Pants("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Linen Coat",
     description: "A rough fabric coat, dyed purple.",
     kind: Armor((
-        kind: Shoulder("ClothPurple0"),
+        kind: Shoulder("ClothPurple"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Velorite Chest",
+    name: "Cultist Chest",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Chest("VeloriteMage0"),
+        kind: Chest("Cultist"),
         stats: (
             protection: Normal(30.0),
             poise_resilience: Normal(15.0),

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

@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Purple Cultist Gloves",
+    name: "Cultist Gloves",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Hand("CultistPurple"),
+        kind: Hand("Cultist"),
         stats: (
             protection: Normal(12.0),
             poise_resilience: Normal(8.0),

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

@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Purple Cultist Skirt",
+    name: "Cultist Skirt",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Pants("CultistPurple"),
+        kind: Pants("Cultist"),
         stats: (
             protection: Normal(24.0),
             poise_resilience: Normal(14.0),

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

@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Velorite Mantle",
+    name: "Cultist Mantle",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Shoulder("VeloriteMage0"),
+        kind: Shoulder("Cultist"),
         stats: (
             protection: Normal(18.0),
             poise_resilience: Normal(10.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Druid Shoulders",
     description: "Forged for protectors of the wild.",
     kind: Armor((
-        kind: Shoulder("DruidShoulder"),
+        kind: Shoulder("Druid"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(6.0),

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

@@ -1,13 +0,0 @@
-ItemDef(
-    name: "Velorite Gloves",
-    description: "Ceremonial attire used by members.",
-    kind: Armor((
-        kind: Hand("VeloriteMage0"),
-        stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(10.0),
-        ),
-    )),
-    quality: Epic,
-    tags: [],
-)

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Belt",
     description: "A belt made from simple leather.",
     kind: Armor((
-        kind: Belt("Leather2"),
+        kind: Belt("Leather"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Cuirass",
     description: "A cuirass made of simple leather.",
     kind: Armor((
-        kind: Chest("Leather2"),
+        kind: Chest("Leather"),
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(8.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Boots",
     description: "Boots made of simple leather.",
     kind: Armor((
-        kind: Foot("Leather2"),
+        kind: Foot("Leather"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(3.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Gloves",
     description: "Gloves made of simple leather.",
     kind: Armor((
-        kind: Hand("Leather2"),
+        kind: Hand("Leather"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(5.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Leg Armour",
     description: "Leg armour made of simple leather.",
     kind: Armor((
-        kind: Pants("Leather2"),
+        kind: Pants("Leather"),
         stats: (
             protection: Normal(8.0),
             poise_resilience: Normal(4.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Shoulder Pad",
     description: "A simple shoulder pad made of leather.",
     kind: Armor((
-        kind: Shoulder("Leather2"),
+        kind: Shoulder("Leather"),
         stats: (
             protection: Normal(6.0),
             poise_resilience: Normal(2.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Belt",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Belt("PlateLeather"),
+        kind: Belt("LeatherPlate"),
         stats: (
             protection: Normal(4.0),
             poise_resilience: Normal(8.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Chest",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Chest("PlateLeather"),
+        kind: Chest("LeatherPlate"),
         stats: (
             protection: Normal(25.0),
             poise_resilience: Normal(40.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Boots",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Foot("PlateLeather"),
+        kind: Foot("LeatherPlate"),
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(10.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Gloves",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Hand("PlateLeather"),
+        kind: Hand("LeatherPlate"),
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(15.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Chausses",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Pants("PlateLeather"),
+        kind: Pants("LeatherPlate"),
         stats: (
             protection: Normal(20.0),
             poise_resilience: Normal(26.0),

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

@@ -2,7 +2,7 @@ ItemDef(
     name: "Leather Plate Shoulder Pad",
     description: "Leather adorned with steel for better protection.",
     kind: Armor((
-        kind: Shoulder("PlateLeather"),
+        kind: Shoulder("LeatherPlate"),
         stats: (
             protection: Normal(15.0),
             poise_resilience: Normal(20.0),

assets/common/items/armor/misc/back/backpack.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Traveler\'s Backpack",
     description: "Comfort and capacity united.",
     kind: Armor((
-        kind: Back("Backpack0"),
+        kind: Back("Backpack"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

assets/common/items/armor/misc/back/dungeon_purple.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Purple Cultist Cape",
     description: "Smells like dark magic and candles.",
     kind: Armor((
-        kind: Back("DungPurp0"),
+        kind: Back("DungeonPurple"),
         stats: (
             protection: Normal(3.0),
             poise_resilience: Normal(1.0),

assets/common/items/armor/misc/foot/jackalope_slippers.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Fluffy Jackalope Slippers",
     description: "So warm and cozy!",
     kind: Armor((
-        kind: Foot("JackalopeSlips"),
+        kind: Foot("Jackalope"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(10.0),

assets/common/items/armor/misc/foot/sandals.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Worn out Sandals",
     description: "Loyal companions.",
     kind: Armor((
-        kind: Foot("Sandal0"),
+        kind: Foot("Sandal"),
         stats: (
             protection: Normal(0.0),
             poise_resilience: Normal(0.0),

assets/common/items/armor/misc/neck/plain_0.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Plain Necklace",
     description: "It\'s become tarnished with age.",
     kind: Armor((
-        kind: Neck("Neck0"),
+        kind: Neck("Plain0"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

assets/common/items/armor/misc/neck/plain_1.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gem of lesser Protection",
     description: "Surrounded by a discrete magical glow.",
     kind: Armor((
-        kind: Neck("Neck1"),
+        kind: Neck("Plain1"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),

assets/common/items/armor/misc/neck/shell.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Seashell Necklace",
     description: "Contains the guardian aura of the ocean",
     kind: Armor((
-        kind: Neck("NeckShell"),
+        kind: Neck("Shell"),
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),

assets/common/items/armor/misc/pants/worker_blue.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Blue Worker Pants",
     description: "Pants used by a farmer, until recently.",
     kind: Armor((
-        kind: Pants("WorkerBlue0"),
+        kind: Pants("WorkerBlue"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),

assets/common/items/armor/misc/ring/gold.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gold Ring",
     description: "Someone is surely missing it...",
     kind: Armor((
-        kind: Ring("RingGold0"),
+        kind: Ring("Gold"),
         stats: (
             protection: Normal(0.5),
             poise_resilience: Normal(0.0),