Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'floppy-bat-wing-tweaks' into 'master'

Browse Source 
tweak bat wing animation

See merge request veloren/veloren!3684
This commit is contained in:
Christof Petig 2022-11-12 10:18:11 +00:00
commit a820eee289
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/voxygen/voxel/bird_medium_lateral_manifest.ron
View File

@ -289,11 +289,11 @@
), ),
(Bat, Male): ( (Bat, Male): (
wing_l: ( wing_l: (
offset: (-13.0, 2.5, -3.5), offset: (-15.0, 2.5, -2.5),
lateral: ("npc.bat.male.wing_r"), lateral: ("npc.bat.male.wing_r"),
), ),
wing_r: ( wing_r: (
offset: (-1.0, 2.5, -3.5), offset: (1.0, 2.5, -2.5),
lateral: ("npc.bat.male.wing_r"), lateral: ("npc.bat.male.wing_r"),
), ),
foot_l: ( foot_l: (
@ -307,11 +307,11 @@
), ),
(Bat, Female): ( (Bat, Female): (
wing_l: ( wing_l: (
offset: (-13.0, 2.5, -3.5), offset: (-15.0, 2.5, -2.5),
lateral: ("npc.bat.male.wing_r"), lateral: ("npc.bat.male.wing_r"),
), ),
wing_r: ( wing_r: (
offset: (-1.0, 2.5, -3.5), offset: (1.0, 2.5, -2.5),
lateral: ("npc.bat.male.wing_r"), lateral: ("npc.bat.male.wing_r"),
), ),
foot_l: ( foot_l: (

2
assets/world/wildlife/spawn/desert/hot.ron
View File

@ -20,7 +20,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.peaceful.holladon")), (1, (1, 1, "common.entity.wild.peaceful.holladon")),
(1, (1, 1, "common.entity.wild.peaceful.porcupine")), (1, (1, 1, "common.entity.wild.peaceful.porcupine")),
(1, (1, 1, "common.entity.wild.peaceful.pangolin")), (1, (1, 1, "common.entity.wild.peaceful.pangolin")),
(1, (2, 4, "common.entity.wild.aggressive.bat")), (1, (1, 3, "common.entity.wild.aggressive.bat")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Night], day_period: [Night],

2
assets/world/wildlife/spawn/jungle/rainforest_area.ron
View File

@ -22,7 +22,7 @@ SpawnEntry (
groups: [ groups: [
(5, (1, 1, "common.entity.wild.peaceful.quokka")), (5, (1, 1, "common.entity.wild.peaceful.quokka")),
(1, (1, 1, "common.entity.wild.peaceful.tortoise")), (1, (1, 1, "common.entity.wild.peaceful.tortoise")),
(5, (2, 4, "common.entity.wild.aggressive.bat")), (2, (1, 3, "common.entity.wild.aggressive.bat")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Night], day_period: [Night],

2
assets/world/wildlife/spawn/temperate/rainforest.ron
View File

@ -45,7 +45,7 @@ SpawnEntry (
// Pack // Pack
(5, (1, 3, "common.entity.wild.peaceful.rat")), (5, (1, 3, "common.entity.wild.peaceful.rat")),
(5, (1, 3, "common.entity.wild.peaceful.squirrel")), (5, (1, 3, "common.entity.wild.peaceful.squirrel")),
(5, (2, 4, "common.entity.wild.aggressive.bat")), (3, (1, 3, "common.entity.wild.aggressive.bat")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Night], day_period: [Night],

2
voxygen/anim/src/bird_medium/mod.rs
View File

@ -153,7 +153,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Owl, Female) => (3.5, -6.0, 3.5), (Owl, Female) => (3.5, -6.0, 3.5),
(Parrot, _) => (2.0, -4.5, 3.0), (Parrot, _) => (2.0, -4.5, 3.0),
(Penguin, _) => (4.0, 0.5, 1.0), (Penguin, _) => (4.0, 0.5, 1.0),
(Bat, _) => (3.0, -8.0, -1.0), (Bat, _) => (1.0, -8.0, -2.0),
}, },
foot: match (body.species, body.body_type) { foot: match (body.species, body.body_type) {
(Duck, _) => (2.5, -2.0, 4.0), (Duck, _) => (2.5, -2.0, 4.0),

6
world/src/layer/cave.rs
View File

@ -830,7 +830,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
), ),
( (
Some("common.entity.wild.aggressive.bat"), Some("common.entity.wild.aggressive.bat"),
(biome.mushroom + 0.1) * 0.5, (biome.mushroom + 0.1) * 0.25,
), ),
// Leafy biome // Leafy biome
( (
@ -875,7 +875,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
), ),
( (
Some("common.entity.wild.aggressive.bat"), Some("common.entity.wild.aggressive.bat"),
(biome.leafy + 0.1) * 0.5, (biome.leafy + 0.1) * 0.25,
), ),
// Dusty biome // Dusty biome
( (
@ -900,7 +900,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
), ),
( (
Some("common.entity.wild.aggressive.bat"), Some("common.entity.wild.aggressive.bat"),
(biome.dusty + 0.1) * 0.5, (biome.dusty + 0.1) * 0.25,
), ),
// Icy biome // Icy biome
( (