8 Commits 5b3abf9217 ... 5c44a63943

Author SHA1 Message Date
  wingbrother 5c44a63943 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work 5 years ago
  julzor 8d9a1c6428 [fixes] Eat and run should be for free in gkafe if your mother didn't throw you out of the house 5 years ago
  julzor e57ef1d8ca [fixes] wrong image links in nyp_school 5 years ago
  julzor f64a6478fb [fixes] pregchem wasn't set to 0 in cheatmenu_din and hotelhole 5 years ago
  julzor 3ced201973 [added] you can throw away your porn card decks (new cards can be bought again, vintage cards are gone forever) 5 years ago
  julzor 9800e8e9fd Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor c36422a579 [fixes] matched katjas pav_sex checks in stat to pav_slut and matched the check to similar pav_slut checks 5 years ago
  julzor 681a2adf72 [fixes] giving birth didn't set pregchem to 0, recovery period wasn't set in poli and gpoli 5 years ago

+ 3 - 2
locations/Cheatmenu_din.qsrc

@@ -1473,8 +1473,9 @@ $cheatmenu['remove_preg'] = {
 	thinkpreg = 0
 	knowpreg = 0
 	cycle = 4
-	RecovH = rand(7,70)
-	RecovH += pregchem
+	!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is 1 week
+	RecovH = 189 
+	pregchem = 0	
 	knowpregloss = 2
 	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
 	nextbaby = arrsize('yearkid')

+ 5 - 2
locations/Gadsarai.qsrc

@@ -323,7 +323,7 @@ if $ARGS[0] = '':
 			*clr & cla
 			minut += 15
 			gs 'stat'
-			if vcard = 0:
+			if vcard = 0 and vcard_trash = 0:
 				*clr & cla
 				if RAND(0,5) >= 4:
 					gs 'stat'
@@ -409,7 +409,10 @@ if $ARGS[0] = '':
 		end
 
 		if vcard > 0:
-			act 'Take card from the vintage deck of erotic cards':card_deck = 0 & gt 'card'
+			act 'Look at your deck of vintage porn cards':card_deck = 0 & gt 'card'
+		end
+		if card > 0:
+			act 'Look at your deck of new porn cards':card_deck = 1 & gt 'card'
 		end
 
 		if pcs_horny >= 50:

+ 7 - 15
locations/HotelHole.qsrc

@@ -31,10 +31,7 @@ end
 if hour = 0 and $prevloc = 'HotelRoom':
 	if resepseen = 1:
 	hotresepQW = 3
-
-		*clr
-		cls
-		cla
+		*clr & cla
 		observ_exp += 3
 		gs 'stat'
 		'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
@@ -50,9 +47,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 		'"Oh Mister Leonidovich," she says pouting like a little girl, "I am so sorry, I have been bad daddy."'
 		'At that moment you figure out they are just playing a game and being caught flashing was all part of their weird little role play.'
 		act 'Continue':
-
-			*clr
-			cls
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event9.jpg"></center>'
 			 'She needs his foregiveness and kisses his mouth while he undresses her.'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event3.jpg"></center>'
@@ -64,9 +59,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 			 'All of a sudden, she moves the dick between her breasts and starts fucking it through the space between them.'
 			'"Miss Tanich, you should slow down, I don''t want to blow my load before I get to try that sweet little pussy of yours."'
 			act 'Continue':
-
-				*clr
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event5.jpg"></center>'
 				'So Miss Tanich releases his cock and pushes him down on to the bench. And then she turns around, props herself up so her cunt rests on top of his cock and she slowly lowers her hips down as his cock spears her pussy.'
 				'She starts riding him furiously while he reaches his hands around her body and squeezes her juicy breasts.'
@@ -77,8 +70,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 				gs 'arousal', 'voyeur',60
 				gs 'arousal', 'end'
 				act 'Continue':
-					*clr
-					cls
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event7.jpg"></center>'
 					'"Ok, my turn now," the manager suddenly yelled.'
 					'It seems like the desk girl knew exactly what he meant by that since she dismounted him and placed herself on her hands and knees.'
@@ -90,7 +82,6 @@ if hour = 0 and $prevloc = 'HotelRoom':
 					'Miss Tanich just smiled at him while showing off her pussy and cum stained buttocks.'
 					'You have seen enough and quietly go back to your room'
 
-
 					act 'Continue':
 						if hotelroom = 1:gt'hotelroom','normal'
 						if hotelroom = 2:gt'hotelroom','better'
@@ -600,8 +591,9 @@ if $ARGS[0] = 'PregBDSM' :
 									abortionbirthdate = daystart
 									cycle = 4
 									unintendedabort = 1
-									RecovH = rand(7,70)
-									RecovH += pregchem
+									!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~2-3 weeks
+									RecovH = rand(375,575) 
+									pregchem = 0
 									knowpregloss = 2
 									thinkpreg = 0
 									knowpreg = 0

+ 7 - 0
locations/card.qsrc

@@ -58,6 +58,13 @@ act 'Pull a card from the deck':
 end
 
 act 'Put the cards away':gt $loc
+
+if card_deck = 0:
+	act 'Throw away your deck of vintage porn cards': vcard = 0 & vcard_trash = 1 & gt $loc
+elseif card_deck = 1:
+	act 'Throw away your deck of new porn cards': card = 0 & gt $loc
+end
+
 !!act 'Playing cards':gt 'blackjack'
 
 --- card ---------------------------------

+ 5 - 0
locations/cikl.qsrc

@@ -133,6 +133,11 @@ if i <= 147:jump 'loopprice'
 
 if coatH[defaultcoat] <= 0: defaultcoat = 0
 
+!! Abortion and pregnancy recovery resets if finished
+
+if abortionbirthdate ! 0 and daystart - abortionbirthdate > 24: abortionbirthdate = 0
+if pregbirthdate ! 0 and daystart - pregbirthdate > 73: pregbirthdate = 0
+
 !!------------------------------------------------------------------------------------------------------------
 !!	Bimbo
 !!------------------------------------------------------------------------------------------------------------

+ 1 - 1
locations/food_menu.qsrc

@@ -52,7 +52,7 @@ if $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if home_owned[2] = 1 or SchoolBlock = 1:
+	if storyline > 0 and SchoolBlock = 0:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

+ 4 - 1
locations/gkafe.qsrc

@@ -101,9 +101,12 @@ if $ARGS[0] = 'menu':
 	$loc = 'gkafe'
 	$metka = ''
 	act 'See the menu':gs 'food_menu'
-	if money >= 350:
+	if (StoryLine = 0 or (StoryLine > 0 and SchoolBlock = 1)) and money >= 350:
 		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
+	if storyline > 0 and SchoolBlock = 0:
+		act 'Eat and run (0:20)': gt 'food', 'f_food'
+	end
 end
 
 if $ARGS[0] = 'boris':

+ 6 - 1
locations/gpoli.qsrc

@@ -26,9 +26,10 @@ if $ARGS[0] = '':
 			menu_off = 1
 			if kid > 0:minut += rand(300,660) else minut += rand(120,480)
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
-			'You lay on the bed and your feet are put in stirups.'
+			'You lay on the bed and your feet are put in stirrups.'
 			'Your contractions get closer and closer, and after some time (and a lot of swearing) you finally give birth.'
 			:multikidloop
+				minut += rand(30,90)
 				sterilewb += 1
 				nextbaby = arrpos('$kidname', 'unborn')
 				kid += 1
@@ -48,11 +49,15 @@ if $ARGS[0] = '':
 				end
 			if BabyEmbryo > 0:'You do not have much time to stare at your <<$polreb[nextbaby]>>, because you are having an another contraction. Your next baby is coming!' & jump 'multikidloop'
 			preg = 0
+			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
+			RecovH = rand(1175,1875)
+			pregbirthdate = daystart
 			thinkpreg = 0
 			knowpreg = 0
 			knowpregrecover = 1
 			vidage += 1
 			pregtalk = 0
+			pregchem = 0
 			cycle = 4
 			gs 'cum_cleanup', 'reset'
 			dynamic $d_cycreport_choice

+ 10 - 10
locations/nyp_school.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'start':
 					act 'Drink some more':pcs_hydra += 10 & gt 'nyp_school', 'drink more'
 					if grupTipe = 5:
 						!!If Sveta is a outcast this should be the only option and the above options should not show up, if Sveta is a outcast. If Sveta is not a outcast then the go stand against the wall alone should not show up.
-						act 'Go stand against the wall alone.':gt 'nyp_school', 'outcast'
+						act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 					else
 						act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
 						act 'Hangout with the nerds':gt 'nyp_school', 'nerds'
@@ -754,7 +754,7 @@ if $ARGS[0] = 'gopniks':
 			act 'Hangout until the party ends':gt 'nyp_school', 'end'
 		end
 	end
-	act 'Go pick on someone.':
+	act 'Go pick on someone':
 		cla & *clr
 		minut += 5
 		gs 'stat'
@@ -970,10 +970,10 @@ end
 if $ARGS[0] = 'slut':
 	*clr & cla
 	gs 'stat'
-	'Once in the bathroom Vasily immediately pulls down his pants and says, "Suck my cock bitch.I know that you''ve been anticipating this the whole party."'
+	'Once in the bathroom Vasily immediately pulls down his pants and says, "Suck my cock bitch. I know that you''ve been anticipating this the whole party."'
 	act 'Suck him off':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolbj.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snybj.jpg"></center>'
 		'You kneel down infront of Vasily and begin sucking his cock. After a few moments you hear the door open and a few guys from your class wander in. Before you know it all the boys in your class, except Kotova, who was rumored to have already passed out, are surrounding you. You hear someone unzipping their fly, pulling out their cock. Shortly thereafter the others follow suit.'
 		$rand_boy = $npc_firstname['A9']
 		pav_sex += 60
@@ -984,7 +984,7 @@ if $ARGS[0] = 'slut':
 		act 'Serve classmates':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolfilming.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyfilming.jpg"></center>'
 			'You slurp on one cock in your mouth, while you use your hands to jerk off two others, casually looking up you see that Nosov has taken out a camera and started filming it all. "Don''t worry, <<$pcs_nickname>> this is for all our private collections. I''m sure no one will spread this video around." he winks.'
 			gs 'gschool_events', 'rand_boy_arg1',1,2
 			gs 'boyStat', $static_num, '2'
@@ -998,7 +998,7 @@ if $ARGS[0] = 'slut':
 			act 'Try to please them all':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolblowbang.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyblowbang.jpg"></center>'
 				'You suck more cocks than you can count, constantly changing from one to another while always making sure that you''re jerking off two others. You completely lose track of how many guys there are, all you know is that they''re surrounding you and are awaiting their turn as they hold their bare cocks out.'
 				gs 'gschool_events', 'rand_boy_arg1',3,4
 				gs 'boyStat', $static_num, '4'
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'slut':
 				act 'Keep doing it':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolblowbang2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyblowbang2.jpg"></center>'
 					'Some of them grow tired of waiting and start slapping their cocks against your head and face as they await for your mouth or one of your hands to become available. By now you''re starting to feel fatigued as your mouth and hands are already getting tired.'
 					gs 'gschool_events', 'rand_boy_arg1',1,2
 					gs 'boyStat', $static_num, '6'
@@ -1026,7 +1026,7 @@ if $ARGS[0] = 'slut':
 					act 'Struggle through':
 						*clr & cla
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolblowbang3.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyblowbang3.jpg"></center>'
 						'Your jaw starts to ache from sucking so many cocks, but the guys aren''t easing up as they continue to pile on. You look at them pleadingly but they just turn away as they tell you that they won''t fall for your tricks as everyone knows that you''ve done this many times before.'
 						gs 'gschool_events', 'rand_boy_arg1',1,2,3,4
 						gs 'boyStat', $static_num
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'slut':
 						gs 'stat'
 						act 'Keep sucking':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolcum.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snycum.jpg"></center>'
 							'Just as you''re about to break, you finally feel one of them twitch inside the mouth and cums in it. All of a sudden you feel another shoot his sperm onto your face and so begin the rest of them to cum. It''s like everyone waited for the first one to finish just so they wouldn''t last the least. By the time the last one finishes you have lost count of the number of mouth fulls of cum you swallowed and leaving your face completely covered in sperm.'
 							minut += 15
 							gs 'cum_call', 'mouth', $boy, 1
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'drink more':
 	gs 'stat'
 	if grupTipe = 5:
 		!!If Sveta is a outcast this should be the only option and the above options should not show up, if Sveta is a outcast. If Sveta is not a outcast then the go stand against the wall alone should not show up.
-		act 'Go stand against the wall alone.':gt 'nyp_school', 'outcast'
+		act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 	else
 		act 'Drink some more':gt 'nyp_school', 'drink more'
 		act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'

+ 6 - 7
locations/poli.qsrc

@@ -145,8 +145,8 @@ if $ARGS[0] = 'start':
 			thinkpreg = 0
 			knowpreg = 0
 			cycle = 4
-			RecovH = rand(7,70)
-			RecovH += pregchem
+			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~2-3 weeks
+			RecovH = rand(375,575) 
 			pregchem = 0
 			knowpregloss = 2
 			abortrand = rand(0, 10)
@@ -199,7 +199,6 @@ if $ARGS[0] = 'start':
 		act 'Give birth':
 			*clr & cla
 			menu_off = 1
-			cnt = 0
 			if kid > 0:minut += rand(300,660) else minut += rand(120,480)
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
 			'You lay on the bed and your feet are put in stirrups.'
@@ -209,7 +208,6 @@ if $ARGS[0] = 'start':
 				sterilewb += 1
 				nextbaby = arrpos('$kidname', 'unborn')
 				kid += 1
-				cnt += 1
 				BabyEmbryo -= 1
 				daykid[nextbaby] = day
 				monthkid[nextbaby] = month
@@ -226,15 +224,16 @@ if $ARGS[0] = 'start':
 				end
 			if BabyEmbryo > 0:'You do not have much time to stare at your <<$polreb[nextbaby]>>, because you are having an another contraction. Your next baby is coming!' & jump 'multikidloop'
 			preg = 0
-			RecovH = rand(7*cnt,70)
-			abortionbirthdate = daystart
+			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
+			RecovH = rand(1175,1875)
+			pregbirthdate = daystart
 			thinkpreg = 0
 			knowpreg = 0
 			knowpregrecover = 1
 			vidage += 1
 			pregtalk = 0
+			pregchem = 0
 			cycle = 4
-			killvar 'cnt'
 			gs 'cum_cleanup', 'reset'
 			dynamic $d_cycreport_choice
 			gs 'stat'

+ 2 - 2
locations/stat.qsrc

@@ -86,8 +86,8 @@ end
 if lernSkill >= 8: intel_exp += 1 & lernSkill = 0
 if lern >= 10: intel_exp += 1 & lern = 0
 
-if pav_sex >= 25:KatjaKnowBJ = 1
-if pav_sex >= 50 or preg > 0:KatjaKnowSex = 1
+if pav_slut >= 75:KatjaKnowBJ = 1
+if pav_slut >= 125 or preg > 0:KatjaKnowSex = 1
 
 shameless = guy + stat['bj'] + stat['anal'] + stat['hj'] + ((slutty + gang) * 2)
 moneySUM = money + karta + stolmoney

+ 19 - 3
locations/stat_display.qsrc

@@ -510,10 +510,26 @@ if thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succub
 		elseif daystart - lastmens > 84:
 			$stat_msg += '<BR><font color = #AB052A><b>You should consider the possibility of a pregnancy, since apparently you no longer have periods.</b></font>'
 		end
-	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate <= 60:
-		$stat_msg += '<BR><font color = #705243><b>You are probably still in your recovery period. Nothing to worry about.</b></font>'
-	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 60:
+	!!Recovery period after an abortion is ~14-21 days
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate <= 13:
+		$stat_msg += '<BR><font color = #705243><b>You are still in your recovery period. Nothing to worry about.</b></font>'
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 13 and daystart - abortionbirthdate <= 16:
+		$stat_msg += '<BR><font color = #705243><b>You are maybe still in your recovery period, but there could be a risk.</b></font>'	
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 16 and daystart - abortionbirthdate <= 21:
+		$stat_msg += '<BR><font color = #820000><b>You should have recovered from you abortion by know... Right?</b></font>'
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 21:
+		$stat_msg += '<BR><font color = #820000><b>You should have definitely recovered from your abortion by now.</b></font>'				
+	!!Recovery period after giving birth is ~42-70 days
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate <= 41:
+		$stat_msg += '<BR><font color = #705243><b>You are still in your recovery period. Nothing to worry about.</b></font>'
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 41 and daystart - pregbirthdate <= 48:
+		$stat_msg += '<BR><font color = #705243><b>You are probably still in your recovery period.</b></font>'
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 48 and daystart - pregbirthdate <= 55:
+		$stat_msg += '<BR><font color = #705243><b>You are maybe still in your recovery period, but there could be a risk.</b></font>'	
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 55 and daystart - pregbirthdate <= 70:
 		$stat_msg += '<BR><font color = #820000><b>You should have recovered by know... Right?</b></font>'
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 70:
+		$stat_msg += '<BR><font color = #820000><b>You should have definitely recovered from giving birth by now.</b></font>'		
 	end
 end
 if implant_day > 0: