Merge branch 'Sarrakitty/gliders' into 'master'

Sarrakitty/gliders

See merge request veloren/veloren!1771

assets/common/items/glider/glider_basic_red.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Red Cloth Glider",
+    description: "A simple glider, but with a striking red color.",
+    kind: Glider(
+        (
+            kind: "RedCloth",
+        ),
+    ),
+    quality: Moderate,
+)

assets/common/items/glider/glider_basic_white.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Plain Cloth Glider",
+    description: "Simple, but classy.",
+    kind: Glider(
+        (
+            kind: "PlainCloth",
+        ),
+    ),
+    quality: Moderate,
+)

assets/common/items/glider/glider_moth.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Green Luna",
+    description: "The delicate wings flutter faintly.",
+    kind: Glider(
+        (
+            kind: "MothLuna",
+        ),
+    ),
+    quality: High,
+)

assets/common/loot_tables/loot_table_cave_large.ron

@@ -4,8 +4,9 @@
     (2.0, "common.items.crafting_ing.cloth_scraps"),
     (1.0, "common.items.crafting_ing.empty_vial"),  
     (0.1, "common.items.glider.glider_blue"),
-    (0.1, "common.items.glider.glider_morpho"),
-    (0.1, "common.items.glider.glider_monarch"),
+    (0.05, "common.items.glider.glider_morpho"),
+    (0.05, "common.items.glider.glider_monarch"),
+    (0.05, "common.items.glider.glider_moth"),
     (0.05, "common.items.armor.ring.ring_gold_0"),   
     // swords
     (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),

assets/common/recipe_book.ron

@@ -154,6 +154,26 @@
             ("common.items.crafting_ing.honey", 1),
         ],
     ),
+    "Plain Cloth Glider": (
+        ("common.items.glider.glider_basic_white", 1),
+        [
+            ("common.items.crafting_ing.twigs", 5),
+            ("common.items.crafting_ing.leather_scraps", 5),
+            ("common.items.crafting_ing.cloth_scraps", 10),
+            ("common.items.crafting_tools.craftsman_hammer", 0),
+            ("common.items.crafting_tools.sewing_set", 0),
+        ],
+    ),
+    "Red Cloth Glider": (
+        ("common.items.glider.glider_basic_red", 1),
+        [
+            ("common.items.crafting_ing.twigs", 5),
+            ("common.items.crafting_ing.cloth_scraps_red", 10),
+            ("common.items.crafting_ing.leather_scraps", 5),
+            ("common.items.crafting_tools.craftsman_hammer", 0),
+            ("common.items.crafting_tools.sewing_set", 0),
+        ],
+    ),
     "Leaves Glider": (
         ("common.items.glider.glider_leaves", 1),
         [

assets/voxygen/item_image_manifest.ron

@@ -1624,6 +1624,14 @@
         "voxel.glider.glider_starter",
         (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
     ),
+    Glider("PlainCloth"): VoxTrans(
+        "voxel.glider.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",
+        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
+    ),
     Glider("Blue0"): VoxTrans(
         "voxel.glider.glider_blue",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
@@ -1636,6 +1644,10 @@
         "voxel.glider.glider_butterfly2",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
     ),
+    Glider("MothLuna"): VoxTrans(
+        "voxel.glider.glider_moth",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
     Glider("SandRaptor"): VoxTrans(
         "voxel.glider.glider_sandraptor",
         (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,

assets/voxygen/voxel/humanoid_glider_manifest.ron

@@ -8,16 +8,28 @@
             vox_spec: ("glider.glider_starter", (-15.0, -5.0, -5.0)),
             color: None
         ),   
+        "PlainCloth": (
+            vox_spec: ("glider.glider_basic_white", (-25.0, -20.0, -5.0)),
+            color: None
+        ),   
+        "RedCloth": (
+            vox_spec: ("glider.glider_basic_red", (-25.0, -20.0, -5.0)),
+            color: None
+        ),   
         "Blue0": (
             vox_spec: ("glider.glider_blue", (-26.0, -26.0, -5.0)),
             color: None
         ),
         "ButterflyMorpho": (
-            vox_spec: ("glider.glider_butterfly1", (-26.0, -25.0, -5.0)),
+            vox_spec: ("glider.glider_butterfly1", (-26.0, -13.0, -5.0)),
             color: None
         ),
         "ButterflyMonarch": (
-            vox_spec: ("glider.glider_butterfly2", (-26.0, -25.0, -5.0)),
+            vox_spec: ("glider.glider_butterfly2", (-26.0, -13.0, -5.0)),
+            color: None
+        ),        
+        "MothLuna": (
+            vox_spec: ("glider.glider_moth", (-26.0, -22.0, -5.0)),
             color: None
         ),        
         "SandRaptor": (