Merge remote-tracking branch 'julzor/master'

locations/anushapt.qsrc

@@ -734,7 +734,7 @@ if $ARGS[0] = 'chat':
 			!!can you make the <<boyfriend>> be the name of who ever Sveta is dating? Vitek, Artem, etc? I have no clue how hard that would be to code but eventually we will need a code like that, for the expanded chats with NPC''s at school, home and the disco.
 				'You tell her. "I have a boyfriend you know."'
 				'She grins at you. "Right who are you dating again?"'
-				'"<<boyfriend>>" You tell her.'
+				iif(kotovloveQW > 0, '"Vitek', '"<<boyfriend>>')+'" You tell her.'
 				'"Really? Hmm think he would be up for a threesome?" She says as she makes a kissy face at you.'
 			end
 			act 'No':

locations/liames.qsrc

@@ -32,10 +32,13 @@ if hour >= 8 and hour <= 20:
 else
 	'There is a small local shop that is open 8:00 - 20:00 everyday. Currently closed.'
 end
+
 if hour >= 10 and hour <= 22:
 	'A <a href="exec:gt ''liamelkafe'',''start''">tiny cafe</a> displays a street sign outside its door.'
 else
 	'The tiny cafe here is close currently, it is open every day 10:00 - 22:00'
+end
+
 if exhibitionQW > 3:
 	if week < 7 and hour >= 8 and hour <= 18:
 		'<a href="exec:gt ''exhibitionistshop'',''start''">Expression of You</a> is just down a small side street from here.'
@@ -44,13 +47,9 @@ if exhibitionQW > 3:
 	end
 end
 
-if home_owned[4] = 1:
-	act '<b>Go home</b>':gt'korr2x'
-end
+if home_owned[4] = 1: act '<b>Go home</b>':gt'korr2x'
 
-if hour >= 8 and hour <= 17 and exhibitionQW = 3:
-	act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
-end
+if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
 
 act 'wait':gs 'obj_din', 'wait'
 
@@ -88,22 +87,21 @@ end
 
 
 temp = RAND(1,100)
-	if temp >= 90:
-		cls
-		minut += 5
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/oldtown/liamhud1.jpg"></center>'
+if temp >= 90:
+	*clr & cla
+	minut += 5
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/oldtown/liamhud1.jpg"></center>'
 
-		'You have seen both a sitting area-the artist, here the artist girl came and sat opposite him,and the artist began to paint it'
+	'You have seen both a sitting area-the artist, here the artist girl came and sat opposite him,and the artist began to paint it'
 
-		act 'Further':gt'liames'
-	end
+	act 'Further':gt'liames'
+end
 
 
 if hour >= 15 and hour <= 22 and tusa = 0:
 	act'Local Hangout':
-		cls
+		*clr & cla
 		gs'stat'
 		gs'dibodi'
 		minut += 20
@@ -118,7 +116,7 @@ end
 
 if hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
 	act'Local Hangout':
-		cls
+		*clr & cla
 		gs'stat'
 		gs'dibodi'
 		minut += 20

locations/pornstudio.qsrc

@@ -27,9 +27,7 @@ if $ARGS[0] = 'start':
 
 	act 'Visit the managers PA':gt 'pornstudio', 'pa'
 
-	if bomzQW = 1 and week = 4 and workDisk = 0:
-		act 'Arrive for work':gt 'pornstudio', 'delivery'
-	end
+	if bomzQW = 1 and week = 4 and workDisk = 0: act 'Arrive for work':gt 'pornstudio', 'delivery'
 
 	if workDolg > 0 and money >= workDolg:
 		act 'Repay your debt':
@@ -368,6 +366,7 @@ if $ARGS[0] = 'manager':
 			killvar 'pfilmday'
 			killvar 'pornplan'
 			killvar 'porntaken'
+			killvar 'pornnow'
 			gt 'pornstudio', 'start'
 		end
 		exit
@@ -378,6 +377,7 @@ if $ARGS[0] = 'manager':
 		killvar 'pfilmday'
 		killvar 'pornplan'
 		killvar 'porntaken'
+		killvar 'pornnow'
 		'You did not come to the shoot. You fucked me, and you already owed me a lot of money! I paid a lot of money for assistants, actors, cameramen, plus studio rental, and you took it and threw it in my face.'
 		'No, I do not want to work with you and moreover, you''re blacklisted.'
 	elseif pfilmday[0] > 0 and hour >= 10 and hour <= 12:
@@ -869,6 +869,11 @@ if $ARGS[0] = 'medical':
 		if venera > 0:
 			pfilmNO = 1
 			pfilmNoVenera = 1
+			killvar 'prodcosttrue'
+			killvar 'pfilmday'
+			killvar 'pornplan'
+			killvar 'porntaken'
+			killvar 'pornnow'
 			'Your analysis showed an STD. The doctor tells you and calls Peter. Peter looks at the test results.'
 			'"Sorry, but as long as you have an STD you cannot make films."'
 			act 'Leave':gt 'pornstudio', 'start'

locations/soniaDisco.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = '':
 	'Vitek notices you staring at the bottle and thinks for a second, before he decides to invite you along: "Hey, <<$pcs_nickname>>. We''re going out for a drink... want to join us?"'
 
 	act 'Have a drink with them':
-		cls
+		*clr & cla
 		alko += 2
 		cumspclnt = 2
 		gs 'cum_cleanup'
@@ -29,7 +29,7 @@ if $ARGS[0] = '':
 		'Sonia does have more, she''s totally wasted by now. With a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
 
 		act 'Go back to the disco':
-			cls
+			*clr & cla
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/1.jpg"></center>'
@@ -39,7 +39,7 @@ if $ARGS[0] = '':
 	end
 
 	act 'Decline':
-		cls
+		*clr & cla
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/1.jpg"></center>'
@@ -51,7 +51,7 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'dance':
-	cls
+	*clr & cla
 	minut += 5
 	gs'stat'
 
@@ -77,7 +77,7 @@ if $ARGS[0] = 'dance':
 end
 
 if $ARGS[0] = 'dance1':
-	cls
+	*clr & cla
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/1.jpg"></center>'
@@ -91,18 +91,18 @@ if $ARGS[0] = 'dance1':
 	'Sonia smiles at him and confesses: "Of course! I love popsicles! Bu-"'
 	'Vitek reaches for his pocket, and actually pulls out a popsicle. Sonia looks at him in awe for a moment, as if he is a magician that just made a bunny appear out of thin air. Then she tries to reach out for it, but Vitek pulls it away from her and says: "No, no hands. I''ll hold it, you only use your mouth."'
 	act 'Watch':
-	    cls
+	    *clr & cla
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/2.jpg"></center>'
 		'Sonia obediently pulls her hands away and opens her mouth, and Vitek slowly puts the popsicle against her lips and tongue. Then she closes her lips around it and sucks on it, while looking at Vitek seductively.'
 		'Vitek grins and lowers the popsicle further and further, until it is at the same level as his groin. All this time, Sonia has never taken her mouth off it, and eventually she gets down on her knees after bending over awkwardly and nearly falling over once or twice. The way she''s sucking and licking the popsicle definitely gets Vitek aroused, and you see his cock straining against the fabric of his pants. Meanwhile, Dan and Vasily are looking at the two of them with their mouths open, somewhat awkwardly hiding their erections.'
 		'Once the popsicle is mostly gone, Dan clears his throat and suggests: "Let''s go outside for a while."'
 		
-		gs 'arousal', 'voyeur', 3, 'group'
+		gs 'arousal', 'voyeur', 3
 		gs 'stat'
 		
 		act 'Stay at the disco':
-			cls
+			*clr & cla
 			minut += 15
 			danc_exp += 1
 			soniaPS = 1
@@ -124,7 +124,7 @@ if $ARGS[0] = 'dance1':
 end
 
 if $ARGS[0] = 'dance2':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/3.jpg"></center>'
 	'You could go for some fresh air, and follow the group outside. It''s you, Sonia, Vitek, Dan, Vasily and two more guys you don''t know. Sonia is nearly tripping over her own legs as she walks, still clearly affected by the alcohol. After a few minutes the group halts to relax for a while, you assume. When Sonia finishes the popsicle that Vitek gave her, she asks: "That was yummy! Vitek, do you have another one?"'
@@ -133,31 +133,31 @@ if $ARGS[0] = 'dance2':
 	'When Sonia opens her eyes again, she recoils a bit from the hard cock right in front of her face. She giggles, but stays on her knees in front of him without any intentions of getting up.'
 	'Vitek softly says in a reassuring voice: "You can touch it if you want. It feels much nicer than a popsicle!"'
 	
-	gs 'arousal', 'voyeur', 3, 'group'
+	gs 'arousal', 'voyeur', 3
 	gs 'stat'
 		
 	act 'Watch':
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/4.jpg"></center>'
 		'Sonia stares at the erection in front of her face for a while, spellbound. Then she slowly extends her hand and pokes the cock with her finger. It twitches and some precum leaks from the head, making Sonia giggle with glee. Fascinated by it all, she hesitantly closes her slender fingers around the head and jerks him off carefully.'
 		'Vitek groans, totally not expecting his plan to actually get this far. He quickly clears his mind and tells her: "Now have a taste... I bet you will love it!"'
 		
-		gs 'arousal', 'voyeur', 3, 'group'
+		gs 'arousal', 'voyeur', 3
 		gs 'stat'
 		
 		act 'Watch':
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/5.jpg"></center>'
 			'Sonia nods and leans in closer, and sticks out her tongue before carefully licking the head. You can tell the other guys around you are getting restless, watching Vitek about to get a blowjob from one of the better looking girls in school... who, until now, had always behaved like a total prude.'
 			'Sonia slowly closes her lips around the head and begins to suck on it. The loud smacking sounds she makes while she''s sucking on the head of Vitek''s cock is the final straw for the other guys, and they all unbutton their pants too. They surround her, eager to get in on the action while she is too drunk to know better.'
 			
-			gs 'arousal', 'voyeur', 3, 'group'
+			gs 'arousal', 'voyeur', 3
 			gs 'stat'
 		
 			act 'Watch':
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/6.jpg"></center>'
 				'When the boys surround Sonia, to your surprise she stays calm and does not resist being in this position. In fact, she revels in it! She smiles at the guys, looking them in the eyes while she keeps sucking on Vitek''s cock like she had been.'
@@ -165,11 +165,11 @@ if $ARGS[0] = 'dance2':
 				'Too drunk to know better, she mumbles: "Sowwy," with a cock still in her mouth and puts her hands on two more. She does her best to please them all, sucking and stroking them in turns.'
 				'The boys don''t last long, and dump their warm loads of sperm all over her face one by one. By the time the last guy is finished, her face is covered completely.'
 				
-				gs 'arousal', 'voyeur', 3, 'group', 'humiliation'
+				gs 'arousal', 'voyeur', 3
 				gs 'stat'
 		
 				act 'Watch':
-					cls
+					*clr & cla
 					soniaPS = 1
 					soniaPSdays = daystart
 					grupTipe[25] = 5
@@ -181,7 +181,7 @@ if $ARGS[0] = 'dance2':
 					'Meanwhile, Sonia drunkenly rises to her feet and leans against a tree, trying to keep her balance. Thick gobs of cum are slowly dripping down from her face, and when you look closely you can see tears forming in the corners of her eyes. It looks like reality has finally caught up with her, and she now realizes what she just did. She softly whispers, more to herself than anyone else: "What have I done... I''m such an idiot!" between sobs.'
 					'She''s not given much time to recover from the initial shock. Vitek grabs her arm and announces to the other guys that it''s time to show her off. When he drags Sonia back to the disco with the rest of the boys in tow, you can''t help but feel a bit sorry for her. Knowing your classmates, they will judge her very harshly.'
 					
-					gs 'arousal', 'voyeur', 3, 'group', 'humiliation'
+					gs 'arousal', 'voyeur', 3
 					gs 'arousal', 'end'
 					gs 'stat'
 		

locations/test.qsrc

@@ -55,7 +55,7 @@ i = 0
 :CombatSpellTest
 $ThisSpellName = $combatSpells[i]
 if i < arrsize('$combatSpells'):
-	spellKnown[$ThisSpellName] = 1:
+	spellKnown[$ThisSpellName] = 1
 	i += 1
 	jump 'CombatSpellTest'
 end
@@ -63,7 +63,7 @@ i = 0
 :NonComSpellTest
 $ThisSpellName = $nonComSpells[i]
 if i < arrsize('$nonComSpells'):
-	spellKnown[$ThisSpellName] = 1:
+	spellKnown[$ThisSpellName] = 1
 	i += 1
 	jump 'NonComSpellTest'
 end