From 5f59726bdd7a4909f4c5572f26bbee8c00ed9d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Thu, 11 Apr 2024 17:31:58 +0200
Subject: [PATCH] Serialize Template Transition

---
 .../gamesystems/SimpleTemplateGamesystem.ts   |  8 ++++----
 .../transitions/SimpleTemplateTransition.ts   |  4 ++--
 .../project/serializer/CharacterSerializer.ts |  9 ++++++++-
 testModel/characters/Hicks Haddock.json       | 19 ++++---------------
 testModel/gamesystems/Characterstimmung.json  |  3 +--
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/app/project/game-model/gamesystems/SimpleTemplateGamesystem.ts b/src/app/project/game-model/gamesystems/SimpleTemplateGamesystem.ts
index 992d3f1..4d3cfa0 100644
--- a/src/app/project/game-model/gamesystems/SimpleTemplateGamesystem.ts
+++ b/src/app/project/game-model/gamesystems/SimpleTemplateGamesystem.ts
@@ -56,12 +56,12 @@ export class SimpleTemplateGamesystem<ReferenceType> extends Gamesystem<SimpleTe
     })
 
     this.transitions.forEach(transition => {
-      if(!transition.conditions.has(reference)) {
-        transition.conditions.set(reference, transition.scriptAccountConditions.concat())
+      if(!transition.conditionMap.has(reference)) {
+        transition.conditionMap.set(reference, transition.scriptAccountConditions.concat())
       }
 
-      if(!transition.actions.has(reference)) {
-        transition.actions.set(reference, transition.scriptAccountActions.concat())
+      if(!transition.actionMap.has(reference)) {
+        transition.actionMap.set(reference, transition.scriptAccountActions.concat())
       }
     })
   }
diff --git a/src/app/project/game-model/gamesystems/transitions/SimpleTemplateTransition.ts b/src/app/project/game-model/gamesystems/transitions/SimpleTemplateTransition.ts
index 72d267a..ad66d2a 100644
--- a/src/app/project/game-model/gamesystems/transitions/SimpleTemplateTransition.ts
+++ b/src/app/project/game-model/gamesystems/transitions/SimpleTemplateTransition.ts
@@ -4,6 +4,6 @@ import {ScriptAccountAction} from "../actions/ScriptAccountAction";
 
 export class SimpleTemplateTransition<ReferenceType> extends SimpleTransition {
 
-  conditions: Map<ReferenceType, ScriptAccountCondition[]> = new Map();
-  actions: Map<ReferenceType, ScriptAccountAction[]> = new Map();
+  conditionMap: Map<ReferenceType, ScriptAccountCondition[]> = new Map();
+  actionMap: Map<ReferenceType, ScriptAccountAction[]> = new Map();
 }
diff --git a/src/app/project/serializer/CharacterSerializer.ts b/src/app/project/serializer/CharacterSerializer.ts
index da04fa6..ca38d9b 100644
--- a/src/app/project/serializer/CharacterSerializer.ts
+++ b/src/app/project/serializer/CharacterSerializer.ts
@@ -30,10 +30,17 @@ export class CharacterSerializer {
         return value.componentName
       }
 
-      if(key === 'conditionMap') {
+      if(key === 'conditionMap' || key === 'actionMap') {
+        if(value.get(character) == undefined) {
+          return []
+        }
         return value.get(character)
       }
 
+      if(key === 'startingState' || key === 'endingState') {
+        return value.stateLabel
+      }
+
       if(this.ignoredKeys.includes(key)) {
         return undefined
       } else {
diff --git a/testModel/characters/Hicks Haddock.json b/testModel/characters/Hicks Haddock.json
index d616330..54fd6be 100644
--- a/testModel/characters/Hicks Haddock.json	
+++ b/testModel/characters/Hicks Haddock.json	
@@ -24,21 +24,10 @@
                 {
                     "scriptAccountActions": [],
                     "scriptAccountConditions": [],
-                    "startingState": {
-                        "stateLabel": "Fröhlich",
-                        "conditionMap": [
-                            {
-                                "scriptAccount": "Luftfeuchtigkeit",
-                                "minValue": 0,
-                                "maxValue": "10"
-                            }
-                        ]
-                    },
-                    "endingState": {
-                        "stateLabel": "Wütend",
-                        "conditionMap": []
-                    },
-                    "actions": {}
+                    "startingState": "Fröhlich",
+                    "endingState": "Wütend",
+                    "conditionMap": [],
+                    "actionMap": []
                 }
             ]
         }
diff --git a/testModel/gamesystems/Characterstimmung.json b/testModel/gamesystems/Characterstimmung.json
index 5ef6057..26fca23 100644
--- a/testModel/gamesystems/Characterstimmung.json
+++ b/testModel/gamesystems/Characterstimmung.json
@@ -21,8 +21,7 @@
             "scriptAccountConditions": [],
             "startingState": "Fröhlich",
             "endingState": "Wütend",
-            "conditions": {},
-            "actions": {}
+            "actionMap": {}
         }
     ],
     "templateType": 1