diff --git a/assets/common/items/glider/glider_basic_red.ron b/assets/common/items/glider/glider_basic_red.ron new file mode 100644 index 0000000000..ec778d7356 --- /dev/null +++ b/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, +) diff --git a/assets/common/items/glider/glider_basic_white.ron b/assets/common/items/glider/glider_basic_white.ron new file mode 100644 index 0000000000..c9249f2ab1 --- /dev/null +++ b/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, +) diff --git a/assets/common/items/glider/glider_moth.ron b/assets/common/items/glider/glider_moth.ron new file mode 100644 index 0000000000..28a214c3dc --- /dev/null +++ b/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, +) diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index 0b17d53617..bb5f5a7043 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/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"), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index d849655475..bebe0f9ca0 100644 --- a/assets/common/recipe_book.ron +++ b/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), [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 371885dddc..2f2ce8aa90 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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, diff --git a/assets/voxygen/voxel/glider/glider_basic_red.vox b/assets/voxygen/voxel/glider/glider_basic_red.vox new file mode 100644 index 0000000000..b74c00db94 Binary files /dev/null and b/assets/voxygen/voxel/glider/glider_basic_red.vox differ diff --git a/assets/voxygen/voxel/glider/glider_basic_white.vox b/assets/voxygen/voxel/glider/glider_basic_white.vox new file mode 100644 index 0000000000..6dcb62d270 Binary files /dev/null and b/assets/voxygen/voxel/glider/glider_basic_white.vox differ diff --git a/assets/voxygen/voxel/glider/glider_butterfly1.vox b/assets/voxygen/voxel/glider/glider_butterfly1.vox index bb191688f8..f759444648 100644 Binary files a/assets/voxygen/voxel/glider/glider_butterfly1.vox and b/assets/voxygen/voxel/glider/glider_butterfly1.vox differ diff --git a/assets/voxygen/voxel/glider/glider_butterfly2.vox b/assets/voxygen/voxel/glider/glider_butterfly2.vox index 5d4c8ebef8..dbc4aaafbf 100644 Binary files a/assets/voxygen/voxel/glider/glider_butterfly2.vox and b/assets/voxygen/voxel/glider/glider_butterfly2.vox differ diff --git a/assets/voxygen/voxel/glider/glider_moth.vox b/assets/voxygen/voxel/glider/glider_moth.vox new file mode 100644 index 0000000000..c09e838aad Binary files /dev/null and b/assets/voxygen/voxel/glider/glider_moth.vox differ diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index f64d093d32..4c1672e0f2 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/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": (