diff --git a/assets/common/items/glider/butterfly3.ron b/assets/common/items/glider/butterfly3.ron new file mode 100644 index 0000000000..f191a901db --- /dev/null +++ b/assets/common/items/glider/butterfly3.ron @@ -0,0 +1,11 @@ +ItemDef( + name: "Moonlit Love", + description: "Love is in the air.", + kind: Glider( + ( + kind: "ButterflyLove", + ), + ), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/glider/moonrise.ron b/assets/common/items/glider/moonrise.ron new file mode 100644 index 0000000000..4089616c53 --- /dev/null +++ b/assets/common/items/glider/moonrise.ron @@ -0,0 +1,11 @@ +ItemDef( + name: "Aquatic Night", + description: "The stars are beautiful tonight.", + kind: Glider( + ( + kind: "Moonrise", + ), + ), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/glider/sunset.ron b/assets/common/items/glider/sunset.ron new file mode 100644 index 0000000000..86ba095e52 --- /dev/null +++ b/assets/common/items/glider/sunset.ron @@ -0,0 +1,11 @@ +ItemDef( + name: "Horizon", + description: "It isn't high noon.", + kind: Glider( + ( + kind: "Sunset", + ), + ), + quality: Epic, + tags: [], +) diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron index 298094e660..0cf6b9164a 100644 --- a/assets/common/loot_tables/dungeon/tier-2/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron @@ -5,4 +5,5 @@ (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")), // Special Loot (1.0, Item("common.items.armor.misc.bag.heavy_seabag")), -] \ No newline at end of file + (0.5, Item("common.items.glider.moonrise")), +] diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 3fcc5ee09e..adc2af9820 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -453,6 +453,34 @@ ], craft_sprite: Some(CraftingBench), ), + "Moonlit Love": ( + output: ("common.items.glider.butterfly3", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.moonweave"), 20), + (Item("common.items.crafting_ing.twigs"), 5), + (Item("common.items.flowers.red"), 6), + (Item("common.items.crafting_ing.sticky_thread"), 8), + (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + (Item("common.items.tool.craftsman_hammer"), 0), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "Horizon": ( + output: ("common.items.glider.sunset", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.sunsilk"), 20), + (Item("common.items.crafting_ing.twigs"), 5), + (Item("common.items.crafting_ing.cactus"), 8), + (Item("common.items.mineral.gem.topaz"), 6), + (Item("common.items.mineral.gem.ruby"), 2), + (Item("common.items.crafting_tools.sewing_set"), 0), + (Item("common.items.tool.craftsman_hammer"), 0), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), "Healing Sceptre": ( output: ("common.items.weapons.sceptre.starter_sceptre", 1), inputs: [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index afbf8f05e7..9d3d8b2c0f 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2773,6 +2773,10 @@ "voxel.glider.butterfly2", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), + Glider("ButterflyLove"): VoxTrans( + "voxel.glider.butterfly3", + (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, + ), Glider("MothLuna"): VoxTrans( "voxel.glider.moth", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, @@ -2789,6 +2793,14 @@ "voxel.glider.woodraptor", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), + Glider("Sunset"): VoxTrans( + "voxel.glider.sunset", + (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, + ), + Glider("Moonrise"): VoxTrans( + "voxel.glider.moonrise", + (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, + ), Glider("Purple0"): VoxTrans( "voxel.glider.cultists", (5.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, diff --git a/assets/voxygen/voxel/glider/butterfly3.vox b/assets/voxygen/voxel/glider/butterfly3.vox new file mode 100644 index 0000000000..5b5d264798 --- /dev/null +++ b/assets/voxygen/voxel/glider/butterfly3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc8764acac901395b43029c05a95a3ce4bbf09316211117b7fb628a091111abe +size 9888 diff --git a/assets/voxygen/voxel/glider/moonrise.vox b/assets/voxygen/voxel/glider/moonrise.vox new file mode 100644 index 0000000000..79c4589838 --- /dev/null +++ b/assets/voxygen/voxel/glider/moonrise.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4734dad76dde9aa1018850cd727a15c58564be6f44502017cf7899d791ab4d0f +size 6280 diff --git a/assets/voxygen/voxel/glider/sunset.vox b/assets/voxygen/voxel/glider/sunset.vox new file mode 100644 index 0000000000..eece26fdf8 --- /dev/null +++ b/assets/voxygen/voxel/glider/sunset.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e256a80d6bacbbb87842d97871eefbb16ee52d21054941f49c3e32955cb4ff41 +size 6280 diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index 8711842a0d..1e030a673d 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/assets/voxygen/voxel/humanoid_glider_manifest.ron @@ -28,6 +28,10 @@ vox_spec: ("glider.butterfly2", (-26.0, -13.0, 0.0)), color: None ), + "ButterflyLove": ( + vox_spec: ("glider.butterfly3", (-26.0, -13.0, 0.0)), + color: None + ), "MothLuna": ( vox_spec: ("glider.moth", (-26.0, -22.0, 0.0)), color: None @@ -43,7 +47,15 @@ "WoodRaptor": ( vox_spec: ("glider.woodraptor", (-26.0, -25.0, 0.0)), color: None - ), + ), + "Sunset": ( + vox_spec: ("glider.sunset", (-26.0, -26.0, 0.0)), + color: None + ), + "Moonrise": ( + vox_spec: ("glider.moonrise", (-26.0, -26.0, 0.0)), + color: None + ), "Purple0": ( vox_spec: ("glider.cultists", (-26.0, -26.0, 0.0)), color: None