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

issue-15 #21

Merged
sebastian merged 60 commits from issue-15 into main 2024-03-22 07:46:49 +00:00
Conversation 0 Commits 60 Files Changed 133 +50 -50
24 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f38626683e - Show all commits

2
e2e/game-model/gamesystems/productGamesystems/CreateProductStates.spec.ts
View File

@ -11,7 +11,7 @@ import {end} from "electron-debug";
import {GamesystemTrainer} from "./GamesystemTrainer";
import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem";
import {ProductStateTrainer} from "./ProductStateTrainer";
import {SimpleState} from "../../../../src/app/game-model/gamesystems/SimpleState";
import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState";
test.describe('Test Create ProductStates', () => {
test("Adding already existent ProductState", async () => {

2
e2e/game-model/gamesystems/productGamesystems/CreateProductTransitions.spec.ts
View File

@ -1,6 +1,6 @@
import { test, expect } from '@playwright/test';
import {ProductStateTrainer} from "./ProductStateTrainer";
import {ProductState} from "../../../../src/app/game-model/gamesystems/ProductState";
import {ProductState} from "../../../../src/app/game-model/gamesystems/states/ProductState";
import {SimpleGamesystem} from "../../../../src/app/game-model/gamesystems/SimpleGamesystem";
test.describe('Test Create ProductTransitions', () => {
test("Test ProductTransition Creation with invalid inputs", async ()=> {

2
e2e/game-model/gamesystems/productGamesystems/EqualInnerStates.spec.ts
View File

@ -11,7 +11,7 @@ import {end} from "electron-debug";
import {GamesystemTrainer} from "./GamesystemTrainer";
import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem";
import {ProductStateTrainer} from "./ProductStateTrainer";
import {SimpleState} from "../../../../src/app/game-model/gamesystems/SimpleState";
import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState";
test.describe('Test Check Equal of Innerstates', () => {
test("Test invalid input for equal checking", async()=> {

2
e2e/game-model/gamesystems/productGamesystems/ProductStateGeneration.spec.ts
View File

@ -11,7 +11,7 @@ import {end} from "electron-debug";
import {GamesystemTrainer} from "./GamesystemTrainer";
import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem";
import {ProductStateTrainer} from "./ProductStateTrainer";
import {SimpleState} from "../../../../src/app/game-model/gamesystems/SimpleState";
import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState";
import {ProductSystemGenerationTrainer} from "./ProductSystemGenerationTrainer";
test.describe('Test Create ProductStates', () => {

4
e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer.ts
View File

@ -1,7 +1,7 @@
import {ProductGamesystem} from "../../../../src/app/game-model/gamesystems/ProductGamesystem";
import {SimpleGamesystem} from "../../../../src/app/game-model/gamesystems/SimpleGamesystem";
import {ProductState} from "../../../../src/app/game-model/gamesystems/ProductState";
import {ProductTransition} from "../../../../src/app/game-model/gamesystems/ProductTransition";
import {ProductState} from "../../../../src/app/game-model/gamesystems/states/ProductState";
import {ProductTransition} from "../../../../src/app/game-model/gamesystems/transitions/ProductTransition";
export class ProductStateTrainer {
static INNERSTATE_LETTER_1 = "A";

2
src/app/app.component.ts
View File

@ -16,7 +16,7 @@ import {ScriptAccount} from "./game-model/scriptAccounts/ScriptAccount";
import {GamescriptOverviewComponent} from "./side-overviews/gamescript-overview/gamescript-overview.component";
import {SimpleGamesystem} from "./game-model/gamesystems/SimpleGamesystem";
import {ProductGamesystem} from "./game-model/gamesystems/ProductGamesystem";
import {ProductState} from "./game-model/gamesystems/ProductState";
import {ProductState} from "./game-model/gamesystems/states/ProductState";
import {LoadModel} from "../../app/LoadModel";
import {LoadedProject} from "../../app/LoadedProject";
import {ProcessLoadedProject} from "./game-model/fs/ProcessLoadedProject";

4
src/app/editor/editor.component.ts
View File

@ -4,8 +4,8 @@ import {ModelComponent} from "../game-model/ModelComponent";
import {ModelComponentType} from "../game-model/ModelComponentType";
import {ScriptAccount} from "../game-model/scriptAccounts/ScriptAccount";
import {Gamesystem} from "../game-model/gamesystems/Gamesystem";
import {State} from "../game-model/gamesystems/State";
import {Transition} from "../game-model/gamesystems/Transition";
import {State} from "../game-model/gamesystems/states/State";
import {Transition} from "../game-model/gamesystems/transitions/Transition";
@Component({
selector: 'app-editor',

4
src/app/editor/gamesystem-editor/gamesystem-editor.component.ts
View File

@ -1,8 +1,8 @@
import {Component, EventEmitter, Input, Output} from '@angular/core';
import {GameModel} from "../../game-model/GameModel";
import {Gamesystem} from "../../game-model/gamesystems/Gamesystem";
import {State} from "../../game-model/gamesystems/State";
import {Transition} from "../../game-model/gamesystems/Transition";
import {State} from "../../game-model/gamesystems/states/State";
import {Transition} from "../../game-model/gamesystems/transitions/Transition";
import {SimpleGamesystem} from "../../game-model/gamesystems/SimpleGamesystem";
import {ProductGamesystem} from "../../game-model/gamesystems/ProductGamesystem";

6
src/app/editor/gamesystem-editor/product-gamesystem-editor/LeafGamesystemCalculator.ts
View File

@ -1,9 +1,9 @@
import {Gamesystem} from "../../../game-model/gamesystems/Gamesystem";
import {SimpleGamesystem} from "../../../game-model/gamesystems/SimpleGamesystem";
import {ProductGamesystem} from "../../../game-model/gamesystems/ProductGamesystem";
import {State} from "../../../game-model/gamesystems/State";
import {ProductState} from "../../../game-model/gamesystems/ProductState";
import {SimpleState} from "../../../game-model/gamesystems/SimpleState";
import {State} from "../../../game-model/gamesystems/states/State";
import {ProductState} from "../../../game-model/gamesystems/states/ProductState";
import {SimpleState} from "../../../game-model/gamesystems/states/SimpleState";
export class LeafGamesystemCalculator {

8
src/app/editor/gamesystem-editor/state-editor/product-state-editor/product-state-editor.component.ts
View File

@ -4,11 +4,11 @@ import {SimpleGamesystem} from "../../../../game-model/gamesystems/SimpleGamesys
import {
MatTableDataSource
} from "@angular/material/table";
import {SimpleState} from "../../../../game-model/gamesystems/SimpleState";
import {State} from "../../../../game-model/gamesystems/State";
import {SimpleState} from "../../../../game-model/gamesystems/states/SimpleState";
import {State} from "../../../../game-model/gamesystems/states/State";
import {LeafGamesystemCalculator} from "../../product-gamesystem-editor/LeafGamesystemCalculator";
import {ProductTransition} from "../../../../game-model/gamesystems/ProductTransition";
import {ProductState} from "../../../../game-model/gamesystems/ProductState";
import {ProductTransition} from "../../../../game-model/gamesystems/transitions/ProductTransition";
import {ProductState} from "../../../../game-model/gamesystems/states/ProductState";
@Component({
selector: 'app-product-state-editor',

4
src/app/editor/gamesystem-editor/state-editor/simple-state-editor/simple-state-editor.component.ts
View File

@ -1,10 +1,10 @@
import {Component, Input, OnInit} from '@angular/core';
import {SimpleState} from "../../../../game-model/gamesystems/SimpleState";
import {SimpleState} from "../../../../game-model/gamesystems/states/SimpleState";
import {MatTableDataSource} from "@angular/material/table";
import {animate, state, style, transition, trigger} from "@angular/animations";
import {MatSnackBar} from "@angular/material/snack-bar";
import {SimpleGamesystem} from "../../../../game-model/gamesystems/SimpleGamesystem";
import {ProductState} from "../../../../game-model/gamesystems/ProductState";
import {ProductState} from "../../../../game-model/gamesystems/states/ProductState";
import {LeafGamesystemCalculator} from "../../product-gamesystem-editor/LeafGamesystemCalculator";
@Component({

4
src/app/editor/gamesystem-editor/transition-editor/product-transition-editor/product-transition-editor.component.ts
View File

@ -5,8 +5,8 @@ import {
MatTableDataSource
} from "@angular/material/table";
import {LeafGamesystemCalculator} from "../../product-gamesystem-editor/LeafGamesystemCalculator";
import {ProductTransition} from "../../../../game-model/gamesystems/ProductTransition";
import {ProductState} from "../../../../game-model/gamesystems/ProductState";
import {ProductTransition} from "../../../../game-model/gamesystems/transitions/ProductTransition";
import {ProductState} from "../../../../game-model/gamesystems/states/ProductState";
class DisplayedColumnName {
displayedName: string
internalName: string

6
src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.ts
View File

@ -10,10 +10,10 @@ import {
MatTable,
MatTableDataSource
} from "@angular/material/table";
import {SimpleTransition} from "../../../../game-model/gamesystems/SimpleTransition";
import {SimpleTransition} from "../../../../game-model/gamesystems/transitions/SimpleTransition";
import {animate, state, style, transition, trigger} from "@angular/animations";
import {SimpleState} from "../../../../game-model/gamesystems/SimpleState";
import {ProductTransition} from "../../../../game-model/gamesystems/ProductTransition";
import {SimpleState} from "../../../../game-model/gamesystems/states/SimpleState";
import {ProductTransition} from "../../../../game-model/gamesystems/transitions/ProductTransition";
import {LeafGamesystemCalculator} from "../../product-gamesystem-editor/LeafGamesystemCalculator";
@Component({

4
src/app/game-model/GameModel.ts
View File

@ -1,7 +1,7 @@
import {Gamesystem} from "./gamesystems/Gamesystem";
import {ScriptAccount} from "./scriptAccounts/ScriptAccount";
import {Transition} from "./gamesystems/Transition";
import {State} from "./gamesystems/State";
import {Transition} from "./gamesystems/transitions/Transition";
import {State} from "./gamesystems/states/State";
import {ProductGamesystem} from "./gamesystems/ProductGamesystem";
import {SimpleGamesystem} from "./gamesystems/SimpleGamesystem";
import {StorageModel} from "./fs/StorageModel";

4
src/app/game-model/fs/parser/SimpleGamesystemParser.ts
View File

@ -1,6 +1,6 @@
import {SimpleGamesystem} from "../../gamesystems/SimpleGamesystem";
import {SimpleState} from "../../gamesystems/SimpleState";
import {SimpleTransition} from "../../gamesystems/SimpleTransition";
import {SimpleState} from "../../gamesystems/states/SimpleState";
import {SimpleTransition} from "../../gamesystems/transitions/SimpleTransition";
export class SimpleGamesystemParser {

10
src/app/game-model/gamesystems/ProductGamesystem.ts
View File

@ -1,9 +1,9 @@
import {Gamesystem} from "./Gamesystem";
import {ProductState} from "./ProductState";
import {ProductTransition} from "./ProductTransition";
import {State} from "./State";
import {Transition} from "./Transition";
import {SimpleState} from "./SimpleState";
import {ProductState} from "./states/ProductState";
import {ProductTransition} from "./transitions/ProductTransition";
import {State} from "./states/State";
import {Transition} from "./transitions/Transition";
import {SimpleState} from "./states/SimpleState";
import {SimpleGamesystem} from "./SimpleGamesystem";
import {GameModel} from "../GameModel";
import {ProductStateTrainer} from "../../../../e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer";

12
src/app/game-model/gamesystems/SimpleGamesystem.ts
View File

@ -1,10 +1,10 @@
import {Gamesystem} from "./Gamesystem";
import {SimpleState} from "./SimpleState";
import {SimpleTransition} from "./SimpleTransition";
import {State} from "./State";
import {Transition} from "./Transition";
import {ProductState} from "./ProductState";
import {ProductTransition} from "./ProductTransition";
import {SimpleState} from "./states/SimpleState";
import {SimpleTransition} from "./transitions/SimpleTransition";
import {State} from "./states/State";
import {Transition} from "./transitions/Transition";
import {ProductState} from "./states/ProductState";
import {ProductTransition} from "./transitions/ProductTransition";
import {ProductGamesystem} from "./ProductGamesystem";
export class SimpleGamesystem extends Gamesystem<SimpleState, SimpleTransition> {

4
src/app/game-model/gamesystems/ProductState.ts → src/app/game-model/gamesystems/states/ProductState.ts
View File

@ -1,7 +1,7 @@
import {ProductTransition} from "./ProductTransition";
import {ProductTransition} from "../transitions/ProductTransition";
import {State} from "./State";
import {SimpleState} from "./SimpleState";
import {Transition} from "./Transition";
import {Transition} from "../transitions/Transition";
export class ProductState extends State<ProductTransition> {
innerStates: State<any>[] = [];

4
src/app/game-model/gamesystems/SimpleState.ts → src/app/game-model/gamesystems/states/SimpleState.ts
View File

@ -1,6 +1,6 @@
import {State} from "./State";
import {SimpleTransition} from "./SimpleTransition";
import {Transition} from "./Transition";
import {SimpleTransition} from "../transitions/SimpleTransition";
import {Transition} from "../transitions/Transition";
export class SimpleState extends State<SimpleTransition> {
stateLabel: string = "";

2
src/app/game-model/gamesystems/State.ts → src/app/game-model/gamesystems/states/State.ts
View File

@ -1,4 +1,4 @@
import {Transition} from "./Transition";
import {Transition} from "../transitions/Transition";
export abstract class State<T extends Transition<any>> {

2
src/app/game-model/gamesystems/ProductTransition.ts → src/app/game-model/gamesystems/transitions/ProductTransition.ts
View File

@ -1,5 +1,5 @@
import {Transition} from "./Transition";
import {ProductState} from "./ProductState";
import {ProductState} from "../states/ProductState";
export class ProductTransition extends Transition<ProductState> {

2
src/app/game-model/gamesystems/SimpleTransition.ts → src/app/game-model/gamesystems/transitions/SimpleTransition.ts
View File

@ -1,4 +1,4 @@
import {SimpleState} from "./SimpleState";
import {SimpleState} from "../states/SimpleState";
import {Transition} from "./Transition";
export class SimpleTransition extends Transition<SimpleState> {

2
src/app/game-model/gamesystems/Transition.ts → src/app/game-model/gamesystems/transitions/Transition.ts
View File

@ -1,4 +1,4 @@
import {State} from "./State";
import {State} from "../states/State";
export abstract class Transition<S extends State<any>> {
startingState: S

4
src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts
View File

@ -1,7 +1,7 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {Gamesystem} from "../../game-model/gamesystems/Gamesystem";
import {State} from "../../game-model/gamesystems/State";
import {Transition} from "../../game-model/gamesystems/Transition";
import {State} from "../../game-model/gamesystems/states/State";
import {Transition} from "../../game-model/gamesystems/transitions/Transition";
import {ProductGamesystem} from "../../game-model/gamesystems/ProductGamesystem";
import {FlatTreeControl} from "@angular/cdk/tree";
import {