Implemented machine filter for production, fixed bugs in dataset, add…

…ed modal for old version

src/Data/Data.ts

@@ -370,7 +370,7 @@ export class Data
 			return true;
 		}
 
-		return typeof entity.metadata.manufacturingSpeed !== 'undefined';;
+		return entity.metadata.manufacturingSpeed !== 0;
 	}
 
 	public isExtractorBuilding(entity: BuildingTypes): boolean
@@ -390,6 +390,15 @@ export class Data
 		});
 	}
 
+	public getManufacturers(): IBuildingSchema[]
+	{
+		return Object.values(this.getRawData().buildings).filter((building) => {
+			return this.isManufacturerBuilding(building) && !this.isManualManufacturer(building);
+		}).sort((a, b) => {
+			return a.name.localeCompare(b.name);
+		});
+	}
+
 }
 
 export default new Data;

src/Module/AppModule.ts

@@ -1,4 +1,4 @@
-import {ILocationProvider, IModule, ISCEProvider, IScope} from 'angular';
+import {ILocationProvider, IModule, ISCEProvider, IScope, ITimeoutService} from 'angular';
 import {StateService, StateParams, UrlRouterProvider} from 'angular-ui-router';
 import {HomeController} from '@src/Module/Controllers/HomeController';
 import {AppDirective} from '@src/Module/Directives/AppDirective';
@@ -346,7 +346,7 @@ export class AppModule
 				});
 			},
 		]);
-		this.app.run(['$transitions', '$rootScope', '$state', ($transitions: any, $rootScope: any, $state: StateService) => {
+		this.app.run(['$transitions', '$rootScope', '$state', '$timeout', ($transitions: any, $rootScope: any, $state: StateService, $timeout: ITimeoutService) => {
 			$rootScope.aprilMode = April.isApril();
 			$rootScope.aprilModePossible = April.isAprilPossible();
 
@@ -379,6 +379,13 @@ export class AppModule
 					DataProvider.change($state.params.version);
 				});
 			});
+
+			$timeout(() => {
+				$('#modal').modal({
+					backdrop: 'static',
+					keyboard: false,
+				});
+			})
 		}]);
 
 		this.app.filter('number', () => {

src/Module/Controllers/ProductionController.ts

@@ -32,6 +32,7 @@ export class ProductionController
 	public readonly sinkableItems: IItemSchema[] = data.getSinkableItems();
 	public readonly alternateRecipes: IRecipeSchema[] = data.getAlternateRecipes();
 	public readonly basicRecipes: IRecipeSchema[] = data.getBaseItemRecipes();
+	public readonly machines: IBuildingSchema[] = data.getManufacturers();
 
 	public result: string;
 

src/Tools/Production/IProductionData.ts

@@ -24,6 +24,7 @@ export interface IProductionDataRequest
 
 	blockedResources: string[]; // whether the raw resource is available for usage or not
 	blockedRecipes: string[]; // whether normal recipe can be used
+	blockedMachines?: string[]; // which machines are blocked
 	allowedAlternateRecipes: string[]; // whether alt is available or not (doesn't guarantee usage)
 
 	sinkableResources: string[]; // whether or not you can sink a given resource

src/Tools/Production/ProductionTab.ts

@@ -12,6 +12,7 @@ import {Solver} from '@src/Solver/Solver';
 import {ProductionResult} from '@src/Tools/Production/Result/ProductionResult';
 import {ProductionResultFactory} from '@src/Tools/Production/Result/ProductionResultFactory';
 import {DataProvider} from '@src/Data/DataProvider';
+import {IRecipeSchema} from '@src/Schema/IRecipeSchema';
 
 export class ProductionTab
 {
@@ -54,14 +55,18 @@ export class ProductionTab
 			this.addEmptyProduct();
 		}
 
+		if (typeof this.data.request.blockedMachines === 'undefined') {
+			this.data.request.blockedMachines = [];
+		}
+
 		this.unregisterCallback = scope.$watch(() => {
 			return this.data.request;
 		}, Callbacks.debounce((newValue, oldValue) => {
 			this.firstRun = false;
 			this.scope.saveState();
 			this.shareLink = '';
 			this.calculate(this.scope.$timeout);
-		}, 300), true);
+		}, 400), true);
 	}
 
 	public calculate($timeout?: ITimeoutService): void
@@ -89,8 +94,43 @@ export class ProductionTab
 		this.resultStatus = ResultStatus.CALCULATING;
 
 		const calc = () => {
-			const apiRequest: IProductionDataApiRequest = this.data.request as IProductionDataApiRequest;
+			const apiRequest: IProductionDataApiRequest = angular.copy(this.data.request) as IProductionDataApiRequest;
 			apiRequest.gameVersion = this.version === '0.8' ? '0.8.0' : '1.0.0';
+
+			const blockedMachines = apiRequest.blockedMachines || [];
+			const allowedAlts: string[] = [];
+			for (const recipeClass of apiRequest.allowedAlternateRecipes) {
+				const recipe = data.getRecipeByClassName(recipeClass);
+				if (recipe) {
+					let allowed = true;
+					for (const machineClass of blockedMachines) {
+						if (recipe.producedIn.indexOf(machineClass) !== -1) {
+							allowed = false;
+						}
+					}
+					if (allowed) {
+						allowedAlts.push(recipeClass);
+					}
+				}
+			}
+			apiRequest.allowedAlternateRecipes = allowedAlts;
+
+			const blockedRecipes: string[] = [];
+			for (const recipe of data.getBaseItemRecipes()) {
+				let allowed = apiRequest.blockedRecipes.indexOf(recipe.className) === -1;
+				for (const machineClass of blockedMachines) {
+					if (recipe.producedIn.indexOf(machineClass) !== -1) {
+						allowed = false;
+					}
+				}
+				if (!allowed) {
+					blockedRecipes.push(recipe.className);
+				}
+			}
+			apiRequest.blockedRecipes = blockedRecipes;
+
+			delete apiRequest.blockedMachines;
+
 			Solver.solveProduction(apiRequest, (result) => {
 				const res = () => {
 					let length = 0;
@@ -142,6 +182,7 @@ export class ProductionTab
 			request: {
 				allowedAlternateRecipes: [],
 				blockedRecipes: [],
+				blockedMachines: [],
 				blockedResources: [],
 				sinkableResources: [],
 				production: [],
@@ -358,6 +399,40 @@ export class ProductionTab
 		return this.data.request.blockedRecipes.indexOf(className) === -1;
 	}
 
+	public isMachineEnabled(className: string): boolean
+	{
+		if (typeof this.data.request.blockedMachines === 'undefined') {
+			return false;
+		}
+		return this.data.request.blockedMachines.indexOf(className) === -1;
+	}
+
+	public toggleMachine(className: string): void
+	{
+		if (typeof this.data.request.blockedMachines === 'undefined') {
+			return;
+		}
+		const index = this.data.request.blockedMachines.indexOf(className);
+		if (index === -1) {
+			this.data.request.blockedMachines.push(className);
+		} else {
+			this.data.request.blockedMachines.splice(index, 1);
+		}
+	}
+
+	public recipeMachineDisabled(recipe: IRecipeSchema): boolean
+	{
+		if (typeof this.data.request.blockedMachines === 'undefined') {
+			return false;
+		}
+		for (const madeIn of recipe.producedIn) {
+			if (this.data.request.blockedMachines.indexOf(madeIn) !== -1) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public convertAlternateRecipeName(name: string): string
 	{
 		return name.replace('Alternate: ', '');

styles/production.scss

@@ -272,6 +272,11 @@ $border: 1px solid rgba(0, 0, 0, 0.125);
 		background-color: $gray-700;
 	}
 
+	tr.disabled {
+		color: $gray-600;
+		text-decoration: line-through;
+	}
+
 	td {
 		padding: 2px;
 		.recipe-item {

templates/Controllers/production.html

@@ -170,7 +170,14 @@ <h4>Import (.sft file)</h4>
 								<span class="fas fa-fw fa-scroll mr-1"></span>
 								Recipes
 							</a>
-						<!--</li><li class="nav-item">
+						</li>
+						<li class="nav-item">
+							<a href="javascript: void(0);" class="nav-link" ng-class="{active: ctrl.tab.tab === 'machines'}" ng-click="ctrl.tab.tab = 'machines'">
+								<span class="fas fa-fw fa-industry mr-1"></span>
+								Machines
+							</a>
+						</li>
+						<!--<li class="nav-item">
 							<a href="javascript: void(0);" class="nav-link" ng-class="{active: ctrl.tab.tab === 'sink'}" ng-click="ctrl.tab.tab = 'sink'">
 								<span class="fas fa-fw fa-ticket-alt mr-1"></span>
 								Sink points
@@ -402,7 +409,7 @@ <h3 class="card-header card-header-with-buttons">
 
 								<div class="card-body" ng-show="ctrl.tab.state.alternateRecipesExpanded">
 									<table class="alternate-recipe-list">
-										<tr ng-repeat="recipe in ctrl.alternateRecipes | filter: {name: ctrl.tab.state.alternateRecipesQuery} | orderBy:'name'" ng-click="ctrl.tab.toggleAlternateRecipe(recipe.className)">
+										<tr ng-repeat="recipe in ctrl.alternateRecipes | filter: {name: ctrl.tab.state.alternateRecipesQuery} | orderBy:'name'" ng-click="ctrl.tab.toggleAlternateRecipe(recipe.className)" ng-class="{'disabled': ctrl.tab.recipeMachineDisabled(recipe)}" data-tooltip title="{{ctrl.tab.recipeMachineDisabled(recipe) ? 'Recipe disabled because corresponding building is disabled.' : ''}}">
 											<td>
 												<span class="fas fa-check-square" ng-show="ctrl.tab.isAlternateRecipeEnabled(recipe.className)"></span>
 												<span class="fas fa-square" ng-show="!ctrl.tab.isAlternateRecipeEnabled(recipe.className)"></span>
@@ -452,7 +459,7 @@ <h3 class="card-header d-flex">
 								</h3>
 								<div class="card-body" ng-show="ctrl.tab.state.basicRecipesExpanded">
 									<table class="alternate-recipe-list">
-										<tr ng-repeat="recipe in ctrl.basicRecipes | filter: {name: ctrl.tab.state.basicRecipesQuery} | orderBy:'name'" ng-click="ctrl.tab.toggleBasicRecipe(recipe.className)">
+										<tr ng-repeat="recipe in ctrl.basicRecipes | filter: {name: ctrl.tab.state.basicRecipesQuery} | orderBy:'name'" ng-click="ctrl.tab.toggleBasicRecipe(recipe.className)" ng-class="{'disabled': ctrl.tab.recipeMachineDisabled(recipe)}" data-tooltip title="{{ctrl.tab.recipeMachineDisabled(recipe) ? 'Recipe disabled because corresponding building is disabled.' : ''}}">
 											<td>
 												<span class="fas fa-check-square" ng-show="ctrl.tab.isBasicRecipeEnabled(recipe.className)"></span>
 												<span class="fas fa-square" ng-show="!ctrl.tab.isBasicRecipeEnabled(recipe.className)"></span>
@@ -481,6 +488,41 @@ <h3 class="card-header d-flex">
 					</div>
 				</div>
 
+				<div class="col-md-10" ng-if="ctrl.tab.tab === 'machines'">
+					<p>
+						Select machines you have available. Disabling a machine will automatically disable all recipes in that machine.
+					</p>
+
+					<div class="row">
+						<div class="col-md-6">
+							<div class="recipe-list-card card">
+								<div class="card-header d-flex">
+									<span class="recipe-list-card-title text-nowrap">
+										Available machines
+									</span>
+								</div>
+
+								<div class="card-body">
+									<table class="alternate-recipe-list">
+										<tr ng-repeat="machine in ctrl.machines | orderBy:'name'" ng-click="ctrl.tab.toggleMachine(machine.className)">
+											<td>
+												<span class="fas fa-check-square" ng-show="ctrl.tab.isMachineEnabled(machine.className)"></span>
+												<span class="fas fa-square" ng-show="!ctrl.tab.isMachineEnabled(machine.className)"></span>
+											</td>
+											<td class="d-flex justify-content-between">
+												<span>
+													<item-icon item="machine.className" size="20"></item-icon>
+													{{machine.name}}
+												</span>
+											</td>
+										</tr>
+									</table>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+
 				<div class="col-md-10" ng-show="ctrl.tab.tab === 'sink'">
 					<div class="row">
 						<div class="col-md-6">

templates/Directives/app.html

@@ -98,12 +98,6 @@ <h6 class="dropdown-header">Support me</h6>
 </nav>
 
 <div class="container-fluid px-xl-5 px-lg-4 px-md-3 px-sm-2 px-1" style="margin-top: 60px;">
-	<div class="alert alert-danger alert-dismissible fade show" ng-if="version === '0.8'">
-		<b>You're looking at Tools for Update 8!</b> If you want to calculate builds for full release (1.0), change version in top menu.<br>
-		You can use the export/import functionality to move production lines to 1.0 Tools.
-		<button class="close" data-dismiss="alert">&times;</button>
-	</div>
-
 	<div ui-view></div>
 
 	<hr>
@@ -116,3 +110,23 @@ <h6 class="dropdown-header">Support me</h6>
 	</footer>
 </div>
 
+<div class="modal" tabindex="-1" ng-if="version === '0.8'" id="modal">
+	<div class="modal-dialog modal-dialog-centered">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h3 class="modal-title">Old version!</h3>
+			</div>
+			<div class="modal-body">
+				<p class="alert alert-danger">
+					<b>You're looking at Tools for Update 8!</b> If you want to calculate builds for full release (1.0), use the button below to switch.<br>
+					You can use the export/import functionality to move production lines to 1.0 Tools.
+				</p>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-danger" data-dismiss="modal">Stay on 0.8 Tools</button>
+				<a ng-click="changeVersion('1.0')" class="btn btn-success">Go to 1.0 Tools</a>
+			</div>
+		</div>
+	</div>
+</div>
+