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

Probability for biome play

Browse Source
This commit is contained in:
jiminycrick 2020-11-03 22:41:54 -08:00
parent c8d79b0b0e
commit e880654f2e
2 changed files with 117 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
assets/voxygen/audio/soundtrack.ron
View File

@ -3,24 +3,46 @@
(
tracks: [
//(
// title: "A Solemn Quest",
// path: "voxygen.audio.soundtrack.a_solemn_quest",
// length: 206.0,
// timing: Some(Day),
// biome: Some(Forest),
// site: None,
// artist: "Eden",
//),
//(
// title: "Into The Dark Forest",
// path: "voxygen.audio.soundtrack.into_the_dark_forest",
// length: 184.0,
// timing: Some(Day),
// biome: Some(Grassland),
// site: None,
// artist: "Aeronic",
//),
(
title: "A Solemn Quest",
path: "voxygen.audio.soundtrack.a_solemn_quest",
length: 206.0,
timing: Some(Day),
biomes: (
void: 1,
lake: 1,
grassland: 1,
ocean: 1,
mountain: 1,
snowland: 1,
desert: 1,
swamp: 1,
jungle: 1,
forest: 0,
),
site: None,
artist: "Eden",
),
(
title: "Into The Dark Forest",
path: "voxygen.audio.soundtrack.into_the_dark_forest",
length: 184.0,
timing: Some(Day),
biomes: (
void: 1,
lake: 1,
grassland: 1,
ocean: 1,
mountain: 1,
snowland: 1,
desert: 1,
swamp: 1,
jungle: 1,
forest: 0,
),
site: None,
artist: "Aeronic",
),
//(
// title: "Field Grazing",
// path: "voxygen.audio.soundtrack.field_grazing",
@ -116,7 +138,18 @@
path: "voxygen.audio.soundtrack.down_the_rabbit_hole",
length: 244.0,
timing: None,
biome: None,
biomes: (
void: 1,
lake: 1,
grassland: 1,
ocean: 1,
mountain: 1,
snowland: 1,
desert: 1,
swamp: 1,
jungle: 1,
forest: 1,
),
site: Some(Cave),
artist: "badbbad",
),
@ -125,7 +158,18 @@
path: "voxygen.audio.soundtrack.between_the_fairies",
length: 175.0,
timing: None,
biome: None,
biomes: (
void: 1,
lake: 1,
grassland: 1,
ocean: 1,
mountain: 1,
snowland: 1,
desert: 1,
swamp: 1,
jungle: 1,
forest: 1,
),
site: Some(Dungeon),
artist: "badbbad",
),

67
voxygen/src/audio/music.rs
View File

@ -45,7 +45,7 @@ use common::{
state::State,
terrain::{BiomeKind, SitesKind},
};
use rand::{seq::IteratorRandom, thread_rng};
use rand::{prelude::SliceRandom, thread_rng};
use serde::Deserialize;
use std::time::Instant;
use tracing::warn;
@ -67,10 +67,24 @@ pub struct SoundtrackItem {
length: f64,
/// Whether this track should play during day or night
timing: Option<DayPeriod>,
biome: Option<BiomeKind>,
biomes: BiomeProbability,
site: Option<SitesKind>,
}
#[derive(Debug, Deserialize)]
pub struct BiomeProbability {
void: u8,
lake: u8,
grassland: u8,
ocean: u8,
mountain: u8,
snowland: u8,
desert: u8,
swamp: u8,
jungle: u8,
forest: u8,
}
/// Allows control over when a track should play based on in-game time of day
#[derive(Debug, Deserialize, PartialEq)]
enum DayPeriod {
@ -120,10 +134,10 @@ impl MusicMgr {
/// request to play the next (random) track
pub fn maintain(&mut self, audio: &mut AudioFrontend, state: &State, client: &Client) {
// Gets the current player biome
let current_biome: BiomeKind = match client.current_chunk() {
Some(chunk) => chunk.meta().biome(),
_ => self.last_biome,
};
//let current_biome: BiomeKind = match client.current_chunk() {
// Some(chunk) => chunk.meta().biome(),
// _ => self.last_biome,
//};
if let Some(current_chunk) = client.current_chunk() {
println!("biome: {:?}", current_chunk.meta().biome());
@ -160,8 +174,8 @@ impl MusicMgr {
}
fn play_random_track(&mut self, audio: &mut AudioFrontend, state: &State, client: &Client) {
const SILENCE_BETWEEN_TRACKS_SECONDS: f64 = 45.0;
//const SILENCE_BETWEEN_TRACKS_SECONDS: f64 = 5.0;
//const SILENCE_BETWEEN_TRACKS_SECONDS: f64 = 45.0;
const SILENCE_BETWEEN_TRACKS_SECONDS: f64 = 5.0;
let game_time = (state.get_time_of_day() as u64 % 86400) as u32;
let current_period_of_day = Self::get_current_day_period(game_time);
@ -180,17 +194,42 @@ impl MusicMgr {
None => true,
}
})
.filter(|track| match &track.biome {
Some(biome) => biome == &current_biome,
None => true,
})
.filter(|track| match &track.site {
Some(site) => site == &current_site,
None => true,
})
.choose(&mut rng);
.filter(|track| match current_biome {
BiomeKind::Void => false,
BiomeKind::Lake => track.biomes.lake > 0,
BiomeKind::Grassland => track.biomes.grassland > 0,
BiomeKind::Ocean => track.biomes.ocean > 0,
BiomeKind::Mountain => track.biomes.mountain > 0,
BiomeKind::Snowland => track.biomes.snowland > 0,
BiomeKind::Desert => track.biomes.desert > 0,
BiomeKind::Swamp => track.biomes.swamp > 0,
BiomeKind::Jungle => track.biomes.jungle > 0,
BiomeKind::Forest => track.biomes.forest > 0,
})
.collect::<Vec<&SoundtrackItem>>();
if let Some(track) = maybe_track {
//let new_maybe_track = maybe_track
// .choose_weighted(&mut rng, |track|
// track.biomes.unwrap().entry(current_biome));
let new_maybe_track = maybe_track.choose_weighted(&mut rng, |track| match current_biome {
BiomeKind::Void => track.biomes.void,
BiomeKind::Lake => track.biomes.lake,
BiomeKind::Grassland => track.biomes.grassland,
BiomeKind::Ocean => track.biomes.ocean,
BiomeKind::Mountain => track.biomes.mountain,
BiomeKind::Snowland => track.biomes.snowland,
BiomeKind::Desert => track.biomes.desert,
BiomeKind::Swamp => track.biomes.swamp,
BiomeKind::Jungle => track.biomes.jungle,
BiomeKind::Forest => track.biomes.forest,
});
if let Ok(track) = new_maybe_track {
self.last_track = String::from(&track.title);
self.began_playing = Instant::now();
self.next_track_change = track.length + SILENCE_BETWEEN_TRACKS_SECONDS;