diff --git a/src/app/game-model/gamesystems/ProductGamesystem.ts b/src/app/game-model/gamesystems/ProductGamesystem.ts index 6166b18..01d7d1f 100644 --- a/src/app/game-model/gamesystems/ProductGamesystem.ts +++ b/src/app/game-model/gamesystems/ProductGamesystem.ts @@ -7,6 +7,7 @@ import {SimpleState} from "./states/SimpleState"; import {SimpleGamesystem} from "./SimpleGamesystem"; import {GameModel} from "../GameModel"; import {ProductStateTrainer} from "../../../../e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer"; +import {ScriptAccountCondition} from "./conditions/ScriptAccountCondition"; export class ProductGamesystem extends Gamesystem { @@ -99,20 +100,34 @@ export class ProductGamesystem extends Gamesystem productInitial = productInitial && innerState.initial) + binary_productState!.initial = productInitial + + const combinedStateConditions: ScriptAccountCondition[] = leftInnerState.conditions.concat(rightInnerState.conditions) + const conditionsContradicting = false + for(let i=0; i