Rename "Test-Scene-Grotto" to "3.2-Grotto"

Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt

@@ -17,8 +17,10 @@
                 RunTree("32_Grotto_Kueche_Intro")
                 //RunTree("32_Grotto_Kueche_Zwiebeln_schneiden")
                 //RunTree("32_Grotto_Kueche_alles_gefunden")
+                //RunTree("32_Grotto_Kueche_Interesse_Kochen")
                 //RunTree("32_Grotto_Kueche_Kochen_Anzahl")
                 //RunTree("32_Grotto_Kueche_Zusammen_Kochen")
+                //RunTree("32_Grotto_Kueche_Parmigiano")
                 //RunTree("32_Grotto_Im_Grotto_Essen_Intro")
             }
         }
@@ -630,8 +632,7 @@ Tree("32_Grotto_Kueche_Zwiebeln_schneiden") {
                             BTC.CompareBool("RisottoIsSnapped", false)
 
                             // Objekt geht zurueck
-                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Risotto", -6.824, 1.335, -18.8996)
-
+                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Risotto", -7.920319, 0.9762855, -16.10492)
                             BTC.Run("AudioSource.AUDIO.Kueche5Zwiebelnsch")
                         }
                     }
@@ -658,7 +659,7 @@ Tree("32_Grotto_Kueche_Zwiebeln_schneiden") {
                             BTC.CompareBool("SalzIsSnapped", false)
 
                             // Objekt geht zurueck
-                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Salz", -6.607, 1.321, -18.8996)
+                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Salz", -7.94902, 0.9696183, -16.31448)
 
                             BTC.Run("AudioSource.AUDIO.Kueche5Zwiebelnsch")
                         }
@@ -686,7 +687,7 @@ Tree("32_Grotto_Kueche_Zwiebeln_schneiden") {
                             BTC.CompareBool("PfefferIsSnapped", false)
 
                             // Objekt geht zurueck
-                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Pfeffer", -6.686, 1.321, -18.8996)
+                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Pfeffer", -7.923509, 0.976778, -16.23407)
 
                             BTC.Run("AudioSource.AUDIO.Kueche5Zwiebelnsch")
                         }
@@ -714,7 +715,7 @@ Tree("32_Grotto_Kueche_Zwiebeln_schneiden") {
                             BTC.CompareBool("WeissweinIsSnapped", false)
 
                             // Objekt geht zurueck
-                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Weisswein", -6.58, 1.451, -19.0233)
+                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Weisswein", -8.098644, 0.9762855, -16.33541)
 
                             BTC.Run("AudioSource.AUDIO.Kueche5Zwiebelnsch")
                         }
@@ -742,7 +743,7 @@ Tree("32_Grotto_Kueche_Zwiebeln_schneiden") {
                             BTC.CompareBool("BouillonIsSnapped", false)
 
                             // Objekt geht zurueck
-                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Bouillon", -6.947, 1.402, -18.995)
+                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Bouillon", -8.082785, 0.9762855, -15.99537)
 
                             BTC.Run("AudioSource.AUDIO.Kueche5Zwiebelnsch")
                         }
@@ -770,7 +771,7 @@ Tree("32_Grotto_Kueche_Zwiebeln_schneiden") {
                             BTC.CompareBool("OlivenoelIsSnapped", false)
 
                             // Objekt geht zurueck
-                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Olivenoel", -6.752, 1.449, -19.024)
+                            BTC.SetPosition("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Olivenoel", -8.0905, 0.9762856, -16.20448)
 
                             BTC.Run("AudioSource.AUDIO.Kueche5Zwiebelnsch")
                         }
@@ -807,8 +808,8 @@ Tree("32_Grotto_Kueche_alles_gefunden") {
         BTC.Run("AudioSource.AUDIO.Kueche2allesgefund")
 
         // Herd anstellen - ToDo: Handling in Story?
-        BTC.Run("NamedGrabEvent.STATIC.Herdschalter")
-        BTC.Run("StudioEventEmitter.STATIC.HerdplatteAnstelle")
+        //BTC.Run("NamedGrabEvent.STATIC.Herdschalter")
+        //BTC.Run("StudioEventEmitter.STATIC.HerdplatteAnstelle")
 
         // Zwiebeln in Topf geben
         BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Zwiebeln")
@@ -924,28 +925,43 @@ Tree("32_Grotto_Kueche_Interesse_Kochen") {
 // --- Kueche - Interesse Kochen ---
     Composite(Sequence) {
         BTC.Run("AudioSource.AUDIO.Kueche1InteresseKo")
-        // ToDo: Freie Antwort als Speech Input
-        BTC.Set("TextMeshPro.GO.Option1Button", "text", "Lasagne")
-        BTC.Show("GO.GO.Option1Button")
-        BTC.SetBool("32_Grotto_Kueche_Interesse_Kochen_Button_Clicked", false)
+        // Frage beantworten
+        BTC.AddPossbileSpeechIntent("Kueche.Interesse_Kochen.2")
+        BTC.StartSpeechIntentRecognition()
 
         Composite(Race) {
+            // -- Race 1: User sagt etwas
             Composite(Sequence) {
-                // Lieblingsessen nennen
-                BTC.Run("NamedEventTrigger.GO.Option1Button")
-                BTC.SetBool("32_Grotto_Kueche_Interesse_Kochen_Button_Clicked")
-                BTC.Hide("GO.GO.Option1Button")
-                RunTree("32_Grotto_Kueche_Kochen_Anzahl")
+                BTC.UserStartedSpeechInput()
+                
+                Composite(Selector) {
+                    // -- Selector 1: Intent erkannt
+                    Composite(Sequence) {
+                        BTC.SpeechIntentRecognized()
+
+                        // Intent erkannt
+                        BTC.ClearPossbileSpeechIntents()
+                        RunTree("32_Grotto_Kueche_Kochen_Anzahl")
+                    }
+
+                    // -- Selector 2: Intent nicht erkannt
+                    Composite(Sequence) {
+                        BTC.ClearPossbileSpeechIntents()
+                        RunTree("32_Grotto_Kueche_Kochen_Anzahl")
+                    }
+                }
             }
+
+            // -- Race 2: User sagt nichts
             Composite(Sequence) {
-                // keine Antwort
                 BTC.Wait(5)
-                BTC.CompareBool("32_Grotto_Kueche_Interesse_Kochen_Button_Clicked", false)
-                BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button")
-                BTC.Hide("GO.GO.Option1Button")
+                BTC.CompareUserSpeechInputStarted(false)
+                BTC.AbortSpeechEventListener()
+                BTC.StopSpeechIntentRecognition()
+                BTC.ClearPossbileSpeechIntents()
                 RunTree("32_Grotto_Kueche_Zusammen_Kochen")
             }
-        }
+        }    
     }
 }
 
@@ -1108,26 +1124,50 @@ Tree("32_Grotto_Kueche_Selbststaendig_Kochen") {
 Tree("32_Grotto_Kueche_Parmigiano") {
 // --- Kueche - Parmigiano ---
     Composite(Sequence) {
-        BTC.SynthesizeText("Schau, ich habe dir den Parmigiano hingestellt. Du kannst ihn nun in den Topf geben.")
+        BTC.SynthesizeText("Ho preparato il parmigiano, puoi aggiungerlo al risotto, per piacere?")
         BTC.SpeechOutputEnded()
 
         // Parmigiano in Topf geben
-        BTC.Run("NamedGrabEvent.INTERACTABLES.Parmigiano")
         BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Parmigiano")
         BTC.Run("Collider.INTERACTABLES.Topf")
 
-        BTC.SynthesizeText("Bist du fertig?")
+        BTC.SynthesizeText("Hai finito?")
         BTC.SpeechOutputEnded()
 
         // Antwort User
-        // ToDo: Sprache fehlt
-        BTC.Set("TextMeshPro.GO.Option1Button", "text", "Ja")
-        BTC.Show("GO.GO.Option1Button")
+        BTC.AddPossbileSpeechIntent("Kueche.Zusammen_Kochen.6")
+        BTC.StartSpeechIntentRecognition()
+
         Composite(Race) {
-            BTC.Run("NamedEventTrigger.GO.Option1Button")
-            BTC.Wait(5)
+            // -- Race 1: User sagt etwas
+            Composite(Sequence) {
+                BTC.UserStartedSpeechInput()
+                
+                Composite(Selector) {
+                    // -- Selector 1: Intent erkannt
+                    Composite(Sequence) {
+                        BTC.SpeechIntentRecognized()
+
+                        // Intent erkannt
+                        BTC.ClearPossbileSpeechIntents()
+                    }
+
+                    // -- Selector 2: Intent nicht erkannt
+                    Composite(Sequence) {
+                        BTC.ClearPossbileSpeechIntents()
+                    }
+                }
+            }
+
+            // -- Race 2: User sagt nichts
+            Composite(Sequence) {
+                BTC.Wait(5)
+                BTC.CompareUserSpeechInputStarted(false)
+                BTC.AbortSpeechEventListener()
+                BTC.StopSpeechIntentRecognition()
+                BTC.ClearPossbileSpeechIntents()
+            }
         }
-        BTC.Hide("GO.GO.Option1Button")
 
         BTC.SynthesizeText("Bitte stelle den Risotto hier hin.")
         BTC.SpeechOutputEnded()

Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset

@@ -710,7 +710,7 @@ MonoBehaviour:
   LiveUpdatePort: 9264
   EnableMemoryTracking: 0
   AndroidUseOBB: 0
-  AndroidPatchBuild: 1
+  AndroidPatchBuild: 0
   MeterChannelOrdering: 0
   StopEventsOutsideMaxDistance: 0
   BoltUnitOptionsBuildPending: 0

Viagg-io/Assets/Scenes/3.2-Grotto-v0.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0977a1da3081d5d469e616e1fa1c692c
+guid: 61d90deb37c0e46be98cba4198a10963
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Viagg-io/Assets/Scenes/3.2-Grotto-v0.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
+guid: 51bd2edc532024f96a432eaf867d3a47
 DefaultImporter:
   externalObjects: {}
   userData: 

Viagg-io/Assets/Scenes/3.2-Grotto-v0/LightingData.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2f1c3014b6e5d9f47ab6d5c982c66b7d
+guid: 1a10286c0191e429e8bf8ac54a8b5c7c
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 112000000

Viagg-io/Assets/Scenes/3.2-Grotto-v0/ReflectionProbe-0.exr.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 90f55034ca206b94eb8c380dfeb8c120
+guid: 07acb425eee48482bbba511136e53475
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Viagg-io/Assets/Scenes/3.2-Grotto-v0/ReflectionProbe-1.exr.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dacead820ce2cd242ae01ace40f4164f
+guid: 031b5f0dafd4b48debaa3ad596e2b2a7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Viagg-io/Assets/Scenes/3.2-Grotto-v0/ReflectionProbe-2.exr.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ed7101ffb9d45fa43827245a6cc6164b
+guid: 7e95315b0505249ed892183cdafc20bd
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Viagg-io/Assets/Scenes/3.2-Grotto.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 61d90deb37c0e46be98cba4198a10963
+guid: 0977a1da3081d5d469e616e1fa1c692c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Viagg-io/Assets/Scenes/3.2-Grotto.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 51bd2edc532024f96a432eaf867d3a47
+guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
 DefaultImporter:
   externalObjects: {}
   userData: 

Viagg-io/Assets/Scenes/3.2-Grotto/LightingData.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1a10286c0191e429e8bf8ac54a8b5c7c
+guid: 2f1c3014b6e5d9f47ab6d5c982c66b7d
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 112000000