From 526386e51c813059f1afce86a7a361cdfb66e801 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 7 Jun 2023 14:46:54 -0400 Subject: [PATCH 1/5] Initial cacti work --- .../sprite/cacti/Cactus_Barrel_Flower.vox | 3 + .../sprite/cacti/Cactus_Branch_Large_1.vox | 3 + .../cacti/Cactus_Branch_Large_1_Flower.vox | 3 + .../sprite/cacti/Cactus_Branch_Large_2.vox | 3 + .../cacti/Cactus_Branch_Large_2_Flower.vox | 3 + .../voxel/sprite/cacti/barrel_cactus.vox | 4 +- .../voxel/sprite/cacti/cactus_round.vox | 4 +- .../voxel/sprite/cacti/cactus_short.vox | 4 +- .../voxel/sprite/cacti/flat_cactus_med.vox | 4 +- .../voxel/sprite/cacti/flat_cactus_short.vox | 4 +- .../voxel/sprite/cacti/large_cactus.vox | 4 +- assets/voxygen/voxel/sprite/cacti/tall.vox | 4 +- assets/voxygen/voxel/sprite/cacti/tall2.vox | 3 + assets/voxygen/voxel/sprite_manifest.ron | 58 +++++++++++++++---- common/src/terrain/sprite.rs | 4 +- world/src/layer/scatter.rs | 30 ++++++++-- 16 files changed, 108 insertions(+), 30 deletions(-) create mode 100644 assets/voxygen/voxel/sprite/cacti/Cactus_Barrel_Flower.vox create mode 100644 assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1.vox create mode 100644 assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1_Flower.vox create mode 100644 assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2.vox create mode 100644 assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2_Flower.vox create mode 100644 assets/voxygen/voxel/sprite/cacti/tall2.vox diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Barrel_Flower.vox b/assets/voxygen/voxel/sprite/cacti/Cactus_Barrel_Flower.vox new file mode 100644 index 0000000000..fc7dc67885 --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/Cactus_Barrel_Flower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70fce37c59f71d0b90e7ed6bedd4d808b28a27323f74f1dbe5fb6c3ab37417b2 +size 24188 diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1.vox b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1.vox new file mode 100644 index 0000000000..7d09bfecc1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfa91e4a989463bf746cd7d6ca3d2487ab749358ad54c75b70b22b23f0c1ce8b +size 32940 diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1_Flower.vox b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1_Flower.vox new file mode 100644 index 0000000000..75b26b00df --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1_Flower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50cb5f8707679730c3966f7668a29dd2d8826a24c5d1bd554958f7488358a096 +size 33009 diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2.vox b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2.vox new file mode 100644 index 0000000000..eece74a26b --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16da2bc27651ef7d310ca859f7f18fa482470cc93b157ec06c859be1e28df1cd +size 36229 diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2_Flower.vox b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2_Flower.vox new file mode 100644 index 0000000000..ebea7b7947 --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2_Flower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c098fcfcececb6b5909ef2268f0aa40a8eb827624cb61058500ecd225e328d58 +size 36365 diff --git a/assets/voxygen/voxel/sprite/cacti/barrel_cactus.vox b/assets/voxygen/voxel/sprite/cacti/barrel_cactus.vox index 0d30102473..7705bca145 100644 --- a/assets/voxygen/voxel/sprite/cacti/barrel_cactus.vox +++ b/assets/voxygen/voxel/sprite/cacti/barrel_cactus.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d01fa15cbbe663a2bce6e603b5cfa301177eae6d5b77d8342c37c25914ebcdb4 -size 3012 +oid sha256:6fbc3df155a39bc88f47480e6f5ee357ec1dfdd76367f9ffc6b33fd8814b0d7b +size 24138 diff --git a/assets/voxygen/voxel/sprite/cacti/cactus_round.vox b/assets/voxygen/voxel/sprite/cacti/cactus_round.vox index a8552fc18d..6a1592d7db 100644 --- a/assets/voxygen/voxel/sprite/cacti/cactus_round.vox +++ b/assets/voxygen/voxel/sprite/cacti/cactus_round.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ee7ed801ba8a7cae2767eb46571d366f3961a1f24a8691e4313080941d2f911 -size 1700 +oid sha256:8ee5201a6c1a5c16766eea40a3be6794dda3e3546fa32e9bad516534cef68f5f +size 22320 diff --git a/assets/voxygen/voxel/sprite/cacti/cactus_short.vox b/assets/voxygen/voxel/sprite/cacti/cactus_short.vox index 66e9702e89..725676b9a5 100644 --- a/assets/voxygen/voxel/sprite/cacti/cactus_short.vox +++ b/assets/voxygen/voxel/sprite/cacti/cactus_short.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ffdaaae693723e3ba1817bef3de422eba68c9f37d84fd5fd931e074e92b928b -size 4820 +oid sha256:94f5212b0cae151cd27944fd952f11131bb3a7f426af72cd56f461827ada7d4a +size 26174 diff --git a/assets/voxygen/voxel/sprite/cacti/flat_cactus_med.vox b/assets/voxygen/voxel/sprite/cacti/flat_cactus_med.vox index 132f0de467..870e22e67a 100644 --- a/assets/voxygen/voxel/sprite/cacti/flat_cactus_med.vox +++ b/assets/voxygen/voxel/sprite/cacti/flat_cactus_med.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07dd77b78992b7e506734d4bbaa49d07e678fedf2b4140db38c5ec988ca9a5c7 -size 1456 +oid sha256:52eb96143b602f01720eb05e6fc8df84c827c3caf9c2cba2654e24003b222f26 +size 22220 diff --git a/assets/voxygen/voxel/sprite/cacti/flat_cactus_short.vox b/assets/voxygen/voxel/sprite/cacti/flat_cactus_short.vox index 5cc8cf92e2..4bc9be5abf 100644 --- a/assets/voxygen/voxel/sprite/cacti/flat_cactus_short.vox +++ b/assets/voxygen/voxel/sprite/cacti/flat_cactus_short.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d27ad1c604a82427ea516400f18c064382e3591ec0881714009e09054d05d13 -size 1272 +oid sha256:6104828081294a030a02ca8d92561d7840af367c23d08af2181a8bb1ac9a117e +size 21908 diff --git a/assets/voxygen/voxel/sprite/cacti/large_cactus.vox b/assets/voxygen/voxel/sprite/cacti/large_cactus.vox index 40105bb2b4..b505a8bdf4 100644 --- a/assets/voxygen/voxel/sprite/cacti/large_cactus.vox +++ b/assets/voxygen/voxel/sprite/cacti/large_cactus.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6966ba7cfd2baa44720616ccc580d6d1eaec877e908674c7dbe329390dc292 -size 14248 +oid sha256:5f5e9424d35678637c25fa28d8d29b68c8c463419310232bd7221732ed03ad68 +size 32971 diff --git a/assets/voxygen/voxel/sprite/cacti/tall.vox b/assets/voxygen/voxel/sprite/cacti/tall.vox index b2cd3cc605..a819d0c153 100644 --- a/assets/voxygen/voxel/sprite/cacti/tall.vox +++ b/assets/voxygen/voxel/sprite/cacti/tall.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f66395ca29e05a8da4234b49922a0560a01360e4a003cea70cc5edc87e8488 -size 3244 +oid sha256:30187c2b9e730d4c490b8c48f9c06937219669915451dd39ed52cf08d8dc76e3 +size 24325 diff --git a/assets/voxygen/voxel/sprite/cacti/tall2.vox b/assets/voxygen/voxel/sprite/cacti/tall2.vox new file mode 100644 index 0000000000..461cc06c27 --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/tall2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc679dcfebe7d23e021b57efd6bf8aa2e0a42fc0faacd1a0979020b097f2da06 +size 27029 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index d93dcec34e..c1deb9be8a 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -44,25 +44,61 @@ Window4: Some(( wind_sway: 0.0, )), // Cacti -LargeCactus: Some(( +BarrelCactus: Some(( variations: [ ( - model: "voxygen.voxel.sprite.cacti.large_cactus", - offset: (-13.5, -5.5, 0.0), + model: "voxygen.voxel.sprite.cacti.barrel_cactus", + offset: (-6.0, -6.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), - ( - model: "voxygen.voxel.sprite.cacti.tall", + ( + model: "voxygen.voxel.sprite.cacti.Cactus_Barrel_Flower", offset: (-6.0, -6.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], wind_sway: 0.0, )), -BarrelCactus: Some(( +LargeCactus: Some(( variations: [ ( - model: "voxygen.voxel.sprite.cacti.barrel_cactus", + model: "voxygen.voxel.sprite.cacti.large_cactus", + offset: (-12.5, -4.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_1", + offset: (-2.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_2", + offset: (-11.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + + ), + ( + model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_1_Flower", + offset: (-2.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_2_Flower", + offset: (-11.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), +TallCactus: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.cacti.tall", + offset: (-6.0, -6.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.cacti.tall2", offset: (-6.0, -6.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), @@ -73,7 +109,7 @@ RoundCactus: Some(( variations: [ ( model: "voxygen.voxel.sprite.cacti.cactus_round", - offset: (-6.0, -6.0, 0.0), + offset: (-4.5, -4.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -83,7 +119,7 @@ ShortCactus: Some(( variations: [ ( model: "voxygen.voxel.sprite.cacti.cactus_short", - offset: (-6.0, -6.0, 0.0), + offset: (-10.5, -4.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -93,7 +129,7 @@ MedFlatCactus: Some(( variations: [ ( model: "voxygen.voxel.sprite.cacti.flat_cactus_med", - offset: (-6.0, -6.0, 0.0), + offset: (-6.0, -2.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -103,7 +139,7 @@ ShortFlatCactus: Some(( variations: [ ( model: "voxygen.voxel.sprite.cacti.flat_cactus_short", - offset: (-6.0, -6.0, 0.0), + offset: (-6.0, -2.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index e0127dc418..c7ce6a464d 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -253,6 +253,7 @@ make_case_elim!( GlowIceCrystal = 0xE1, OneWayWall = 0xE2, GlassKeyhole = 0xE3, + TallCactus = 0xE4, } ); @@ -266,7 +267,8 @@ impl SpriteKind { SpriteKind::BedrollSnow => 0.4, SpriteKind::BedrollPirate => 0.3, SpriteKind::Tomato => 1.65, - SpriteKind::LargeCactus => 2.5, + SpriteKind::LargeCactus => 3.0, + SpriteKind::TallCactus => 2.5, SpriteKind::Scarecrow => 3.0, SpriteKind::Turnip => 0.36, SpriteKind::Pumpkin => 0.81, diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index f5ef44914b..8ae2b09ef5 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -576,13 +576,35 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti ) }, }, + ScatterConfig { + kind: TallCactus, + water_mode: Ground, + permit: |b| matches!(b, BlockKind::Grass), + f: |_, col| { + ( + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 1.5, + None, + ) + }, + }, + ScatterConfig { + kind: BarrelCactus, + water_mode: Ground, + permit: |b| matches!(b, BlockKind::Grass), + f: |_, col| { + ( + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0, + None, + ) + }, + }, ScatterConfig { kind: RoundCactus, water_mode: Ground, permit: |b| matches!(b, BlockKind::Grass), f: |_, col| { ( - close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5, + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0, None, ) }, @@ -593,7 +615,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti permit: |b| matches!(b, BlockKind::Grass), f: |_, col| { ( - close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5, + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0, None, ) }, @@ -604,7 +626,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti permit: |b| matches!(b, BlockKind::Grass), f: |_, col| { ( - close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5, + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0, None, ) }, @@ -615,7 +637,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti permit: |b| matches!(b, BlockKind::Grass), f: |_, col| { ( - close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.5, + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 2.0, None, ) }, From 8978bc9dc45a34031a6acea38d76fd6cfab009cf Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Jun 2023 13:14:33 -0400 Subject: [PATCH 2/5] Test --- world/src/layer/scatter.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index 8ae2b09ef5..f446729b79 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -576,17 +576,6 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti ) }, }, - ScatterConfig { - kind: TallCactus, - water_mode: Ground, - permit: |b| matches!(b, BlockKind::Grass), - f: |_, col| { - ( - close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 1.5, - None, - ) - }, - }, ScatterConfig { kind: BarrelCactus, water_mode: Ground, @@ -598,6 +587,17 @@ pub fn apply_scatter_to(canvas: &mut Canvas, _rng: &mut impl Rng, calendar: Opti ) }, }, + ScatterConfig { + kind: TallCactus, + water_mode: Ground, + permit: |b| matches!(b, BlockKind::Grass), + f: |_, col| { + ( + close(col.temp, 1.0, 0.25).min(close(col.humidity, 0.0, 0.1)) * MUSH_FACT * 1.5, + None, + ) + }, + }, ScatterConfig { kind: RoundCactus, water_mode: Ground, From 6684685679c2c47f4a9b20273a0dd7be087b53f6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Jun 2023 13:49:40 -0400 Subject: [PATCH 3/5] Attempt to fix BarrelCactus --- common/src/terrain/sprite.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index c7ce6a464d..9918ddc3b5 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -267,6 +267,7 @@ impl SpriteKind { SpriteKind::BedrollSnow => 0.4, SpriteKind::BedrollPirate => 0.3, SpriteKind::Tomato => 1.65, + SpriteKind::BarrelCactus => 1.0, SpriteKind::LargeCactus => 3.0, SpriteKind::TallCactus => 2.5, SpriteKind::Scarecrow => 3.0, @@ -325,8 +326,7 @@ impl SpriteKind { SpriteKind::IceSpike => 1.0, SpriteKind::RepairBench => 1.2, // TODO: Find suitable heights. - SpriteKind::BarrelCactus - | SpriteKind::RoundCactus + SpriteKind::RoundCactus | SpriteKind::ShortCactus | SpriteKind::MedFlatCactus | SpriteKind::ShortFlatCactus From 1269cfe00d0f9b2e8d02a64e941b567d261179e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 17 Jun 2023 20:20:05 -0400 Subject: [PATCH 4/5] Lowercase asset files --- assets/voxygen/voxel/sprite_manifest.ron | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index c1deb9be8a..13e99dcab2 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -52,7 +52,7 @@ BarrelCactus: Some(( lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.cacti.Cactus_Barrel_Flower", + model: "voxygen.voxel.sprite.cacti.cactus_barrel_flower", offset: (-6.0, -6.0, 0.0), lod_axes: (1.0, 1.0, 1.0), ), @@ -67,23 +67,23 @@ LargeCactus: Some(( lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_1", + model: "voxygen.voxel.sprite.cacti.cactus_branch_large_1", offset: (-2.5, -3.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_2", + model: "voxygen.voxel.sprite.cacti.cactus_branch_large_2", offset: (-11.5, -3.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_1_Flower", + model: "voxygen.voxel.sprite.cacti.cactus_branch_large_1_flower", offset: (-2.5, -3.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ( - model: "voxygen.voxel.sprite.cacti.Cactus_Branch_Large_2_Flower", + model: "voxygen.voxel.sprite.cacti.cactus_branch_large_2_flower", offset: (-11.5, -3.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), From 413befadae6f35c32fae4da8af7604dfcdf4d25c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 17 Jun 2023 20:35:28 -0400 Subject: [PATCH 5/5] Lowercase asset files --- .../cacti/{Cactus_Barrel_Flower.vox => cactus_barrel_flower.vox} | 0 .../{Cactus_Branch_Large_1.vox => cactus_branch_large_1.vox} | 0 ...Branch_Large_1_Flower.vox => cactus_branch_large_1_flower.vox} | 0 .../{Cactus_Branch_Large_2.vox => cactus_branch_large_2.vox} | 0 ...Branch_Large_2_Flower.vox => cactus_branch_large_2_flower.vox} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename assets/voxygen/voxel/sprite/cacti/{Cactus_Barrel_Flower.vox => cactus_barrel_flower.vox} (100%) rename assets/voxygen/voxel/sprite/cacti/{Cactus_Branch_Large_1.vox => cactus_branch_large_1.vox} (100%) rename assets/voxygen/voxel/sprite/cacti/{Cactus_Branch_Large_1_Flower.vox => cactus_branch_large_1_flower.vox} (100%) rename assets/voxygen/voxel/sprite/cacti/{Cactus_Branch_Large_2.vox => cactus_branch_large_2.vox} (100%) rename assets/voxygen/voxel/sprite/cacti/{Cactus_Branch_Large_2_Flower.vox => cactus_branch_large_2_flower.vox} (100%) diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Barrel_Flower.vox b/assets/voxygen/voxel/sprite/cacti/cactus_barrel_flower.vox similarity index 100% rename from assets/voxygen/voxel/sprite/cacti/Cactus_Barrel_Flower.vox rename to assets/voxygen/voxel/sprite/cacti/cactus_barrel_flower.vox diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox similarity index 100% rename from assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1.vox rename to assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1_Flower.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox similarity index 100% rename from assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_1_Flower.vox rename to assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox similarity index 100% rename from assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2.vox rename to assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox diff --git a/assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2_Flower.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox similarity index 100% rename from assets/voxygen/voxel/sprite/cacti/Cactus_Branch_Large_2_Flower.vox rename to assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox