Ver código fonte

Merge remote-tracking branch 'julzor/master'

KevinSmarts 5 anos atrás
pai
commit
0f1c065e98
5 arquivos alterados com 112 adições e 66 exclusões
  1. 20 18
      locations/Komp.qsrc
  2. 11 20
      locations/foto.qsrc
  3. 48 2
      locations/pavaptcourtev.qsrc
  4. 22 26
      locations/pavtrain.qsrc
  5. 11 0
      locations/willpower.qsrc

+ 20 - 18
locations/Komp.qsrc

@@ -1,6 +1,6 @@
 # Komp
 if $ARGS[0] = 'start':
-	cls
+	*clr & cla
 	elektro += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/komp.jpg"></center>'
@@ -16,14 +16,13 @@ if $ARGS[0] = 'start':
 
 	if student > 0 and kursovik < 100:'You should probably do some of your <a href="exec:gt ''Komp'',''kursak''">coursework</a>.'
 
-	if $LOC = 'shulga_room':
+	if $loc = 'shulga_room' or $loc = 'anushapt':
+		internet_store = internet
 		internet = 100000
 		act 'Browse the internet':gt 'Komp', 'brows'
 	else
 		'You have <<internet>> hours of prepaid internet access remaining.'
-		if internet > 0:
-			act 'Browse the internet':gt 'Komp', 'brows'
-		end
+		if internet > 0: act 'Browse the internet':gt 'Komp', 'brows'
 	end
 
 	act 'Shut your computer down':
@@ -36,13 +35,22 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'brows':
-	cls
+	*clr & cla
 	gs 'stat'
+	
+	act 'Close the browser':
+		if $loc = 'shulga_room' or $loc = 'anushapt':
+			internet = internet_store
+			killvar 'internet_store'
+		end
+		gt 'Komp','start'
+	end
+	
 	if internet <= 0:
 		'<center><b>Browser</b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/eror.jpg"></center>'
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
-		if camwhore = 1 and $loc ! 'shulga_room':
+		if camwhore = 1 and $loc ! 'shulga_room' and $loc ! 'anushapt':
 			'Since MyFreeCams will cover the cost, you can still log on to do a cam show.'
 			act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
 		end
@@ -54,7 +62,7 @@ if $ARGS[0] = 'brows':
 
 		if home_owned[1] = 2 and husband = 0:act 'Rent your apartment out':gt 'Komp', 'sale'
 
-		act 'Search for porn (1:00)':gt 'Komp', 'porno'
+		if $loc ! 'anushapt': act 'Search for porn (1:00)':gt 'Komp', 'porno'
 		act 'Browse a dating website (1:00)':gt 'Komp', 'znak'
 
 		if hour < 20 and hour > 7:
@@ -71,12 +79,10 @@ if $ARGS[0] = 'brows':
 
 		if shantfoto > 0:act 'Find the girl you took photos of in the park on "Assbook"':gt 'Komp', 'foto'
 		if gor_dorm = 7:act 'Read letter from Eugene':gt 'etoexhib', 'pos91'
-		if camwhore = 1 and $loc ! 'shulga_room':act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
+		if camwhore = 1 and $loc ! 'shulga_room' and $loc ! 'anushapt':act 'Go to MyFreeCams.org':gt 'Komp', 'mfc'
 		if (storyline = 1 and SchoolAtestat = 0) or student > 0:act 'Spend time studying':gt 'Komp', 'study'
 		if sucpcinfo = 0 and succubxp > 0: act 'Research the strange feelings you''ve been having': gt 'succubus', 'kompresearch'
 	end
-
-	act '<B>Close the browser</B>':gt 'Komp','start'
 end
 
 if $ARGS[0] = 'sale':
@@ -392,22 +398,18 @@ if $ARGS[0] = 'foto':
 end
 
 if $ARGS[0] = 'rabota':
-	cla
-	*clr
-
+	*clr & cla
 	if internet <= 0:
 		'<center><b>Browser</b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/eror.jpg"></center>'
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
 
-		act '<B>Close the browser</B>':gt 'Komp','start'
-
+		act 'Close the browser':gt 'Komp','start'
 	else
-
 		minut += 60
 		internet -= 1
 		komprabota = rand(0, 10)
-		if $LOC = 'shulga_room':komprabota = rand(5, 15)
+		if $loc = 'shulga_room':komprabota = rand(5, 15)
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/komp.jpg"></center>'

+ 11 - 20
locations/foto.qsrc

@@ -171,9 +171,7 @@ if $ARGS[0] = 'studio':
 		'It appears you are in some kind of photography studio. Just near the door you came in is a reception desk, out of place due to the fact that it simply sits in the middle of the room. A man sits behind it in the light of a desk lamp, doing something on a computer.'
 		*nl
 		'Farther along, you can see what appear to be <a href="exec:gt ''foto_albums'',''model_portraits''">photo albums</a> that sit on a shelf.'
-	end
-
-	if model = 1:
+	elseif model = 1:
 		'You step onto the main floor of the studio, standing amongst the various sets and photographers who are working those sets. Sitting by the door is a <a href="exec:gs ''shortgs'',''img msg'',''images/locations/city/citycenter/photo/dress_code.jpg''">sign</a> to remind models of the dress code.'
 		*nl
 		'Farther along are the studio''s collection of <a href="exec:gt ''foto_albums'',''model_portraits''">photo albums</a> of their top 10 models. '
@@ -210,9 +208,7 @@ if $ARGS[0] = 'studio':
 		end
 	end
 
-	if mesec > 0 and isprok = 0 and model = 1:
-		msg'You''ve just realized that you''re walking around naked while on your period. Maybe you should consider using tampons when you model here...'
-	end
+	if mesec > 0 and isprok = 0 and model = 1: msg'You''ve just realized that you''re walking around naked while on your period. Maybe you should consider using tampons when you model here...'
 
 	if artemIzdev = 2 or artemIzdev = 3:
 		act 'Ask about the microcamera':
@@ -244,6 +240,7 @@ if $ARGS[0] = 'studio':
 
 	if pfilmNO = 1:
 		menu_off = 1
+		gs 'stat'
 		'	"You''re blacklisted, no decent studio will deal with you, goodbye."'
 		act 'Leave': minut += 1 & gt 'down'
 	end
@@ -264,17 +261,11 @@ if $ARGS[0] = 'studio':
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
 				'	You go into the back room to put on clothes and get ready to go home.'
-				act 'Leave':
-					minut += 1
-					gt 'down'
-				end
+				act 'Leave': minut += 1 & gt 'down'
 			end
 		end
 	elseif model = 0:
-		act 'Leave':
-			minut += 1
-			gt 'down'
-		end
+		act 'Leave': minut += 1 & gt 'down'
 	end
 
 	if parkblackmail = 2: act 'Look around for the blackmailer':gt 'foto', 'blackm'
@@ -283,8 +274,9 @@ if $ARGS[0] = 'studio':
 		act 'Ask about working as a glamor model':
 			cla & *clr
 			menu_off = 1
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'		
 			if vidage >= 40:
 				'	You ask about working as a model, but the photographer says to you, "I''m sorry, but you look like a pretty mature woman, we need models with a more youthful appearance." This is his way of telling you that you look too old for this business.'
 			elseif pcs_skin < 40:
@@ -334,8 +326,8 @@ if $ARGS[0] = 'studio':
 					'	"Welcome to Aphrodite."'
 					model = 1
 					modelyear = year
-					act'Head to the back':gt'foto','start'
 					act'Leave the studio':gt'down'
+					act'Head to the back':gt'foto','start'
 				end
 			elseif fotofakepassport >= 2:
 				'	You walk up to the front desk and find the same man who "interviewed" you previously. He looks up from his computer and recognizing you, he gives you a lewd smile and a knowing look.'
@@ -367,8 +359,7 @@ if $ARGS[0] = 'studio':
 		end
 	elseif pcs_apprnc < 80:
 		act 'Ask for work':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			'<center><b><font color="maroon">Photographer</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -402,8 +393,7 @@ if $ARGS[0] = 'studio':
 end
 
 if $ARGS[0] = 'gave_passport':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -422,6 +412,7 @@ if $ARGS[0] = 'interview':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+	if foto_anush_referral = 1:	'You walk up to the front desk and say Anushka send you. You only have to wait a few minutes before somebody arrives to interview you.' 
 	'	"You want to work here? How old are you?"'
 	if age >= 18:
 		act'I''m <<age>>':

+ 48 - 2
locations/pavaptcourtev.qsrc

@@ -311,6 +311,8 @@ if $ARGS[0] = 'events1':
 						gs 'willpower', 'resist'
 						gt 'pavComplex', 'start' 
 					end
+				else
+					'You don''t have enough willpower to refuse.'
 				end
 				act 'Get down on your knees':gt 'pavaptcourtev', 'smokeblowjob'
 			else
@@ -592,6 +594,8 @@ if $ARGS[0] = 'events2':
 						gs 'willpower', 'resist'
 						gt 'pavComplex', 'start'
 					end
+				else
+					'You don''t have enough willpower to refuse.'
 				end
 				act 'Get down on your knees':gt 'pavaptcourtev', 'smokeblowjob'
 			else
@@ -630,7 +634,10 @@ if $ARGS[0] = 'male_gopnik_beer':
 			gs 'willpower', 'resist'
 			gt 'pavComplex', 'start'
 		end
+	else
+		'You don''t have enough willpower to stop drinking and leave.'
 	end
+	
 	act 'Drink more':
 		*clr & cla
 		minut += 5
@@ -644,6 +651,8 @@ if $ARGS[0] = 'male_gopnik_beer':
 				gs 'willpower', 'resist'
 				gt 'pavComplex', 'start'
 			end
+		else
+			'You don''t have enough willpower to stop drinking and leave.'
 		end
 		act 'Drink even more':
 			*clr & cla
@@ -665,6 +674,9 @@ if $ARGS[0] = 'male_gopnik_beer':
 						gs 'willpower', 'resist'
 						gt 'pavComplex', 'start'
 					end
+				else
+					'You don''t have enough willpower to stop drinking and leave.'
+				end
 				end
 				act 'Grab another beer':
 					*clr & cla
@@ -693,6 +705,8 @@ if $ARGS[0] = 'male_gopnik_beer':
 									'He laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to suck his dick for a beer you sigh and leave them.'
 									act 'Move away':gt 'pavComplex', 'start'
 								end
+							else
+								'You don''t have enough willpower to refuse.'
 							end
 							act 'Agree': gt 'pavaptcourtev', 'suck3stooges'
 							gs 'willpower', 'drink'
@@ -711,8 +725,12 @@ if $ARGS[0] = 'male_gopnik_beer':
 									'He puts his dick away and spends the next several minutes complaining about how much his dick hurts. With the last of the beers drank, the boys get up and telling you they will see you later and then they move off to go do who knows what. They don''t invite you to join them, so you take the hint.'
 									act 'Move away':gt 'pavComplex', 'start'
 								end
+							elseif grupTipe = 4 and will_cost > pcs_willpwr:
+								'You don''t have enough willpower to threaten Dan.'
 							end
 						end
+					else
+						'You don''t have enough willpower to refuse.'
 					end
 					act 'Make bet':
 						*clr & cla
@@ -784,6 +802,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 			gs 'willpower', 'resist'
 			gt 'pavComplex', 'start'
 		end
+	else
+		'You don''t have enough willpower to stop drinking and leave.'
 	end
 	act 'Drink more':
 		*clr & cla
@@ -798,6 +818,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 				gs 'willpower', 'resist'
 				gt 'pavComplex', 'start' 
 			end
+		else
+			'You don''t have enough willpower to stop drinking and leave.'
 		end
 		act 'Drink even more':
 			*clr & cla
@@ -812,6 +834,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 					gs 'willpower', 'resist'
 					gt 'pavComplex', 'start'
 				end
+			else
+				'You don''t have enough willpower to stop drinking and leave.'
 			end
 			act 'Grab another beer':
 				*clr & cla
@@ -851,6 +875,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 							'You know they will get over it eventually, most likely. You also know their is no point arguing with them, so you leave them to grumble about you welshing on your bet.'
 							act 'Move away':gt 'pavComplex', 'start'
 						end
+					else
+						'You don''t have enough willpower to refuse paying.'
 					end
 					act 'Payup':
 						*clr & cla
@@ -880,9 +906,9 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 						gs 'willpower', 'resist'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatmelera.jpg"></center>'
 						'You shake your head no. "No I don''t think so, I wouldn''t win so no reason for me to make that bet." You reach for another beer but Lera pulls it away before you can grab it. Then he stands up and pulls her pants down enough to show off her clit. "If you want another beer you have to eat me <<$pcs_nickname>>." She says with a smirk. The other girls perk up at this and seem interested in what you''re going to do.' 
-						gs 'willpower', 'bj'
+						gs 'willpower', 'cuni'
 						if will_cost <= pcs_willpwr:
-							act 'Refuse(<<will_cost>> Willpower)':
+							act 'Refuse (<<will_cost>> Willpower)':
 								*clr & cla
 								gs 'willpower', 'resist'
 								'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
@@ -890,6 +916,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 								'She laughs, "Then you''re not getting another beer." Knowing you won''t win this and you are not about to lick her pussy for a beer you sigh and leave them.'
 								act 'Move away':gt 'pavComplex', 'start'
 							end
+						else
+							'You don''t have enough willpower to refuse.'
 						end
 						act 'Agree':gt 'pavaptcourtev', 'eatlera'
 						gs 'willpower', 'drink'
@@ -910,6 +938,8 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 								'She pulls her pants back up and spends the next several minutes complaining about how much her clit hurts. With the last of the beers drank, the girls get up and tell each other and you night. Then they each go their own way.'
 								act 'Move away':gt 'pavComplex', 'start'
 							end
+						elseif grupTipe = 4 and will_cost > pcs_willpwr:
+							'You don''t have enough willpower to threaten Lera.'
 						end
 					end
 				end
@@ -935,6 +965,8 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 			gs 'willpower', 'resist'
 			gt 'pavComplex', 'start'
 		end
+	else
+		'You don''t have enough willpower to stop drinking and leave.'
 	end
 	act 'Drink more':
 		*clr & cla
@@ -949,6 +981,8 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 				gs 'willpower', 'resist'
 				gt 'pavComplex', 'start' 
 			end
+		else
+			'You don''t have enough willpower to stop drinking and leave.'
 		end
 		act 'Drink even more':
 			*clr & cla
@@ -963,6 +997,8 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 					gs 'willpower', 'resist'
 					gt 'pavComplex', 'start'
 				end
+			else
+				'You don''t have enough willpower to stop drinking and leave.'
 			end
 			act 'Grab another beer':
 				*clr & cla
@@ -977,6 +1013,8 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 						gs 'willpower', 'resist'
 						gt 'pavComplex', 'start' 
 					end
+				else
+					'You don''t have enough willpower to stop drinking and leave.'
 				end
 				act 'Keep drinking':
 					*clr & cla
@@ -1000,6 +1038,8 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 							'With that you get up and stumble off, before you get really wasted.'
 							act 'Move away':gt 'pavComplex', 'start'
 						end
+					else
+						'You don''t have enough willpower to stop drinking and leave.'
 					end
 					act 'Try to keep up':
 						*clr & cla
@@ -1027,6 +1067,8 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 								'With that you get up and stumble off, barely able to walk at all.'
 								act 'Move away':gt 'pavComplex', 'start'
 							end
+						else
+							'You don''t have enough willpower to stop drinking and leave.'
 						end
 						act 'Keep going':
 							*clr & cla
@@ -1098,6 +1140,8 @@ if $ARGS[0] = 'follownush':
 						'She rolls her eyes slightly. "Yeah whatever, anyways I should get going." With that she gets up and straightens up her clothes as she heads upstairs. Leaving you behind, with nothing to do but return to the courtyard.'
 						act 'Leave':gt 'pavComplex', 'start'
 					end
+				else
+					'You don''t have enough willpower to stop stop and leave.'
 				end
 				act 'Undress':
 					*clr & cla
@@ -1446,6 +1490,8 @@ if $ARGS[0] = 'two_boys':
 !!		end
 			act 'Stay home': gt 'bedrPar'
 		end
+	else
+		'You don''t have enough willpower to refuse.'
 	end
 	act 'Agree':
 		*clr & cla

+ 22 - 26
locations/pavtrain.qsrc

@@ -28,17 +28,13 @@ gs 'stat'
 *nl
 'Pavlovsk''s only and rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. Always on the look out for maids among the local girl population.'
 
-if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0:
-	gt 'dimaRevenge', dimaRevenge
-	dimaRevenge += 1
-end
-
+if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0: dimaRevenge += 1 & gt 'dimaRevenge', dimaRevenge
 
 if kidaloa = 0:
 	podrand = rand(0, 5)
 
 	if money >= 5000 and hour >= 8 and hour <= 20 and podrand = 0 and monthKidalo ! month:
-		cls
+		*clr & cla
 		menu_off = 1
 		monthKidalo = month
 		gs 'stat'
@@ -48,8 +44,19 @@ if kidaloa = 0:
 		'She turns back to you and happily exclaims: "Hello! We''re shooting a pilot for TV. It''s going to be a novel program: it is a show in which we hand out gifts to random strangers, and then film their response. It''s called "Happiness in Russia", we''re hoping it will catch on all over the world. We have chosen you to be part of our pilot, congratulations!"'
 		'She grabs hold of a large box the camera man handed to her. It''s beautifully wrapped, with a nice bow to boot. She whispers to you: "This box contains a brand new laptop! Just act surprised when you open it!"'
 
+		act 'Say you have no time':
+			*clr & cla
+			gs 'stat'
+			kidaloa = 1
+			'<center><h4>Pavlovsk''s train station</h4></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+			'Even though you definitely wouldn''t mind a new laptop, you simply don''t have time to talk to them right now. You politely decline and walk away before they can protest. A few minutes later you see the two of them hastily running across the square, while some poor guy opens the fancily packed box only to find a brick in it. By the time he realizes he got scammed, they are long gone. Looks like you dodged a bullet there!'
+			
+			act 'Return to the station' :minut += 15 & gt $curloc
+		end	
+		
 		act 'Wow, this must be your lucky day!':
-			cls
+			*clr & cla
 			gs 'stat'
 			'<center><h4>Pavlovsk''s train station</h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
@@ -57,7 +64,7 @@ if kidaloa = 0:
 			'The girl tells you: "Unfortunately, the government doesn''t just let us give away items for nothing. We''re legally obligated to have our winners pay VAT over the amount of money their gift is worth. In your case, this comes down to 5000 <b>₽</b>."'
 
 			act 'Pay the VAT and check out your new laptop':
-				cls
+				*clr & cla
 				money -= 5000
 				kidaloa = 1
 				if pcs_mood > 5: pcs_mood = 5
@@ -69,7 +76,7 @@ if kidaloa = 0:
 				act 'Return to the train station':minut += 15 & gt $curloc
 			end
 			act 'Say you can''t afford it right now':
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><h4>Pavlovsk''s train station</h4></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
@@ -79,25 +86,14 @@ if kidaloa = 0:
 				act 'Thank them and leave': minut +=15 & gt $curloc
 			end
 		end
-		act 'Say you have no time':
-			cls
-			gs 'stat'
-			kidaloa = 1
-			'<center><h4>Pavlovsk''s train station</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
-			'Even though you definitely wouldn''t mind a new laptop, you simply don''t have time to talk to them right now. You politely decline and walk away before they can protest. A few minutes later you see the two of them hastily running across the square, while some poor guy opens the fancily packed box only to find a brick in it. By the time he realizes he got scammed, they are long gone. Looks like you dodged a bullet there!'
-			
-			act 'Return to the station' :minut += 15 & gt $curloc
-		end	
 		exit
 	end
 end
-		
-		
+				
 if kidalob = 0:
 	podrand = rand(0, 5)	
 	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and monthKidalo ! month:
-		cls
+		*clr & cla
 		menu_off = 1
 		monthKidalo = month
 		gs 'stat'
@@ -110,7 +106,7 @@ if kidalob = 0:
 		act 'You''re not interested':minut += 15 & gt $curloc
 		
 		act 'Agree to do the photo shoot':
-			cls
+			*clr & cla
 			gs 'stat'
 			'Wow, this offer sounds amazing! There is no way you can decline. The guys take you to the back of the railway station, and the guy who hasn''t said anything to you pulls out an expensive looking camera, mounting it on a tripod near some trees.'
 			'The first guy approaches you and says: "The shoot will be against a natural background. We''ve done market research, and have determined that the picturesque background of the outdoors is by far the most desirable option for our campaign. There is only one problem... your dress is not what we are looking for at all. You''ll have to change."'
@@ -119,7 +115,7 @@ if kidalob = 0:
 			act 'Refuse and leave, you''re not taking off your clothes!':minut += 15 & gt $curloc
 			
 			act 'Change into the sundress':
-				cls
+				*clr & cla
 				!! ths will either add the sundress or simply set it to a certain damage level
 				dynamic '<<$clothingworntype>>[<<clothingwornnumber>>] = 0'
 				dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] = 0'
@@ -136,13 +132,13 @@ if kidalob = 0:
 				'You quickly get into the car and take off your dress, and put on the dress the man gave you. You give your <<$titsize>> breasts a squeeze through the fabric, adjusting the dress a bit so it fits well around them for the photo shoot.'
 				
 				act 'Pose for the camera':
-					cls
+					*clr & cla
 					kidalob = 1
 					gs 'stat'
 					'You get out of the car leaving your possessions in there, figuring it''s easier to just collect them when you change back to your regular clothes. You get out and walk to the tree the camera is aimed at. The guy who hasn''t said a word mans the camera, while the first guy instructs you how to stand in several poses. "Very nice, very nice... now turn your back to the camera!" The camera clicks several times. "Excellent. Now tilt your head backwards and close your eyes." You do as instructed, waiting for the now familiar click of the camera. It never comes.'
 					
 					act 'Ask what''s taking so long':
-						cls
+						*clr & cla
 						money = 0
 						if pcs_mood > 50: pcs_mood = 50
 						gs 'stat'

+ 11 - 0
locations/willpower.qsrc

@@ -143,6 +143,17 @@ if $ARGS[0] = 'prostitution':
 		will_cost = (100 + will_calc)/10
 	end
 end
+
+if $ARGS[0] = 'humiliation':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	if stat['humiliation'] <= 90:
+		will_cost = (stat['humiliation'] + will_calc)/10
+	else
+		will_cost = (100 + will_calc)/10
+	end
+end
 	
 if $ARGS[0] = 'swallow':
 	gs 'willpower', 'calc'