From 34c92148a07bddeb67b79199a34c1d7a1c95ed93 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 31 Mar 2018 15:01:10 -0500
Subject: [PATCH] fix 3
---
src/init/setupVars.tw | 4 ++--
src/pregmod/editGenetics.tw | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index d145dd7ec1e..63469cc3ab2 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -275,7 +275,7 @@
<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an animator", "an air hostess", "an archaeologist", "an assassin", "an astronaut", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
-<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
<<set setup.gratefulCareers = ["a beggar", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
@@ -299,7 +299,7 @@
<<set setup.attendantCareers = ["a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a mediator", "a police negotiator", "a psychologist", "a therapist", "a yoga instructor"]>>
-<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a veterinarian", "a zookeeper"]>>
+<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a shepherd", "a veterinarian", "a zookeeper"]>>
<<set setup.stewardessCareers = ["a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker"]>>
diff --git a/src/pregmod/editGenetics.tw b/src/pregmod/editGenetics.tw
index 18afeacda28..3901fa8b963 100644
--- a/src/pregmod/editGenetics.tw
+++ b/src/pregmod/editGenetics.tw
@@ -3,7 +3,7 @@
<html>
<script type="text/x-template" id="birthFullNameTmpl">
<% if(State.variables.surnameOrder != 1) {
- %><% if(["Chinese", "Japanese", "Korean", "Cambodian", "Vietnamese", "Hungarian", "Mongolian"].includes(s.nationality)) {
+ %><% if(["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(s.nationality)) {
%><% if(s.birthSurname || s.surname) { %><%- s.birthSurname || s.surname%> <% } %><b><u><%- s.birthName || s.name %></u></b><%
} else {
%><b><u><%- s.birthName || s.name %></u></b><% if(s.birthSurname || s.surname) { %> <%- s.birthSurname || s.surname %><% } %><%
@@ -14,7 +14,7 @@
</script>
<script type="text/x-template" id="currentFullNameTmpl">
<% if(State.variables.surnameOrder != 1) {
- %><% if(["Chinese", "Japanese", "Korean", "Cambodian", "Vietnamese", "Hungarian", "Mongolian"].includes(s.nationality)) {
+ %><% if(["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(s.nationality)) {
%><% if(s.slaveSurname) { %><%- s.slaveSurname %> <% } %><b><u><%- s.slaveName %></u></b><%
} else {
%><b><u><%- s.slaveName %></u></b><% if(s.slaveSurname) { %> <%- s.slaveSurname %><% } %><%
--
GitLab