added utility variables to avoid misspelling of Dictionary entrys

added a redundant check to avoid interpreting Tags as audiofiles

Packages/vr.teachr.structuretree/Runtime/Scripts/ImpulseController.cs

@@ -10,15 +10,8 @@ using TeachR.Config;
 using TeachR.Atmosphere;
 using TeachR.WebCommunication;
 using System.Threading.Tasks;
-using static TeachR.StructureTree.StructureTreeContainer;
-using System.Linq.Expressions;
 using System.Linq;
 using UnityEngine.Networking;
-using System.Runtime.InteropServices.WindowsRuntime;
-using UnityEngine.UIElements;
-
-
-
 
 
 
@@ -40,7 +33,6 @@ namespace TeachR.StructureTree
     [Loggable]
     public class ImpulseController : MonoBehaviour_Loggable
     {
-        private static readonly HashSet<string> StudentreeKeywords = new HashSet<string> { "Stö", "StöEx", "Int", "anim", "KM", null };
         private int _levelOfDistortion = 0;
         private List<GameObject> _impulsedStudents = new();
         [SerializeField] private UnityWaiter waiter;
@@ -50,7 +42,14 @@ namespace TeachR.StructureTree
         public Dictionary<string, Dictionary<ImpulseType, string>> impulseDescriptionTexts;
         public List<GraphToTreeConverter.StringImpulseTypeDictionary> impulseDescriptionDebug;
         private ConfigLoader config;
-        
+
+        #region utility vars
+        private static readonly HashSet<string> StudentreeKeywords = new HashSet<string> { "Stö", "StöEx", "Int", "anim", "KM", null }; // this exists to check if a node is an audiofile
+
+        private static readonly string followedByAudioNode = "followedByAudioNode";
+        private static readonly string InitialAudioChainNode = "initialAudioChainNode";
+        #endregion
+
 
         // in case something specific needs to be loaded for each theme, there is an EventHook.
         public static event Action<string> ThemeChangedHook;
@@ -284,6 +283,7 @@ namespace TeachR.StructureTree
                 }
 
                 Dictionary<string, bool> nodeFlags = new Dictionary<string, bool>(); //keeps track of the recursion path
+                
                 // No node based on a tag was found, set the next node by impulse:
                 if (nextNode.Equals(default(GraphToTreeConverter.StructureTreeNode)))
                 {
@@ -294,7 +294,7 @@ namespace TeachR.StructureTree
                             nextNode = StructureTreeHandler.GetNextNode(ImpulseType.None, currentNode, chanceToMisbehave);
                             nodeFlags = getNodeFlags(ImpulseType.None, nextNode);
 
-                            if (nextNode.Equals(new GraphToTreeConverter.StructureTreeNode()) && nodeFlags["followedByAudioNode"] == false)
+                            if (nextNode.Equals(new GraphToTreeConverter.StructureTreeNode()) && nodeFlags[followedByAudioNode] == false)
                                 return; //in case no next node was found with give "none"-Impulse, nothing shall change.
 
                             break;
@@ -324,9 +324,9 @@ namespace TeachR.StructureTree
                 LogData($"{DateTime.Now.ToString(DateTimeFormat)};impulse:{impulse};nextNode:{nextNode.nodeId}");
                 if (bc.nextNode != null)
                 {
-                    if (nodeFlags["followedByAudioNode"])
+                    if (nodeFlags[followedByAudioNode])
                     {
-                        if (nodeFlags["initialAudioNode"])
+                        if (nodeFlags[InitialAudioChainNode])
                         {//Start Student Node Chain
                             BranchPredictionInStructureTree(bc, nextNode, impulse, isInitiationInTree);
                         }
@@ -356,23 +356,23 @@ namespace TeachR.StructureTree
         {
             Dictionary<string, bool> NodeFlags = new Dictionary<string, bool>()
                 {
-                    { "followedByAudioNode", false },
-                    { "initialAudioNode", false }
+                    { followedByAudioNode, false },
+                    { InitialAudioChainNode, false }
                 };
 
             switch(incomingImpulse)
                 {
                     case ImpulseType.None: 
                         if (nextNode.nodeType == NodeType.studentNode)
-                            NodeFlags["followedByAudioNode"] = IsSoundfile(StructureTreeHandler.stc[nextNode.nodeId].soundFileName);
+                            NodeFlags[followedByAudioNode] = IsSoundfile(StructureTreeHandler.stc[nextNode.nodeId].soundFileName);
                         break;
                     case ImpulseType.Negative:
                     case ImpulseType.Positive:
                     case ImpulseType.Neutral:
                         if (nextNode.nodeType == NodeType.studentNode
                             && StructureTreeHandler.GetNextNode(ImpulseType.None, nextNode.nodeId, chanceToMisbehave).nodeType == NodeType.studentNode)
-                            NodeFlags["followedByAudioNode"] = IsSoundfile(StructureTreeHandler.stc[nextNode.nodeId].soundFileName);
-                            NodeFlags["initialAudioNode"] = true;
+                            NodeFlags[followedByAudioNode] = IsSoundfile(StructureTreeHandler.stc[nextNode.nodeId].soundFileName);
+                            NodeFlags[InitialAudioChainNode] = true;
                         break;
                     default:
                         break;
@@ -411,7 +411,11 @@ namespace TeachR.StructureTree
             }
         }
 
-        private bool IsSoundfile(string name) => !StudentreeKeywords.Contains(name); // FIX ME May cause Problems in combination with tags
+        private bool IsSoundfile(string name)
+        {//the string in the Tag is neither part of defined Keywords nor used in the Tagconfiguration.
+            //This makes sure audionodechain only executes if the studentnode is a audiofile
+            return !StudentreeKeywords.Contains(name) || StudentConfigurationHandler.possibleTags.Contains(name);
+        }
 
         private void BranchPredictionInStructureTree(BehaviourController bc, GraphToTreeConverter.StructureTreeNode nextNode, string impulse, bool isInitiationInTree)
         {

Packages/vr.teachr.structuretree/Runtime/Scripts/StudentConfigurationHandler.cs

@@ -20,7 +20,7 @@ namespace TeachR.StructureTree
     {
         private static StudentConfiguration studentConfig = new();
         public static Dictionary<string, string> tagAllocation = new();
-        private static List<string> possibleTags = new List<string>();
+        public static List<string> possibleTags {get; private set; } = new List<string>();
         private static List<string> possibleStudentSlots = new List<string>();
         static string csvLineSplitter = @"\r\n|\n\r|\n|\r";