mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
lion rock
fixes
This commit is contained in:
parent
4b244ac1ba
commit
a22c0ab48f
8
assets/world/manifests/spots_savannah/lion_rock.ron
Normal file
8
assets/world/manifests/spots_savannah/lion_rock.ron
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#![enable(unwrap_newtypes)]
|
||||||
|
|
||||||
|
[
|
||||||
|
(
|
||||||
|
specifier: "world.structure.natural.lionrock_0",
|
||||||
|
center: (16, 16, 5)
|
||||||
|
),
|
||||||
|
]
|
BIN
assets/world/structure/natural/lionrock_0.vox
(Stored with Git LFS)
Normal file
BIN
assets/world/structure/natural/lionrock_0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -40,7 +40,12 @@ pub enum Spot {
|
|||||||
//TowerRuin,
|
//TowerRuin,
|
||||||
//WellOfLight,
|
//WellOfLight,
|
||||||
//MerchantOutpost,
|
//MerchantOutpost,
|
||||||
|
//TrollHideout,
|
||||||
|
//RuinedHuntingCabin, <-- Bears!
|
||||||
|
//LionRock,
|
||||||
|
//WolfBurrow,
|
||||||
// *Random world objects*
|
// *Random world objects*
|
||||||
|
LionRock,
|
||||||
TreeStumpForest,
|
TreeStumpForest,
|
||||||
DesertBones,
|
DesertBones,
|
||||||
AirshipCrash,
|
AirshipCrash,
|
||||||
@ -91,6 +96,20 @@ impl Spot {
|
|||||||
);
|
);
|
||||||
// Random World Objects -> Themed to their Biome and the NPCs that regularly
|
// Random World Objects -> Themed to their Biome and the NPCs that regularly
|
||||||
// spawn there
|
// spawn there
|
||||||
|
Self::generate_spots(
|
||||||
|
Spot::LionRock,
|
||||||
|
world,
|
||||||
|
1.0,
|
||||||
|
|g, c| {
|
||||||
|
g < 0.25
|
||||||
|
&& !c.near_cliffs()
|
||||||
|
&& !c.river.near_water()
|
||||||
|
&& !c.path.0.is_way()
|
||||||
|
&& c.sites.is_empty()
|
||||||
|
&& matches!(c.get_biome(), BiomeKind::Grassland)
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
);
|
||||||
Self::generate_spots(
|
Self::generate_spots(
|
||||||
Spot::TreeStumpForest,
|
Spot::TreeStumpForest,
|
||||||
world,
|
world,
|
||||||
@ -230,20 +249,25 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
// Random World Objects
|
// Random World Objects
|
||||||
|
Spot::LionRock => SpotConfig {
|
||||||
|
base_structures: Some("spots_savannah.lion_rock"),
|
||||||
|
entity_radius: 20.0,
|
||||||
|
entities: &[(0..8, "common.entity.wild.aggressive.lion")],
|
||||||
|
},
|
||||||
Spot::TreeStumpForest => SpotConfig {
|
Spot::TreeStumpForest => SpotConfig {
|
||||||
base_structures: Some("trees.oak_stumps"),
|
base_structures: Some("trees.oak_stumps"),
|
||||||
entity_radius: 30.0,
|
entity_radius: 30.0,
|
||||||
entities: &[(0..1, "common.entity.wild.aggressive.deadwood")],
|
entities: &[(0..2, "common.entity.wild.aggressive.deadwood")],
|
||||||
},
|
},
|
||||||
Spot::DesertBones => SpotConfig {
|
Spot::DesertBones => SpotConfig {
|
||||||
base_structures: Some("trees.quirky_dry"),
|
base_structures: Some("trees.quirky_dry"),
|
||||||
entity_radius: 40.0,
|
entity_radius: 40.0,
|
||||||
entities: &[(1..6, "common.entity.wild.aggressive.hyena")],
|
entities: &[(4..9, "common.entity.wild.aggressive.hyena")],
|
||||||
},
|
},
|
||||||
Spot::AirshipCrash => SpotConfig {
|
Spot::AirshipCrash => SpotConfig {
|
||||||
base_structures: Some("trees.airship_crash"),
|
base_structures: Some("trees.airship_crash"),
|
||||||
entity_radius: 10.0,
|
entity_radius: 20.0,
|
||||||
entities: &[(1..4, "common.entity.spot.bandit_camp.grim_salvager")],
|
entities: &[(4..9, "common.entity.spot.bandit_camp.grim_salvager")],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
// Blit base structure
|
// Blit base structure
|
||||||
|
Loading…
Reference in New Issue
Block a user