Merge branch 'uniior/starter-glider' into 'master'

Starter glider.

See merge request veloren/veloren!4160
This commit is contained in:
flo 2023-11-04 22:09:00 +00:00
commit bae450146b
8 changed files with 18 additions and 7 deletions

View File

@ -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

View File

@ -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"),
)

View File

@ -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: [

View File

@ -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(

BIN
assets/voxygen/voxel/glider/cloverleaf.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/glider/starter.vox (Stored with Git LFS)

Binary file not shown.

View File

@ -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": (

View File

@ -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",