sebastian/ConceptCreator
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sebastian:6381488fa18865640c1508905b83601190adea60
Branches Tags
sebastian:main
sebastian:character-interactions
..
compare: sebastian:cfc23efb719017d52ca4690a1108f70465fd4b4d
Branches Tags
sebastian:character-interactions
sebastian:main

No commits in common. "6381488fa18865640c1508905b83601190adea60" and "cfc23efb719017d52ca4690a1108f70465fd4b4d" have entirely different histories.
6381488fa1 ... cfc23efb71

3 changed files with 2 additions and 7 deletions
Show Stats Expand all files Collapse all files

1
src/app/project/game-model/GameModel.ts
View File

@ -76,7 +76,6 @@ export class GameModel {
let parentProductGamesystem: ProductGamesystem;
if(parentGamesystem instanceof SimpleTemplateGamesystem) {
console.log("Simple Template")
parentProductGamesystem = ProductTemplateCreator.constructTemplateFromSimpleGamesystem(parentGamesystem, this, templateType!)
} else if(parentGamesystem instanceof SimpleGamesystem) {
if(simpleGamesystem instanceof SimpleTemplateGamesystem) {

2
src/app/project/game-model/characters/CharacterRelation.ts
View File

@ -4,7 +4,6 @@ import {ProductTemplateSystem} from "../templates/productGamesystem/ProductTempl
import {Gamesystem} from "../gamesystems/Gamesystem";
import {SimpleTemplateGamesystem} from "../templates/simpleGamesystem/SimpleTemplateGamesystem";
import {TemplateType} from "../templates/TemplateType";
import {ProductTemplateCreator} from "../templates/productGamesystem/ProductTemplateCreator";
export class CharacterRelation implements TemplateElement{
@ -24,7 +23,6 @@ export class CharacterRelation implements TemplateElement{
templateGamesystem.addChildGamesystem(gamesystem);
templateGamesystem.addChildGamesystem(gamesystem);
this.characterRelationGamesystems.push(templateGamesystem);
templateGamesystem.addTemplateElement(this);
} else {
console.log("Test")
}

6
src/app/project/game-model/gamesystems/productSystemGenerator/TemplateProductSystemGenerator.ts
View File

@ -27,8 +27,6 @@ export class TemplateProductSystemGenerator extends ProductSystemGenerator {
const productTemplateSystem = this.productGamesystem as ProductTemplateSystem
productTemplateSystem.transitionMap.set(this.templateElement, generationResult.transitions)
productTemplateSystem.stateMap.set(this.templateElement, generationResult.states)
console.log("Test")
}
protected getTransitionConditions(transition: Transition<any>, leftSystem: boolean) {
@ -43,7 +41,7 @@ export class TemplateProductSystemGenerator extends ProductSystemGenerator {
const templateElement = this.determineTemplateElement(leftSystem)!;
if(transition instanceof SimpleTemplateTransition && transition.actionMap.has(templateElement)) {
return transition.actionMap.get(templateElement)!
return transition.actionMap.get(this.templateElement)!
} else {
return transition.scriptAccountActions;
}
@ -53,7 +51,7 @@ export class TemplateProductSystemGenerator extends ProductSystemGenerator {
protected getStateConditions(state: State<any>, leftSystem: boolean): ScriptAccountCondition[] {
const templateElement = this.determineTemplateElement(leftSystem)!
if(state instanceof SimpleTemplateState && state.conditionMap.has(templateElement)) {
return state.conditionMap.get(templateElement)!
return state.conditionMap.get(this.templateElement)!
} else {
return state.conditions
}