Merge remote-tracking branch 'julzor/master'

locations/cikl.qsrc

@@ -435,6 +435,33 @@ if tabletkicheck = 2:
 	if tabletkishot > 0:tabletkishot -= 1
 end
 
+!! bc_implant['status']
+!! 0: No implant
+!! 3: Implant (more than 30 days left)
+!! 2: Implant (less than 30 days left)
+!! 1: Empty implant
+
+if bc_implant['status'] > 1:
+	pcs_skin += rand(0,1)
+	
+	pillcon += ((pillcon + 15000) / 25) + 4000
+	if pillcon > 40000: pillcon = 40000
+	
+	pillcon2 += ((pillcon2 + 15000) / 25) + 4000
+	if pillcon2 > 40000: pillcon2 = 40000
+	
+	bc_implant['timer'] -= 1
+	if bc_implant['timer'] > 0 and bc_implant['timer'] < 30:
+		bc_implant['status'] = 2
+		'Your birth control implant is only good for <<bc_implant[''timer'']>> more'+iif(bc_implant['timer'] = 1, 'day.', 'days.')
+	elseif bc_implant['timer'] < 0:
+		bc_implant['status'] = 1
+		'You should renew or remove your birth control implant.'
+	end
+elseif bc_implant['status'] = 1:
+	'You should renew or remove your birth control implant.'
+end
+
 tabletkipd += tabletkipi
 tabletkipi = 0
 tabletkipt = 0

locations/din_bad.qsrc

@@ -981,31 +981,23 @@ if $ARGS[0] = 'takepill':
 	end
 	!! added empty week to allow menstruation - it take effect only when the pills are taken automatically
 	if placebopart <= 0 or tabletkicheck ! 1:
-		!!pillcon2 is the ideal state, PC cosiders this the believed pillcon value
-		pillcon2 += ((pillcon2+15000)/40)+1000
-		if pillcon2 > 40000:pillcon2 = 40000
-
 		if ptype = 0:
 			pillsleft[ptype] -= 1
 			pcs_skin += 1
-			pillcon += ((pillcon+15000)/40)+1000
-			if pillcon > 40000: pillcon = 40000
+			pillcon += ((pillcon + 15000) / 25) + 4000
 		elseif ptype = 1:
 			pillsleft[ptype] -= 1
 			pcs_skin += rand(0,1)
-			pillcon += ((pillcon+15000)/40)+ rand(250,1000)
-			if pillcon > 40000: pillcon = 40000
+			pillcon += (( pillcon+ 15000) / 25)+ rand(2000,4000)
 		elseif ptype = 2:
 			pillsleft[ptype] -= 1
 			pcs_skin += rand(0,1)
-			pillcon += ((pillcon+15000)/40)+ rand(0,500)
-			if pillcon > 40000: pillcon = 40000
+			pillcon += ((pillcon + 15000) / 25)+ rand(500,2000)
 		elseif ptype = 3:
 			pillsleft[ptype] -= 1
 			pcs_skin += rand(0,1)
 			if rand(0,4) = 0: pain['tummy'] += rand(5,10)
-			pillcon += ((pillcon+15000)/40)+ rand(250,2000)
-			if pillcon > 40000: pillcon = 40000
+			pillcon += ((pillcon + 15000) / 25)+ rand(2000,6000)
 		elseif ptype = 4:
 			pillsleft[ptype] -= 1
 		elseif ptype = 5:
@@ -1013,6 +1005,11 @@ if $ARGS[0] = 'takepill':
 			pcs_skin += 1
 			EggRH += rand(10,80)
 		end
+		
+		!!pillcon2 is the ideal state, PC considers this the believed pillcon value
+		pillcon2 += ((pillcon2 + 15000) / 25) + 4000
+		if pillcon2 > 40000: pillcon2 = 40000
+		if pillcon > 40000: pillcon = 40000
 	end
 end
 

locations/gpoli.qsrc

@@ -165,36 +165,11 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if therapistday ! daystart:
-			act 'Visit the therapist (1:00)': gt 'therapist'
-		end
+		if therapistday ! daystart: act 'Visit the therapist (1:00)': gt 'therapist'
 
-		if pcs_know_mward > 0:
-			act 'Visit the maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
-		end
+		if pcs_know_mward > 0: act 'Visit the maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
 
-		if tabletkishot < 5 and money >= 750 and knowpreg = 0:
-			act 'Get a birth control shot for 750 <b>₽</b> (0:15)':
-				*clr & cla
-				menu_off = 1
-				minut += 15
-				money -= 750
-				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-				'You are escorted into an examination room, where you are told that say have to do a small test before giving you the shot. You wait for fifteen minutes before the nurse comes back in.'
-				if preg = 0:
-					gs 'medical_din','birthControlShot'
-					'"Everything looks great." She says and gives you a reassuring smile as she sticks a needle in your arm, and depresses the plunger. Seconds later she explains: "All done! You should be good to go for three months, give or take. It depends a bit from person to person: Body type, hormone levels, and so on. If you want to be perfectly safe, we recommend you come back for another treatment one week before the three months are over. Have a nice day, miss!"'
-					'You thank her and wish her the same, while you gather your things. You silently mutter to yourself: "If it is that simple, why did they make me wait 15 minutes..."'
-				else
-					'"I''m sorry, but we can''t give you the shot, because you''re pregnant."'
-					'After the initial shock subsides you pay the 750 <b>₽</b> for the test and leave.'
-					thinkpreg = 1
-					knowpreg = 1
-				end
-				gs 'stat'
-				act 'Leave':gt $curloc
-			end
-		end
+		gs 'medical_din', 'birth_control'
 
 		act 'Go to the sexual health clinic':
 			*clr & cla

locations/medical_din.qsrc

@@ -1,5 +1,113 @@
 # medical_din
 
+if $ARGS[0] = 'birth_control':
+	if tabletkishot < 5 and money >= 2750 and knowpreg = 0 and bc_implant['status'] = 0:
+		act 'Get a birth control shot for 2750 <b>₽</b> (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+			'You are escorted into an examination room, where you are told that say have to do a small test before giving you the shot. You wait for fifteen minutes before the nurse comes back in.'
+			if preg = 0:
+				money -= 2750
+				gs 'medical_din','birthControlShot'
+				'"Everything looks great." She says and gives you a reassuring smile as she sticks a needle in your arm, and depresses the plunger. Seconds later she explains: "All done! You should be good to go for three months, give or take. It depends a bit from person to person: Body type, hormone levels, and so on. If you want to be perfectly safe, we recommend you come back for another treatment one week before the three months are over. Have a nice day, miss!"'
+				'You thank her and wish her the same, while you gather your things. You silently mutter to yourself: "If it is that simple, why did they make me wait 15 minutes..."'
+			else
+				money -= 650
+				'"I''m sorry, but we can''t give you the shot, because you''re pregnant."'
+				'After the initial shock subsides you pay the 650 <b>₽</b> for the test and leave.'
+				thinkpreg = 1
+				knowpreg = 1
+			end
+			gs 'stat'
+			act 'Leave': gt $loc, $metka
+		end
+	elseif tabletkishot < 5 and money < 2750 and knowpreg = 0 and bc_implant['status'] = 0:
+		act 'Get a birth control shot for <font color="red">3,900 <b>₽</b></font> (0:15)': '<br><font color="red">You don''t have enough money to get a birth control shot.</font>'
+	end
+
+	if bc_implant['status'] = 0 and money >= 19650 and knowpreg = 0:
+		act 'Get a birth control implant for 19,650 <b>₽</b> (0:35)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+			'You are escorted into an examination room, where you are told that say have to do a small test before inserting the implant into your left arm. You wait for fifteen minutes before the nurse comes back in.'
+			if preg = 0:
+				minut += 20
+				money -= 19650
+				bc_implant['status'] = 3
+				bc_implant['timer'] = 1095
+				pillcon += ((pillcon + 15000) / 25) + 4000
+				pillcon2 += ((pillcon2 + 15000) / 25) + 4000
+				'"Everything looks great." She says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
+				'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect, before she makes a tiny incision and pushes a small tube inside your arm. It isn''t bigger than a matchstick.'
+				'"All done! You should be good to go for three years."'
+			else
+				money -= 650
+				'"I''m sorry, but we can''t give you the implant, because you''re pregnant."'
+				'After the initial shock subsides you pay the 650 <b>₽</b> for the test and leave.'
+				thinkpreg = 1
+				knowpreg = 1
+			end
+			gs 'stat'
+			act 'Leave': gt $loc, $metka
+		end
+	elseif bc_implant['status'] = 0 and money < 19650 and knowpreg = 0:
+		act 'Get a birth control implant for <font color="red">19,000 <b>₽</b></font> (0:35)': '<br><font color="red">You don''t have enough money to get a birth control implant.</font>'
+	elseif bc_implant['status'] > 0:
+		if money >= 1000:
+			act 'Remove your birth control implant for 1,000 <b>₽</b> (0:20)':
+				*clr & cla
+				menu_off = 1
+				minut += 20
+				money -= 1000
+				bc_implant['status'] = 0
+				bc_implant['timer'] = 0
+				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+				'"Everything looks great." She says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
+				'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect, before she makes a tiny incision and takes out your old implant. "All done!"'
+					
+				act 'Leave': gt $loc, $metka			
+			end
+		else
+			act 'Remove your birth control implant for <font color="red">1,000 <b>₽</b></font> (0:35)': '<br><font color="red">You don''t have enough money to remove your birth control implant.</font>'
+		end
+			
+		if bc_implant['status'] < 3 and money >= 19650:
+			act 'Renew your birth control implant for 19,650 <b>₽</b> (0:35)':
+				*clr & cla
+				menu_off = 1
+				minut += 15
+				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+				'You are escorted into an examination room, where you are told that say have to do a small test before inserting the implant into your left arm. You wait for fifteen minutes before the nurse comes back in.'
+				if preg = 0:
+					minut += 20
+					money -= 19650
+					bc_implant['status'] = 3
+					bc_implant['timer'] = 1095
+					pillcon += ((pillcon + 15000) / 25) + 4000
+					pillcon2 += ((pillcon2 + 15000) / 25) + 4000
+					'"Everything looks great." She says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
+					'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect, before she makes a tiny incision, takes out your old implant and pushes in a new one.'
+					'"All done! You should be good to go for three years."'
+				else
+					bc_implant['status'] = 0
+					bc_implant['timer'] = 0
+					money -= 1650
+					'"I''m sorry, but we can''t give you the implant again, because you''re pregnant."'
+					'After the initial shock subsides you pay the 1650 <b>₽</b> for the test and the removal of your old implant leave.'
+					thinkpreg = 1
+					knowpreg = 1
+				end
+			end
+		elseif bc_implant['status'] < 3 and money < 19650:
+			act 'Renew your control implant for <font color="red">19,650 <b>₽</b></font> (0:35)': '<br><font color="red">You don''t have enough money to renew your birth control implant.</font>'
+		end
+	end
+end
+
 if $ARGS[0] = 'abortion':
 	!! Aborts pregnency. Usage: gs 'medical_din','abortion'
 	vidage += 1

locations/poli.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = 'start':
 	CLOSE all
 	$sexloc = 'poli'
 	$loc = 'poli'
+	$metka = ''
 	$location_type = 'indoors'
 	$menu_loc = 'poli'
 	$menu_arg = $ARGS[0]
@@ -81,29 +82,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if tabletkishot < 5 and money >= 750 and knowpreg = 0:
-		act 'Get a birth control shot for 750 <b>₽</b> (0:15)':
-			*clr & cla
-			menu_off = 1
-			minut += 15
-			money -= 750				
-			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-			'You are escorted into an examination room, where you are told that say have to do a small test before giving you the shot. You wait for fifteen minutes before the nurse comes back in.'
-			if preg = 0:
-				gs 'medical_din','birthControlShot'
-				'"Everything looks great." She says and gives you a reassuring smile as she sticks a needle in your arm, and depresses the plunger. Seconds later she explains: "All done! You should be good to go for three months, give or take. It depends a bit from person to person: Body type, hormone levels, and so on. If you want to be perfectly safe, we recommend you come back for another treatment one week before the three months are over. Have a nice day, miss!"'
-				'You thank her and wish her the same, while you gather your things. You silently mutter to yourself: "If it is that simple, why did they make me wait 15 minutes..."'
-			else
-				'"I''m sorry, but we can''t give you the shot, because you''re pregnant."'
-				'After the initial shock subsides you pay the 750 <b>₽</b> for the test and leave.' 
-				thinkpreg = 1
-				knowpreg = 1
-			end
-			gs 'stat'
-			act 'Leave the clinic': minut += 5 & gt 'street'
-			act 'Return to the entrance': gt 'poli', 'start'
-		end
-	end
+	gs 'medical_din', 'birth_control'
 			
 	act 'Go to the STD clinic':gt 'poli', 'stdclinic'
 

locations/pornfilm.qsrc

@@ -163,12 +163,12 @@ if $ARGS[0] = '2':
 					*clr & cla
 					minut += 5
 					facial += 1
-					gs 'stat'
 					'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/cum.mp4"></video></center>'
 					'<<$pakter[1]>> is close, so you start quickly jerking him and stick your tongue out for him to shoot his load.'
 					cumnostd = 1
 					gs 'cum_call', 'mouth', $pakterID[1], 1, 0, 0, 36
 					gs 'cum_call', 'face', $pakterID[1], 1, 0, 0, 4
+					gs 'stat'
 					act 'Clean his cock':
 						*clr & cla
 						minut += 5

locations/pornstudio.qsrc

@@ -37,6 +37,7 @@ if $ARGS[0] = 'start':
 			workDisk = 0
 			money -= workDolg
 			workDolg = 0
+			menu_off = 1
 			gs 'stat'
 			'You give the money that you owe to the studio.'
 
@@ -286,9 +287,13 @@ end
 if $ARGS[0] = 'shower':
 	*clr & cla
 	$location_type = 'bathroom'
+	$loc = 'pornstudio'
+	$metka = 'bathroom'
 	$locM = 'pornstudio'
-	menu_off = 1
 	$metkaM = 'bathroom'
+	$menu_loc = 'pornstudio'
+	$menu_arg = 'bathroom'
+	menu_off = 1
 	minut += 5
 	pcs_horny += 1
 	pcs_makeup = 1
@@ -308,12 +313,8 @@ end
 
 if $ARGS[0] = 'bathroom':
 	*clr & cla
-	$location_type = 'bathroom'
-	$locM = 'pornstudio'
-	$metkaM = 'bathroom'
-	$menu_loc = 'pornstudio'
-	$menu_arg = 'bathroom'
-	menu_off = 0
+	minut += 1
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/shower.jpg"></center>'
 	'You are in the shower room after your movie shoot, you should go and see Peter to get your pay unless you need to use the mirror again.'