CityScreen plays a sound when opened (#7163)

* added sounds to cityScreen

* changes? ..don't know how to name this commit

* removed try block

* improved era1 sound and added slider for city enter sounds

* added Information Era sound

* added Future Era sound

* better option name + translation

* added Atomic Era sound

* normalized sounds

* prevent spam + better era 0 and 1 sounds

* cleanup

* sound improvements to medieval and atomic

* volume now tied to sound effects

* improved information sound

* improved future sound

* sounds now stop if you exit the city screen

* improved Renaissance sound

* now in separate function

* now using the music controller

* better file names

* WLTK day sound + sounds are now configurable in Eras.json

* removed redundant setting and fixed comment

* added PlaySingle

* musicController no longer used

* Gdx.audio.newMusic is now used

* function name

* function are now in their own class

* CitySoundPlayer now has 1 instance in UncivGame and is hooked

* credits

* sounds loop

* loopable sounds

* updated credits

* fixed sound not stopping when changing city without leaving cityScreen

* changed WLTKNew sound

* added toggle for the sounds

* changed WLTK sound, removed music and made all tracks have the same volume

* addressed some of the issues

* addressed more issues

* increased sounds volume + volume slider

* made WLTK sound slightly quieter

* removed entry from Vanilla eras

* revert back to CitySoundPlayer.kt

* no more hooks

* removed unused stuff

* changees

* completly reverted MusicController

* and the MusicTrackChooserFlags

* fixed ESC not stopping sounds

* updated credits to mention the sounds are modified

* dispose()

* removed try block
This commit is contained in:
alexban011
2022-06-22 09:11:03 +03:00
committed by GitHub
parent 7de3fdf452
commit 8f53262fc4
21 changed files with 171 additions and 57 deletions

View File

@ -1,7 +1,7 @@
[
// Source: the fandom, so take these with a grain of salt
// I also did some testing in the official version, but by far not all
{
"name": "Ancient era",
"researchAgreementCost": 150,
@ -13,6 +13,7 @@
"baseUnitBuyCost": 200,
"embarkDefense": 3,
"startPercent": 0,
"citySound": "cityAncient",
"friendBonus": {
"Cultured": ["Provides [+3 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -42,6 +43,7 @@
"baseUnitBuyCost": 200,
"embarkDefense": 4,
"startPercent": 10,
"citySound": "cityClassical",
"friendBonus": {
"Cultured": ["Provides [+3 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -73,6 +75,7 @@
"baseUnitBuyCost": 200,
"embarkDefense": 6,
"startPercent": 25,
"citySound": "cityMedieval",
"friendBonus": {
"Cultured": ["Provides [+6 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -100,11 +103,12 @@
"startingCulture": 300,
"settlerPopulation": 2,
"settlerBuildings": ["Monument","Granary","Lighthouse"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus"],
"baseUnitBuyCost": 300,
"embarkDefense": 8,
"startPercent": 37,
"citySound": "cityRenaissance",
"friendBonus": {
"Cultured": ["Provides [+6 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -138,6 +142,7 @@
"baseUnitBuyCost": 400,
"embarkDefense": 10,
"startPercent": 50,
"citySound": "cityIndustrial",
"friendBonus": {
"Cultured": ["Provides [+13 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -167,11 +172,12 @@
"settlerBuildings": ["Monument","Granary","Lighthouse","Market","Workshop","Temple","Barracks","Library","Colosseum"],
"startingObsoleteWonders": ["Temple of Artemis", "Stonehenge", "The Great Library", "Mausoleum of Halicarnassus", "The Pyramids", "Statue of Zeus",
"The Great Lighthouse", "Hanging Gardens", "The Oracle", "Great Wall", "Colossus",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame",
"Hagia Sophia", "Chichen Itza", "Machu Picchu", "Angkor Wat", "Notre Dame",
"Sistine Chapel", "Forbidden Palace", "Himeji Castle", "Taj Mahal", "Porcelain Tower", "Kremlin"],
"baseUnitBuyCost": 600,
"embarkDefense": 13,
"startPercent": 65,
"citySound": "cityModern",
"friendBonus": {
"Cultured": ["Provides [+13 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -207,6 +213,7 @@
"baseUnitBuyCost": 800,
"embarkDefense": 16,
"startPercent": 65,
"citySound": "cityAtomic",
"friendBonus": {
"Cultured": ["Provides [+13 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -243,9 +250,10 @@
"baseUnitBuyCost": 1000,
"embarkDefense": 20,
"startPercent": 80,
// So theoretically this is always just all the wonders at least 2 eras old. So we could just use that.
// So theoretically this is always just all the wonders at least 2 eras old. So we could just use that.
// But where is the modularity? The excluding of very specific wonders? That is no fun.
// So we just write down the entire long list (sorted by era!) instead.
"citySound": "cityInformation",
"friendBonus": {
"Cultured": ["Provides [+13 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],
@ -263,8 +271,8 @@
},
"iconRGB": [76, 176, 81],
},
{ // Technically, this Era doesn't exist in the original game.
// But as it is _really_ usefull to have for testing, I'd like to keep it.
{ // Technically, this Era doesn't exist in the original game.
// But as it is _really_ usefull to have for testing, I'd like to keep it.
// The stats are just copy-pasted from the information era.
"name": "Future era",
"researchAgreementCost": 400,
@ -285,6 +293,7 @@
"baseUnitBuyCost": 1000,
"embarkDefense": 25,
"startPercent": 80,
"citySound": "cityFuture",
"friendBonus": {
"Cultured": ["Provides [+13 Culture] per turn"],
"Maritime": ["Provides [+2 Food] [in capital] per turn"],