gov: multiply by building tier

ts/gov.ts

@@ -79,11 +79,11 @@ async function _render(planetName: string, pop: Pop) {
 		'education': calcTotalNeeds(lastPOPR, 'education'),
 	};
 
-	const currentPOPIFilled: Map<POPIBuilding, number> = new Map();
+	const currentPOPIFilled: POPIFill = new Map();
 	for (const infra of infras) {
 		const filled = calcPOPIFilled(infra);
 		if (filled !== null)
-			currentPOPIFilled.set(infra.Type, filled);
+			currentPOPIFilled.set(infra.Type, {tier: infra.CurrentLevel, numMats: filled});
 	}
 
 	// gen
@@ -153,10 +153,10 @@ async function _render(planetName: string, pop: Pop) {
 			${infras.map((infra) => {
 				if (infra.CurrentLevel === 0)
 					return '';
-				const filled = currentPOPIFilled.get(infra.Type)!;
+				const fill = currentPOPIFilled.get(infra.Type)!;
 				return `<tr>
 					<td>${infra.Type} T${infra.CurrentLevel}</td>
-					<td>${filled}/${infra.Upkeeps.length}</td>
+					<td>${fill.numMats}/${infra.Upkeeps.length}</td>
 				</tr>`;
 			}).join('')}
 		</tr>
@@ -168,7 +168,7 @@ async function _render(planetName: string, pop: Pop) {
 	${[...popiFillCombinations(currentPOPIFilled)].map((combination) => {
 		const happiness = projectedHappiness(pop, totalNeeds, siteCount, combination);
 		return `<tr>
-			<td>${[...combination.entries()].map(([building, filled]) => `${building}: ${filled}`).join(', ')}</td>
+			<td>${[...combination.entries()].map(([building, fill]) => `${building}: ${fill.numMats}`).join(', ')}</td>
 			<td>${formatPct(happiness)}</td>
 		</tr>`;
 	}).join('')}
@@ -225,30 +225,30 @@ function calcPOPIFilled(infra: Infrastructure): number | null {
 	return filled;
 }
 
-function* popiFillCombinations(currentPOPIFilled: Map<POPIBuilding, number>): Generator<Map<POPIBuilding, number>> {
+function* popiFillCombinations(currentPOPIFilled: POPIFill): Generator<POPIFill> {
 	const entries = [...currentPOPIFilled.keys()];
-	function* helper(index: number, current: Map<POPIBuilding, number>): Generator<Map<POPIBuilding, number>> {
+	function* helper(index: number, current: POPIFill): Generator<POPIFill> {
 		if (index === entries.length) {
 			yield new Map(current);
 			return;
 		}
 		const building = entries[index];
+		const tier = currentPOPIFilled.get(building)!.tier;
 		for (let i = 0; i <= POPI[building].max; i++) {
-			current.set(building, i);
+			current.set(building, {tier, numMats: i});
 			yield* helper(index + 1, current);
 		}
 	}
 	yield* helper(0, new Map());
 }
 
-function projectedHappiness(pop: Pop, totalNeeds: Record<Need, number>, siteCount: number,
-		popiFilled: Map<POPIBuilding, number>): number {
+function projectedHappiness(pop: Pop, totalNeeds: Record<Need, number>, siteCount: number, popiFilled: POPIFill): number {
 	let totalProvided: Record<Need, number> = {'safety': 50 * siteCount, 'health': 50 * siteCount,
 		'comfort': 0, 'culture': 0, 'education': 0};
-	for (const [building, filled] of popiFilled.entries()) {
+	for (const [building, fill] of popiFilled.entries()) {
 		const {max, needs} = POPI[building];
 		for (const {need, satisfaction} of needs) {
-			const provided = filled / max * satisfaction;
+			const provided = fill.numMats / max * fill.tier * satisfaction;
 			totalProvided[need] += provided;
 		}
 	}
@@ -297,6 +297,7 @@ type Need = 'safety' | 'health' | 'comfort' | 'culture' | 'education';
 type POPIBuilding = 'SAFETY_STATION' | 'SECURITY_DRONE_POST' | 'EMERGENCY_CENTER' | 'INFIRMARY' | 'HOSPITAL' |
 	'WELLNESS_CENTER' | 'WILDLIFE_PARK' | 'ARCADES' | 'ART_CAFE' | 'ART_GALLERY' | 'THEATER' |
 	'PLANETARY_BROADCASTING_HUB' | 'LIBRARY' | 'UNIVERSITY';
+type POPIFill = Map<POPIBuilding, {tier: number, numMats: number}>;
 
 interface Planet {
 	PopulationReports: POPR[]