Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement map view music, improve music selection, add tracks #5093

Merged
merged 3 commits into from Apr 29, 2021
Merged

Conversation

WKFO
Copy link
Contributor

@WKFO WKFO commented Dec 25, 2020

Implements map view music and adds a few tracks, just like the title suggests.

Map view music is triggered if the already playing track ends while the player is in a map view (sector or system), but fades out and switches back to ambient once player returns to world (flight) view. (This way it doesn't trigger for every short glance at the map, but it's supposed to be playing if you are taking your sweet time admiring the galaxy/plotting routes into hell).

map-core category plays if player is reasonably close to the populated area of the galaxy (starclock.ogg, it's sort of techno-electronica-whatever), map-unexplored plays while the player is far far away from civilization (no music, minimal ambient sounds to fit the feeling of the unexplored ambient tracks).

Finally, also adding 2 tracks to discovery category which I wanted to add for a while (I didn't think those two were worth a PR of their own, so I'm attaching them here.)

@WKFO
Copy link
Contributor Author

WKFO commented Jan 2, 2021

A few new changes:

  • Combat music now loops as long as the player is in combat.
  • Frame change no longer stops combat music either.
  • ship-destroyed category is disabled, because it was annoying more than anything. I simply commented out the code so if someone thinks it has been a mistake after this PR is merged, it can be simply uncommented back. If not, I can simply remove the whole thing with the next music player update, some unknown time later.
  • README.music.txt has been neglected for a while. That has been updated.

@WKFO
Copy link
Contributor Author

WKFO commented Jan 2, 2021

Also using this opportunity to add another track.

@ConfedMajor
Copy link

I would add a track for thoose times that the player stays close or the player orbits a star

@WKFO
Copy link
Contributor Author

WKFO commented Jan 5, 2021

I might look into something along those lines, but not for now. It would require some effort I can't provide soon enough.

@WKFO WKFO changed the title Implement map view music, add tracks Implement map view music, improve music selection, add tracks Jan 17, 2021
@WKFO
Copy link
Contributor Author

WKFO commented Jan 29, 2021

My initial reservations about a map music in unexplored space has been solved and I came to the conclusion that if there is a difference between world view and map view in populated space, there should be a distinction in unexplored space as well.

@WKFO
Copy link
Contributor Author

WKFO commented Feb 24, 2021

I made a slight rearrangement; moved the old, more energetic unexplored map music to map-core, and instead added another, calmer track to map-unexplored.

@Web-eWorks
Copy link
Member

@WKFO any further changes you'd like to make to this PR, or is it ready for merge? Sorry it's taken so long to get around to merging again!

@WKFO
Copy link
Contributor Author

WKFO commented Mar 28, 2021

@Web-eWorks I have nothing planned, it should be ready for merge if you don't see any problems.

@Web-eWorks Web-eWorks merged commit 65390f4 into pioneerspacesim:master Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants