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

bat config

Browse Source
This commit is contained in:
IsseW 2022-10-25 00:31:04 +02:00
parent 6bacb487f3
commit 9a6a3a05a1
15 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/custom/simpleflyingmelee/singlestrike.ron
View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 4.0,
base_damage: 1.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,

11
assets/common/entity/wild/aggressive/bat.ron Normal file
View File

@ -0,0 +1,11 @@
#![enable(implicit_some)]
(
name: Automatic,
body: RandomWith("bat"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.calendar.halloween.bat"),
inventory: (
loadout: FromBody,
),
meta: [],
)

4
assets/common/loot_tables/calendar/halloween/bat.ron Normal file
View File

@ -0,0 +1,4 @@
[
(1.0, Item("common.items.food.pumpkin_spice_brew")),
(5.0, Item("common.items.food.honeycorn")),
]

9
assets/common/loot_tables/creature/bat.ron Normal file
View File

@ -0,0 +1,9 @@
[
// halloween event loot
(2.0, Item("common.items.food.pumpkin_spice_brew")),
(5.0, Item("common.items.food.honeycorn")),
// crafting
(1.0, Item("common.items.crafting_ing.hide.animal_hide")),
(1.0, Item("common.items.crafting_ing.animal_misc.shar_fang")),
]

12
assets/voxygen/voxel/bird_medium_central_manifest.ron
View File

@ -225,29 +225,29 @@
),
(Bat, Male): (
head: (
offset: (-4.5, 2.0, -9.0),
offset: (-4.5, 2.0, -11.0),
central: ("npc.bat.male.head"),
),
torso: (
offset: (-3.5, -5.0, -4.5),
offset: (-3.5, -5.0, -6.5),
central: ("npc.bat.male.torso"),
),
tail: (
offset: (-2.5, -0.5, 1.5),
offset: (-2.5, -1.5, -1.5),
central: ("npc.bat.male.tail"),
)
),
(Bat, Female): (
head: (
offset: (-4.5, 2.0, -9.0),
offset: (-4.5, 2.0, -11.0),
central: ("npc.bat.male.head"),
),
torso: (
offset: (-3.5, -5.0, -4.5),
offset: (-3.5, -5.0, -6.5),
central: ("npc.bat.male.torso"),
),
tail: (
offset: (-2.5, -0.5, 1.5),
offset: (-2.5, -1.5, -1.5),
central: ("npc.bat.male.tail"),
)
),

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

@ -289,37 +289,37 @@
),
(Bat, Male): (
wing_l: (
offset: (-1.0, 2.5, -18.0),
offset: (-13.0, 2.5, -3.5),
lateral: ("npc.bat.male.wing_r"),
),
wing_r: (
offset: (-1.0, 2.5, -18.0),
offset: (-1.0, 2.5, -3.5),
lateral: ("npc.bat.male.wing_r"),
),
foot_l: (
offset: (-2.0, -2.0, -7.0),
offset: (-2.0, 2.0, -8.5),
lateral: ("npc.bat.male.leg_r"),
),
foot_r: (
offset: (-2.0, -2.0, -7.0),
offset: (-2.0, 2.0, -8.5),
lateral: ("npc.bat.male.leg_r"),
)
),
(Bat, Female): (
wing_l: (
offset: (-1.0, 2.5, -18.0),
offset: (-13.0, 2.5, -3.5),
lateral: ("npc.bat.male.wing_r"),
),
wing_r: (
offset: (-1.0, 2.5, -18.0),
offset: (-1.0, 2.5, -3.5),
lateral: ("npc.bat.male.wing_r"),
),
foot_l: (
offset: (-2.0, -2.0, -7.0),
offset: (-2.0, 2.0, -8.5),
lateral: ("npc.bat.male.leg_r"),
),
foot_r: (
offset: (-2.0, -2.0, -7.0),
offset: (-2.0, 2.0, -8.5),
lateral: ("npc.bat.male.leg_r"),
)
),

BIN
assets/voxygen/voxel/npc/bat/male/leg_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bat/male/wing_r.vox (Stored with Git LFS)
View File

Binary file not shown.

1
assets/world/wildlife/spawn/calendar/halloween/halloween.ron
View File

@ -6,6 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")),
(2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")),
(3, (4, 8, "common.entity.wild.aggressive.bat")),
(3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")),
],
spawn_mode: Land,

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

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

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

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

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

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

1
common/src/comp/body.rs
View File

@ -424,6 +424,7 @@ impl Body {
bird_medium::Species::Duck => Vec3::new(0.9, 1.0, 1.4),
bird_medium::Species::Goose => Vec3::new(1.0, 1.2, 1.5),
bird_medium::Species::Peacock => Vec3::new(1.3, 1.1, 1.4),
bird_medium::Species::Bat => Vec3::new(2.0, 2.0, 1.5),
_ => Vec3::new(2.0, 1.0, 1.5),
},
Body::BirdLarge(body) => match body.species {

4
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),
(Parrot, _) => (2.0, -4.5, 3.0),
(Penguin, _) => (4.0, 0.5, 1.0),
(Bat, _) => (3.0, -8.0, 4.0),
(Bat, _) => (3.0, -8.0, -1.0),
},
foot: match (body.species, body.body_type) {
(Duck, _) => (2.5, -2.0, 4.0),
@ -166,7 +166,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Owl, Female) => (1.5, -3.0, 6.5),
(Parrot, _) => (1.5, -3.0, 3.0),
(Penguin, _) => (2.5, -2.0, 6.0),
(Bat, _) => (2.0, -2.0, 8.0),
(Bat, _) => (5.0, -1.0, 8.0),
},
feed: match (body.species, body.body_type) {
(Chicken, _) => 1.2,

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

@ -828,6 +828,10 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
Some("common.entity.wild.peaceful.fungome"),
(biome.mushroom + 0.02) * 0.5,
),
(
Some("common.entity.wild.aggressive.bat"),
(biome.mushroom + 0.1) * 0.5,
),
// Leafy biome
(
Some("common.entity.wild.peaceful.holladon"),
@ -869,6 +873,10 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
Some("common.entity.wild.aggressive.swamp_troll"),
(biome.leafy + 0.0) * 0.1,
),
(
Some("common.entity.wild.aggressive.bat"),
(biome.leafy + 0.1) * 0.5,
),
// Dusty biome
(
Some("common.entity.wild.aggressive.dodarock"),
@ -890,6 +898,10 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
Some("common.entity.wild.peaceful.rat"),
(biome.dusty + 0.1) * 0.3,
),
(
Some("common.entity.wild.aggressive.bat"),
(biome.dusty + 0.1) * 0.5,
),
// Icy biome
(
Some("common.entity.wild.aggressive.blue_oni"),