Browse Source

Merge remote-tracking branch 'julzor/master'

KevinSmarts 5 years ago
parent
commit
064b7ccebc
4 changed files with 109 additions and 115 deletions
  1. 1 1
      locations/foto.qsrc
  2. 97 111
      locations/hotel_resep.qsrc
  3. 1 1
      locations/mirasex.qsrc
  4. 10 2
      locations/street_event.qsrc

+ 1 - 1
locations/foto.qsrc

@@ -2151,7 +2151,7 @@ if $ARGS[0] = 'nude_shoot':
 				gs 'fame', 'pav', 'mdlng', rand(1,city_modelling)/10
 				inhib_exp += 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(1,3)>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(2,4)>>.jpg"></center>'
 				'	You dress up in sexy clothes and spend the next two hours posing for the photographer.'
 				*nl
 				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'

+ 97 - 111
locations/hotel_resep.qsrc

@@ -15,6 +15,98 @@ if $ARGS[0] = '':
 	
 	act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
 
+	if GermanQW < 1:
+		act 'Ask about the maid job':
+			menu_off = 1
+			*clr & cla
+			if GermanQW = 0:GermanQW = 1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
+			'You approach the reception desk, and ask the girl: "Excuse me... I hear you are often looking for maids? I would like to come work as a maid here."'
+			'She nods understandingly, and takes a quick look at your figure: "We do often need maids, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Herman Leonidovich, the hotel manager. He''s usually in his office between 12:00 and 14:00. I bet he will hire you! Good luck when you go see him!"'
+
+			act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
+		end
+	end
+	
+	if hotelcollect > 0:
+		act 'Collect your money':
+			cla
+			hotelcollect = 0
+			money += maidtime * 250
+			'She quickly checks the computer and then gives you <<maidtime*250>> <b>₽</b> for all the shifts you worked in the hotel.'
+			maidtime=0
+			
+			if maidHotelCount >= rand(8,10) and nichHotelReferral = 0:
+				'"You are doing a good job as our maid. Did you ever think about working as a maid full-time? I know of a person who''s living in the city and is looking for a live-in maid. The job also pays well."'
+				'She hesitates for a second.'
+				'"I could write you a referral. He wouldn''t invite you for a job interview without one. But the boss wouldn''t like me referring his maids to another employer. That''s why I require you to pay me 5.000 <b>₽</b> for my troubles. Just look at it as a small fee. Just tell me if you want the job and have the money."'
+				nichHotelReferral = 1
+				act 'Thank her for the offer and step away from the reception desk':gt'HotelHole','skip_resepevent'
+			else
+				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
+			end
+		end
+	end
+
+	if proshotelopen = 1 and proshotelday ! daystart:
+		act'Ask for "The Peacock"':
+			*clr & cla
+			menu_off = 1
+			if pavhotprosQW = 6:
+				pavhotprosQW = 7
+				PavlinQW = 1
+			end
+			gs'stat'
+			
+			if pavlevent = 1:
+				'You are too scared of <<$npc_nickname[''A217'']>> at the moment to meet him in a private place.'
+				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
+				exit
+			elseif pcs_makeup <= 1 or pcs_hairbsh < 1 or pcs_sweat > 26:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
+				'"<<$npc_nickname[''A217'']>> expects you to be clean, made-up and with your hair looking nice. I can''t let you go up looking like this." She says.'
+				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
+				exit
+			else
+				'You approach <<$receptionName>> and ask for ''The Peacock''.'
+				gt 'hotel_resep', 'pavgenpros'
+			end
+		end
+	end
+	
+	if nichHotelReferral = 1:
+		act 'Ask about the live-in maid job':
+			*clr & cla
+			menu_off = 1
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
+			'You approach the reception desk, and ask the girl: "About the job you told me about ... I''d like to get your referral."'
+			'"Great. Do you have my fee of 5.000 <b>₽</b> with you?"'
+			
+			act 'No':
+				cla & *nl
+				'"Actually I don''t."'
+				'"Too bad. I''m afraid I can''t help you unless you pay me. Just come back as soon as you have the money."'
+				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
+			end
+			
+			if money >= 5000:
+				act 'Yes (give it to her)':
+					cla & *nl
+					money -= 5000
+					nichHotelReferral = 2
+					gs 'stat'
+					'You give her the money and she swiftly puts it into her purse. Then she hands you your referral. It says that you are a experienced, wellbehaved and diligent maid. It is written on the official paper of the hotel and even has the signature of the manager on it.'
+					'"Don''t worry, the signature is legit. The boss signs everything I hand him."'
+					'She also hands you a small card with an address on it.'
+					'"This is the address. You can get there easily from the city center of St. Petersburg. Just go there in the late afternoon and present your referral. You also have to wear a maid uniform. If you don''t own one you can buy one at the G&M-Store. And make sure you look presentable in every way. I heard this man is a perfectionist. Good luck!"'
+					act 'Thank her and step away':gt'HotelHole','skip_resepevent'
+				end
+			end
+		end
+	end
+	
 	act'Rent a room':
 		menu_off = 1
 		*clr & cla
@@ -25,18 +117,15 @@ if $ARGS[0] = '':
 		else
 			'<<$receptionName>> smiles at you and asks: "Hello <<$pcs_nickname>>! Would you like to rent a room?"'
 		end
-		if hotelroom>0:
-			*clr
-			cla
+		if hotelroom > 0:
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
 			act'Yes, cancel your booking':hotelroom=0 & gt'HotelHole'
 			act'No':gt'HotelHole'
-		end
-		if hotelroom = 0:
-			act'Yes':
-				*clr
-				cla
+		elseif hotelroom = 0:
+			act 'Yes':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 				'She smiles at you happily: "Excellent! We have the following rooms available right now:"'
 				'Standard room - 500 <b>₽</b> / night;'
@@ -108,109 +197,6 @@ if $ARGS[0] = '':
 	end
 end
 
-if hotelcollect > 0:
-	hotelcollect = 0
-	money+=maidtime*250
-	'She quickly checks the computer and then gives you <<maidtime*250>> <b>₽</b> for all the shifts you worked in the hotel.'
-	maidtime=0
-	
-	if maidHotelCount >= rand (8,10) and nichHotelReferral = 0:
-		'"You are doing a good job as our maid. Did you ever think about working as a maid full-time? I know of a person who''s living in the city and is looking for a live-in maid. The job also pays well."'
-		'She hesitates for a second.'
-		'"I could write you a referral. He wouldn''t invite you for a job interview without one. But the boss wouldn''t like me referring his maids to another employer. That''s why I require you to pay me 5.000 <b>₽</b> for my troubles. Just look at it as a small fee. Just tell me if you want the job and have the money."'
-		nichHotelReferral = 1
-	end
-	
-end
-
-if nichHotelReferral = 1:
-	act 'Ask about the live-in maid job':
-		menu_off = 1
-		*clr & cla
-
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
-		'You approach the reception desk, and ask the girl: "About the job you told me about ... I''d like to get your referral."'
-		'"Great. Do you have my fee of 5.000 <b>₽</b> with you?"'
-		if money >= 5000:
-			act 'Yes (give it to her)':
-				cla
-				money -= 5000
-				nichHotelReferral = 2
-				'You give her the money and she swiftly puts it into her purse. Then she hands you your referral. It says that you are a experienced, wellbehaved and diligent maid. It is written on the official paper of the hotel and even has the signature of the manager on it.'
-				'"Don''t worry, the signature is legit. The boss signs everything I hand him."'
-				'She also hands you a small card with an address on it.'
-				'"This is the address. You can get there easily from the city center of St. Petersburg. Just go there in the late afternoon and present your referral. You also have to wear a maid uniform. If you don''t own one you can buy one at the G&M-Store. And make sure you look presentable in every way. I heard this man is a perfectionist. Good luck!"'
-				act 'Thank her and step away':gt'HotelHole','skip_resepevent'
-			end
-		end
-		
-		act 'No':
-			cla
-			'"Actually I don''t."'
-			'"Too bad. I''m afraid I can''t help you unless you pay me. Just come back as soon as you have the money."'
-			act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
-		end
-		
-		
-	end
-end
-
-
-If GermanQW < 1:
-	act 'Ask about the maid job':
-		menu_off = 1
-		*clr & cla
-		if GermanQW = 0:GermanQW = 1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
-		'You approach the reception desk, and ask the girl: "Excuse me... I hear you are often looking for maids? I would like to come work as a maid here."'
-		'She nods understandingly, and takes a quick look at your figure: "We do often need maids, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Herman Leonidovich, the hotel manager. He''s usually in his office between 12:00 and 14:00. I bet he will hire you! Good luck when you go see him!"'
-
-		act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
-	end
-
-	If GermanQW < 1:
-		act 'Ask about the maid job':
-			menu_off = 1
-			*clr & cla
-			if GermanQW = 0:GermanQW = 1
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
-			'You approach the reception desk, and ask the girl: "Excuse me... I hear you are often looking for maids? I would like to come work as a maid here."'
-			'She nods understandingly, and takes a quick look at your figure: "We do often need maids, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Herman Leonidovich, the hotel manager. He''s usually in his office between 12:00 and 14:00. I bet he will hire you! Good luck when you go see him!"'
-
-			act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
-		end
-	end
-
-	if proshotelopen = 1 and proshotelday ! daystart:
-		act'Ask for "The Peacock"':
-			menu_off = 1
-			if pavhotprosQW = 6:
-				pavhotprosQW = 7
-				PavlinQW = 1
-			end
-			*clr & cla
-			gs'stat'
-			
-			if pavlevent = 1:
-				'You are too scared of <<$npc_nickname[''A217'']>> at the moment to meet him in a private place.'
-				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
-				exit
-			elseif pcs_makeup <= 1 or pcs_hairbsh < 1 or pcs_sweat > 26:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
-				'"<<$npc_nickname[''A217'']>> expects you to be clean, made-up and with your hair looking nice. I can''t let you go up looking like this." She says.'
-				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
-				exit
-			else
-				'You approach <<$receptionName>> and ask for ''The Peacock''.'
-				gt 'hotel_resep', 'pavgenpros'
-			end
-		end
-	end
-end
-
 if $ARGS[0] = 'pavlbar':
 	menu_off = 1
 	*clr & cla

+ 1 - 1
locations/mirasex.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'miralick_dog':
 	gs 'stat'
 	if svetahorny >= 50 and rand(0,2) ! 0:
 		you_orgasm = 1
-		orgasm_or = 'yes'
+		$orgasm_or = 'yes'
 		$orgasm_txt = 'You cannot hold out any more from the stimulation that Mira is providing and with a shudder you cum in her face.'
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/miralick_dog_cum.jpg"></center>'
 	else

+ 10 - 2
locations/street_event.qsrc

@@ -125,6 +125,10 @@ if money >= 2500:
 	end
 end
 
+!!The chance to get robbed is capped at 10%
+if streetev_rob > 10: streetev_rob = 10
+if streetev_hijack > 10: streetev_hijack = 10
+
 if $ARGS[1] = 'extras':
 	if rand(0, 100) < streetev_bf and pcs_lover < 3 and streetbfhour ! hour:
 		streetbfhour = hour
@@ -498,7 +502,7 @@ if $ARGS[1] = 'main':
 	end
 
 	streetrand = rand(0, 100)
-	if streetrand < streetev_rob and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1:
+	if streetrand < streetev_rob and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1 and streetev_rob_day ! daystart:
 		*clr & cla
 		menu_off = 1
 		streetev_day = daystart
@@ -589,11 +593,13 @@ if $ARGS[1] = 'main':
 			end
 		end
 		exit
+	elseif streetrand >= streetev_rob and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1 and streetev_rob_day ! daystart:
+		streetev_rob_day = daystart
 	end
 
 	streetrand = rand(0, 100)
 
-	if streetrand < streetev_hijack and daystart >= 10 and hour >= 6 and hour < 20 and streetev_day ! daystart and bag = 1:
+	if streetrand < streetev_hijack and daystart >= 10 and hour >= 6 and hour < 20 and streetev_day ! daystart and bag = 1 and streetev_hijack_day ! daystart:
 		*clr & cla
 		menu_off = 1
 		gs'stat'
@@ -644,6 +650,8 @@ if $ARGS[1] = 'main':
 			end
 		end
 		exit
+	elseif streetrand >= streetev_hijack and daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and bag = 1 and streetev_hijack_day ! daystart:
+		streetev_hijack_day = daystart
 	end
 
 	!!end of old random street events that can always happen