sub/sup starting arcologies now retain their racial choice

devNotes/Useful JS Function Documentation.txt

@@ -180,11 +180,11 @@ UtilJS [script]
 
 		numberWithCommas() - Currently unsed.
 
-		jsRandom()
+		jsRandom() - JS equivalent of sugarcube's random().
 
-		jsRandomMany()
+		jsRandomMany() - JS equivalent of sugarcube's randomMany().
 
-		jsEither() - This function wants an array - which explains why it works like array.random(). Give it one or you'll face a NaN
+		jsEither() - This function wants an array - which explains why it works like array.random(). Give it one or you'll face a NaN. JS equivalent of sugarcube's either() and array.random().
 
 		deepCopy() - This function is alternative to clone - usage needed if nested objects present. Slower but result is separate object tree, not with reference to source object.
 
@@ -260,8 +260,6 @@ UtilJS [script]
 
  Intelligence.random(options) - returns a random intelligence. If no options are passed, the generated number will be on a normal distribution with mean 0 and standard deviation 45.
 
- generateNewID()
-
  getSlaveDevotionClass(slave) - returns the trust of the target as text. e.g. if ('mindbroken' == slave.fetish) return 'mindbroken';
 
  getSlaveTrustClass(slave) - returns the trust of the target as text. e.g. if (slave.trust < -95) return 'extremely-terrified';
@@ -331,7 +329,7 @@ UtilJS [script]
 
 	html5passage(passage_function) - circumvents sugarcube, allowing a plain HTML5 UI within it
 
-	capFirstChar()
+	capFirstChar() - Capitalizes the first character of a given string.
 
 	cmToInchString() - takes an integer e.g. $activeSlave.hLength, returns a string in the format 10 inches
 

devNotes/VersionChangeLog-Premod+LoliMod.txt

@@ -2,6 +2,14 @@
 
 0.10.7.1-0.10.x
 
+11/02/2018
+
+	42
+	-fixes
+	-new random non-individual event added
+	-some more JS conversion
+	-starting Sup/Sub arcologies now retain their racial choice
+
 11/01/2018
 
 	41

src/events/intro/initNationalities.tw

@@ -249,13 +249,21 @@
 	<<if ndef $customVariety>>
 		<<set $nationalities = arr2obj(setup.baseNationalities)>>
 	<</if>>
-	<<set $arcologies[0].FSSupremacistRace = "white">>
-	<<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "white">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+		<</if>>
 <<else>>
 	<<switch $continent>>
 	<<case "North America">>
-		<<set $arcologies[0].FSSupremacistRace = "white">>
-		<<set $arcologies[0].FSSubjugationistRace = "black">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "white">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "black">>
+		<</if>>
 		<<if ndef $customVariety>> /* If non-custom variety, adds regional $nationalities */
 		<<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>>
 		<<set hashPush($nationalities, "Antiguan")>>
@@ -286,8 +294,12 @@
 		<<set hashPush($nationalities, "Vincentian")>>
 		<</if>>
 	<<case "South America">>
-		<<set $arcologies[0].FSSupremacistRace = "latina">>
-		<<set $arcologies[0].FSSubjugationistRace = "black">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "latina">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "black">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian")>>
 		<<set hashPush($nationalities, "Bolivian", "Bolivian")>>
@@ -304,8 +316,12 @@
 		<<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
 		<</if>>
 	<<case "Brazil">>
-		<<set $arcologies[0].FSSupremacistRace = "white">>
-		<<set $arcologies[0].FSSubjugationistRace = "black">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "white">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "black">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian", "Argentinian")>>
 		<<set hashPush($nationalities, "Bolivian", "Bolivian")>>
@@ -322,8 +338,12 @@
 		<<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
 		<</if>>
 	<<case "the Middle East">>
-		<<set $arcologies[0].FSSupremacistRace = "middle eastern">>
-		<<set $arcologies[0].FSSubjugationistRace = "asian">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "middle eastern">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "asian">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Afghan", "Afghan")>>
 		<<set hashPush($nationalities, "Armenian", "Armenian")>>
@@ -349,8 +369,12 @@
 		<<set hashPush($nationalities, "Yemeni", "Yemeni")>>
 		<</if>>
 	<<case "Africa">>
-		<<set $arcologies[0].FSSupremacistRace = "black">>
-		<<set $arcologies[0].FSSubjugationistRace = "white">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "black">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "white">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Algerian", "Algerian", "Algerian")>>
 		<<set hashPush($nationalities, "Angolan")>>
@@ -408,8 +432,12 @@
 		<<set hashPush($nationalities, "Zimbabwean", "Zimbabwean")>>
 		<</if>>
 	<<case "Asia">>
-		<<set $arcologies[0].FSSupremacistRace = "asian">>
-		<<set $arcologies[0].FSSubjugationistRace = "indo-aryan">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "asian">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "indo-aryan">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
 		<<set hashPush($nationalities, "Bhutanese")>>
@@ -442,8 +470,12 @@
 		<<set hashPush($nationalities, "Vietnamese", "Vietnamese", "Vietnamese")>>
 		<</if>>
 	<<case "Europe">>
-		<<set $arcologies[0].FSSupremacistRace = "white">>
-		<<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "white">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Albanian")>>
 		<<set hashPush($nationalities, "Andorran")>>
@@ -494,8 +526,12 @@
 		<<set hashPush($nationalities, "Vatican")>>
 		<</if>>
 	<<case "Australia">>
-		<<set $arcologies[0].FSSupremacistRace = "white">>
-		<<set $arcologies[0].FSSubjugationistRace = "asian">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "white">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "asian">>
+		<</if>>
 		<<set hashPush($nationalities, "Australian", "Australian", "Australian")>>
 		<<set hashPush($nationalities, "a Cook Islander")>>
 		<<set hashPush($nationalities, "Fijian")>>
@@ -516,8 +552,12 @@
 		<<set hashPush($nationalities, "Tongan")>>
 		<<set hashPush($nationalities, "Tuvaluan")>>
 	<<case "Japan">>
-		<<set $arcologies[0].FSSupremacistRace = "asian">>
-		<<set $arcologies[0].FSSubjugationistRace = "asian">>
+		<<if $targetArcology.type != "Supremacist">>
+			<<set $arcologies[0].FSSupremacistRace = "asian">>
+		<</if>>
+		<<if $targetArcology.type != "Subjugationist">>
+			<<set $arcologies[0].FSSubjugationistRace = "asian">>
+		<</if>>
 		<<if ndef $customVariety>>
 		<<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
 		<</if>>

src/pregmod/pAssociatesPublicSlut.tw

@@ -17,13 +17,13 @@ You take a detour down one of the minor byways that feed into the Promenade prop
 <br><br>
 
 <<if _num < $seeDicks>>
-	The one restraining him is a business associate of yours. Shes a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blond hair. Her eyes light up as her gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "<<if $dick>>Sir<<else>> Ma'am<</if>>, it would honour me if you fucked him!".
+	The one restraining him is a business associate of yours. She's a beautiful woman who cuts a gorgeous figure in her expensive, tasteful business attire. You have some rapport with one another and she greets you cheerily and you make small talk as she finishes up shackling her newly minted slave. He was, she explains, her boyfriend, who had accrued significant debt due to his severe lack of business sense and tact. She had bought out his debt in order to save him from enslavement, only to find out not long after that he had been cheating on her with another free woman. Since she owned his debt, it took only a few formalities to turn him into her property as revenge. "Since he likes sluts so much, I'm going to turn him into one!" She giggles, while stroking the struggling traps luxurious bleach blond hair. Her eyes light up as her gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to her. She reaches around her slave and spreads his ass cheeks. "<<if $dick>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked him!".
 
 	You consider the slaves anus. Your associate has clearly spent all day customising her new toy, it looks freshly bleached, and is smooth and inviting. It effectively has been transformed into a sex organ.
 <<else>>
-	The one restraining her is a business associate of yours. Hes a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free woman. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, Ive simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $dick>>Sir<<else>> Ma'am<</if>>, it would honour me if you fucked her! Ive had her hymen restored just a few hours ago, first time is all yours if you want it.".
+	The one restraining her is a business associate of yours. Hes a well built man who cuts a handsome figure in his expensive, tasteful business attire. You have some rapport with one another and he greets you cheerily and you make small talk as he finishes up shackling his newly minted slave. She was, he explains, his girlfriend, who had accrued significant debt due to her severe lack of business sense and tact. He had bought out her debt in order to save her from enslavement, only to find out not long after that she had been cheating on him with another free woman. Since he owned her debt, it took only a few formalities to turn her into his property as revenge. "She was already a slut, Ive simply made her look the part, and play it more honestly!" he chuckles, while fondling the struggling bimbo's ample ass. He favors you with a rueful smile as his gaze returns to you. You know whats coming, and are surprised it took this long for it to occur to him. He reaches around his slave and spreads her ass cheeks. "<<if $dick>>Sir<<else>> Ma'am<</if>>, it would honor me if you fucked her! Ive had her hymen restored just a few hours ago, first time is all yours if you want it.".
 
-	You consider the slaves pussy. Your associate has clearly spent all day customising his new toy, it looks tight and inviting. Surprisingly, she's quite moist, indicating that in spite of her struggling, shes actually rather aroused, seems she has a bit of a fetish for humiliation. Shell assuredly make an excellent slave if thats the case.
+	You consider the slaves pussy. Your associate has clearly spent all day customising his new toy, it looks tight and inviting. Surprisingly, she's quite moist, indicating that in spite of her struggling, she's actually rather aroused, seems she has a bit of a fetish for humiliation. She'll assuredly make an excellent slave if thats the case.
 <</if>>
 
 <br><br>
@@ -32,12 +32,12 @@ You take a detour down one of the minor byways that feed into the Promenade prop
 <<link "Give <<if _num < $seeDicks>>him his<<else>>her the<</if>> first taste of slave life">>
 	<<replace "#result">>
 		<<if _num < $seeDicks>>
-			Taking a slaves anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $dick == 0>>. You also reach for one of the brand new strapons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $dick == 0>>The slave climaxes, and while you dont quite join him, watching him squirm helplessly underneath you as you used his ass has left you instensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's faced is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that shes so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very very fashionable. 
+			Taking a slaves anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $dick == 0>>. You also reach for one of the brand new strapons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $dick == 0>>The slave climaxes, and while you dont quite join him, watching him squirm helplessly underneath you as you used his ass has left you instensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's faced is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very very fashionable. 
 		<<else>>
 			Taking a slaves virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet.<<if $dick == 0>>. You do however reach for one of the brand new strapons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<<else>>.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering hes new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very very fashionable. 
 		<</if>>
 		Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while. 
-		<<set $rep += 2000>>
+		<<set $rep += 100>>
 	<</replace>>
 <</link>>
 <br><<link "Decline, but suggest Coffee in the Cafe across the street">>
@@ -48,7 +48,7 @@ You take a detour down one of the minor byways that feed into the Promenade prop
 			You decline his offer, but instead offer to buy him coffee at the nearby cafe. You enjoy some especially delicious coffee together while admiring the view of his slaves pussy being broken in by a trickle of curious parties, who also occasionally avail of her ass or walk around to the other side of the helpless slut to use her mouth.
 		<</if>>
 		You trade friendly chit-chat and end up discussing business after a while, eventually striking a minor bargain over some outstanding orders that were causing some grief to your holdings, earning you some @@.yellowgreen;extra cash.@@
-		<<set $cash += random(5000,10000)>>
+		<<set $cash += random(250,1000)>>
 	<</replace>>
 <</link>>
 </span>
\ No newline at end of file