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

cave and tree distributions and minor tweaks

Browse Source
This commit is contained in:
UncomfySilence 2024-02-21 12:28:41 +01:00
parent 3b7a9b38af
commit f3cc4bf90f
8 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/common/item_i18n_manifest.ron
View File

@ -597,6 +597,9 @@
Simple(
"common.items.npc_armor.quadruped_medium.hirdrasil",
): "common-items-npc_armor-quadruped_medium-hirdrasil",
Simple(
"common.items.npc_armor.quadruped_medium.wolf",
): "common-items-npc_armor-quadruped_medium-wolf",
Simple(
"common.items.npc_armor.quadruped_small.boar",
): "common-items-npc_armor-quadruped_small-boar",

3
assets/voxygen/i18n/en/item/armor/npc.ftl
View File

@ -586,6 +586,9 @@ common-items-npc_armor-quadruped_medium-hirdrasil = Hirdrasil's Blessing
common-items-npc_armor-quadruped_medium-roshwalr = Roshwalr's Thick Skin
.desc = Testing123.
common-items-npc_armor-quadruped_medium-wolf = Wolf Armor
.desc = Testing123.
common-items-npc_armor-quadruped_small-boar = Boar Armor
.desc = Worn by small beasties.

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

@ -27,7 +27,7 @@ SpawnEntry (
(28, (1, 1, "common.entity.wild.aggressive.deadwood")),
(24, (1, 1, "common.entity.wild.aggressive.tiger")),
(10, (1, 1, "common.entity.wild.aggressive.maneater")),
(8, (1, 1, "common.entity.wild.aggressive.mossdrake")),)
(8, (1, 1, "common.entity.wild.aggressive.mossdrake")),
(2, (1, 1, "common.entity.wild.aggressive.cockatrice")),
(1, (1, 1, "common.entity.wild.aggressive.odonto")),
],

2
assets/world/wildlife/spawn/taiga/area.ron
View File

@ -15,7 +15,7 @@ SpawnEntry (
(8, (2, 5, "common.entity.wild.peaceful.boar")),
(10, (5, 10, "common.entity.wild.peaceful.sheep")),
(14, (1, 2, "common.entity.wild.peaceful.squirrel")),
(9, (5, 10, "common.entity.wild.peaceful.goat")),
(8, (2, 6, "common.entity.wild.peaceful.goat")),
(7, (3, 8, "common.entity.wild.peaceful.llama")),
(7, (1, 2, "common.entity.wild.peaceful.donkey")),
(8, (1, 1, "common.entity.wild.peaceful.skunk")),

3
common/src/comp/inventory/loadout_builder.rs
View File

@ -1198,6 +1198,9 @@ impl LoadoutBuilder {
| quadruped_medium::Species::Zebra => {
Some("common.items.npc_armor.quadruped_medium.equus")
},
quadruped_medium::Species::Wolf => {
Some("common.items.npc_armor.quadruped_medium.wolf")
},
_ => Some("common.items.npc_armor.quadruped_medium.broad"),
},
Body::Theropod(body) => match body.species {

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

@ -831,7 +831,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
// Leafy biome
(
Some("common.entity.wild.peaceful.holladon"),
(biome.leafy + 0.05) * 0.5,
(biome.leafy.max(biome.barren) + 0.1) * 0.5,
),
(
Some("common.entity.wild.peaceful.turtle"),
@ -847,11 +847,11 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
),
(
Some("common.entity.wild.aggressive.maneater"),
(biome.leafy + 0.05) * 0.1,
(biome.leafy + 0.0) * 0.05,
),
(
Some("common.entity.wild.aggressive.batfox"),
(biome.leafy.max(biome.barren) + 0.3) * 0.35,
(biome.leafy.max(biome.barren) + 0.15) * 0.35,
),
(
Some("common.entity.wild.aggressive.rocksnapper"),
@ -859,11 +859,11 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
),
(
Some("common.entity.wild.aggressive.cave_salamander"),
(biome.leafy + 0.0) * 0.2,
(biome.leafy + 0.1) * 0.2,
),
(
Some("common.entity.wild.aggressive.asp"),
(biome.leafy + 0.1) * 0.15,
(biome.leafy + 0.1) * 0.1,
),
(
Some("common.entity.wild.aggressive.swamp_troll"),
@ -880,7 +880,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
),
(
Some("common.entity.wild.aggressive.cave_spider"),
(biome.dusty + 0.0) * 0.25,
(biome.dusty + 0.0) * 0.05,
),
(
Some("common.entity.wild.aggressive.cave_troll"),
@ -888,15 +888,15 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
),
(
Some("common.entity.wild.aggressive.antlion"),
(biome.dusty.max(biome.barren) + 0.1) * 0.05,
(biome.dusty.min(biome.depth) + 0.0) * 0.01,
),
(
Some("common.entity.wild.peaceful.rat"),
(biome.dusty + 0.1) * 0.3,
(biome.dusty.max(biome.barren) + 0.15) * 0.3,
),
(
Some("common.entity.wild.peaceful.bat"),
(biome.dusty + 0.1) * 0.25,
(biome.dusty.max(biome.barren) + 0.1) * 0.25,
),
// Icy biome
(
@ -905,7 +905,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
),
(
Some("common.entity.wild.aggressive.icedrake"),
(biome.icy + 0.0) * 0.1,
(biome.icy + 0.0) * 0.04,
),
(
Some("common.entity.wild.aggressive.wendigo"),
@ -914,15 +914,11 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
// Lava biome
(
Some("common.entity.wild.aggressive.lavadrake"),
(biome.fire + 0.0) * 0.2,
),
(
Some("common.entity.wild.aggressive.basilisk"),
(biome.fire + 0.1) * 0.01,
(biome.fire + 0.0) * 0.15,
),
(
Some("common.entity.wild.peaceful.crawler_molten"),
(biome.fire + 0.0) * 0.75,
(biome.fire + 0.0) * 0.35,
),
(
Some("common.entity.wild.aggressive.red_oni"),
@ -937,6 +933,10 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
Some("common.entity.wild.aggressive.ogre"),
(biome.depth + 0.0) * 0.02,
),
(
Some("common.entity.wild.aggressive.basilisk"),
(biome.depth + 0.1) * 0.005,
),
(None, 100.0),
]
.choose_weighted(rng, |(_, w)| *w)

24
world/src/layer/mod.rs
View File

@ -616,7 +616,7 @@ pub fn apply_caves_supplement<'a>(
.map_or(true, |b| b.is_fluid())
})
}) {
if RandomField::new(index.seed).chance(wpos2d.into(), 0.0014)
if RandomField::new(index.seed).chance(wpos2d.into(), 0.14)
&& cave_base < surface_z - 40
{
let entity = EntityInfo::at(wpos2d.map(|e| e as f32).with_z(z as f32));
@ -635,22 +635,22 @@ pub fn apply_caves_supplement<'a>(
}
}
} else if cave_depth < 70.0 {
match dynamic_rng.gen_range(0..4) {
0 => "common.entity.wild.peaceful.truffler",
1 => "common.entity.wild.aggressive.dodarock",
2 => "common.entity.wild.peaceful.holladon",
_ => "common.entity.wild.aggressive.batfox",
match dynamic_rng.gen_range(0..9) {
0..=1 => "common.entity.wild.peaceful.truffler",
2 => "common.entity.wild.aggressive.dodarock",
3..=4 => "common.entity.wild.peaceful.holladon",
5..=6 => "common.entity.wild.aggressive.batfox",
_ => "common.entity.wild.peaceful.rat",
}
} else if cave_depth < 120.0 {
match dynamic_rng.gen_range(0..10) {
2 => "common.entity.wild.aggressive.rocksnapper",
5 => "common.entity.wild.aggressive.cave_salamander",
7 => "common.entity.wild.aggressive.cave_spider",
8 => "common.entity.wild.peaceful.crawler_molten",
match dynamic_rng.gen_range(0..5) {
0..=1 => "common.entity.wild.aggressive.cave_salamander",
2 => "common.entity.wild.aggressive.cave_spider",
3..=4 => "common.entity.wild.peaceful.crawler_molten",
_ => "common.entity.wild.aggressive.asp",
}
} else if cave_depth < 190.0 {
match dynamic_rng.gen_range(0..5) {
match dynamic_rng.gen_range(0..4) {
1 => "common.entity.wild.aggressive.rocksnapper",
2 => "common.entity.wild.aggressive.lavadrake",
3 => "common.entity.wild.aggressive.black_widow",

10
world/src/site2/plot/giant_tree.rs
View File

@ -46,9 +46,9 @@ impl GiantTree {
above_block: &Block,
dynamic_rng: &mut impl Rng,
) -> Option<EntityInfo> {
if above_block.kind() == BlockKind::Leaves && dynamic_rng.gen_bool(0.001) {
if above_block.kind() == BlockKind::Leaves && dynamic_rng.gen_bool(0.000055) {
let entity = EntityInfo::at(pos.as_());
match dynamic_rng.gen_range(0..=4) {
match dynamic_rng.gen_range(0..=7) {
0 => Some(entity.with_asset_expect(
"common.entity.wild.aggressive.horn_beetle",
dynamic_rng,
@ -59,17 +59,17 @@ impl GiantTree {
dynamic_rng,
None,
)),
2 => Some(entity.with_asset_expect(
2..=3 => Some(entity.with_asset_expect(
"common.entity.wild.aggressive.deadwood",
dynamic_rng,
None,
)),
3 => Some(entity.with_asset_expect(
4 => Some(entity.with_asset_expect(
"common.entity.wild.aggressive.maneater",
dynamic_rng,
None,
)),
4 => Some(entity.with_asset_expect(
5..=7 => Some(entity.with_asset_expect(
"common.entity.wild.peaceful.parrot",
dynamic_rng,
None,