From 1d8a23c30e713ca9e40368c662d24e84cbe42dac Mon Sep 17 00:00:00 2001 From: Uniior Date: Sat, 4 Nov 2023 22:09:00 +0000 Subject: [PATCH] Starter glider. --- CHANGELOG.md | 1 + assets/common/loadout/default.ron | 2 +- assets/common/recipe_book.ron | 10 ++++++++++ assets/voxygen/item_image_manifest.ron | 2 +- assets/voxygen/voxel/glider/cloverleaf.vox | 3 +++ assets/voxygen/voxel/glider/starter.vox | 3 --- assets/voxygen/voxel/humanoid_glider_manifest.ron | 2 +- assets/voxygen/voxel/item_drop_manifest.ron | 2 +- 8 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 assets/voxygen/voxel/glider/cloverleaf.vox delete mode 100644 assets/voxygen/voxel/glider/starter.vox diff --git a/CHANGELOG.md b/CHANGELOG.md index e8fccc8d4d..6f81dfcb62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New voxelised LoD shader effect - Allow plugins to add recipes and item images - `SnowGlitter` experimental shader. +- Crafting recipe for Cloverleaf glider. ### Changed diff --git a/assets/common/loadout/default.ron b/assets/common/loadout/default.ron index 88ead078b4..038610d43b 100644 --- a/assets/common/loadout/default.ron +++ b/assets/common/loadout/default.ron @@ -5,5 +5,5 @@ legs: Item("common.items.armor.misc.pants.worker_brown"), feet: Item("common.items.armor.misc.foot.sandals"), lantern: Item("common.items.lantern.black_0"), - glider: Item("common.items.glider.cloverleaf"), + glider: Item("common.items.glider.basic_white"), ) \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 8769572d34..41be5457c8 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -430,6 +430,16 @@ ], craft_sprite: Some(CraftingBench), ), + "cloverleaf_glider": ( + output: ("common.items.glider.cloverleaf", 1), + inputs: [ + (Item("common.items.log.wood"), 5, false), + (Item("common.items.flowers.plant_fiber"), 3, false), + (Item("common.items.crafting_ing.sentient_seed"), 1, false), + (Item("common.items.crafting_tools.sewing_set"), 0, false), + ], + craft_sprite: Some(CraftingBench), + ), "leaves_glider": ( output: ("common.items.glider.leaves", 1), inputs: [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index d9df28d58f..1ea9ca1937 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3728,7 +3728,7 @@ ), // Gliders Simple("common.items.glider.cloverleaf"): VoxTrans( - "voxel.glider.starter", + "voxel.glider.cloverleaf", (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), Simple("common.items.glider.basic_white"): VoxTrans( diff --git a/assets/voxygen/voxel/glider/cloverleaf.vox b/assets/voxygen/voxel/glider/cloverleaf.vox new file mode 100644 index 0000000000..49506fb1e9 --- /dev/null +++ b/assets/voxygen/voxel/glider/cloverleaf.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cafc02939dda6a258dc84c04ab87b7ac19005b3888788cf48c982ea879bb0508 +size 29429 diff --git a/assets/voxygen/voxel/glider/starter.vox b/assets/voxygen/voxel/glider/starter.vox deleted file mode 100644 index 56c68d06b9..0000000000 --- a/assets/voxygen/voxel/glider/starter.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4ba475a035ae499c87e1e7d606182f270217ced1efd459124187f31761b9262 -size 4928 diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index ca1bffa593..03e2984150 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/assets/voxygen/voxel/humanoid_glider_manifest.ron @@ -5,7 +5,7 @@ ), map: { "common.items.glider.cloverleaf": ( - vox_spec: ("glider.starter", (-15.0, -5.0, 0.0)), + vox_spec: ("glider.cloverleaf", (-19.0, -5.0, 0.0)), color: None ), "common.items.glider.basic_white": ( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 87e44fcdff..c0399cb8cd 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -955,7 +955,7 @@ Simple("common.items.keys.quarry_keys.flamekeeper_left"): "element.items.keeper_goggle", Simple("common.items.keys.quarry_keys.flamekeeper_right"): "element.items.keeper_goggle", // Gliders - Simple("common.items.glider.cloverleaf"): "voxel.glider.starter", + Simple("common.items.glider.cloverleaf"): "voxel.glider.cloverleaf", Simple("common.items.glider.basic_white"): "voxel.glider.basic_white", Simple("common.items.glider.basic_red"): "voxel.glider.basic_red", Simple("common.items.glider.blue"): "voxel.glider.blue",