From 319cfd1fe9570cbe31348f2faddba84b6390d44e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 17 Dec 2018 13:24:48 +0200 Subject: [PATCH] Added sound effect for purchasing constructions and tiles --- Credits.md | 3 ++- android/assets/sounds/coin.mp3 | Bin 0 -> 10224 bytes core/src/com/unciv/ui/cityscreen/CityScreen.kt | 3 ++- .../com/unciv/ui/cityscreen/CityStatsTable.kt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 android/assets/sounds/coin.mp3 diff --git a/Credits.md b/Credits.md index 699d2c599e..dcbd8ab4db 100644 --- a/Credits.md +++ b/Credits.md @@ -399,4 +399,5 @@ Sounds are from FreeSound.org and are either Creative Commons or Public Domain * [SawInOut01](https://freesound.org/people/kingof_thelab/sounds/340243/) By kingof_thelab for construction picking? * [Chain Snare #1](https://freesound.org/people/lovesbody/sounds/322079/) By lovesbody for Fortify * [Level up](https://freesound.org/people/Marregheriti/sounds/266100/) By Marregheriti for Promote action -* [levelup](https://freesound.org/people/Seidhepriest/sounds/382915/) By Seidhepriest for special actions (free tech, build city, hhurry wonder etc. \ No newline at end of file +* [levelup](https://freesound.org/people/Seidhepriest/sounds/382915/) By Seidhepriest for special actions (free tech, build city, hhurry wonder etc. +* [Coin](https://freesound.org/people/TheDJoe93/sounds/97373/) By TheDJoe93 for purchasing tiles and constructions \ No newline at end of file diff --git a/android/assets/sounds/coin.mp3 b/android/assets/sounds/coin.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..1af053174bf7252da9a8dce831989e74c46086b4 GIT binary patch literal 10224 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.civInfo.gold) buyTileButton.disable() tileTable.add(buyTileButton) } diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt index 131e6cbb74..19b47393c7 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt @@ -66,7 +66,7 @@ class CityStatsTable(val cityScreen: CityScreen) : Table(){ row() val buildingGoldCost = construction.getGoldCost(city.civInfo.policies.getAdoptedPolicies()) val buildingBuyButton = TextButton("Buy for [$buildingGoldCost] gold".tr(), CameraStageBaseScreen.skin) - buildingBuyButton.onClick { + buildingBuyButton.onClick("coin") { city.cityConstructions.purchaseBuilding(city.cityConstructions.currentConstruction) update() }