From b9b5384ca44fe2587859bd25165b7803af4bf024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Thu, 11 Apr 2024 17:35:09 +0200 Subject: [PATCH] Load Templatetransition as TemplateTransition and not as SimpleTransition --- .../parser/gamesystemParser/GamesystemParser.ts | 2 +- .../parser/gamesystemParser/TransitionParser.ts | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/project/parser/gamesystemParser/GamesystemParser.ts b/src/app/project/parser/gamesystemParser/GamesystemParser.ts index eec11c1..2ae86a3 100644 --- a/src/app/project/parser/gamesystemParser/GamesystemParser.ts +++ b/src/app/project/parser/gamesystemParser/GamesystemParser.ts @@ -54,7 +54,7 @@ export class GamesystemParser { simpleGamesystem.states = stateParser.parseStates(gamesystemData.states, templateType) const transitionParser = new TransitionParser(simpleGamesystem.states, this.scriptAccounts) - simpleGamesystem.transitions = transitionParser.parseTransitions(gamesystemData.transitions) + simpleGamesystem.transitions = transitionParser.parseTransitions(gamesystemData.transitions, templateType) return simpleGamesystem diff --git a/src/app/project/parser/gamesystemParser/TransitionParser.ts b/src/app/project/parser/gamesystemParser/TransitionParser.ts index 2bd13df..82b4ea1 100644 --- a/src/app/project/parser/gamesystemParser/TransitionParser.ts +++ b/src/app/project/parser/gamesystemParser/TransitionParser.ts @@ -3,6 +3,8 @@ import {ScriptAccountConditionParser} from "./ScriptAccountConditionParser"; import {ScriptAccount} from "../../game-model/scriptAccounts/ScriptAccount"; import {SimpleTransition} from "../../game-model/gamesystems/transitions/SimpleTransition"; import {ScriptAccountActionParser} from "./ScriptAccountActionParser"; +import {TemplateType} from "../../game-model/TemplateType"; +import {SimpleTemplateTransition} from "../../game-model/gamesystems/transitions/SimpleTemplateTransition"; export class TransitionParser { @@ -18,10 +20,10 @@ export class TransitionParser { this.actionParser = new ScriptAccountActionParser(scriptAccounts) } - public parseTransitions(transitionData: any): SimpleTransition[] { + public parseTransitions(transitionData: any, templateType: TemplateType): SimpleTransition[] { const transitions: SimpleTransition[] = [] for(let i=0; i