diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 221fe57..be0a940 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -211,7 +211,7 @@ export class AppComponent implements OnInit{ const gamesystemParser = new GamesystemParser(scriptAccounts); const gamesystems = gamesystemParser.parseStoredGamesystems(storedGameModel.storedGamesystems); - const characterParser = new CharacterParser(gamesystemParser.getParsedTemplateGamesystems(TemplateType.CHARACTER), scriptAccounts); + const characterParser = new CharacterParser(gamesystemParser.getParsedTemplateGamesystems(TemplateType.CHARACTER)); const characters = characterParser.parseCharacters(storedGameModel.storedCharacters); gameModel.scriptAccounts = scriptAccounts diff --git a/src/app/project/parser/characterParser/CharacterParser.ts b/src/app/project/parser/characterParser/CharacterParser.ts index d1323f9..6ded01a 100644 --- a/src/app/project/parser/characterParser/CharacterParser.ts +++ b/src/app/project/parser/characterParser/CharacterParser.ts @@ -1,19 +1,14 @@ import {StoreComponent} from "../../../../../app/storage/StoreComponent"; import {Character} from "../../game-model/characters/Character"; import {SimpleTemplateGamesystem} from "../../game-model/gamesystems/SimpleTemplateGamesystem"; -import {ScriptAccount} from "../../game-model/scriptAccounts/ScriptAccount"; -import {ScriptAccountParser} from "../ScriptAccountParser"; -import {ScriptAccountConditionParser} from "../gamesystemParser/ScriptAccountConditionParser"; export class CharacterParser { characterSpecificGamesystems: SimpleTemplateGamesystem[] - scriptAccountConditionParser: ScriptAccountConditionParser - constructor(characterSpecificGamesystems: SimpleTemplateGamesystem[], scriptAccounts: ScriptAccount[]) { + constructor(characterSpecificGamesystems: SimpleTemplateGamesystem[]) { this.characterSpecificGamesystems = characterSpecificGamesystems; - this.scriptAccountConditionParser = new ScriptAccountConditionParser(scriptAccounts) } public parseCharacters(characters: StoreComponent[]): Character[] { @@ -25,6 +20,7 @@ export class CharacterParser { private parseSingleCharacter(characterData: any): Character { const character = new Character(characterData.componentName, characterData.componentDescription); character.characterSpecificGamesystems = this.parseCharacterSpecificGamesystems(character, characterData.characterSpecificGamesystems); + console.log("Parsed Character", character) return character; } @@ -45,14 +41,13 @@ export class CharacterParser { const stateReference = characterSpecificGamesystem.states[i]; const state = this.findReferencedState(referencedGamesystem, stateReference.stateLabel)! - const conditions = this.scriptAccountConditionParser.parseStoredConditions(stateReference.conditionMap); - - state.conditionMap.set(character, conditions) + state.conditionMap.set(character, []) } } return referencedGamesystem; } + private findCharacterSpecificGamesystem(componentName: string): SimpleTemplateGamesystem | undefined{ return this.characterSpecificGamesystems.find(gamesystem => gamesystem.componentName === componentName) }