Merge branch 'modelling_expansion' into 'dev'

content: model fame

See merge request !1296

game/base-system/caption.twee

@@ -407,6 +407,7 @@
 	<<set $allure -= ($famegood / 2)>>
 	<<set $allure -= ($famebusiness / 2)>>
 	<<set $allure -= ($famesocial / 2)>>
+	<<set $allure -= ($famemodel / 2)>>
 	<<if $dev is 1>>
 		<<set $allure -= ($famepimp / 2)>>
 	<</if>>

game/base-system/clamp.twee

@@ -163,7 +163,7 @@
 <<set $famesocial to Math.clamp($famesocial, 0, 2000)>>
 <<set $famemodel to Math.clamp($famemodel, 0, 2000)>>
 
-<<set $fame to ($famesex + $famerape + $famebestiality + $fameexhibitionism + $fameprostitution + $famescrap + $famegood + $famebusiness + $famepimp + $famesocial)>>
+<<set $fame to ($famesex + $famerape + $famebestiality + $fameexhibitionism + $fameprostitution + $famescrap + $famegood + $famebusiness + $famepimp + $famesocial + $famemodel)>>
 
 <</widget>>
 

game/base-system/mirror.twee

@@ -676,6 +676,25 @@ Decreasing your allure:
 	<span class="pink">Obscure socialite</span>
 	<br>
 <</if>>
+<<if $famemodel gte 1000>>
+	<span class="green">Notorious show off</span>
+	<br>
+<<elseif $famemodel gte 600>>
+	<span class="teal">Famous model</span>
+	<br>
+<<elseif $famemodel gte 400>>
+	<span class="lblue">Recognised model</span>
+	<br>
+<<elseif $famemodel gte 200>>
+	<span class="blue">Known model</span>
+	<br>
+<<elseif $famemodel gte 100>>
+	<span class="purple">Low-key model</span>
+	<br>
+<<elseif $famemodel gte 30>>
+	<span class="pink">Obscure model</span>
+	<br>
+<</if>>
 <<if $moorLuck gt 5>>
 	<span class="green">????</span>
 	<br>

game/overworld-town/loc-domus-homes/work.twee

@@ -1340,9 +1340,15 @@ The bathroom is <<print either("small","tiny","very clean")>>.
 			<br><br>
 		<</if>>
 	<<else>>
-		<<if $fameexhibitionism gte 600>>
+		<<if $famemodel gte 600>>
+			One <<personsimple>> double-takes as you take the stage. "I must be dreaming. Never thought I'd see a famous model like <<phim>> here."
+			<br><br>
+		<<elseif $fameexhibitionism gte 600>>
 			One <<personsimple>> laughs as you take the stage. "You paid <<phim>> to strip?! I don't think I've ever seen <<phim>> in clothes."
 			<br><br>
+		<<elseif $famemodel gte 400>>
+			One <<personsimple>> double-takes as you take the stage. "I'm impressed. <<pShes>> kind of famous, not just your average model wannabe."
+			<br><br>
 		<<elseif $fameexhibitionism gte 400>>
 			One <<personsimple>> double-takes as you take the stage. "I'm impressed. <<pShes>> kind of famous for this."
 			<br><br>
@@ -1359,7 +1365,7 @@ The bathroom is <<print either("small","tiny","very clean")>>.
 		Like they're drawing a bowl of fruit.
 		<<larousal>><<arousal -2>>
 		<br>
-		The paintings produced are quite beautiful and artistic.<<lstress>><<stress -1>><<fameexhibitionism 5 pic>><br>
+		The paintings produced are quite beautiful and artistic.<<lstress>><<stress -1>><<fameexhibitionism 5 pic>><<famemodel 5 art>><br>
 	<<elseif $rng gte 33>>
 		The poses they ask for start off normal but slowly move toward the lewd: more poses with spread legs and bending over.
 		<<if $exhibitionism lte 34>>In spite of your initial nerves,<<else>>As you expected,<</if>> it turns out to be quite good fun:
@@ -1367,7 +1373,7 @@ The bathroom is <<print either("small","tiny","very clean")>>.
 		<<promiscuity2>>
 
 		The paintings produced are varied but mostly focus on your <<if pregnancyBellyVisible()>>belly, <</if>><<breasts>> and <<genitals>>.
-		<<fameexhibitionism 10 pic>>
+		<<fameexhibitionism 10 pic>><<famemodel 2 art>>
 	<<else>>
 		While they maintain the pretence that this is life-art, it's quite clear they just enjoy getting a
 		<<if $player.gender is "f">>girl to expose herself<<elseif $player.gender is "h">>hermaphrodite to expose themself<<else>>boy to expose himself<</if>> in the lewd poses they want to see.
@@ -1452,6 +1458,7 @@ The bathroom is <<print either("small","tiny","very clean")>>.
 				<br>Eventually <<he>> gives up. That felt good.<<lstress>><<stress -2>><br><br>
 			<</if>>
 		<</if>>
+		<<famemodel 2 art>>
 	<<else>>
 		<<generate2>>
 		<<if $awareness lt 200>>
@@ -1485,8 +1492,10 @@ The bathroom is <<print either("small","tiny","very clean")>>.
 
 		<<if $english gte 500>>
 			"That face!" the <<person1>><<person>> shouts. "Artists, capture that moment. That expression. That's real."
+			<<famemodel 2 art>>
 		<<elseif $english gte 250>>
 			"Paint, artists. Paint." The <<person1>><<person>> says. "<<print either("Take in the whole scene.","Paint what you see.","Immortalise this moment.")>>"
+			<<famemodel 1 art>>
 		<<else>>
 			"Paint, artists. Paint." The <<person1>><<person>> crouches next to you and whispers sharply in your ear.
 			"Start acting like this is real, or I might ask <<person2>><<him>> to actually do it!"
@@ -1529,6 +1538,7 @@ The bathroom is <<print either("small","tiny","very clean")>>.
 		<<if $english gte 500>>
 			"Nice acting," the <<person1>><<person>> says. "But I think <span class="red">it's time for something more authentic.</span>"<br>
 			<<He>> nods to the <<person2>><<person>>. "Do it."
+			<<famemodel 2 art>>
 		<<else>>
 			"No. <span class="red">That face. I'm not buying it.</span>" the <<person1>><<person>> nods to the <<person2>><<person>> behind you. "Can you do something to make this more authentic?"
 		<</if>>

game/overworld-town/loc-street/widgets.twee

@@ -1998,6 +1998,39 @@ You smell freshly baked pastries, and hear a knock on a nearby door. You recogni
 <<destinationeventend>>
 <</widget>>
 
+<<widget "streetmodelshow">>
+<<generate1>><<person1>>
+<<if $famemodel gte 400>>
+	You notice a <<person>> coming towards you. As <<he>> approaches, <<he>> suddenly breaks into an excited smile and steps in front of you.
+	<br><br>
+
+	“I know you,” the <<person>> exclaims. “You're that model <<girl>>, right?” <<He>> clasps your hand and <<his>> smile grows even wider. “I'm a real fan of yours."
+	<br><br>
+	
+	Before you can answer, the <<person>> speaks again. "I'd love to have some pictures of you, that no one else does." <<He>> lets go of your hand and hurriedly pulls out <<his>> phone, showing it to you as <<he>> keeps talking. "Please? Could you be my model, just for a few minutes?"
+	<br><br>
+
+	<<link [[Agree (0:05)|Street Private Photoshoot Alley]]>><<pass 5>><<set $phase to 0>><</link>>
+	<br>
+	<<link [[Demand money (0:05)|Street Private Photoshoot Alley]]>><<pass 5>><<set $phase to 1>><</link>>
+	<br>
+	<<link [[Refuse|Street Private Photoshoot Refuse]]>><</link>>
+	<br>
+<<else>>
+	You notice a <<person>> coming towards you. As <<he>> approaches, <<he>> suddenly breaks into a grin and steps in front of you, grasping your arm.
+	<br><br>
+
+	"You've got looks of a model, <<lass>>," <<he>> smirks. "Wanna pose for a few shots? I've got my camera right here." <<His>> hand cups <<his>> crotch, leaving no doubt about <<his>> intentions.
+	<br><br>
+	
+	Your face flushes. Pulling free from <<his>> grasp you hasten away, leaving the <<person>> and <<his>> crude remarks behind you.<<stress 3>><<trauma 3>><<gstress>><<gtrauma>>
+	<br><br>
+	
+	<<endevent>>
+	<<destinationeventend>>
+<</if>>
+<</widget>>
+
 :: Widget Passout Street [widget]
 <<widget "passoutstreet">>
 /*ToDo: Pregnancy, remove $pregnancyTesting to properly enable*/
@@ -2899,7 +2932,7 @@ You find a quiet place and open the <<wallet>>.
 <</widget>>
 
 <<widget "eventsstreetday">>
-<<set $dangerevent to random(1, 176)>>
+<<set $dangerevent to random(1, 180)>>
 <<set $rng to random(1, 100)>>
 <<if $rng lte 10 and $worn.feet.type.includes("heels") and $feetskill lt $worn.feet.reveal>>
 	<<streetheeltrip>>
@@ -2948,11 +2981,13 @@ You find a quiet place and open the <<wallet>>.
 	<<streetdog>>
 <<elseif $dangerevent lte 176>>
 	<<streetexshow>>
+<<elseif $dangerevent lte 180>>
+	<<streetmodelshow>>
 <</if>>
 <</widget>>
 
 <<widget "eventsstreetnight">>
-<<set $dangerevent to random(1, 149)>>
+<<set $dangerevent to random(1, 154)>>
 <<set $rng to random(1, 100)>>
 <<if $rng lte 10 and $worn.feet.type.includes("heels") and $feetskill lt $worn.feet.reveal>>
 	<<streetheeltrip>>
@@ -2999,6 +3034,8 @@ You find a quiet place and open the <<wallet>>.
 <<elseif $dangerevent lte 149>>
 	<<eventAmbient>>
 	<<destinationeventend>>
+<<elseif $dangerevent lte 154>>
+	<<streetmodelshow>>
 <</if>>
 <</widget>>