Audio fixes and new music

assets/voxygen/audio/calendar/christmas/soundtrack.ron

@@ -307,6 +307,19 @@
 
         // Dungeon music
 
+        Individual((
+            title: "A Heart's Ice-Cold Protection",
+            path: "voxygen.audio.soundtrack.dungeon.a_hearts_ice-cold_protection",
+            length: 205.0,
+            timing: None,
+            weather: None,
+            biomes:[],
+            sites: [
+                Dungeon(Adlet),
+            ],
+            music_state: Activity(Explore),
+            artist: ("GeekyGami", "https://geekygami.newgrounds.com/audio/"),
+        )),
         Individual((
             title: "Mysty Temple",
             path: "voxygen.audio.soundtrack.dungeon.mysty_temple",
@@ -316,6 +329,7 @@
             biomes:[],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Tiny", None),
@@ -342,6 +356,7 @@
             biomes: [],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@@ -355,6 +370,7 @@
             biomes: [],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@@ -436,8 +452,8 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))),
-                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.0, Activity(Combat(High)), None),
+                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 61.818, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.545, Activity(Combat(High)), None),
                 ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-end", 6.0, Transition(Combat(High), Explore), None),
             ],
             artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
@@ -451,14 +467,14 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.reversal.reversal-start", 60.0, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.reversal.reversal-start", 61.666, Transition(Explore, Combat(High)), Some(Combat(High))),
                 ("voxygen.audio.soundtrack.combat.reversal.reversal-loop", 60.0, Activity(Combat(High)), None),
-                ("voxygen.audio.soundtrack.combat.reversal.reversal-end", 4.0, Transition(Combat(High), Explore), None),
+                ("voxygen.audio.soundtrack.combat.reversal.reversal-end", 3.666, Transition(Combat(High), Explore), None),
             ],
             artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
         ),
         Segmented(
-            title: "Valiant Voxels",
+            title: "Clash",
             timing: None,
             weather: None,
             biomes: [],
@@ -466,11 +482,11 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-start", 7.846, Transition(Explore, Combat(High)), Some(Combat(High))),
-                ("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-loop", 59.126, Activity(Combat(High)), None),
-                ("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-end", 5.49, Transition(Combat(High), Explore), None),
+                ("voxygen.audio.soundtrack.combat.clash.clash-start", 121.5, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.clash.clash-loop", 81.0, Activity(Combat(High)), None),
+                ("voxygen.audio.soundtrack.combat.clash.clash-end", 1.5, Transition(Combat(High), Explore), None),
             ],
-            artist: ("Seventh Sam", "https://seventhsam.com/"),
+            artist: ("Alfredo Pompa D & Rodriogo Plata", None),
         ),
     ]
 )

assets/voxygen/audio/calendar/halloween/soundtrack.ron

@@ -165,6 +165,19 @@
 
         // Dungeon music
 
+        Individual((
+            title: "A Heart's Ice-Cold Protection",
+            path: "voxygen.audio.soundtrack.dungeon.a_hearts_ice-cold_protection",
+            length: 205.0,
+            timing: None,
+            weather: None,
+            biomes:[],
+            sites: [
+                Dungeon(Adlet),
+            ],
+            music_state: Activity(Explore),
+            artist: ("GeekyGami", "https://geekygami.newgrounds.com/audio/"),
+        )),
         Individual((
             title: "Mysty Temple",
             path: "voxygen.audio.soundtrack.dungeon.mysty_temple",
@@ -174,6 +187,7 @@
             biomes:[],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Tiny", None),
@@ -200,6 +214,7 @@
             biomes: [],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@@ -213,6 +228,7 @@
             biomes: [],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@@ -294,8 +310,8 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))),
-                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.0, Activity(Combat(High)), None),
+                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 61.818, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.545, Activity(Combat(High)), None),
                 ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-end", 6.0, Transition(Combat(High), Explore), None),
             ],
             artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
@@ -309,11 +325,26 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.reversal.reversal-start", 60.0, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.reversal.reversal-start", 61.666, Transition(Explore, Combat(High)), Some(Combat(High))),
                 ("voxygen.audio.soundtrack.combat.reversal.reversal-loop", 60.0, Activity(Combat(High)), None),
-                ("voxygen.audio.soundtrack.combat.reversal.reversal-end", 4.0, Transition(Combat(High), Explore), None),
+                ("voxygen.audio.soundtrack.combat.reversal.reversal-end", 3.666, Transition(Combat(High), Explore), None),
             ],
             artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
         ),
+        Segmented(
+            title: "Clash",
+            timing: None,
+            weather: None,
+            biomes: [],
+            sites: [
+                Dungeon(Old),
+            ],
+            segments: [
+                ("voxygen.audio.soundtrack.combat.clash.clash-start", 121.5, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.clash.clash-loop", 81.0, Activity(Combat(High)), None),
+                ("voxygen.audio.soundtrack.combat.clash.clash-end", 1.5, Transition(Combat(High), Explore), None),
+            ],
+            artist: ("Alfredo Pompa D & Rodriogo Plata", None),
+        ),
     ]
 )

assets/voxygen/audio/sfx.ron

@@ -549,13 +549,6 @@
             threshold: 0.5,
             subtitle: "subtitle-unwield_staff",
         ),
-        Attack(BasicBeam, Staff): (
-            files: [
-                "voxygen.audio.sfx.abilities.flame_thrower",
-            ],
-            threshold: 0.2,
-            subtitle: "subtitle-staff_attack",
-        ),
         //Attack(BasicRanged, Staff): (
         //    files: [
         //        "voxygen.audio.sfx.abilities.staff_channeling",

assets/voxygen/audio/soundtrack.ron

@@ -16,6 +16,20 @@
 
         // Overworld exploration tracks
 
+        Individual((
+            title: "Graceful Journey",
+            path: "voxygen.audio.soundtrack.overworld.graceful_journey",
+            length: 240.0,
+            timing: Day,
+            weather: None,
+            biomes: [
+                (Lake, 1),
+                (Grassland, 1),
+            ],
+            sites: [Void],
+            music_state: Activity(Explore),
+            artist: ("Tobias Thy - (Thy SFX)", "https://soundcloud.com/thyofficial"),
+        )),
         Individual((
             title: "A Cold Breeze Blows",
             path: "voxygen.audio.soundtrack.overworld.a_cold_breeze_blows",
@@ -744,6 +758,19 @@
 
         // Dungeon music
 
+        Individual((
+            title: "A Heart's Ice-Cold Protection",
+            path: "voxygen.audio.soundtrack.dungeon.a_hearts_ice-cold_protection",
+            length: 205.0,
+            timing: None,
+            weather: None,
+            biomes:[],
+            sites: [
+                Dungeon(Adlet),
+            ],
+            music_state: Activity(Explore),
+            artist: ("GeekyGami", "https://geekygami.newgrounds.com/audio/"),
+        )),
         Individual((
             title: "Mysty Temple",
             path: "voxygen.audio.soundtrack.dungeon.mysty_temple",
@@ -753,6 +780,7 @@
             biomes:[],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Tiny", None),
@@ -779,6 +807,7 @@
             biomes: [],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@@ -792,6 +821,7 @@
             biomes: [],
             sites: [
                 Dungeon(Old),
+                Dungeon(Adlet),
             ],
             music_state: Activity(Explore),
             artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@@ -873,8 +903,8 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))),
-                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.0, Activity(Combat(High)), None),
+                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 61.818, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.545, Activity(Combat(High)), None),
                 ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-end", 6.0, Transition(Combat(High), Explore), None),
             ],
             artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
@@ -888,11 +918,26 @@
                 Dungeon(Old),
             ],
             segments: [
-                ("voxygen.audio.soundtrack.combat.reversal.reversal-start", 60.0, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.reversal.reversal-start", 61.666, Transition(Explore, Combat(High)), Some(Combat(High))),
                 ("voxygen.audio.soundtrack.combat.reversal.reversal-loop", 60.0, Activity(Combat(High)), None),
-                ("voxygen.audio.soundtrack.combat.reversal.reversal-end", 4.0, Transition(Combat(High), Explore), None),
+                ("voxygen.audio.soundtrack.combat.reversal.reversal-end", 3.666, Transition(Combat(High), Explore), None),
             ],
             artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
         ),
+        Segmented(
+            title: "Clash",
+            timing: None,
+            weather: None,
+            biomes: [],
+            sites: [
+                Dungeon(Old),
+            ],
+            segments: [
+                ("voxygen.audio.soundtrack.combat.clash.clash-start", 121.5, Transition(Explore, Combat(High)), Some(Combat(High))),
+                ("voxygen.audio.soundtrack.combat.clash.clash-loop", 81.0, Activity(Combat(High)), None),
+                ("voxygen.audio.soundtrack.combat.clash.clash-end", 1.5, Transition(Combat(High), Explore), None),
+            ],
+            artist: ("Alfredo Pompa D & Rodriogo Plata", None),
+        ),
     ]
 )

common/src/terrain/site.rs

@@ -14,6 +14,7 @@ pub enum SiteKindMeta {
 pub enum DungeonKindMeta {
     Old,
     Gnarling,
+    Adlet,
 }
 
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]

common/systems/src/beam.rs

@@ -121,6 +121,10 @@ impl<'a> System<'a> for Sys {
                             sound: Sound::new(SoundKind::Beam, pos.0, 13.0, read_data.time.0),
                         });
                     }
+                    outcomes.push(Outcome::Beam {
+                        pos: pos.0,
+                        specifier: beam.specifier,
+                    });
 
                     // Group to ignore collisions with
                     // Might make this more nuanced if beams are used for non damage effects

voxygen/src/audio/music.rs

@@ -165,8 +165,8 @@ pub struct MusicMgr {
     /// The previous track's activity kind, for transitions
     last_activity: MusicState,
     // For debug menu
-    pub current_track: String,
-    pub current_artist: String,
+    current_track: String,
+    current_artist: String,
     track_length: f32,
 }
 
@@ -493,6 +493,17 @@ impl MusicMgr {
         }
     }
 
+    pub fn current_track(&self) -> String { self.current_track.clone() }
+
+    pub fn current_artist(&self) -> String { self.current_artist.clone() }
+
+    pub fn reset_track(&mut self) {
+        self.began_playing = Instant::now();
+        self.next_track_change = 0.0;
+        self.current_artist = String::from("None");
+        self.current_track = String::from("None");
+    }
+
     /// Loads default soundtrack if no events are active. Otherwise, attempts to
     /// compile and load all active event soundtracks, falling back to default
     /// if they are empty.

voxygen/src/session/mod.rs

@@ -412,7 +412,7 @@ impl SessionState {
                 client::Event::CharacterCreated(_) => {},
                 client::Event::CharacterEdited(_) => {},
                 client::Event::CharacterError(_) => {},
-                client::Event::CharacterJoined(_) => {},
+                client::Event::CharacterJoined(_) => self.scene.music_mgr.reset_track(),
                 client::Event::MapMarker(event) => {
                     self.hud.show.update_map_markers(event);
                 },
@@ -1493,8 +1493,8 @@ impl PlayState for SessionState {
                     num_particles: self.scene.particle_mgr().particle_count() as u32,
                     num_particles_visible: self.scene.particle_mgr().particle_count_visible()
                         as u32,
-                    current_track: self.scene.music_mgr().current_track.clone(),
-                    current_artist: self.scene.music_mgr().current_artist.clone(),
+                    current_track: self.scene.music_mgr().current_track(),
+                    current_artist: self.scene.music_mgr().current_artist(),
                 }
             });
 

world/src/lib.rs

@@ -378,7 +378,18 @@ impl World {
             sim_chunk
                 .sites
                 .iter()
-                .find_map(|site| index.sites[*site].kind.convert_to_meta()),
+                .filter(|id| {
+                    index.sites[**id]
+                        .get_origin()
+                        .distance_squared(chunk_center_wpos2d) as f32
+                        <= index.sites[**id].radius().powi(2)
+                })
+                .min_by_key(|id| {
+                    index.sites[**id]
+                        .get_origin()
+                        .distance_squared(chunk_center_wpos2d)
+                })
+                .map(|id| index.sites[*id].kind.convert_to_meta().unwrap_or_default()),
         );
 
         let mut chunk = TerrainChunk::new(base_z, stone, air, meta);

world/src/site/mod.rs

@@ -467,6 +467,7 @@ impl SiteKind {
             },
             SiteKind::Dungeon(_) => Some(SiteKindMeta::Dungeon(DungeonKindMeta::Old)),
             SiteKind::Gnarling(_) => Some(SiteKindMeta::Dungeon(DungeonKindMeta::Gnarling)),
+            SiteKind::Adlet(_) => Some(SiteKindMeta::Dungeon(DungeonKindMeta::Adlet)),
             _ => None,
         }
     }