Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1021-90

See merge request pregmodfan/fc-pregmod!916

src/pregmod/widgets/economyWidgets.tw

@@ -7,6 +7,17 @@
 	<<else>>
 		<<set _details = $args[0]>>
 		<<set _b = $facility.brothel>>
+		<<run
+			_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
+			_b.rep = (def _b.rep) ? _b.rep : 0;
+			_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
+			_b.adsIncome = (def _b.adsIncome) ? _b.adsIncome : 0;
+			_b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
+			_b.adsCosts = (def _b.adsCosts) ? _b.adsCosts : 0;
+			_b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0;
+			_b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0;
+			_b.profit = (def _b.profit) ? _b.profit : 0;
+		>>
 		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
 		<tr style="border-bottom: 2px solid white;">
 			<th>Items</th>
@@ -102,6 +113,17 @@
 	<<else>>
 		<<set _details = $args[0]>>
 		<<set _b = $facility.club>>
+		<<run
+			_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
+			_b.rep = (def _b.rep) ? _b.rep : 0;
+			_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
+			_b.adsIncome = (def _b.adsIncome) ? _b.adsIncome : 0;
+			_b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
+			_b.adsCosts = (def _b.adsCosts) ? _b.adsCosts : 0;
+			_b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0;
+			_b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0;
+			_b.profit = (def _b.profit) ? _b.profit : 0;
+		>>
 		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
 		<tr style="border-bottom: 2px solid white;">
 			<th>Items</th>
@@ -197,6 +219,14 @@
 	<<else>>
 		<<set _details = $args[0]>>
 		<<set _b = $facility.dairy>>
+		<<run
+			_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
+			_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
+			_b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
+			_b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0;
+			_b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0;
+			_b.profit = (def _b.profit) ? _b.profit : 0;
+		>>
 		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
 		<tr style="border-bottom: 2px solid white;">
 			<th>Items</th>
@@ -274,6 +304,15 @@
 	<<else>>
 		<<set _details = $args[0]>>
 		<<set _b = $facility.arcade>>
+		<<run
+			_b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
+			_b.rep = (def _b.rep) ? _b.rep : 0;
+			_b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
+			_b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
+			_b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0;
+			_b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0;
+			_b.profit = (def _b.profit) ? _b.profit : 0;
+		>>
 		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
 		<tr style="border-bottom: 2px solid white;">
 			<th>Items</th>