Display Characterspecific conditions in simple-state-editor

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

@@ -1,3 +1,3 @@
-<app-simple-gamesystem-editor *ngIf="isSimpleGamesystem()" [simpleGamesystem]="convertGamesystemToSimpleGamesystem()" [scriptAccunts]="scriptAccounts"></app-simple-gamesystem-editor>
+<app-simple-gamesystem-editor *ngIf="isSimpleGamesystem()"  [templateElement]="templateElement" [simpleGamesystem]="convertGamesystemToSimpleGamesystem()" [scriptAccunts]="scriptAccounts"></app-simple-gamesystem-editor>
 <app-product-gamesystem-editor *ngIf="!isSimpleGamesystem()" [gamesystem]="convertGamesystemToProductGamesystem()"
                                (onOpenGamesystemEditor)="onOpenGamesystemEditor($event)"></app-product-gamesystem-editor>

src/app/editor/gamesystem-editor/gamesystem-editor.component.ts

@@ -5,6 +5,7 @@ import { Transition } from '../../project/game-model/gamesystems/transitions/Tra
 import {ScriptAccount} from "../../project/game-model/scriptAccounts/ScriptAccount";
 import {SimpleGamesystem} from "../../project/game-model/gamesystems/SimpleGamesystem";
 import {ProductGamesystem} from "../../project/game-model/gamesystems/ProductGamesystem";
+import {TemplateElement} from "../../project/game-model/templates/TemplateElement";
 
 @Component({
   selector: 'app-gamesystem-editor',
@@ -15,6 +16,7 @@ export class GamesystemEditorComponent implements OnInit{
 
   @Input() gamesystem: Gamesystem<State<any>, Transition<any>> | undefined
   @Input() scriptAccounts: ScriptAccount[] = [];
+  @Input() templateElement: TemplateElement | undefined
   @Output('onOpenGamesystemEditor') openGamesystemEmitter = new EventEmitter<SimpleGamesystem>();
 
   ngOnInit() {

src/app/editor/gamesystem-editor/simple-gamesystem-editor/simple-gamesystem-editor.component.html

@@ -1,4 +1,4 @@
-<app-simple-state-editor [states]="simpleGamesystem!.states" [gamesystem]="simpleGamesystem" [scriptAccounts]="scriptAccunts"></app-simple-state-editor>
+<app-simple-state-editor [templateElement]="templateElement" [states]="simpleGamesystem!.states" [gamesystem]="simpleGamesystem" [scriptAccounts]="scriptAccunts"></app-simple-state-editor>
 <div id="transition-editor">
   <app-simple-transition-editor [gamesystem]="simpleGamesystem" [scriptAccounts]="scriptAccunts"></app-simple-transition-editor>
 </div>

src/app/editor/gamesystem-editor/simple-gamesystem-editor/simple-gamesystem-editor.component.ts

@@ -2,6 +2,7 @@ import {Component, Input} from '@angular/core';
 import {MatTableDataSource} from "@angular/material/table";
 import {SimpleGamesystem} from "../../../project/game-model/gamesystems/SimpleGamesystem";
 import {ScriptAccount} from "../../../project/game-model/scriptAccounts/ScriptAccount";
+import {TemplateElement} from "../../../project/game-model/templates/TemplateElement";
 
 @Component({
   selector: 'app-simple-gamesystem-editor',
@@ -12,6 +13,7 @@ export class SimpleGamesystemEditorComponent {
 
   @Input() simpleGamesystem: SimpleGamesystem | undefined
   @Input() scriptAccunts: ScriptAccount[] = []
+  @Input() templateElement: TemplateElement | undefined
 
 
 }

src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.html

@@ -27,7 +27,7 @@
             </mat-form-field>
 
             <div class="long-form">
-              <app-scriptaccount-condition-editor [conditions]="element.conditions" [scriptAccounts]="scriptAccounts" [enableEditiong]="true"
+              <app-scriptaccount-condition-editor [conditions]="getDisplayedConditions(element)" [scriptAccounts]="scriptAccounts" [enableEditiong]="true"
                                                   (onCreateCondition)="onCreateCondition(element, $event)" (onDeleteCondition)="deleteCondition(element, $event)"></app-scriptaccount-condition-editor>
             </div>
           </div>

src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.ts

@@ -6,6 +6,8 @@ import {SimpleState} from "../../../../project/game-model/gamesystems/states/Sim
 import {SimpleGamesystem} from "../../../../project/game-model/gamesystems/SimpleGamesystem";
 import {ScriptAccount} from "../../../../project/game-model/scriptAccounts/ScriptAccount";
 import {ScriptAccountCondition} from "../../../../project/game-model/gamesystems/conditions/ScriptAccountCondition";
+import {TemplateElement} from "../../../../project/game-model/templates/TemplateElement";
+import {SimpleTemplateState} from "../../../../project/game-model/templates/simpleGamesystem/SimpleTemplateState";
 
 @Component({
   selector: 'app-simple-state-editor',
@@ -24,6 +26,7 @@ export class SimpleStateEditorComponent implements OnInit{
   @Input() states: SimpleState[] = [];
   @Input() gamesystem: SimpleGamesystem | undefined
   @Input() scriptAccounts: ScriptAccount[] = []
+  @Input() templateElement: TemplateElement | undefined
   dataSource = new MatTableDataSource<SimpleState>();
   displayedColumns = ["name", "initial", "edit", "delete"];
   columnsToDisplayWithExpand = [...this.displayedColumns, 'expand'];
@@ -96,11 +99,29 @@ export class SimpleStateEditorComponent implements OnInit{
   }
 
   onCreateCondition(state: SimpleState, condition: ScriptAccountCondition) {
-    state.addScriptAccountCondition(condition);
+    if(this.templateElement != undefined && state instanceof SimpleTemplateState) {
+      state.conditionMap.get(this.templateElement)!.push(condition)
+    } else {
+      state.addScriptAccountCondition(condition);
+    }
   }
 
 
   deleteCondition(state: SimpleState, condition: ScriptAccountCondition) {
-    state.removeScriptAccountCondition(condition.scriptAccount);
+    if(this.templateElement != undefined && state instanceof SimpleTemplateState) {
+      let conditions = state.conditionMap.get(this.templateElement)!
+      conditions = conditions.filter(currentCondition => condition.scriptAccount !== currentCondition.scriptAccount)!;
+      state.conditionMap.set(this.templateElement, conditions);
+    } else {
+      state.removeScriptAccountCondition(condition.scriptAccount);
+    }
+  }
+
+  getDisplayedConditions(state: SimpleState) {
+    if(this.templateElement == undefined) {
+      return state.conditions
+    } else if(state instanceof SimpleTemplateState){
+      return (state as SimpleTemplateState).conditionMap.get(this.templateElement)!
+    }
   }
 }

testModel/gamesystems/TemplateGamesystem.json

@@ -1,7 +1,50 @@
 {
     "componentName": "TemplateGamesystem",
     "componentDescription": "",
-    "states": [],
+    "states": [
-    "transitions": [],
+        {
+            "initial": false,
+            "conditions": [
+                {
+                    "scriptAccount": "Luftfeuchtigkeit",
+                    "minValue": 0,
+                    "maxValue": "10"
+                }
+            ],
+            "stateLabel": "A",
+            "stateDescription": ""
+        },
+        {
+            "initial": false,
+            "conditions": [
+                {
+                    "scriptAccount": "New ScriptAccount",
+                    "minValue": 0,
+                    "maxValue": 100
+                }
+            ],
+            "stateLabel": "B",
+            "stateDescription": ""
+        }
+    ],
+    "transitions": [
+        {
+            "scriptAccountActions": [
+                {
+                    "changingValue": 10,
+                    "scriptAccount": "Luftfeuchtigkeit"
+                }
+            ],
+            "scriptAccountConditions": [
+                {
+                    "scriptAccount": "Temperature",
+                    "minValue": 0,
+                    "maxValue": 10
+                }
+            ],
+            "startingState": "A",
+            "endingState": "B"
+        }
+    ],
     "templateType": 0
 }