Pārlūkot izejas kodu

Merge remote-tracking branch 'upstream/master' into minor-fixes

Spackled Lanturn 3 gadi atpakaļ
vecāks
revīzija
0c269b2234

+ 4 - 0
.gitignore

@@ -24,3 +24,7 @@ Music Life Wiki/
 images.zip
 
 *.png
+
+#ignore Visual Studio build files
+tools/qsp-analyser/QSP_Analyser/[Bb]in/
+tools/qsp-analyser/QSP_Analyser/[Oo]bj/

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -1563,7 +1563,7 @@ $cheatmenu['time'] = {
 	$SS
 	killvar 'SS'
 	*nl
-	'Weather: <a href="exec:sunWeather=iif(sunWeather=0,1,0) & $pogoda=iif(sunWeather=0,''Rain...'',''Clear...'') & chWeather = 1 & gs ''outdoors'', ''weather'' & dynamic $cheatmenu[''time'']">'+iif(sunWeather=0,'Rain','Sunny')+'</a>'
+	'Weather: <a href="exec:sunWeather=iif(sunWeather=0,1,0) & chWeather = 1 & gs ''outdoors'', ''weather'' & dynamic $cheatmenu[''time'']">'+iif(sunWeather=0,'Rain','Sunny')+'</a>'
 	*nl
 	'Temperature = <<$temperature>> - <a href="exec:temper += 1 & dynamic $cheatmenu[''time'']">+1 degree</a> - <a href="exec:temper += 5 & dynamic $cheatmenu[''time'']">+5 degrees</a> - <a href="exec:temper -= 1 & dynamic $cheatmenu[''time'']">-1 degree</a> - <a href="exec:temper -= 5 & dynamic $cheatmenu[''time'']">-5 degrees</a>'
 	*nl

+ 143 - 4
locations/HotelWork.qsrc

@@ -510,9 +510,9 @@ if $ARGS[0] = 'maid':
 			
 			:new_maid_event
 			if soniaPS = 5 and maidcheck_sonia ! daystart:
-				maidrand = rand(0,140)
+				maidrand = rand(0,160)
 			else 
-				maidrand = rand(0,110)
+				maidrand = rand(0,120)
 			end
 
 			if maidstat < 100: maidstat += rand(0,1)
@@ -524,6 +524,7 @@ if $ARGS[0] = 'maid':
 			!! MJ: from 50,51 to 50,150 -- More often but less.
 			if chai1 < 25: chai = rand(20,60) + rand(0, maidstat)
 
+			!! maidrand[1] used for daystat check in last event before Sonia
 			if maidrand <= 10:
 				minut += 35
 				gs 'stat'
@@ -1280,6 +1281,144 @@ if $ARGS[0] = 'maid':
 					act 'Get back to work': gt 'hotelwork', 'maid'
 				end
 			elseif maidrand <= 120:
+				if maidrand[1] = daystart: gt 'hotelwork', 'maid'
+				maidrand[1] = daystart
+				if rand(0,5) < 2:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/bed'+rand(1,2)+'.jpg"></center>'
+					'You open the door to the next room to see a woman in a green dress on her bed smiling.'
+					'"Hi, I work evenings and was just relaxing before my shift. Can you come back later?" She asks"'
+					'You have more rooms to do so it is easy enough to come back after cleaning them, so you agree.'
+
+					act 'Get back to work': gt 'hotelwork', 'maid'
+				elseif rand(0,5) < 3:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/tipsy1.jpg"></center>'
+					'As you are cleaning the guest walks in. She looks like she has had a few drinks and just waves you out of her way.'
+					'She is wear just a bra, mini skirt and heels all in black. You would guess she''d been clubbing but at this time?'
+					'It''s either too early or far too late.'
+					
+					act 'Move aside and let her pass':
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/tipsy2.jpg"></center>'
+						'She crawls up on to the bed exposing to you her lack of underwear.'
+						'Damn, you think that must have been a hell of a party.'
+						'You can''t help but stare at her pussy as she gives you such a show.'
+						
+						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Stare at her':
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/tipsy3.jpg"></center>'
+							'Promptly your free show ends as she rolls over and passes out'
+							'You had mostly finished her room and this situation might look bad if you boss saw you so you gather your things and leave feeling a little more aroused then when you started.'
+							
+							act 'Get back to work': gt 'hotelwork', 'maid'
+						end
+					end
+				elseif rand(0,5) < 4:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/nude'+rand(1,2)+'.jpg"></center>'
+					'You walk in to the room to find a regular guess standing in her room completely naked.'
+					'She is clearly distracted and does not notice you so you decide to go back out and close the door.'
+
+					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'end'
+					gs 'stat'
+					
+					act 'Get back to work': gt 'hotelwork', 'maid'
+				elseif rand(0,5) < 5:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/underwear.jpg"></center>'
+					'You walk in to the room to find a regular guess standing in her room in just her underwear.'
+					'She is not looking in your direction so you just back out and close the door.'
+					
+					act 'Get back to work': gt 'hotelwork', 'maid'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate1.jpg"></center>'
+					'You walk in to the room and see a regular guest on her bed naked and clearly masturbating.'
+					'She is looking to the side and has not realised you are in the room.'
+					
+					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					gs 'willpower', 'voyeur', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Get back to work (<<will_cost>> Willpower)':
+							gs 'willpower', 'voyeur', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							gt 'hotelwork', 'maid'
+						end
+					else
+						act 'Get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+
+					act 'Stay and watch for a bit':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate2.jpg"></center>'
+						'You crouch down so that she wont see you and have a perfect close view of her pussy.'
+						'She is moaning quite loudly now and you watch her insert a finger deeply inside.'
+							
+						gs 'arousal', 'voyeur', 10
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						gs 'willpower', 'voyeur', 'resist'
+						if will_cost <= pcs_willpwr:
+							act 'Maybe you should get back to work (<<will_cost>> Willpower)':
+								gs 'willpower', 'voyeur', 'resist'
+								gs 'willpower', 'pay', 'resist'
+								gs 'stat'
+								gt 'hotelwork', 'maid'
+							end
+						else
+							act 'Maybe you should get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+
+						act 'Stay and watch for a little more':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate3.jpg"></center>'
+							'She is clearly more aroused as her pussy glistens and the sound of her fucking herself makes it harder to hear her moans even as they grow louder.'
+							'She slides a second finger inside desperate to sate her growing desire.'
+									
+							gs 'arousal', 'voyeur', 10
+							gs 'arousal', 'end'
+							gs 'stat'
+
+							gs 'willpower', 'voyeur', 'resist'
+							if will_cost <= pcs_willpwr:
+								act 'You really should get back to work (<<will_cost>> Willpower)':
+									gs 'willpower', 'voyeur', 'resist'
+									gs 'willpower', 'pay', 'resist'
+									gs 'stat'
+									gt 'hotelwork', 'maid'
+								end
+							else
+								act 'You really should get back to work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end
+					
+							act 'Stay to watch her finish':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate4.jpg"></center>'
+								'Bucking her hips and crying out for an orgasm the guest gives up on internal pleasures.'
+								'She removes her fingers and focuses solely on her clit.'
+								'"Oh God! Fuck! Yes!" Her body spasms as she finally achieves what must be a massive orgasm.'
+										
+								gs 'arousal', 'voyeur', 10
+								gs 'arousal', 'end'
+								gs 'stat'
+
+								act 'Time to leave':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/work/events/masturbate5.jpg"></center>'
+									'She is lying back recovering, the occasional twitch the only sign that she is still concious.'
+									'You go to pass her a towel so she can stop her juice dripping on to the sheets before you catch yourself and sneak out of the room.'
+									
+									act 'Get back to work': gt 'hotelwork', 'maid'
+								end
+							end
+						end
+					end
+				end
+			elseif maidrand <= 140:
 				maidcheck_sonia = daystart
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy0,'+rand(0,4)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. When you look around the corner, you see a girl giving a guy an enthusiastic blowjob, happily gagging on his cock while she tries to take it down her throat over and over. Wait a minute... that''s Sonia, from your class!'
@@ -1319,7 +1458,7 @@ if $ARGS[0] = 'maid':
 						end
 					end
 				end
-			elseif maidrand <= 130:
+			elseif maidrand <= 150:
 				maidcheck_sonia = daystart
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga0,'+rand(0,2)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. When you look around the corner, you see Sonia giving a black guy an enthusiastic blowjob, happily gagging on his cock while she tries to take it down her throat over and over. Obviously it''s not working; his cock is way too big for her.'
@@ -1370,7 +1509,7 @@ if $ARGS[0] = 'maid':
 						end
 					end
 				end
-			elseif maidrand <= 140:
+			elseif maidrand <= 160:
 				maidcheck_sonia = daystart
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.two.nigga0,'+rand(0,1)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. When you look around the corner, you see Sonia with not one, but two huge black guys. She''s happily sucking their enormous dicks in turn, massaging the one she doesn''t currently have in her mouth with her delicate fingers.'

+ 1 - 1
locations/MartinSex3.qsrc

@@ -314,7 +314,7 @@ if $ARGS[0] = 'MartinPussyLick':
 	act 'Get up and tell Martin you wanna ride him (Cowgirl)':$martinpos='cowgirl' & gt 'MartinSex2','MartinSexPrep'
 	act 'Get up and tell Martin you wanna ride him (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinSexPrep'
 	act '"Fuck my ass, Martin"':$martinpos = 'doggystyle' & gt'MartinSex2','MartinAnalDyn'
-	act 'Lower your ass onto his dick':& $martinpos = 'rev_cowgirl' & gt'MartinSex2','MartinAnalDyn'
+	act 'Lower your ass onto his dick': $martinpos = 'rev_cowgirl' & gt'MartinSex2','MartinAnalDyn'
 			
 	act 'Blueball him - Get dressed and leave':
 		cls

+ 1 - 1
locations/TerminalOffice.qsrc

@@ -336,7 +336,7 @@ if $ARGS[0] = '31':
 				'"I was told by Anatoly Chubais from the company "OOO Bystroushka limited", to hand over these documents to you."'
 				'The man stops talking on the phone, frowns, and pointing towards the door, "You need to head over to the accountant''s office."'
 				AboutDocs = 1
-				delact 'Give documents'
+				delact 'Give him the documents'
 			end
 		end
 		

+ 2 - 2
locations/_face_image.qsrc

@@ -73,14 +73,14 @@ if pcs_hairlng > 80:
 	else
 		$RESULT += 'normal'
 	end
-!! style for short hair (other images don't exist)
+!! style for short hair (other images don''t exist)
 elseif pcs_hairlng <= 80 and pcs_hairlng > 30:
 	if hbangs > 0:
 		$RESULT += 'bangs'
 	else
 		$RESULT += 'normal'
 	end
-!! style for very short hair (other images don't exist)
+!! style for very short hair (other images don''t exist)
 else
 	$RESULT += 'normal'
 end

+ 2 - 2
locations/arturend.qsrc

@@ -36,8 +36,8 @@ act 'Brush up':
 			'Arthur looks away guiltily and says "Uh, so I did not have time to look for a gift for you. But here is some money. Buy what do you like, sweet girl."'
 		end
 	elseif bag = 0:
-		cheap_purses[13] = 1
-		$currentpursetype = 'cheap'
+		gm_purses[13] = 1
+		$currentpursetype = 'gm'
 		currentpursenumber = 13
 		bag = 1
 		'Arthur gives you a quality handbag. You take it, feeling a mixture of joy and guilt welling up inside you. "Did I really just sleep with a stranger for a purse? Does this make me a whore, or a slut?" You think to yourself'

+ 1 - 1
locations/barbershop.qsrc

@@ -311,7 +311,7 @@ if $ARGS[0] = 'cuthair':
 				else
 					*clr & cla
 					minut += 20
-					pcs_hairlng = 31
+					pcs_hairlng = 81
 					pcs_hairbsh = 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'

+ 8 - 8
locations/belpicknick.qsrc

@@ -416,15 +416,15 @@ if $ARGS[0] = 'vibor':
 end
 
 if $ARGS[0] = 'poisk':
-	gm = gmember
+	tempgm = gmember
 	:markpoisk_gmember
-	gm += 1
-	if gm > 4:gm = 1
-	if gm = 1 and sashaBeliTimes = 0:jump'markpoisk_gmember'
-	if gm = 2 and sipliGangTimes = 0:jump'markpoisk_gmember'
-	if gm = 3 and kolGangTimes = 0:jump'markpoisk_gmember'
-	if gm = 4 and tatarGangTimes = 0:jump'markpoisk_gmember'
-	if gm = 1 and sashaBeliTimes > 0 or gm = 2 and sipliGangTimes > 0 or gm = 3 and kolGangTimes > 0 or gm = 4 and tatarGangTimes > 0:gmember = gm
+	tempgm += 1
+	if tempgm > 4:tempgm = 1
+	if tempgm = 1 and sashaBeliTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 2 and sipliGangTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 3 and kolGangTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 4 and tatarGangTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 1 and sashaBeliTimes > 0 or tempgm = 2 and sipliGangTimes > 0 or tempgm = 3 and kolGangTimes > 0 or tempgm = 4 and tatarGangTimes > 0:gmember = tempgm
 end
 
 

+ 1 - 1
locations/cikl.qsrc

@@ -1539,7 +1539,7 @@ if month = 6 and day = 13:$natholi = 'National holiday' & natholi = 1
 if month = 11 and day = 4:$natholi = 'Unity Day' & natholi = 1
 if natholi = 1:
 	if $holyday ! '': $holyday += '<br>'
-	$holiday += $natholi
+	$holyday += $natholi
 end
 
 if bcream_used >= 1:

+ 0 - 1
locations/city_clinic.qsrc

@@ -1054,7 +1054,6 @@ if $ARGS[0] = 'ninel3':
 end
 
 if $ARGS[0] = 'glavdoc':
-	delact 'Visit the clinic''s chief of staff'
 	menu_off = 1
 	minut += 5
 	if workhosp = 0:

+ 2 - 2
locations/gadsarai.qsrc

@@ -88,8 +88,8 @@ if $ARGS[0] = 'search':
 		*nl
 		'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
 		'You can use this cool looking bag as a handbag.'
-		cheap_purses[5] = 1
-		$currentpursetype = 'cheap'
+		gm_purses[5] = 1
+		$currentpursetype = 'gm'
 		currentpursenumber = 5
 	elseif vcard = 0 and vcard_trash = 0 and rand(0,10) >= 8:
 		*clr & cla

+ 0 - 2
locations/gschool_lunch.qsrc

@@ -90,7 +90,6 @@ if $ARGS[0] = 'cafeteria':
 			cla
 			menu_off = 1
 			gs 'food', 'bag_lunch'
-			delact 'Finish'
 			gs 'gschool_gossip', 'bagged'
 			act 'Continue': gt 'gschool_lunch', 'break'
 		end
@@ -102,7 +101,6 @@ if $ARGS[0] = 'cafeteria':
 			menu_off = 1
 			money -= 50
 			gs 'food', 'm_meal'
-			delact 'Finish'
 			gs 'gschool_gossip', 'buying'
 			act 'Continue': gt 'gschool_lunch', 'break'
 		end

+ 1 - 1
locations/hairsalon.qsrc

@@ -203,7 +203,7 @@ if $ARGS[0] = 'cuthair':
 				else
 					cla & *clr
 					minut += 30
-					pcs_hairlng = 31
+					pcs_hairlng = 81
 					pcs_hairbsh = 1
 					money -= 750
 					gs 'stat'

+ 3 - 3
locations/loadg.qsrc

@@ -41,12 +41,12 @@ if pavlin > 0:
 end
 
 if bag = 1 and $currentpursetype = '':
-	cheap_purses[1] = 1
-	$currentpursetype = 'cheap'
+	gm_purses[1] = 1
+	$currentpursetype = 'gm'
 	currentpursenumber = 1
 end
 
-if cheap_purse[1] = 1:cheap_purses[1] = 1
+if cheap_purse[1] = 1:gm_purses[1] = 1
 
 if npc_dick['A55'] = 23: npc_dick['A55'] = 30
 

+ 2 - 2
locations/lover_love.qsrc

@@ -62,13 +62,13 @@ elseif loverlove[lover_number] = 2:
 	exit
 end
 
-if pcs_makeup > 1 and ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 0:
+if pcs_makeup > 1 and ($clothingworntype = 'fashionista' or $clothingworntype = 'moncheri') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 0:
 	'<<$loverdesc[lover_number]>> looks very excited. He decides that you are now ready to meet his mother.'
 
 	act 'Meet the parents':gt 'love', 'mother'
 
 	exit
-elseif pcs_makeup > 1 and ($clothingworntype = 'expensive' or $clothingworntype = 'formal') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 1 and $pantyworntype ! 'none':
+elseif pcs_makeup > 1 and ($clothingworntype = 'fashionista' or $clothingworntype = 'moncheri') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 1 and $pantyworntype ! 'none':
 	'<<$loverdesc[lover_number]>> examins you and decides that you are ready to meet his friends.'
 
 	act 'Meet his friends':gt 'love', 'frends'

+ 8 - 8
locations/mey_tamara_events.qsrc

@@ -221,7 +221,7 @@ if $args[0] = 'learning1':
 
 		newdress_count = 0
 		newdress_loop = 0
-		!by random cloth, modify from :markbuyclomother. original kitty pussy *2 (average clothes), set to 1 formal 1 average
+		!by random cloth, modify from :markbuyclomother. original kitty pussy *2 (average clothes), set to 1 moncheri 1 average
 		'<center><table><tr><td>'
 		:markbuyclotamaraaverage
 		newdress_id = rand(1, 522)
@@ -243,11 +243,11 @@ if $args[0] = 'learning1':
 		:markbuyclotamaraformal
 		newdress_id = rand(1, 168)
 
-		if formal[newdress_id] = 0:
-			formal[newdress_id] = 1
-			formalH[newdress_id] = 35
-			formalB[newdress_id] = pcs_hips
-			*P '<center><img height = 400 src="images/pc/clothing/4formal/<<newdress_id>>.jpg"></center>'
+		if moncheri[newdress_id] = 0:
+			moncheri[newdress_id] = 1
+			moncheriH[newdress_id] = 35
+			moncheriB[newdress_id] = pcs_hips
+			*P '<center><img height = 400 src="images/pc/clothing/moncheri/<<newdress_id>>.jpg"></center>'
 		else
 			newdress_loop += 1
 			if newdress_loop > 1000:
@@ -477,8 +477,8 @@ end
 if $args[0] = 'check_look':
 	*clr & cla
 	! dress, medium black, clean, looks stunning
-	!there need a good glamour dress, change to formal or expensive in ECV (she already give you 1 formal)
-	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
+	!there need a good glamour dress, change to moncheri or expensive in ECV (she already give you 1 moncheri)
+	if ($clothingworntype = 'moncheri' or $clothingworntype = 'fashionista') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
 		! if long hair is desired styling
 		if shorthair = 0 and pcs_hairbsh = 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party0.jpg"></center>'

+ 1 - 1
locations/mother.qsrc

@@ -630,7 +630,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
+	if ($clothingworntype = 'moncheri' or $clothingworntype = 'fashionista') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
 	if week = 5 and dostupindorf = 1 and grandaQW['block'] = 0:
 		if hour > 9:'While your <<$npc_nickname[''A29'']>> is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'

+ 1 - 1
locations/pav_train.qsrc

@@ -169,7 +169,7 @@ 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:
+	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'moncheri' or $clothingworntype = 'fashionista') and monthKidalo ! month:
 		*clr & cla
 		menu_off = 1
 		monthKidalo = month

+ 0 - 1
locations/pav_train_market.qsrc

@@ -353,7 +353,6 @@ if ARGS[0] = 4:
 			money -= 699
 			card = 2
 			TimesBuyPorno += 1
-			delact 'Buy cards'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 			'You try not to look into the eyes of the porn dealer as you count the money. You quickly grab the cards and shove them in your purse.'

+ 2 - 2
locations/pod_whore.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'client_talk':
 	else
 		if $clothingworntype = 'nude':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_nude'+rand(1,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'formal' or $clothingworntype = 'expensive':
+		elseif $clothingworntype = 'moncheri' or $clothingworntype = 'fashionista':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_glamur.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door.jpg"></center>'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'setup':
 	if pcs_hairbsh = 1: money_hapri = 50
 	!glamorous clothes
 	money_glamur = 0
-	if $clothingworntype = 'formal' or $clothingworntype = 'expensive': money_glamur = 150
+	if $clothingworntype = 'moncheri' or $clothingworntype = 'fashionista': money_glamur = 150
 	!!hooker clothing
 	money_odethooker = 0
 	if PCloStyle = 4: money_odethooker = 50

+ 9 - 9
locations/preCUST.qsrc

@@ -272,8 +272,8 @@ if $ARGS[0] = 'Done':
 		pcs_pubes = 30
 		pcs_leghair = 12
 		pcs_makeup = 5
-		cheap_purses[7] = 1
-		$currentpursetype = 'cheap'
+		gm_purses[7] = 1
+		$currentpursetype = 'gm'
 		currentpursenumber = 7
 		bag = 1
 		home_owned[1] = 1
@@ -411,14 +411,14 @@ if $ARGS[0] = 'Done':
 		sgandm[43] = 1
 		shoewornnumber = 43
 		$shoeworntype = 'gandm'
-		bomba_outfits[16] = 1
-		bomba_outfitsH[16] = 100
-		bomba_outfitsB[16] = pcs_hips
-		bomba_outfits[37] = 1
-		bomba_outfitsH[37] = 100
-		bomba_outfitsB[37] = pcs_hips
+		bomba_outfit[16] = 1
+		bomba_outfitH[16] = 100
+		bomba_outfitB[16] = pcs_hips
+		bomba_outfit[37] = 1
+		bomba_outfitH[37] = 100
+		bomba_outfitB[37] = pcs_hips
 		sportsclothingnumber = 45
-		gs 'clothing', 'wear', 'bomba_outfits', 37
+		gs 'clothing', 'wear', 'bomba_outfit', 37
 	elseif $ARGS[1] = 'CSB':
 		cheap_panties[5] = 1
 		cheap_bras[12] = 1

+ 1 - 1
locations/preSYS.qsrc

@@ -1401,7 +1401,7 @@ if $ARGS[0] = 'slut':
 		falselashesplain = 20
 		$currentpursetype = 'kats'
 		currentpursenumber = 10
-		kats_purses[10] = 1
+		cats_purses[10] = 1
 		bag = 1
 		gs 'obj_din', 'old'
 		greben = 1

+ 3 - 3
locations/restoran.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'maitred':
 	menu_off = 0
 	minut += 5
 	!!eto there_were glamur > 1 and pcs_apprnc > 50
-	if $clothingworntype = 'formal' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
+	if $clothingworntype = 'moncheri' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
 		'<center><b><font color="maroon">Babel</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 		'The well-dressed maître d'' politely asks you whether you prefer the VIP section or the common room'
@@ -36,7 +36,7 @@ if $ARGS[0] = 'maitred':
 		'The maître d'' politely informs you that customers must look presentable and wear formal clothing if they wish to dine here.'
 	end
 
-	if $clothingworntype = 'formal' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20 and money >= 5000:
+	if $clothingworntype = 'moncheri' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20 and money >= 5000:
 		act 'Go to the VIP room (5,000 <b>₽</b>)':
 		*clr & cla
 		'<center><b><font color="maroon">Babel</font></b></center>'
@@ -47,7 +47,7 @@ if $ARGS[0] = 'maitred':
 		end
 	end
 
-	if $clothingworntype = 'formal' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
+	if $clothingworntype = 'moncheri' and pcs_makeup > 1 and pcs_hairbsh = 1 and pcs_sweat < 20:
 		act 'Go to the Common Room': gt 'restoran', 'zal'
 	end
 	act 'Back to the foyer': gt 'restoran', 'start'

+ 6 - 6
locations/shop_fashionista.qsrc

@@ -196,10 +196,10 @@ if $ARGS[0] = 'dressingbra':
 
 	i = 1
 
-	:loopshop_fashionista_bras2
+	:loopfashionista_bras2
 		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingbras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 42:jump 'loopshop_fashionista_bras2'
+	if i <= 42:jump 'loopfashionista_bras2'
 end
 
 if $ARGS[0] = 'dressingbras2':
@@ -237,10 +237,10 @@ if $ARGS[0] = 'dressingpanties':
 
 	i = 1
 
-	:loopshop_fashionista_panties2
+	:loopfashionista_panties2
 		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingpanties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 79:jump 'loopshop_fashionista_panties2'
+	if i <= 79:jump 'loopfashionista_panties2'
 end
 
 if $ARGS[0] = 'dressingpanties2':
@@ -314,10 +314,10 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 
-	:loopshop_fashionista_panties
+	:loopfashionista_panties
 		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 79:jump 'loopshop_fashionista_panties'
+	if i <= 79:jump 'loopfashionista_panties'
 end
 
 if $ARGS[0] = 'panties2':

+ 2 - 2
locations/shop_flamingos.qsrc

@@ -66,7 +66,7 @@ end
 if $ARGS[0] = 'flamingos_dress':
 	cla
 	menu_off = 1
-	if flamingos[i] ! 0:
+	if flamingos_dress[i] ! 0:
 		msg 'You already own this dress.'
 		gt 'shop_flamingos', 'dresses'
 	end
@@ -115,7 +115,7 @@ end
 if $ARGS[0] = 'flamingos_outfit':
 	cla
 	menu_off = 1
-	if flamingos[i] ! 0:
+	if flamingos_outfit[i] ! 0:
 		msg 'You already own this outfit.'
 		gt 'shop_flamingos', 'clothes'
 	end

+ 1 - 3
locations/shop_pussycats.qsrc

@@ -930,7 +930,6 @@ if $ARGS[0] = '18':
 			'As you step into the booth, you can''t help but notice how <i>stunning</i> Kira appears in her new outfit, despite her rather tearful face. You just need to find a way to remove her panties. Maybe she can be persuaded?'
 
 			act 'Persuade Kira':
-				*clr
 				delact 'Persuade Kira'
 				'You decide to use your psychological skills and convince Kira to take off her panties.'
 
@@ -980,8 +979,7 @@ if $ARGS[0] = '18':
 		'"Really? I''ve seen on TV that young girls everywhere are wearing this style!" The woman looks at you with disbelief. She obviously couldn''t imagine that you would be arguing against a potential sale.'
 		'<i>"The woman clearly wants her daughter to look like a whore,"</i> you think to yourself as you look the woman in the eyes.'
 		act 'Dissuade the woman':
-			cla
-			delact 'Dissuade the woman'
+			*clr & cla
 			'She can''t do that! You decide you need to dissuade this strange woman.'
 
 			if pcs_intel >= 60:

BIN
tools/qsp-analyser/QSP_Analyser.exe


+ 2 - 2
tools/qsp-analyser/QSP_Analyser/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.3.2")]
+[assembly: AssemblyVersion("1.3.3.0")]
+[assembly: AssemblyFileVersion("1.3.3")]

+ 12 - 4
tools/qsp-analyser/QSP_Analyser/QSPGameCode.cs

@@ -137,7 +137,7 @@ namespace Analyser
             string extraLine = "";
             while (curLine < linesCount)
             {
-                string line = code.ToArray()[curLine];
+                string line = code.ToArray()[curLine].Trim(WhiteSpace);
                 int pos = 0;
                 while (pos < line.Length)
                 {
@@ -1200,8 +1200,6 @@ namespace Analyser
                                 ibc++;
                             }
                         }
-                        Console.WriteLine(pomvarstr1);
-                        
                         ParseExecInOutputText(pomvarstr1);
                         if (iifpresent)
                             ParseExecInOutputText(pomvarstr2);
@@ -1503,6 +1501,15 @@ namespace Analyser
 				            break;
 				        waitForOperator = true;
 			        }
+//                  I added this piece of code (next 7 lines) so the program could detect function call and the first argument -name of the function / location
+//                  I do not assure that I did it in a proper place, but it seems that it works.
+                    else if ((opStack[1] == (int)QspFunctionType.Func) && (argIndex == 2))
+                    {
+                        AddLocationLink(s, false, true);
+                    }
+                    else if ((opStack[1] == (int)QspFunctionType.Func) && (argIndex == 3) && (s == ","))
+                    {
+                    }
                     else if ((argIndex < args.Count) && types[argIndex])
 			        {
 				        if (!qspAppendToCompiled(ref itemsCount))
@@ -1539,7 +1546,7 @@ namespace Analyser
                             SubmitError("Syntax error", currentLine);
 					        break;
 				        }
-				        if (qspOps[opCode].MinArgsCount > 0)
+				        if (qspOps[opCode].MinArgsCount > argSp)
 				        {
                             SubmitError("Invalid number of arguments", currentLine);
 					        break;
@@ -1889,6 +1896,7 @@ namespace Analyser
                         {
                             pos++;
                         }
+
                     }
                     else if ((block.Length == 0) && (c2 == '"'))
                     {

+ 2 - 1
tools/qsp-analyser/QSP_Analyser/QSP_Analyser.csproj

@@ -36,7 +36,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.2.%2a</ApplicationVersion>
+    <ApplicationVersion>1.3.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -57,6 +57,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />