From d815b48df12052563fc751e396d2dc6c86590c3a Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 17 Mar 2017 02:53:25 -0400
Subject: [PATCH] Anon's fantastic custom nationality weight mod.
---
src/events/intro/initNationalities.tw | 21 ++++-
src/events/intro/introSummary.tw | 20 ++++-
src/events/intro/tradeIntro.tw | 9 ++-
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/pregmod/customizeSlaveTrade.tw | 107 +++++++++++++++++++++++++
src/pregmod/electiveSurgery.tw | 1 +
src/pregmod/hotswapprosthetics.tw | 10 +--
src/pregmod/slaveTradePresetWidgets.tw | 55 +++++++++++++
src/uncategorized/dairyReport.tw | 2 +-
9 files changed, 212 insertions(+), 15 deletions(-)
create mode 100644 src/pregmod/customizeSlaveTrade.tw
create mode 100644 src/pregmod/electiveSurgery.tw
create mode 100644 src/pregmod/slaveTradePresetWidgets.tw
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index d3185069fc5..eeafb2b71d5 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -82,8 +82,9 @@
/*Nationalities Setup*/
<<set $basenationalities = ["American", "Afghan", "Algerian","Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Scottish", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean"]>>
+<<if ndef $customVariety>> /* If non-custom variety, empties or defines $nationalities */
<<set $nationalities = []>>
-
+<</if>>
<<if $terrain == "oceanic">>
<<set $nationalities = clone($basenationalities)>>
<<set $arcologies[0].FSSupremacistRace to "white">>
@@ -93,6 +94,7 @@
<<case "North America">>
<<set $arcologies[0].FSSupremacistRace to "white">>
<<set $arcologies[0].FSSubjugationistRace to "black">>
+ <<if ndef $customVariety>> /* If non-custom variety, adds regional $nationalities */
<<set $nationalities.push("American","American","American","American")>>
<<set $nationalities.push("Mexican","Mexican")>>
<<set $nationalities.push("Dominican","Dominican")>>
@@ -101,9 +103,11 @@
<<set $nationalities.push("Cuban")>>
<<set $nationalities.push("Puerto Rican")>>
<<set $nationalities.push("Jamaican")>>
+ <</if>>
<<case "South America">>
<<set $arcologies[0].FSSupremacistRace to "latina">>
<<set $arcologies[0].FSSubjugationistRace to "black">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Brazilian","Brazilian","Brazilian","Brazilian")>>
<<set $nationalities.push("Argentinian","Argentinian")>>
<<set $nationalities.push("Colombian","Colombian")>>
@@ -112,9 +116,11 @@
<<set $nationalities.push("Bolivian")>>
<<set $nationalities.push("Chilean")>>
<<set $nationalities.push("Guatemalan")>>
+ <</if>>
<<case "Brazil">>
<<set $arcologies[0].FSSupremacistRace to "white">>
<<set $arcologies[0].FSSubjugationistRace to "black">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian")>>
<<set $nationalities.push("Argentinian","Argentinian")>>
<<set $nationalities.push("Colombian","Colombian")>>
@@ -123,9 +129,11 @@
<<set $nationalities.push("Bolivian")>>
<<set $nationalities.push("Chilean")>>
<<set $nationalities.push("Guatemalan")>>
+ <</if>>
<<case "the Middle East">>
<<set $arcologies[0].FSSupremacistRace to "middle eastern">>
<<set $arcologies[0].FSSubjugationistRace to "asian">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Egyptian", "Egyptian", "Egyptian")>>
<<set $nationalities.push("Iranian", "Iranian")>>
<<set $nationalities.push("Saudi", "Saudi")>>
@@ -139,9 +147,11 @@
<<set $nationalities.push("Iraqi")>>
<<set $nationalities.push("Afghan")>>
<<set $nationalities.push("Yemeni")>>
+ <</if>>
<<case "Africa">>
<<set $arcologies[0].FSSupremacistRace to "black">>
<<set $arcologies[0].FSSubjugationistRace to "white">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Nigerian", "Nigerian", "Nigerian")>>
<<set $nationalities.push("South African","South African","South African")>>
<<set $nationalities.push("Kenyan", "Kenyan")>>
@@ -157,9 +167,11 @@
<<set $nationalities.push("Zimbabwean")>>
<<set $nationalities.push("Tanzanian")>>
<<set $nationalities.push("Ugandan")>>
+ <</if>>
<<case "Asia">>
<<set $arcologies[0].FSSupremacistRace to "asian">>
<<set $arcologies[0].FSSubjugationistRace to "indo-aryan">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese")>>
<<set $nationalities.push("Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian")>>
<<set $nationalities.push("Indonesian","Indonesian","Indonesian")>>
@@ -175,9 +187,11 @@
<<set $nationalities.push("Uzbek")>>
<<set $nationalities.push("Nepalese")>>
<<set $nationalities.push("Kazakh")>>
+ <</if>>
<<case "Europe">>
<<set $arcologies[0].FSSupremacistRace to "white">>
<<set $arcologies[0].FSSubjugationistRace to "middle eastern">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Russian", "Russian", "Russian", "Russian")>>
<<set $nationalities.push("German", "German", "German")>>
<<set $nationalities.push("Belarusian","Belarusian")>>
@@ -206,6 +220,7 @@
<<set $nationalities.push("Portuguese")>>
<<set $nationalities.push("Hungarian")>>
<<set $nationalities.push("Estonian")>>
+ <</if>>
<<case "Australia">>
<<set $arcologies[0].FSSupremacistRace to "white">>
<<set $arcologies[0].FSSubjugationistRace to "asian">>
@@ -214,10 +229,13 @@
<<case "Japan">>
<<set $arcologies[0].FSSupremacistRace to "asian">>
<<set $arcologies[0].FSSubjugationistRace to "asian">>
+ <<if ndef $customVariety>>
<<set $nationalities.push("Japanese","Japanese","Japanese")>>
+ <</if>>
<</switch>>
<</if>>
+<<if ndef $customVariety>> /* If non-custom variety, runs international trade restrictions script */
<<if $internationalTrade != 0>>
<<set $nationalities = clone($basenationalities)>>
<<if $internationalVariety == 0>>
@@ -313,6 +331,7 @@
<<set $nationalities.push("Malaysian", "Malaysian")>>
<</if>>
<</if>>
+<</if>>
<<set $customSlave.nationality to $nationalities.random()>>
<<set $huskSlave.nationality to $nationalities.random()>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index c46e27baa97..da3b0649d84 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -45,26 +45,40 @@ __''World Settings''__
<br>
+<<if ndef $customVariety>>
+You are using standardized slave trading channels. [[Customize the slave trade|Customize Slave Trade][$customVariety to 1, $customWA = 0]]
+<br>
<<if $internationalTrade == 0>>
The slave trade is ''continental,'' so a narrower variety of slaves will be available.
[[Allow intercontinental trade|Intro Summary][$internationalTrade to 1]]
+ <br>
<<else>>
The slave trade is ''international,'' so a wider variety of slaves will be available.
[[Restrict the trade to continental|Intro Summary][$internationalTrade to 0]]
+ <br>
<</if>>
<<if $internationalTrade == 1>>
-<br>
<<if $internationalVariety == 0>>
International slave variety is ''semi-realistic,'' so more populous nations will be more common.
[[Normalized national variety|Intro Summary][$internationalVariety to 1]]
+ <br>
<<else>>
International slave variety is ''normalized,'' so small nations will appear nearly as much as large ones.
[[Semi-realistic national variety|Intro Summary][$internationalVariety to 0]]
+ <br>
<</if>>
<</if>>
-
-<br>
+<<else>>
+Current nationality distributions are [[Adjust the slave trade|Customize Slave Trade][$customWA = 0]] | [[Stop customizing|Intro Summary][delete $customVariety]]
+<br style="clear:both" /><hr style="margin:0">
+<<for _i = 0; _i < $nationalitiescheck.length; _i++>>
+<<set _nation to $nationalitiescheck[_i]>>
+ <<print _nation>> @@color:orange;<<print (($nationalities.count(_nation)/$nationalities.length)*100).toFixed(2)>>%@@
+<<if _i < $nationalitiescheck.length-1>> | <</if>>
+<</for>>
+<br style="clear:both" /><hr style="margin:0">
+<</if>>
<<if $seeAge == 1>>
Slaves will ''age naturally.''
diff --git a/src/events/intro/tradeIntro.tw b/src/events/intro/tradeIntro.tw
index 213626431fe..8131f3cc168 100644
--- a/src/events/intro/tradeIntro.tw
+++ b/src/events/intro/tradeIntro.tw
@@ -1,6 +1,7 @@
-:: Trade Intro
+:: Trade Intro [nobr]
Most of the Free Cities are run on radically libertarian or even anarcho-capitalist principles. The first Free Cities experimented with indentured servitude, and this rapidly developed into widespread slavery. By now, the Free Cities collectively are a fundamentally slaveowning society and maintain a thriving slave trade that feeds off the terrible conditions in parts of the old world. @@color:orange;What attitude have the old world countries generally taken towards this trade?@@
-
-[[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade to 1]] //Slaves from all across the world will appear.//
-[[They've done what little they can to stop it.|Extreme Intro][$internationalTrade to 0]] //Almost all slaves will be from the continent where the arcology is located.//
+<br><br>
+[[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade to 1]] //Slaves from all across the world will appear.//<br>
+[[They've done what little they can to stop it.|Extreme Intro][$internationalTrade to 0]] //Almost all slaves will be from the continent where the arcology is located.//<br>
+<<link "Reactions have been mixed.">><<set $internationalTrade to 0, $customVariety to 1, $customWA = 1>><<goto "Customize Slave Trade">><</link>> //This will bypass arcology location restrictions, allowing you to adjust the nationalities encountered when buying non-customizable slaves.//<br>
\ No newline at end of file
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 2ad22f3574f..2bf0f0a69dd 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -930,7 +930,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''anon'' for HGExclusion and animal pregnancy work.
''anon'' for putting up with my javascript incompetence.
''anon'' for player family listing.
-''anon'' for interchangable prosthetics and advanced facial surgeries.
+''anon'' for interchangable prosthetics, advanced facial surgeries and custom nationality distribution.
''brpregmodfan'' for Brazilian start and slave gen.
''Bane70'' optimized huge swaths of code with notable professionalism.
''Circle Tritagonist'' provided several new collars and outfits.
diff --git a/src/pregmod/customizeSlaveTrade.tw b/src/pregmod/customizeSlaveTrade.tw
new file mode 100644
index 00000000000..1e7c8eb0e98
--- /dev/null
+++ b/src/pregmod/customizeSlaveTrade.tw
@@ -0,0 +1,107 @@
+:: Customize Slave Trade [nobr]
+
+<<if ndef $nationalities>>
+ <<set $nationalities = []>>
+<<else>>
+ <<set $nationalities.sort()>>
+<</if>>
+<<if ndef $customWA>>
+ <<set $customWA = 0>>
+<</if>>
+
+When civilization turned upon itself, some countries readily took to enslaving their own. Others were raided by their neighbors for their desirable, and profitable, citizens. Which nationalities were most affected by the booming slave trade, and thus, likely to appear in your local slave markets?
+<br><br>
+''+ to increase pop. – to reduce pop. 0 to remove entirely''
+<br>
+<<if $nationalities.length < 1>>
+<br>//You cannot be a slave owner without a slave trade. Please add nationalities to continue.//
+<<else>>
+<br>
+<<link "Confirm customization">>
+ <<if $customWA == 0>>
+ <<goto "Intro Summary">>
+ <<else>>
+ <<goto "Extreme Intro">>
+ <</if>>
+<</link>>
+<</if>>
+<<set $basenationalities = ["American", "Afghan", "Algerian","Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Scottish", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean"].sort()>>
+<br>
+/* Generates cloned array of $nationalities, removing duplicates */
+<<set $nationalitiescheck = clone($nationalities)>>
+<<for _i = 0; _i < $nationalitiescheck.length; _i++>>
+ <<set _nation to $nationalitiescheck[_i]>>
+ <<if $nationalitiescheck.count(_nation)>>
+ <<set $nationalitiescheck.delete(_nation),$nationalitiescheck.push(_nation),$nationalitiescheck.sort()>>
+ <</if>>
+<</for>>
+
+/* Prints distribution of $nationalities, using $nationalitiescheck to render array */
+<<for _i = 0; _i < $nationalitiescheck.length; _i++>>
+<<set _nation to $nationalitiescheck[_i]>>
+ <<print _nation>> @@color:orange;<<print (($nationalities.count(_nation)/$nationalities.length)*100).toFixed(2)>>%@@
+<<if _i < $nationalitiescheck.length-1>> | <</if>>
+<</for>>
+
+<br>
+Add:
+<br>
+
+/* Fine control tweaking of populations */
+<<for _i = 0; _i < $basenationalities.length; _i++>>
+<<set _nation to $basenationalities[_i]>>
+<<print "
+_nation
+ <<link '+'>>
+ <<set $nationalities.push($basenationalities[" + _i + "])>>
+ <<goto 'Customize Slave Trade'>>
+<</link>>
+">>
+<<if $nationalitiescheck.includes(_nation) > 0 >>
+<<print "
+ <<link '–'>>
+ <<set $nationalities.deleteAt(($nationalities.indexOf($basenationalities[" + _i + "])))>>
+ <<goto 'Customize Slave Trade'>>
+<</link>>
+">>
+<</if>>
+<<if $nationalities.count(_nation) > 1 >>
+<<print "
+ <<link '0'>>
+ <<set $nationalities.delete($basenationalities[" + _i + "])>>
+ <<goto 'Customize Slave Trade'>>
+<</link>>
+">>
+<</if>>
+<<if _i < $basenationalities.length-1>>
+|
+<</if>>
+<</for>>
+<br style="clear:both" /><hr style="margin:0">
+<<link "Clear all nationalities">><<set $nationalities = []>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Global">><<PresetIntlStd>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Contemporary Europe">><<PresetEurope>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Contemporary East Asia">><<PresetEastAsia>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Contemporary US">><<PresetConUS>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla North America">><<PresetVanillaNA>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla South America">><<PresetVanillaSA>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla Middle East">><<PresetVanillaME>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla Africa">><<PresetVanillaAfrica>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla Asia">><<PresetVanillaAsia>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla Europe">><<PresetVanillaEU>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Vanilla Australia">><<PresetVanillaAU>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Brazil Mod">><<PresetBrazil>><<goto 'Customize Slave Trade'>><</link>>
+|
+<<link "Japan mod">><<PresetJapan>><<goto 'Customize Slave Trade'>><</link>>
\ No newline at end of file
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
new file mode 100644
index 00000000000..99ff2c27920
--- /dev/null
+++ b/src/pregmod/electiveSurgery.tw
@@ -0,0 +1 @@
+:: Elective Surgery [nobr]
\ No newline at end of file
diff --git a/src/pregmod/hotswapprosthetics.tw b/src/pregmod/hotswapprosthetics.tw
index 969e26e107b..83a7805754e 100644
--- a/src/pregmod/hotswapprosthetics.tw
+++ b/src/pregmod/hotswapprosthetics.tw
@@ -7,7 +7,7 @@
<<if $activeSlave.amp == -1>>
<strong>Basic P-limbs equipped<strong>
<<elseif $activeSlave.readyLimbs.includes(-1)>>
- <<link "a basic set">><<set $activeSlave.amp = -1>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</link>>
+ <<link "a basic set">><<set $activeSlave.amp = -1>><<replace "#LimbOptions">><<include "Hotswap Prosthetics">><</replace>><</link>>
<<elseif $activeLimbs.type == "simple" && $activeSlave.ID == $activeLimbs.ID>>
//Basic P-limbs being built
<<else>>
@@ -16,7 +16,7 @@
<<if $activeSlave.amp == -2>>
<strong>Sex focused P-limbs equipped</strong>
<<elseif $activeSlave.readyLimbs.includes(-2)>>
- <<link "a sex focused set">><<set $activeSlave.amp = -2>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</link>>
+ <<link "a sex focused set">><<set $activeSlave.amp = -2>><<replace "#LimbOptions">><<include "Hotswap Prosthetics">><</replace>><</link>>
<<elseif $activeLimbs.type == "sex" && $activeSlave.ID == $activeLimbs.ID>>
//Sex focused P-limbs being built
<<else>>
@@ -25,7 +25,7 @@
<<if $activeSlave.amp == -3>>
<strong>Natural looking P-limbs equipped</strong>
<<elseif $activeSlave.readyLimbs.includes(-3)>>
- <<link "a natural looking set">><<set $activeSlave.amp = -3>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</link>>
+ <<link "a natural looking set">><<set $activeSlave.amp = -3>><<replace "#LimbOptions">><<include "Hotswap Prosthetics">><</replace>><</link>>
<<elseif $activeLimbs.type == "beauty" && $activeSlave.ID == $activeLimbs.ID>>
//Natural looking P-limbs being built
<<else>>
@@ -34,7 +34,7 @@
<<if $activeSlave.amp == -4>>
<strong>Combat P-limbs equipped</strong>
<<elseif $activeSlave.readyLimbs.includes(-4)>>
- <<link "military grade arms">><<set $activeSlave.amp = -4>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</link>>
+ <<link "military grade arms">><<set $activeSlave.amp = -4>><<replace "#LimbOptions">><<include "Hotswap Prosthetics">><</replace>><</link>>
<<elseif $activeLimbs.type == "combat" && $activeSlave.ID == $activeLimbs.ID>>
//Combat P-limbs being built
<<else>>
@@ -43,7 +43,7 @@
<<if $activeSlave.amp == -5>>
<strong>Cybernetic P-limbs equipped</strong>
<<elseif $activeSlave.readyLimbs.includes(-5)>>
- <<link "advanced cybernetics">><<set $activeSlave.amp = -5>><<replace "#LimbOptions">><<display "Hotswap Prosthetics">><</replace>><</link>>
+ <<link "advanced cybernetics">><<set $activeSlave.amp = -5>><<replace "#LimbOptions">><<include "Hotswap Prosthetics">><</replace>><</link>>
<<elseif $activeLimbs.type == "cyber" && $activeSlave.ID == $activeLimbs.ID>>
//Cybernetic P-limbs being built
<<else>>
diff --git a/src/pregmod/slaveTradePresetWidgets.tw b/src/pregmod/slaveTradePresetWidgets.tw
new file mode 100644
index 00000000000..8e279135498
--- /dev/null
+++ b/src/pregmod/slaveTradePresetWidgets.tw
@@ -0,0 +1,55 @@
+:: slave trade preset widgets [widget nobr]
+
+/* To add presets, add <<widget "PresetName">> and call in customizeSlaveTrade as <<link Preset Name>><<PresetName>><</link>> */
+
+<<widget "PresetIntlStd">>
+<<set $nationalities = ["Afghan", "Afghan", "Algerian", "Algerian", "Algerian", "American", "American", "American", "American", "American", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Armenian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belarusian", "Belarusian", "Belgian", "Belgian", "Bolivian", "Bolivian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "Burmese", "Burmese", "Burmese", "Canadian", "Canadian", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Colombian", "Colombian", "Colombian", "Congolese", "Congolese", "Congolese", "Cuban", "Cuban", "Czech", "Czech", "Danish", "Danish", "Dominican", "Dominican", "Dominican", "Dominican", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Finnish", "Finnish", "French", "French", "French", "German", "German", "German", "Ghanan", "Ghanan", "Greek", "Greek", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Hungarian", "Hungarian", "Icelandic", "Icelandic", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Irish", "Irish", "Israeli", "Israeli", "Italian", "Italian", "Italian", "Jamaican", "Jamaican", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Lebanese", "Lebanese", "Libyan", "Libyan", "Lithuanian", "Lithuanian", "Malaysian", "Malaysian", "Malaysian", "Malian", "Malian", "Mexican", "Mexican", "Mexican", "Mexican", "Moroccan", "Moroccan", "Nepalese", "Nepalese", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Norwegian", "Norwegian", "Omani", "Omani", "Pakistani", "Pakistani", "Pakistani", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Puerto Rican", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Saudi", "Saudi", "Scottish", "Scottish", "Serbian", "Serbian", "Slovak", "Slovak", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Zimbabwean", "Zimbabwean", "a New Zealander", "a New Zealander"]>>
+<</widget>>
+
+<<widget "PresetEurope">>
+<<set $nationalities = ["Austrian", "Austrian", "Austrian", "Belgian", "Belgian", "Belgian", "Belgian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Danish", "Danish", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Finnish", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Greek", "Greek", "Greek", "Greek", "Hungarian", "Hungarian", "Hungarian", "Irish", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Lithuanian", "Norwegian", "Norwegian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Portuguese", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Scottish", "Scottish", "Serbian", "Serbian", "Slovak", "Slovak", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Swedish", "Swedish", "Swedish", "Swiss", "Swiss", "Swiss", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian"]>>
+<</widget>>
+
+<<widget "PresetEastAsia">>
+<<set $nationalities = ["Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Japanese", "Japanese", "Korean"]>>
+<</widget>>
+
+<<widget "PresetConUS">>
+<<set $nationalities = ["American", "American", "American", "American", "American", "American", "American", "American", "Canadian", "Mexican", "Mexican", "Mexican"]>>
+<</widget>>
+
+<<widget "PresetVanillaNA">>
+<<set $nationalities = ["American", "American", "American", "American", "American", "Canadian", "Mexican", "Mexican", "Dominican", "Dominican", "Haitian", "Cuban", "Puerto Rican", "Jamaican"]>>
+<</widget>>
+
+<<widget "PresetVanillaSA">>
+<<set $nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan"]>>
+<</widget>>
+
+<<widget "PresetBrazil">>
+<<set $nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan"]>>
+<</widget>>
+
+<<widget "PresetVanillaME">>
+<<set $nationalities = ["Egyptian", "Egyptian", "Egyptian", "Iranian", "Iranian", "Saudi", "Saudi", "Turkish", "Turkish", "Lebanese", "Emirati", "Jordanian", "Omani", "Israeli", "Armenian", "Iraqi", "Afghan", "Yemeni"]>>
+<</widget>>
+
+<<widget "PresetVanillaAfrica">>
+<<set $nationalities = ["Nigerian", "Nigerian", "Nigerian", "South African", "South African", "South African", "Kenyan", "Kenyan", "Congolese", "Congolese", "Ethiopian", "Ethiopian", "Algerian", "Algerian", "Sudanese", "Sudanese", "Moroccan", "Ghanan", "Tunisian", "Malian", "Libyan", "Zimbabwean", "Tanzanian", "Ugandan"]>>
+<</widget>>
+
+<<widget "PresetVanillaAsia">>
+<<set $nationalities = ["Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Thai", "Thai", "Vietnamese", "Vietnamese", "Korean", "Korean", "Pakistani", "Pakistani", "Filipina", "Filipina", "Japanese", "Japanese", "Burmese", "Burmese", "Malaysian", "Malaysian", "Uzbek", "Nepalese", "Kazakh"]>>
+<</widget>>
+
+<<widget "PresetVanillaEU">>
+<<set $nationalities = ["Russian", "Russian", "Russian", "Russian", "German", "German", "German", "Belarusian", "Belarusian", "Ukrainian", "Ukrainian", "French", "French", "Italian", "Italian", "Spanish", "Spanish", "British", "British", "Polish", "Polish", "Romanian", "Lithuanian", "Irish", "Scottish", "Icelandic", "Finnish", "Greek", "Belgian", "Danish", "Czech", "Serbian", "Slovak", "Norwegian", "Dutch", "Austrian", "Swiss", "Portuguese", "Hungarian", "Estonian"]>>
+<</widget>>
+
+<<widget "PresetVanillaAU">>
+<<set $nationalities = ["Australian", "Australian", "Australian", "a New Zealander"]>>
+<</widget>>
+
+<<widget "PresetJapan">>
+<<set $nationalities = ["Japanese", "Japanese", "Japanese"]>>
+<</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 0098f8e879c..38777564db9 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -86,7 +86,7 @@
/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
<<if $seeImages == 1>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$_i] 0 0>>
+ <<SlaveArt $slaves[_i] 0 0>>
</div>
<</if>>
/* 000-250-006 */
--
GitLab