Fix condition combining

src/app/editor/gamesystem-editor/transition-editor/product-transition-editor/product-transition-editor.component.html

@@ -62,7 +62,7 @@
         <td mat-cell *matCellDef="let element" [attr.colspan]="columnsToDisplayWithExpand.length">
           <div class="example-element-detail"
                [@detailExpand]="element == expandedElement ? 'expanded' : 'collapsed'">
-           <p>Expanded Row</p>
+           <app-scriptaccount-condition-editor [enableEditiong]="false" [conditions]="element.scriptAccountConditions" ></app-scriptaccount-condition-editor>
           </div>
         </td>
       </ng-container>

src/app/game-model/gamesystems/conditions/ScriptAccountCondition.ts

@@ -26,7 +26,7 @@ export class ScriptAccountCondition {
   combineCondition(condition: ScriptAccountCondition) {
     if(condition.scriptAccount === this.scriptAccount) {
       const scriptAccount = new ScriptAccountCondition(this.scriptAccount, this.minValue, this.maxValue);
-      scriptAccount.combineCondition(condition);
+      scriptAccount.extendCondition(condition);
       return scriptAccount;
     }
     return undefined;

testModel/gamesystems/ParentTestSystem/A.json

@@ -0,0 +1,32 @@
+{
+    "componentName": "A",
+    "componentDescription": "",
+    "states": [
+        {
+            "initial": false,
+            "conditions": [],
+            "stateLabel": "A",
+            "stateDescription": ""
+        },
+        {
+            "initial": false,
+            "conditions": [],
+            "stateLabel": "B",
+            "stateDescription": ""
+        }
+    ],
+    "transitions": [
+        {
+            "scriptAccountActions": [],
+            "scriptAccountConditions": [
+                {
+                    "scriptAccount": "Temperature",
+                    "minValue": 0,
+                    "maxValue": "10"
+                }
+            ],
+            "startingState": "A",
+            "endingState": "B"
+        }
+    ]
+}

testModel/gamesystems/ParentTestSystem/Numbers.json

@@ -0,0 +1,32 @@
+{
+    "componentName": "Numbers",
+    "componentDescription": "",
+    "states": [
+        {
+            "initial": false,
+            "conditions": [],
+            "stateLabel": "1",
+            "stateDescription": ""
+        },
+        {
+            "initial": false,
+            "conditions": [
+                {
+                    "scriptAccount": "Luftfeuchtigkeit",
+                    "minValue": 0,
+                    "maxValue": "5"
+                }
+            ],
+            "stateLabel": "2",
+            "stateDescription": ""
+        }
+    ],
+    "transitions": [
+        {
+            "scriptAccountActions": [],
+            "scriptAccountConditions": [],
+            "startingState": "1",
+            "endingState": "2"
+        }
+    ]
+}

testModel/gamesystems/ParentTestSystem/ParentTestSystem.json

@@ -0,0 +1,4 @@
+{
+    "componentName": "ParentTestSystem",
+    "componentDescription": ""
+}

testModel/gamesystems/Weathersystem/Season.json

@@ -3,7 +3,7 @@
     "componentDescription": "Ein simples Gamesystem zur Modellierung verschiedener Jahreszeiten und deren Übergänge",
     "states": [
         {
-            "initial": true,
+            "initial": false,
             "conditions": [
                 {
                     "scriptAccount": "Temperature",

testModel/gamesystems/Weathersystem/Weather.json

@@ -3,7 +3,7 @@
     "componentDescription": "A small Gamesystem about local weather events",
     "states": [
         {
-            "initial": true,
+            "initial": false,
             "conditions": [],
             "stateLabel": "Sonne",
             "stateDescription": ""