Update grotto Nachfrage_Kellner (wip)

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

@@ -1330,6 +1330,57 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
     }
 }
 
+Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner") {
+    Composite(Sequence) {
+        BTC.SetBool("drink_ordered", false)
+
+        Composite(Race) {
+            BTC.CompareBool("drink_ordered")
+
+            Decorator(Repeat) {
+                Composite(Sequence) {
+                    BTC.Run("AudioSource.AUDIO.ImGrottoessen1Nach")
+
+                    BTC.AddPossbileSpeechIntent("Im_Grotto_essen.Zweite_Bestellung.2")
+                    BTC.StartSpeechIntentRecognition()
+
+                    Composite(Race) {
+                        // -- Race 1: User sagt etwas
+                        Composite(Sequence) {
+                            BTC.UserStartedSpeechInput()
+                
+                            Composite(Selector) {
+                                // -- Selector 1: Intent erkannt
+                                Composite(Sequence) {
+                                    BTC.SpeechIntentRecognized()
+                                    BTC.ClearPossbileSpeechIntents()
+                                    RunTree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen")
+                                }
+
+                                // -- Selector 2: Intent nicht erkannt
+                                Composite(Sequence) {
+                                    BTC.ClearPossbileSpeechIntents()
+                                    RunTree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen")
+                                }
+                            }
+                        }
+
+                        // -- Race 2: User sagt nichts
+                        Composite(Sequence) {
+                            BTC.Wait(5)
+                            BTC.CompareUserSpeechInputStarted(false)
+                            BTC.AbortSpeechEventListener()
+                            BTC.StopSpeechIntentRecognition()
+                            BTC.ClearPossbileSpeechIntents()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
+
 Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen") {
     Composite(Sequence) {
         BTC.Run("AudioSource.AUDIO.ImGrottoessen1Esse")

Viagg-io/Assets/Scenes/1.0-SBB.unity

@@ -251,7 +251,10 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 4298119583897933017, guid: 5e1bbec9323a9d94097497afd40f797a, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 818524695}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5e1bbec9323a9d94097497afd40f797a, type: 3}
 --- !u!4 &30008259 stripped
@@ -1242,7 +1245,6 @@ Transform:
   - {fileID: 1148303044}
   - {fileID: 297001280}
   - {fileID: 1156450819}
-  - {fileID: 818524695}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &646867269
@@ -2119,6 +2121,11 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!4 &1055882848 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4298119583897933017, guid: 5e1bbec9323a9d94097497afd40f797a, type: 3}
+  m_PrefabInstance: {fileID: 30008258}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1148303043
 GameObject:
   m_ObjectHideFlags: 0
@@ -4441,7 +4448,7 @@ MonoBehaviour:
   overrideLogStringDisplay: 0
   overrideDebugInternalActive: 0
   overrideDebugChangesActive: 0
-  instanceID: 773358
+  instanceID: 61154
   __behaviourTreeGenerator: {fileID: 0}
   taskScripts:
   - {fileID: 4900000, guid: e058cb28be8d744b98baf62e50716721, type: 3}
@@ -5672,35 +5679,35 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 594108320}
+    m_TransformParent: {fileID: 1055882848}
     m_Modifications:
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -1.0775614
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: 12.3661995
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: -8.574576
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.70710677
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: 0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 0.00000017881392
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: 0.00000015813846
       objectReference: {fileID: 0}
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json

@@ -221,13 +221,7 @@
             "intentSentences": [
                 "Io vorrei xy.",
                 "Prendo una coca cola.",
-                "Anch'io prendo una gazzosa."
+                "Anch'io prendo una gazzosa.",
-            ]
-        },
-        {
-            "intentID": "Im_Grotto_essen.Nachfrage_Kellner.2",
-            "intentSentences": [
-                "Io vorrei xy.",
                 "Prendo dell'acqua.",
                 "Prendo un' Icetea."
             ]
@@ -237,12 +231,6 @@
             "intentSentences": [
                 "Io vorrei xy.",
                 "Prendo il risotto.",
-                "Non prendo niente, non ho fame."
-            ]
-        },
-        {
-            "intentID": "Im_Grotto_essen.Nachfrage_Kellner_Essen.3",
-            "intentSentences": [
                 "Prendo i pizochen.",
                 "Prendo un'insalata."
             ]