Merge remote-tracking branch 'hornguy6/master'

locations/bed2.qsrc

@@ -320,7 +320,7 @@ if $ARGS[0] = 'dream':
 		alarm_set -= 1440
 	end
 	
-	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','bathroom_dildos_wakeup1'
+	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','dildo_wakeup1'
 
 	if slept_in = 1:
 		gs 'stat'

locations/foto_events.qsrc

@@ -847,9 +847,8 @@ if $ARGS[0] = 'special':
 		specialjob4 = rand(1,100)
 		specialjob5 = rand(1,100)
 		specialjob6 = rand(1,100)
-!!		specialjob7 = rand(1,100)
-!!		specialjob8 = rand(1,100)
-!!		specialjob9 = rand(1,100)
+		specialjob7 = rand(1,100)
+		specialjob8 = rand(1,100)
 	end
 	cla & *clr
 	'<center><b><font color="maroon">Photographer</font></b></center>'
@@ -884,7 +883,8 @@ if $ARGS[0] = 'list':
 	if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
 	!!if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
 	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-!!		if specialjob8 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
+	if specialjob7 >= 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events'',''kickboxing_documentary''">   Kickboxing documentary</a>'
+    if specialjob8 >= 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events'',''track_&_field_documentary''">   Track & Field documentary</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end
@@ -911,7 +911,6 @@ if $ARGS[0] = 'high_fasion':
 			mdlng_exp += rand(1,2)
 			city_modelling += rand(5,25)
 			pav_modelling += rand(0,city_modelling)/6
-			gs 'exhibitionism', 1
 			money += modelpayfin
 			modelfotomoney += modelpayfin
 			'You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
@@ -1204,7 +1203,6 @@ if $ARGS[0] = 'modern_art':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				city_modelling += rand(1,21)
-				gs 'exhibitionism', 4
 				modern_art_projet = 1
 				pcs_horny += 20
 				'The girl has you and the other model lie down on your sides and then wrap your legs your heads, both of you grabbing the other''s foot with your hand in a way that allows you to perfectly mirror each other''s position. At the client''s insistence, you bury your face between the other girl''s legs. The aroma of her sex fills your nostrils and you can feel her breath on your own pussy as well.'
@@ -2081,7 +2079,6 @@ if $ARGS[0] = 'wet':
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4
-							gs 'exhibitionism', 4
 							money += modelpayfin
 							modelfotomoney += modelpayfin
 							'Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'

locations/foto_events2.qsrc

@@ -114,6 +114,160 @@ if $ARGS[0] = 'champagne1.2':
 	end
 end
 
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------- Kickboxing Documentary ---------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+if $ARGS[0] = 'kickboxing_documentary':
+    cla & *clr
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+    '"A kickboxing documentary?" you ask."'
+    '"Yea. The local sports magazine, is doing a coverage of the Female Kickboxing League. We are doing the graphic part, lots of work doing artistic naked pics, making you women look badass and beautifull. As you are gaining in popularity, they will want a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
+    '"Hmmm..."'
+    act'Back to the list':gt'foto_events','list'
+    act'Yeah! I''m in!':
+        cla
+        *nl
+        specialjob7 = 0
+        '"Great! The photographers are all ready doing their job in the Havanna Fitness Center. You will meet the journalist there."'
+        act'Do the shoot':
+            cla & *clr
+            '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD1.jpg"></center>'
+            minut += 120
+            modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((city_kickboxing + pcs_apprnc)/2)*2
+            modelfoto_naked += 1
+            mdlng_exp += rand(1,2)
+            city_kickboxing += rand(2,12)
+            pav_kickboxing += rand(0,city_modelling)/12  
+            city_modelling += rand(2,12)
+            pav_modelling += rand(0,city_modelling)/12
+			gs 'exhibitionism', 1
+            money += modelpayfin
+            modelfotomoney += modelpayfin
+            inhib_exp += 2
+            gs 'stat'
+            'You aren''t the only one doing this documentay. Around you, walking between photographers, there are others kickboxers trying to follow the instructions to be "dynamic". Beyond that, the modeling, is fairlly artistic, showing skin, but hidding the important bits, between props and poses.'
+            *nl
+            'After doing several shots, finally a journalist has time to talk with you.'
+            act'Do the interview.':
+                cla & *clr
+                gs 'stat'
+                '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD2.jpg"></center>'
+                if city_kickboxing >=150 and razradKik >= 5:
+                    '"You are <<$pcs_lastname>> Isn''t it?"'
+                    'The journalist shakes your hand with a big smile on his face. Interviewing you, must be a great thing, as practically without stopping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
+                    '"Your feeling about that victory? Your favorite color? A man in your life?"'
+                    'The interview goes and goes like this during a long time, until your allocated time end, and then reluctantly the journalist leaves you to talk to another kickboxer.'            
+                elseif city_kickboxing >=60 and razradKik >= 2:
+                    'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the league, confirmation on their information. In general, it doesn''t seems to deep but it is evident that the journalist has his hands more than full, catching up with all the women in the gymnasium.'
+                else
+                    'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
+				end
+                act' Finally the job is done':                        
+                    cla & *clr   
+                    gs 'stat'
+                    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/KD3.jpg"></center>'
+                    if city_kickboxing >=150 and razradKik >= 5:						                               
+                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is a little awkward... The realization, that you are getting famous, as one of the best, if not the BEST, female kickboxer in all St.petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Mean and Famous!'                            
+                    elseif city_kickboxing >=60 and razradKik >= 2:
+                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming kickboxer.'
+                    else
+                        'Two hours later, the model session/interviews end. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is disappointing! Beyond your photo is only your name, and the mention, that you are a participant in the League.'
+                    end
+					act'Go back to the main floor':gt'foto','studio'    
+                end
+            end                   
+        end
+    end
+end
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------- Track & Field Documentary ------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+if $ARGS[0] = 'track_&_field_documentary':
+    cla & *clr
+    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+    '"A Track & Field documentary?" you ask."'
+    '"Aja. During the warmer seasons, local sports magazines, they like to do articles about the women on the running business. With the sun and heat, they can take them to the field and do some artistic photos. We are doing the graphic part in a reserved field. Most photos will be naked, and as they want you to do some runs, it will not be posible to hide all of your bodyparts. As you are gaining in popularity, they will whant a journalist to do an interview. The royalties and the advertising are great. Are you interested?."'
+    '"Hmmm..."'
+    act'Back to the list':gt'foto_events','list'
+    act'I''d like to do this one':
+        cla
+        *nl
+        specialjob8 = 0
+        '"I''d like to do this one."'
+        '"Great! The photographers are all ready doing their job in the field near the Havanna Fitness Center. You will meet a journalist there."'
+        act'Do the shoot':
+            cla & *clr
+            '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD1.jpg"></center>'
+            minut += 120
+            modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((city_running + pcs_apprnc)/2)*2
+            modelfoto_naked += 1
+            mdlng_exp += rand(1,2)
+            city_running += rand(2,12)
+            pav_running += rand(0,city_modelling)/12 
+            city_modelling += rand(2,12)
+            pav_modelling += rand(0,city_modelling)/6
+            money += modelpayfin
+            modelfotomoney += modelpayfin
+            modelfoto_topless += 1
+            gs 'exhibitionism', 1
+            gs 'stat'
+            'You aren''t the only one doing this documentay. Around you, walking between photographers, there are other runners trying to follow the instructions to be "dynamic". Beyond that, the models, try to be fairlly artistic, showing skin, but hiding the important bits, between props and poses, sadlly with all the movement, that is easier said than done, and the security have their hands full, shooing away all the voyeurs trying to catch a peek.'
+            *nl
+            'After doing several shots, finally a journalist has time to talk with you.'
+            act'Do the interview.':
+                cla & *clr   
+                gs 'stat' 
+                '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'              
+                if city_running >=90 and razradbeg >= 3:
+                    '"You are <<$pcs_lastname>> Isn''t it?"'
+                    'The journalist shakes your hand with a big smile on his face. Interviewing you must be a great thing, as practically without stoping, you are showered with questions, from the sport-related to the personal, passing for the absolute trivial.'
+                    '"Your feeling about that victory? Your favorite color? A man in your life?"'
+                    'The interview goes on and on like this for a long time, until you''re allocated time ends, and then reluctantly the journalist leaves you to talk to another runner.'            
+                elseif city_running >=30 and razradKik >= 1:
+                    'Between shots, a journalist comes and asks you questions. Most of them, are fairly generic. Personal data, your opinions about the Championship, confirmation on their information. In general, it doesn''t seem to deep but it is evident that the journalist has his hands more than full, catching up with all the women in the field.'
+                else
+                    'You wait between shots, but the journalist seems to find somebody else more interesting and forgets to talk with you.'
+				end
+				
+                act' Finally the job is done':
+                    cla & *clr   
+                    gs 'stat'
+                    '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD3.jpg"></center>'                      
+                    if city_running >=90 and razradbeg >= 3:					
+                        'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.'
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is a little awkward... The realization, that you are getting famous, as one of the best, if not THE best runner in The Women''s 400 Meter Dash category in all of St.petersburg. Practically, the article turns around you. With even fans asking all kinds of personal questions. Damn! You are Hot, Fast and Famous!'                            
+                    elseif city_running >=30 and razradKik >= 1:
+                        'Two hours later, the model session/interviews ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'Being true, is a little dry, mentioning your name, general information and that you are an up-and-coming runner in The Women''s 400 Meter Dash category.'
+                    else
+                        '<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/TD2.jpg"></center>'
+                        'Two hours later, the model session/interview ends. After returning to the studio, you are handed <<modelpayfin>> <b>₽</b> in payment for the job.' 
+                        'Sometime later, the article is sent to your phone...' 
+                        'And is disappointing! Beyond your photo is only your name, and the mention, that you are a new runner in The Women''s 400 Meter Dash category.' 
+					end
+                    act'Go back to the main floor':gt'foto','studio'   
+                end
+            end                   
+        end
+    end
+end
+
+
 !!------------------------------------------------------------------- Special Events ------------------------------------------------------------------
 
 

locations/journal.qsrc

@@ -48,8 +48,26 @@ if $ARGS[0] = 'records':
 	if film > 0:$tab_text += dyneval($NoteBookLine,'You are working in the city industrial region as a pornographic actress under the name <<$pfname>>')
 	if bumtolik = 4:$tab_text += dyneval($NoteBookLine,'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.')
 	if bumtolik >= 5:$tab_text += dyneval($NoteBookLine,'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.')
-	if model > 0: $tab_text += dyneval($NoteBookLine,'You are a model working at ''Aphrodite Photography'' in St. Petersburg.')
+	
+	if model > 0:	
+		if modelfoto_erotic > 0:
+			$tab_text += dyneval($NoteBookLine,'You are an erotic model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are an artistic nude model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a fitness model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a glamour model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a lingerie model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+			$tab_text += dyneval($NoteBookLine,'You are a fashion model working at ''Aphrodite Photography'' in St. Petersburg.')
+		elseif modelfoto_catalog > 0:
+			$tab_text += dyneval($NoteBookLine,'You are a catalog model working at ''Aphrodite Photography'' in St. Petersburg.')
+		end
+	end
 	*nl
+	
 	if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
 		$tab_text += dyneval($NoteBookLine,'You have no more modeling jobs available this week.')
 	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:

locations/pav_train_market.qsrc

@@ -486,6 +486,41 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
+		if money >= 1000 and suction_dildo = 0:
+			act 'Buy a 15cm suction dildo (1000 <b>₽</b>)':
+				cla
+				minut += 5
+				suction_dildo = 1
+				money -= 1000
+				pcs_horny += 10
+				TimesBuyPorno += 1
+				'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
+				if  pcs_inhib < 35:
+					'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+				else
+					'You buy the dildo and calmly hide it.'
+				end
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
+			end
+		elseif money >= 1000 and suction_dildo > 0:
+			act 'Buy another 15cm suction dildo (1000 <b>₽</b>)':
+				cla
+				minut += 5
+				suction_dildo = 1
+				money -= 1000
+				pcs_horny += 10
+				TimesBuyPorno += 1
+				'<center><img <<$set_imgh>> src="images/pc/items/15cm.jpg"></center>'
+				if  pcs_inhib < 35:
+					'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+				else
+					'You buy the dildo and calmly hide it.'
+				end
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
+			end
+		end
 		if money >= 700 and vibrator = 0:
 			act 'Buy vibrator (700 <b>₽</b>)':
 				cla

locations/stat.qsrc

@@ -1127,6 +1127,8 @@ if pcs_sleep > 100: pcs_sleep = 100
 
 if insleep = 0: gs 'stat_display'
 
+gs 'family_schedule'
+
 
 --- stat ---------------------------------