1 files changed, 115 insertions, 58 deletions

diff --git a/config.yml b/config.yml
index c7d2c5f..c6efff3 100644
--- a/config.yml
+++ b/config.yml
@@ -15,25 +15,42 @@ aliases:
     file: "PIRATE_05-cour_a_londine.mp3"
   fouille_jonglage:
     file: "PIRATE_07-fouille_jonglage.mp3"
+    gain: 0.9
   liberation_prisonniere:
     file: "PIRATE_08-1-liberation_prisonniere.mp3"
   paf:
     file: "PIRATE_08-2-paf_tombe.mp3"
   duo_pirate_ondine:
     file: "PIRATE_09-duo_pirate_ondine.mp3"
+    gain: 115
   trio_jalousie:
     file: "PIRATE_10-1-trios_jalousie.mp3"
   coup:
     file: "PIRATE_10-2-coup.mp3"
   piquage_2_4:
     file: "PIRATE_11-piquage_2_4.mp3"
+    gain: 110
   baston:
     file: "PIRATE_12-1-baston.mp3"
   baston_ascension:
     file: "PIRATE_12-3-baston_ascension.mp3"
-    volume: 50
   ralenti:
     file: "PIRATE_12-2-ralenti.mp3"
+  saluts:
+    file: "PIRATE_13-saluts.mp3"
+  wait_fade:
+    duration: 0.6
+  couleur_chloe:
+    color: [73, 221, 226]
+  couleur_denise:
+    color: [190, 110, 236]
+  couleur_jerome:
+    color: [240, 158, 0]
+  couleur_chris:
+    color: [255, 255, 0]
+  couleur_aure:
+    color: [0, 190, 27]
+
 
 music_properties:
   "PIRATE_01-1-intro_jonglacro.mp3":
@@ -44,6 +61,7 @@ music_properties:
     name: Lancer prisonnière
   "PIRATE_03-1-quete.mp3":
     name: Quête
+    gain: 1.2
   "PIRATE_03-2-monstre.mp3":
     name: Monstre
   "PIRATE_04-entree_ondine.mp3":
@@ -54,6 +72,7 @@ music_properties:
     name: Fouille jonglage
   "PIRATE_08-1-liberation_prisonniere.mp3":
     name: Libération prisonnière
+    gain: 1.2
   "PIRATE_08-2-paf_tombe.mp3":
     name: Paf tombe
   "PIRATE_09-duo_pirate_ondine.mp3":
@@ -68,147 +87,150 @@ music_properties:
     name: Baston
   "PIRATE_12-3-baston_ascension.mp3":
     name: Baston ascension
-    gain: 2
+    gain: 1.4
   "PIRATE_12-2-ralenti.mp3":
     name: Ralenti
+  "PIRATE_13-saluts.mp3":
+    name: Saluts
+    gain: 0.7
 
 key_properties:
   'a':
     description:
-      -  # Chloé
+      -  
       - Jonglacro
-    color: [73, 221, 226]
+    include: couleur_chloe
   'z':
     description:
       -  #Chloé
       - Jonglacro
       - 2
-    color: [73, 221, 226]
+    include: couleur_chloe
   'e':
     description:
       -   #Chloé
       - Fin
       - jonglacro
-    color: [73, 221, 226]
+    include: couleur_chloe
   'r':
     description:
       -   #Chloé
       - Lancer 
       - prisonnière
-    color: [73, 221, 226]
+    include: couleur_chloe
   't':
     description:
       -  #Chloé
       - Fin
       - lancer
-    color: [73, 221, 226]
+    include: couleur_chloe
   'y':
     description:
       -  #Chloé
       - Quête
-    color: [73, 221, 226]
+    include: couleur_chloe
   'u':
     description:
       -  #Chloé
       - Monstre
-    color: [73, 221, 226]
+    include: couleur_chloe
   'i':
     description:
       -  #Chloé
       - Fin quête
       - Grotte
-    color: [73, 221, 226]
+    include: couleur_chloe
   'o':
     description:
       -   #Denise
       - Fin ondine
       - Cour ondine
-    color: [190, 110, 236]
+    include: couleur_denise
   'p':
     description:
       -   #Denise
       - Fin 
       - Cour ondine
-    color: [190, 110, 236]
+    include: couleur_denise
   'q':
     description:
       -  #Chloé
       - Fouille 
       - Jonglage
-    color: [73, 221, 226]
+    include: couleur_chloe
   's':
     description:
       -   #Denise
       - Fin
       - Jonglage
-    color: [190, 110, 236]
+    include: couleur_denise
   'd':
     description:
       -   #Denise
       - Libération 
       - Prisonnière
-    color: [190, 110, 236]
+    include: couleur_denise
   'f':
     description:
       -   #Denise
       - Paf
       - Baisser musique
-    color: [190, 110, 236]
+    include: couleur_denise
   'g':
     description:
       -   #Denise
       - Stop 
       - libération
-    color: [190, 110, 236]
+    include: couleur_denise
   'h':
     description:
       -   #Denise
       - Duo
-    color: [190, 110, 236]
+    include: couleur_denise
   'j':
     description:
       -   #Jérôme
-      - Fin duo
       - Trio
-    color: [240, 158, 0]
+    include: couleur_jerome
   'k':
     description:
-      -   #Jérôme
+      -   
       - Fin trio
-    color: [240, 158, 0]
+    include: couleur_jerome
   'l':
     description:
-      -   #Jérôme
+      - 
       - Jeu à 
       - 2 et 4
-    color: [240, 158, 0]
+    include: couleur_jerome
   'm':
     description:
-      -  #Chloé
+      -  
       - Fin jeu
       - Baston
-    color: [73, 221, 226]
+    include: couleur_chloe
   'w':
     description:
-      -  #Christophe
+      -  
       - Fin baston
       - Ralenti
-    color: [255, 255, 0]
+    include: couleur_chris
   'x':
     description:
-      -  #Christophe
+      -  
       - Fin ralenti
-    color: [255, 255, 0]
+    include: couleur_chris
   'c':
     description:
-      -  #Christophe
+      -  
       - Baston 2
-    color: [255, 255, 0]
+    include: couleur_chris
   'v':
     description:
-      -  #Auréliane
+      -  
       - Fin baston 2
-    color: [0, 190, 27]
+      - Saluts
+    include: couleur_aure
   'ESC':
     description:
       - 
@@ -225,14 +247,21 @@ key_properties:
       -  
       - REPRENDRE
 
+  'F5':
+    description:
+      -   
+      - STOP
+      - FADE
+
 
 keys:
   'a':
+    - stop:
+        fade_out: 0.5
     - play:
         include: intro_jonglacro
   'z': 
     - stop:
-        include: intro_jonglacro
         fade_out: 5
     - wait:
         duration: 7
@@ -240,16 +269,18 @@ keys:
         include: jonglacro_suite
   'e':
     - stop:
-        include: jonglacro_suite
         fade_out: 3
   'r':
+    - stop:
+        fade_out: 0.5
     - play:
         include: lancer_prisonniere
   't':
     - stop:
-        include: lancer_prisonniere
         fade_out: 3
   'y':
+    - stop:
+        fade_out: 0.5
     - play:
         include: quete
   'u':
@@ -265,53 +296,54 @@ keys:
         value: 100
   'i':
     - stop:
-        include: quete
         fade_out: 5
     - wait:
-        duration: 20
+        duration: 18
     - play:
         include: entree_ondine
   'o':
     - stop:
-        include: entree_ondine
         fade_out: 4
     - wait:
-        duration: 4
+        duration: 7
     - play:
         include: cour_ondine
   'p':
     - stop:
-        include: cour_ondine
         fade_out: 5
   'q':
+    - stop:
+        fade_out: 0.5
     - play:
         include: fouille_jonglage
   's':
     - stop:
-        include: fouille_jonglage
         fade_out: 2
   'd':
+    - stop:
+        fade_out: 0.5
     - play:
         include: liberation_prisonniere
+        fade_in: 1
   'f':
     - play:
         include: paf
     - wait:
-        duration: 0.2
+        duration: 0.25
     - volume:
         include: liberation_prisonniere
         value: 30
 
   'g':
     - stop:
-        include: liberation_prisonniere
         fade_out: 3
   'h':
+    - stop:
+        fade_out: 0.5
     - play:
         include: duo_pirate_ondine
   'j':
     - stop:
-        include: duo_pirate_ondine
         fade_out: 2
     - wait:
         duration: 1.5
@@ -321,16 +353,17 @@ keys:
     - play:
         include: coup
     - wait:
-        duration: 0.2
+        duration: 0.1
     - stop:
         include: trio_jalousie
 
   'l':
+    - stop:
+        fade_out: 0.5
     - play:
         include: piquage_2_4
   'm':
     - stop:
-        include: piquage_2_4
         fade_out: 4
     - wait:
         duration: 6
@@ -338,7 +371,6 @@ keys:
         include: baston
   'w':
     - stop:
-        include: baston
         fade_out: 0.5
     - wait:
         duration: 0.5
@@ -346,21 +378,42 @@ keys:
         include: ralenti
   'x':
     - stop:
-        include: ralenti
         fade_out: 1.5
   'c':
+    - stop:
+        fade_out: 0.5
     - play:
         include: baston_ascension
-#    - volume:
-#        include: baston_ascension
-#        value: 100
   'v':
     - stop:
-        include: baston_ascension
         fade_out: 2
-#  'n':
-#    - play:
-#        include: baston_ascension
+    - wait:
+        duration: 7
+    - play:
+        include: saluts
+    - wait:
+        duration: 5
+    - volume:
+        include: saluts
+        value: 90
+    - wait:
+        include: wait_fade
+    - volume:
+        include: saluts
+        value: 80
+    - wait:
+        include: wait_fade
+    - volume:
+        include: saluts
+        value: 70
+    - wait:
+        include: wait_fade
+    - volume:
+        include: saluts
+        value: 60
+
+
+
   'ESC':
     - stop: ~
     - stop_all_actions: ~
@@ -371,3 +424,7 @@ keys:
   'F2':
     - unpause: ~
 
+  'F5':
+    - stop:
+        fade_out: 1
+