From 3da77ce061198745e1acdc12daecad59b4763921 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 9 Apr 2020 12:17:33 +0800
Subject: [PATCH] Play specific music during character selection

---
 .../data/gamedev/interfaces_v3/out_v2_appear.xml     |  9 +++++----
 .../data/gamedev/interfaces_v3/out_v2_location.xml   |  3 ++-
 .../data/gamedev/interfaces_v3/out_v2_select.xml     | 12 ++++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index 67fdecf31..e03027d54 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -1037,10 +1037,11 @@
 
 
 	<!-- Music playing -->
-	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,0)" params="name=Character Creation Fyros.ogg|async=1" />
-	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,1)" params="name=Character Creation Matis.ogg|async=1" />
-	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,2)" params="name=Character Creation Trykers.ogg|async=1" />
-	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,3)" params="name=Character Creation Zorai.ogg|async=1" />
+	<!-- Play character creation music -->
+	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,0)" params="name=character creation fyros.ogg|async=1" />
+	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,1)" params="name=character creation matis.ogg|async=1" />
+	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,2)" params="name=character creation trykers.ogg|async=1" />
+	<action handler="play_music_outgame"  cond="eq(@UI:TEMP:CHAR3D:PEOPLE,3)" params="name=character creation zorai.ogg|async=1" />
 
 </proc>
 
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml
index 016ca3170..02095b522 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_location.xml
@@ -611,7 +611,8 @@
 	<!-- Continue or Restart Default Outgame Music
 		MUST PLAY IT NOT ASYNCLY, else it don't works well during loading 
 	-->
-	<action handler="play_music_outgame"  params="async=0" />
+	<!-- Play character selection music -->
+	<!-- <action handler="play_music_outgame"  params="async=0" /> -->
 </proc>
 
 <proc id="proc_location_finish2">
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
index fa8790dd5..6263f9d29 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
@@ -76,7 +76,8 @@
 	<!-- Continue or Restart Default Outgame Music
 		MUST PLAY IT NOT ASYNCLY, else it don't works well during loading 
 	-->
-	<action handler="play_music_outgame"  params="async=0" />
+	<!-- Play character selection music -->
+	<!-- <action handler="play_music_outgame"  params="async=0" /> -->
 
 </proc>
 
@@ -186,7 +187,14 @@
 			value=switch(@UI:TEMP:CHAR3D:PEOPLE, 60, 60, 60, 60)" />
 	<action handler="set" params="target_property=ui:outgame:charsel:3d_select:y |
 								value=switch(@0, 0, -153, -306, -459, -612)" />	
-								
+	
+	<!-- Play character selection music -->
+	<action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,0),not(isCharSelSlotEmpty(@0)))" params="name=character creation fyros.ogg|async=1" />
+	<action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,1),not(isCharSelSlotEmpty(@0)))" params="name=character creation matis.ogg|async=1" />
+	<action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,2),not(isCharSelSlotEmpty(@0)))" params="name=character creation trykers.ogg|async=1" />
+	<action handler="play_music_outgame" cond="and(eq(@UI:TEMP:CHAR3D:PEOPLE,3),not(isCharSelSlotEmpty(@0)))" params="name=character creation zorai.ogg|async=1" />
+	<action handler="play_music_outgame" cond="isCharSelSlotEmpty(@0)" params="async=1" />
+	
 	<action handler="proc" params="proc_charsel_infos2" />
 </proc>