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

Remove generated Duplicate Transitions
All checks were successful
E2E Testing / test (push) Successful in 1m33s
Details

Browse Source
This commit is contained in:
Sebastian Böckelmann 2024-04-13 08:13:15 +02:00
parent 7acf334db9
commit ec69b9f436
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/project/game-model/gamesystems/productSystemGenerator/ProductGamesystemGenerator.ts
View File

@ -34,7 +34,11 @@ export class ProductGamesystemGenerator extends AbstractProductGamesystemGenerat
transition.scriptAccountActions = this.generateCombinedActions(leftTransition.scriptAccountActions, rightTransition.scriptAccountActions); transition.scriptAccountActions = this.generateCombinedActions(leftTransition.scriptAccountActions, rightTransition.scriptAccountActions);
transition.scriptAccountConditions = this.generateCombinedConditions(leftTransition.scriptAccountConditions, rightTransition.scriptAccountConditions); transition.scriptAccountConditions = this.generateCombinedConditions(leftTransition.scriptAccountConditions, rightTransition.scriptAccountConditions);
if(generatedTransitions.find(generatedTransition => generatedTransition.startingState.equals(startingState) && generatedTransition.endingState.equals(endingState)) == undefined) {
generatedTransitions.push(transition) generatedTransitions.push(transition)
} else {
console.log(transition)
}
} }
} }

4
src/app/project/game-model/gamesystems/productSystemGenerator/ProductTemplateGamesystemGenerator.ts
View File

@ -141,7 +141,11 @@ export class ProductTemplateGamesystemGenerator<TemplateReference> extends Abstr
transition.scriptAccountConditions = this.generateCombinedConditions(leftConditions, rightConditions); transition.scriptAccountConditions = this.generateCombinedConditions(leftConditions, rightConditions);
if(generatedTransitions.find(generatedTransition => generatedTransition.startingState.equals(startingState) && generatedTransition.endingState.equals(endingState)) == undefined) {
generatedTransitions.push(transition) generatedTransitions.push(transition)
} else {
console.log(transition)
}
} }
} }

5
src/app/project/game-model/gamesystems/states/ProductState.ts
View File

@ -2,6 +2,7 @@ import {ProductTransition} from "../transitions/ProductTransition";
import {State} from "./State"; import {State} from "./State";
import {SimpleState} from "./SimpleState"; import {SimpleState} from "./SimpleState";
import {Transition} from "../transitions/Transition"; import {Transition} from "../transitions/Transition";
import {SimpleTemplateState} from "./SimpleTemplateState";
export class ProductState extends State<ProductTransition> { export class ProductState extends State<ProductTransition> {
innerStates: State<any>[] = []; innerStates: State<any>[] = [];
@ -29,6 +30,10 @@ export class ProductState extends State<ProductTransition> {
return false; return false;
} }
if(state instanceof SimpleTemplateState) {
return false;
}
for(let i=0; i<this.innerStates.length; i++) { for(let i=0; i<this.innerStates.length; i++) {
if(!this.innerStates[i].equals((state as ProductState).innerStates[i])) { if(!this.innerStates[i].equals((state as ProductState).innerStates[i])) {
return false; return false;