diff --git a/src/app/editor/gamesystem-editor/transition-editor/product-transition-editor/product-transition-editor.component.html b/src/app/editor/gamesystem-editor/transition-editor/product-transition-editor/product-transition-editor.component.html
index 2ef43f7..8861ae6 100644
--- a/src/app/editor/gamesystem-editor/transition-editor/product-transition-editor/product-transition-editor.component.html
+++ b/src/app/editor/gamesystem-editor/transition-editor/product-transition-editor/product-transition-editor.component.html
@@ -62,7 +62,7 @@
|
diff --git a/src/app/game-model/gamesystems/conditions/ScriptAccountCondition.ts b/src/app/game-model/gamesystems/conditions/ScriptAccountCondition.ts
index 566bfb0..ecc1b26 100644
--- a/src/app/game-model/gamesystems/conditions/ScriptAccountCondition.ts
+++ b/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;
diff --git a/testModel/gamesystems/ParentTestSystem/A.json b/testModel/gamesystems/ParentTestSystem/A.json
new file mode 100644
index 0000000..6db8a9c
--- /dev/null
+++ b/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"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/testModel/gamesystems/ParentTestSystem/Numbers.json b/testModel/gamesystems/ParentTestSystem/Numbers.json
new file mode 100644
index 0000000..546a507
--- /dev/null
+++ 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"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/testModel/gamesystems/ParentTestSystem/ParentTestSystem.json b/testModel/gamesystems/ParentTestSystem/ParentTestSystem.json
new file mode 100644
index 0000000..0572a4c
--- /dev/null
+++ b/testModel/gamesystems/ParentTestSystem/ParentTestSystem.json
@@ -0,0 +1,4 @@
+{
+ "componentName": "ParentTestSystem",
+ "componentDescription": ""
+}
\ No newline at end of file
diff --git a/testModel/gamesystems/Weathersystem/Season.json b/testModel/gamesystems/Weathersystem/Season.json
index a815ccb..5d16d94 100644
--- a/testModel/gamesystems/Weathersystem/Season.json
+++ b/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",
diff --git a/testModel/gamesystems/Weathersystem/Weather.json b/testModel/gamesystems/Weathersystem/Weather.json
index b9de825..f35425f 100644
--- a/testModel/gamesystems/Weathersystem/Weather.json
+++ b/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": ""