From 9610f9f918bbc0afbd8a275bcbf47866abbcbce6 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 3 Nov 2019 20:15:49 +0200
Subject: [PATCH] bugfix - Music volume slider no longer auto-sets to sound
 effect volume

---
 android/assets/jsons/Units.json                             | 6 +++---
 android/build.gradle                                        | 4 ++--
 .../ui/worldscreen/optionstable/WorldScreenOptionsTable.kt  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index eb18a1fc9b..13d92790a1 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -917,7 +917,7 @@
 		requiredTech:"Dynamite",
 		upgradesTo:"Rocket Artillery",
 		uniques:["Bonus vs City 200%","No defensive terrain bonus",
-			"Must set up to ranged attack","Limited Visibility","Indirect Fire"],
+			"Must set up to ranged attack","Limited Visibility","Ranged attacks may be performed over obstacles"],
 		hurryCostModifier:20
 	},
 	{
@@ -1038,7 +1038,7 @@
 		cost: 375,
 		requiredResource:"Oil",
 		requiredTech:"Electronics",
-		uniques:["Indirect Fire", "Bonus vs City 30%"],
+		uniques:["Ranged attacks may be performed over obstacles", "Bonus vs City 30%"],
 		hurryCostModifier:20
 	},
 	{
@@ -1163,7 +1163,7 @@
 		requiredTech:"Rocketry",
 		requiredResource:"Aluminum",
 		uniques:["Bonus vs City 200%","No defensive terrain bonus",
-			"Limited Visibility","Indirect Fire"],
+			"Limited Visibility","Ranged attacks may be performed over obstacles"],
 		hurryCostModifier:20
 	},
 	{
diff --git a/android/build.gradle b/android/build.gradle
index e1cfa07793..efc75dafcf 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 317
-        versionName "3.1.12"
+        versionCode 319
+        versionName "3.1.13"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
index a1bc166286..1428bb4321 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
@@ -154,7 +154,7 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr
             innerTable.add("Music volume".tr())
 
             val musicVolumeSlider = Slider(0f, 1.0f, 0.1f, false, skin)
-            musicVolumeSlider.value = UnCivGame.Current.settings.soundEffectsVolume
+            musicVolumeSlider.value = UnCivGame.Current.settings.musicVolume
             musicVolumeSlider.addListener(object : ChangeListener() {
                 override fun changed(event: ChangeEvent?, actor: Actor?) {
                     UnCivGame.Current.settings.musicVolume = musicVolumeSlider.value