diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 9c138a006c42d05523462aa4b67c7dae1f40ef4e..9bacc60f5923a62a7d595a013f29361f1219f418 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1263,7 +1263,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Armenian": setup.armenianSlaveNames,
"Aruban": setup.arubanSlaveNames,
"Australian.asian": setup.asianAmericanSlaveNames, "Australian": setup.australianSlaveNames,
- "Austrian.middle eastern": setup.turkishSlaveNames, "Austrian": setup.austrianSlaveNames,
+ "Austrian.indo-aryan": setup.turkishSlaveNames, "Austrian.middle eastern": setup.syrianSlaveNames, "Austrian": setup.austrianSlaveNames,
"Azerbaijani": setup.azerbaijaniSlaveNames,
"Bahamian": setup.bahamianSlaveNames,
"Bahraini": setup.bahrainiSlaveNames,
@@ -1307,7 +1307,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Djiboutian": setup.djiboutianSlaveNames,
"Dominican": setup.dominicanSlaveNames,
"Dominiquais": setup.dominiquaisSlaveNames,
- "Dutch.middle eastern": setup.turkishSlaveNames, "Dutch": setup.dutchSlaveNames,
+ "Dutch.indo-aryan": setup.turkishSlaveNames, "Dutch.middle eastern": setup.syrianSlaveNames, "Dutch": setup.dutchSlaveNames,
"East Timorese": setup.eastTimoreseSlaveNames,
"Ecuadorian": setup.ecuadorianSlaveNames,
"Egyptian": setup.egyptianSlaveNames,
@@ -1325,7 +1325,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Gabonese": setup.gaboneseSlaveNames,
"Gambian": setup.gambianSlaveNames,
"Georgian": setup.georgianSlaveNames,
- "German.middle eastern": setup.turkishSlaveNames, "German": setup.germanSlaveNames,
+ "German.indo-aryan": setup.turkishSlaveNames, "German.middle eastern": setup.syrianSlaveNames, "German": setup.germanSlaveNames,
"Ghanan": setup.ghananSlaveNames,
"Greek": setup.greekSlaveNames,
"Greenlandic": setup.greenlandicSlaveNames,
@@ -1419,7 +1419,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Samoan": setup.samoanSlaveNames,
"São Toméan": setup.saoTomeanSlaveNames,
"Saudi": setup.saudiSlaveNames,
- "Scottish": setup.scottishSlaveNames,
+ "Scottish.indo-aryan": setup.indianSlaveNames, "Scottish": setup.scottishSlaveNames,
"Senegalese": setup.senegaleseSlaveNames,
"Serbian": setup.serbianSlaveNames,
"Seychellois": setup.seychelloisSlaveNames,
@@ -1477,12 +1477,12 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Andorran": setup.andorranMaleNames,
"Angolan": setup.angolanMaleNames,
"Antiguan": setup.antiguanMaleNames,
- "American.black": setup.africanAmericanMaleNames, "American.latina": setup.latinaMaleNames, "American.asian": setup.asianAmericanMaleNames, "American.middle eastern": setup.egyptianMaleNames, "American": setup.whiteAmericanMaleNames,
+ "American.black": setup.africanAmericanMaleNames, "American.latina": setup.latinaMaleNames, "American.asian": setup.asianAmericanMaleNames, "American.malay": setup.asianAmericanMaleNames, "American.middle eastern": setup.egyptianMaleNames, "American": setup.whiteAmericanMaleNames,
"Argentinian": setup.argentinianMaleNames,
"Armenian": setup.armenianMaleNames,
"Aruban": setup.arubanMaleNames,
"Australian.asian": setup.asianAmericanMaleNames, "Australian": setup.australianMaleNames,
- "Austrian.middle eastern": setup.turkishMaleNames, "Austrian": setup.austrianMaleNames,
+ "Austrian.indo-aryan": setup.turkishMaleNames, "Austrian.middle eastern": setup.syrianMaleNames, "Austrian": setup.austrianMaleNames,
"Azerbaijani": setup.azerbaijaniMaleNames,
"Bahamian": setup.bahamianMaleNames,
"Bahraini": setup.bahrainiMaleNames,
@@ -1526,7 +1526,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Djiboutian": setup.djiboutianMaleNames,
"Dominican": setup.dominicanMaleNames,
"Dominiquais": setup.dominiquaisMaleNames,
- "Dutch.middle eastern": setup.turkishMaleNames, "Dutch": setup.dutchMaleNames,
+ "Dutch.indo-aryan": setup.turkishMaleNames, "Dutch.middle eastern": setup.syrianMaleNames, "Dutch": setup.dutchMaleNames,
"East Timorese": setup.eastTimoreseMaleNames,
"Ecuadorian": setup.ecuadorianMaleNames,
"Egyptian": setup.egyptianMaleNames,
@@ -1544,7 +1544,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Gabonese": setup.gaboneseMaleNames,
"Gambian": setup.gambianMaleNames,
"Georgian": setup.georgianMaleNames,
- "German.middle eastern": setup.turkishMaleNames, "German": setup.germanMaleNames,
+ "German.indo-aryan": setup.turkishMaleNames, "German.middle eastern": setup.syrianMaleNames, "German": setup.germanMaleNames,
"Ghanan": setup.ghananMaleNames,
"Greek": setup.greekMaleNames,
"Greenlandic": setup.greenlandicMaleNames,
@@ -1638,7 +1638,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Samoan": setup.samoanMaleNames,
"São Toméan": setup.saoTomeanMaleNames,
"Saudi": setup.saudiMaleNames,
- "Scottish": setup.scottishMaleNames,
+ "Scottish.indo-aryan": setup.indianMaleNames, "Scottish": setup.scottishMaleNames,
"Senegalese": setup.senegaleseMaleNames,
"Serbian": setup.serbianMaleNames,
"Seychellois": setup.seychelloisMaleNames,
@@ -1701,7 +1701,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Armenian": setup.armenianSlaveSurnames,
"Aruban": setup.arubanSlaveSurnames,
"Australian.asian": setup.asianAmericanSlaveSurnames, "Australian": setup.australianSlaveSurnames,
- "Austrian.middle eastern": setup.turkishSlaveSurnames, "Austrian": setup.austrianSlaveSurnames,
+ "Austrian.indo-aryan": setup.turkishSlaveSurnames, "Austrian.middle eastern": setup.syrianSlaveSurnames, "Austrian": setup.austrianSlaveSurnames,
"Azerbaijani": setup.azerbaijaniSlaveSurnames,
"Bahamian": setup.bahamianSlaveSurnames,
"Bahraini": setup.bahrainiSlaveSurnames,
@@ -1745,7 +1745,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Djiboutian": setup.djiboutianSlaveSurnames,
"Dominican": setup.dominicanSlaveSurnames,
"Dominiquais": setup.dominiquaisSlaveSurnames,
- "Dutch.middle eastern": setup.turkishSlaveSurnames, "Dutch": setup.dutchSlaveSurnames,
+ "Dutch.indo-aryan": setup.turkishSlaveSurnames, "Dutch.middle eastern": setup.syrianSlaveSurnames, "Dutch": setup.dutchSlaveSurnames,
"East Timorese": setup.eastTimoreseSlaveSurnames,
"Ecuadorian": setup.ecuadorianSlaveSurnames,
"Egyptian": setup.egyptianSlaveSurnames,
@@ -1763,7 +1763,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Gabonese": setup.gaboneseSlaveSurnames,
"Gambian": setup.gambianSlaveSurnames,
"Georgian": setup.georgianSlaveSurnames,
- "German.middle eastern": setup.turkishSlaveSurnames, "German": setup.germanSlaveSurnames,
+ "German.indo-aryan": setup.turkishSlaveSurnames, "German.middle eastern": setup.syrianSlaveSurnames, "German": setup.germanSlaveSurnames,
"Ghanan": setup.ghananSlaveSurnames,
"Greek": setup.greekSlaveSurnames,
"Greenlandic": setup.greenlandicSlaveSurnames,
@@ -1857,7 +1857,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Samoan": setup.samoanSlaveSurnames,
"São Toméan": setup.saoTomeanSlaveSurnames,
"Saudi": setup.saudiSlaveSurnames,
- "Scottish": setup.scottishSlaveSurnames,
+ "Scottish.indo-aryan": setup.indianSlaveSurnames, "Scottish": setup.scottishSlaveSurnames,
"Senegalese": setup.senegaleseSlaveSurnames,
"Serbian": setup.serbianSlaveSurnames,
"Seychellois": setup.seychelloisSlaveSurnames,
@@ -1908,7 +1908,9 @@ Then pick _namePool.random(), or display those names as possible choices, or do
* corresponding (and as far as the nationality/culture is concerned, identical) male surname.
*/
<<set setup.maleSurnamePoolSelector = {
+ "Lithuanian": setup.lithuanianMaleSurnames,
"Polish": setup.polishMaleSurnames,
+ "Russian": setup.russianMaleSurnames,
}>>
<<set setup.ArcologyNamesSupremacistWhite = ["Avalon", "Buyan", "Caucasia", "Cockaigne", "Europa", "Hy-Brasil", "The Old Dominion", "Thule", "White Might"]>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 3079bd56a02af3bfaf4670dedfa4cd20680d8cc0..6255219b18d7a8d81c4e3aa2637432b34a5aec8c 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -195,9 +195,6 @@ $brothelNameCaps
<!-- Statistics output -->
<<BrothelStatistics 1>>
-<!-- Statistics output -->
-<<BrothelStatistics 1>>
-
<br><br>
<<if $Madam != 0>>
<<set $Flag = 2>>
diff --git a/src/utility/economyWidgets.tw b/src/utility/economyWidgets.tw
deleted file mode 100644
index 7412d7177285a9aa894d9601373465dfdddef2cd..0000000000000000000000000000000000000000
--- a/src/utility/economyWidgets.tw
+++ /dev/null
@@ -1,98 +0,0 @@
-:: economy widgets [widget nobr]
-
-<<widget "BrothelStatistics">>
- <<if ($showEconomicDetails)>>
- <<if (!$facility || !$facility.brothel)>>
- <h4>- No statistics for $brothelName gathered this week -</h4>
- <<else>>
- <<set _details = $args[0]>>
- <<set _b = $facility.brothel>>
- <table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
- <tr style="border-bottom: 2px solid white;">
- <th>Items</th>
- <th style="width: 6em">Revenue</th>
- <th style="width: 6em">Expenses</th>
- <th style="width: 6em">Net Income</th>
- <th style="width: 7em">Rep. Change</th>
- </tr>
- <tr>
- <td>Total whoring income</td>
- <td style="padding-right: 2px; text-align: right">@@color:yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
- <td></td>
- <td style="padding-right: 2px; text-align: right">@@color:yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right;"><<if (_b.rep > 0)>>@@color:green;+<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@color:red;<<= _b.rep.toFixedHTML(1)>>@@<<else>>±<<= Number(0).toFixedHTML(1)>><</if>></td>
- </tr>
- <tr>
- <td>Total whore living costs</td>
- <td></td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤-<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
- <td></td>
- </tr>
- <<if _details>>
- <tr>
- <td colspan="3"><b>Whore details</b>
- <div style="padding-left: 20px; padding-right: 10px;">
- <table style="width: 100%; font-size: 90%; line-height: 110%;">
- <tr>
- <th>Whore</th>
- <th style="width: 5em">Customers</th>
- <th style="width: 20em">Revenue</th>
- <th style="width: 6em">Expenses</th>
- <th style="width: 6em">Net Income</th>
- <th style="width: 7em">Rep. Change</th>
- </tr>
- <<set _slaveDetails = _b.income.values()>>
- <<set _slaveInfo = _slaveDetails.next()>>
- <<for !_slaveInfo.done>>
- <<set _revenue = _slaveInfo.value.income + _slaveInfo.value.adsIncome, _netIncome = _revenue - _slaveInfo.value.cost>>
- <tr>
- <td><<if (_slaveInfo.value.customLabel)>>(@@color:yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td>
- <td style="padding-right: 2px; text-align: right"><<if (_slaveInfo.value.customers <= 0)>>@@color:red;none@@<<else>>_slaveInfo.value.customers<</if>></td>
- <td style="padding-right: 2px; text-align: right">@@color:yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@color:yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right"><<if (_netIncome > 0)>>@@color:yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@color:red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td>
- <td style="padding-right: 2px; text-align: right;"><<if (_slaveInfo.value.rep > 0)>>@@color:green;+<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@<<elseif (_slaveInfo.value.rep < 0)>>@@color:red;<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@<<else>><</if>></td>
- </tr>
- <<set _slaveInfo = _slaveDetails.next()>>
- <</for>>
- </table></div></td>
- <td></td>
- <td></td>
- </tr>
- <</if>>
- <<if (_b.adsIncome > 0)>>
- <tr>
- <td>Additional income</td>
- <td style="padding-right: 2px; text-align: right">@@color:yellowgreen;¤<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
- <td></td>
- <td style="padding-right: 2px; text-align: right">@@color:yellowgreen;¤<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
- <td></td>
- </tr>
- <</if>>
- <tr>
- <td>Brothel maintenance</td>
- <td></td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤<<= _b.maintenance.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤-<<= _b.maintenance.toFixedHTML(2)>>@@</td>
- <td></td>
- </tr>
- <<if (_b.adsCosts > 0)>>
- <tr>
- <td>Advertising program</td>
- <td></td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤<<= _b.adsCosts.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤-<<= _b.adsCosts.toFixedHTML(2)>>@@</td>
- <td></td>
- </tr>
- <</if>>
- <tr style="border-top: 1px solid white;">
- <td><b>Total</b></td>
- <td style="padding-right: 2px; text-align: right">@@color:yellowgreen;¤<<= _b.totalIncome.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right">@@color:red;¤<<= _b.totalExpenses.toFixedHTML(2)>>@@</td>
- <td style="padding-right: 2px; text-align: right"><b><<if (_b.profit > 0)>>@@color:yellowgreen;¤<<= _b.profit.toFixedHTML(2)>>@@<<elseif (_b.profit < 0)>>@@color:red;¤<<= _b.profit.toFixedHTML(2)>>@@<<else>>¤<<= _b.profit.toFixedHTML(2)>><</if>></b></td>
- <td style="padding-right: 2px; text-align: right;"><b><<if (_b.rep > 0)>>@@color:green;+<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@color:red;<<= _b.rep.toFixedHTML(1)>>@@<<else>>±<<= Number(0).toFixedHTML(1)>><</if>></b></td></tr>
- </table>
- <</if>>
- <</if>>
-<</widget>>