12 Commits 300941f44c ... 456f79edf0

Author SHA1 Message Date
  wingbrother 456f79edf0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work 5 years ago
  julzor 9aed8b75aa [fixes] pregdueday should have been added to temp and not subtracted from it ... result was an error of up to two month in due date calculation 5 years ago
  julzor 3e74bd13b8 [fixes] added implementation time to the due date calculation 5 years ago
  julzor 8bea517a60 [fixes] due date calculation in din_bad 5 years ago
  julzor 6bd0a858dc [fixes] the clinic is now open if sveta is in labour 5 years ago
  julzor bc47c0734e [fixes] if sveta never was filmed before by dima, she will now be harassed by him if he films her at the new years party 5 years ago
  julzor 41874f9ee0 [added] menu variables to gdk 5 years ago
  julzor 32a560e223 [fixes] blocked niko's events from happening in the school breaks, moved niko's events out of dima's if condition in gschool_grounds 5 years ago
  julzor dfa06555cb [fixes] errors from the analyser in gadforest, pavsharedapt, swamp and swamphouse 5 years ago
  julzor f1b294d99b [fixes] missing cla in din_van and a small text edit 5 years ago
  julzor 8d0e02f3e7 [fixes] moved the leave option in changingroom to the top to make it consistent with the other wardrobe actions 5 years ago
  julzor f1a9bd2084 [added] decline option to street_walker 5 years ago

+ 2 - 2
locations/Komp.qsrc

@@ -250,7 +250,7 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 0
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave':gt 'Komp', 'brows'
+				act 'Leave this website':gt 'Komp', 'brows'
 			end
 
 			act 'Look for a normal guy':
@@ -260,7 +260,7 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 1
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave':gt 'Komp', 'brows'
+				act 'Leave this website':gt 'Komp', 'brows'
 			end
 
 			act 'Look for a strong man':

+ 3 - 5
locations/changingroom.qsrc

@@ -30,6 +30,8 @@ if $ARGS[0] = 'view_swim_list':
 		'<center>You cannot go swimming or sunbathing when the temperature below 15C, so there is no point in getting changed.</center>'
 	end
 
+	act 'Leave':gt $loc, $metka
+	
 	if $clothingworntype = 'swimwear':
 		act 'Put your regular clothes back on':
 			gs 'underwear', 'wear'
@@ -37,9 +39,6 @@ if $ARGS[0] = 'view_swim_list':
 			gt 'changingroom', 'view_swim_list'
 		end
 	end
-
-	act 'Leave':gt $loc, $metka
-
 end
 
 if $ARGS[0] = 'view_swim_item':
@@ -53,14 +52,13 @@ if $ARGS[0] = 'view_swim_item':
 	FUNC('$attributes_swimwear', $ARGS[1], ARGS[2])
 	FUNC('$clothing_name', $ARGS[1], ARGS[2])
 
-
 	$RESULT = '(strength '
 	dynamic '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]'
 	$RESULT += ')'
 	'<<$RESULT>>'
 
-
 	act 'Return':gt 'changingroom', 'view_swim_list'
+	
 	!! if the clothing is worn out
 	if dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') <= 0:
 		'This item is worn and is not suitable for further wear.'

+ 34 - 38
locations/din_bad.qsrc

@@ -79,7 +79,6 @@ $mobile_check = {
 	killvar 'lover_number'
 }
 
-
 $d_salf = {
 	*clr & cla
 	'<center><h1>Tissues</h1></center>'
@@ -687,60 +686,57 @@ $d_cycreport_update = {
 
 
 $d_cycreport_upduedate = {
-	temp = (280 + daylastperiod) - daystart
+	!! Ovulation is ~7d after menstruation
+	!! Implantation takes several days: Average is 5
+	!! Human gastation period: 280 days
+	!! ovu_calc: Days since last ovulation
+	ovu_calc = daystart - lastmens + 7 + 5
+	temp = 280 - ovu_calc
 	pregdueday = day
 	pregduemonth = month
 	pregdueyear = year
+	
+	temp += pregdueday
+	pregdueday = 0
+	
 	:pregduedateloop
-	if pregduemonth = 1 and temp > 31 - pregdueday:
+	if pregduemonth = 1 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 2 and temp > 28 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 2 and temp > 28:
 		pregduemonth += 1
-		temp -= 28 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 3 and temp > 31 - pregdueday:
+		temp -= 28
+	elseif pregduemonth = 3 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 4 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 4 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 5 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 5 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 6 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 6 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 7 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 7 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 8 and temp > 31 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 8 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 9 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 9 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 10 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 10 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 11 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 11 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 12 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 12 and temp > 31:
 		pregduemonth = 1
 		pregdueyear += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
+		temp -= 31
 	else
 		pregdueday = temp
 		temp = 0

+ 7 - 6
locations/din_van.qsrc

@@ -639,6 +639,7 @@ $pirPubic = {
 }
 
 $pirManage = {
+	cla
 	menu_off = 1
 	*nl
 	if pirsA > 0:
@@ -706,7 +707,7 @@ $pirManage = {
 		*nl
 	end
 
-	act'Back':menu_off = 0 & gt $loc, $metka
+	act 'Continue': menu_off = 0 & gt $loc, $metka
 }
 
 $enema = {
@@ -864,10 +865,10 @@ if $ARGS[0] = 'private':
 		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
 	end
 
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage your piercings</a>'
 
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into your breast implants.</a>'
+	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from your breast implants.</a>'
 
 	dynamic $bteeth
 
@@ -1470,7 +1471,8 @@ if $ARGS[0] = 'shave_options':
 	*nl
 	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-
+	
+	act 'Return':menu_off = 0 & gt $loc, $metka
 	act 'Set image height for this view':
 		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")
 		if shave_img_hgt < 50:
@@ -1480,7 +1482,6 @@ if $ARGS[0] = 'shave_options':
 		end
 		gt 'din_van', 'shave_options'
 	end
-	act 'Return':menu_off = 0 & gt $loc, $metka
 end
 
 --- din_van ---------------------------------

+ 1 - 1
locations/gadforest.qsrc

@@ -265,7 +265,7 @@ if $ARGS[0] = '1':
 
 	act 'Leave the woods':
 		if $clothingworntype = 'nude' or swamp_clothes = 1:
-			if ($CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1) swamp_clothes = 0:
+			if ($CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1) and swamp_clothes = 0:
 				! no clothes here, they must be ripped apart enough times in the woods or swamp to get destroyed.
 				! This may be a good exhibition or rape event entry point
 				inhib_exp += rand(0,2)

+ 3 - 0
locations/gdk.qsrc

@@ -1,6 +1,9 @@
 # gdk
 music_loop = 0
 CLOSE ALL
+$menu_loc = 'gdk'
+$menu_arg = ''
+menu_off = 0
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'public_outdoors'

+ 24 - 23
locations/gschool_grounds.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
 
 	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
-		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
+		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
 	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
@@ -131,7 +131,7 @@ if $ARGS[0] = 'main':
 
 	act 'Return to town': minut += 2 & gt 'pavResidential'
 	
-	act 'Go to the sports field': gt 'gschool_grounds', 'sports'
+	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
 	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0:
 		act 'Go to detention': gt 'gschool_detention', 'start'
@@ -173,28 +173,30 @@ if $ARGS[0] = 'main':
 		gt 'dimaRevenge', 5	
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 6:
 		gt 'dimaRevenge', dimaRevenge
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11 and NikoDate_Day ! daystart:
-		'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
-		'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai Volkov</a> is smoking outside of the school.'
 	end
 
-	if week = 1 and NikoIntro = 0 and hour = 14:
-		gt 'NikoEv', 'Intro'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0 and NikoDate_Day ! daystart:
-		gt 'NikoDates', 'After School'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0 and NikoDate_Day ! daystart:
-		gt 'NikoDates', 'After School 2'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 10 and NikoEv = 22 and NikoDate_Day ! daystart:
-		gt 'NikoEv2', 'Recovery'
-	end
-
-	if hour >= 14 and pav_slut >= 75 and SchoolGossip > 0 and afterschoolday ! daystart:gt 'gschool_sex', 'suck'
+	if hour >= 14 and pav_slut >= 125 and SchoolGossip > 0 and afterschoolday ! daystart:gt 'gschool_sex', 'suck'
 
 	if week = 1 and kanikuli = 0 and arthakQW = 10 and apmeetday ! daystart and hour >= 14:gt 'artgar'
 
 	if hour = 14 and week < 6 and kanikuli = 0:
 
+		if NikoDate_Day ! daystart:
+			if NikoIntro = 0:
+				gt 'NikoEv', 'Intro'
+			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
+				gt 'NikoDates', 'After School'
+			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
+				gt 'NikoDates', 'After School 2'		
+			elseif (NikoVolkovQW = 5 and NikoDate = 1) or NikoEv = 11:
+				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
+			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20:
+				'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai Volkov</a> is smoking outside of the school.'
+			elseif NikoVolkovQW = 10 and NikoEv = 22:
+				gt 'NikoEv2', 'Recovery'
+			end
+		end
+		
 		if ivan_afterschool = 1:
 			act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 		end
@@ -288,8 +290,8 @@ if $ARGS[0] = 'sports':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/fieldwinter.jpg"></center>'
 	end
 	'There is a football field and around it is a track, often before and after school kids use the field and track.'
-
-	act 'Leave the sports field':gt 'gschool_grounds', 'main'
+	
+	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
 	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
 		act 'Go for a run (1 hour)':
@@ -312,7 +314,7 @@ if $ARGS[0] = 'sports':
 	end
 
 	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
-		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
+		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
 	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
@@ -370,7 +372,6 @@ if $ARGS[0] = 'bulding':
 		His words fill you with dread as you make your way to class.'
 	end		
 
-
 	if zverSlutQW = 1 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
 		zverSlutQW = 2
 		if KotovZverHelp ! 1:
@@ -599,7 +600,6 @@ if $ARGS[0] = 'change_room':
 	$locM = 'gschool_grounds'
 	$metkaM = 'change_room'
 	*clr & cla
-	minut += 5
 	gs 'stat'
 
 	act 'Leave the school building':
@@ -607,6 +607,7 @@ if $ARGS[0] = 'change_room':
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt 'gschool_grounds', 'change_room'
 		else
+			minut += 1
 			gt 'gschool_grounds', 'main'
 		end
 	end
@@ -616,6 +617,7 @@ if $ARGS[0] = 'change_room':
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt 'gschool_grounds', 'change_room'
 		else
+			minut += 1
 			gt 'gschool_grounds', 'sports'
 		end
 	end
@@ -636,7 +638,6 @@ if $ARGS[0] = 'change_room':
 	dynamic $removepan
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-
 end
 
 --- gschool_grounds ---------------------------------

+ 1 - 2
locations/hanters.qsrc

@@ -792,7 +792,6 @@ end
 if $ARGS[0]='hantersgroupORALs':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupORALs.jpg"></center>'
 	if hantersexnude = 1 or forest_hantersex = 3:'Sergei grabs you by the head and shoves his cock into your mouth. Igor, feeling left out and just stands there with his cock out. You look at Igor with lust while sucking Sergei''s cock. Igor pushes Sergei away and shoves his cock inside your mouth.'
-	'"There, there, don''t fight I can do you both at the same time." you say. You start altering between their cocks, pleasuring them both.'
 	if forest_gopsex = 3:'Kolyamba grabs you by the head and shoves his cock into your mouth. Vasyan, feeling left out and just stands there with his cock out. You look at Vasyan with lust while sucking Kolyamba''s cock. Vasyan pushes Kolyamba away and shoves his cock inside your mouth.'
 	'"There, there, don''t fight I can do you both at the same time." you say. You start altering between their cocks, pleasuring them both.'
 
@@ -934,7 +933,7 @@ if $ARGS[0]='hantersgroupORALend1':
 	swallow += 1
 	if hantersexnude = 1 or forest_hantersex = 3:'The men order you to swallow all of the sperm. You enthusiasticly open your mouth ready to recive their loads. The men started groaning loudly and began cumming, the quantity of sperm was so overwhelming that you were not able to swallow all of it and some of drips onto your face. You see the displeasure in Sergeis'' and Igors'' faces not being able to swallow it all...'
 	if forest_gopsex = 3:'The men order you to swallow all of the sperm. You enthusiasticly open your mouth ready to recive their loads. The men started groaning loudly and began cumming, the quantity of sperm was so overwhelming that you were not able to swallow all of it and some of drips onto your face. You see the displeasure in Kolambas'' with Vasyas'' faces not being able to swallow it all...'
-	''
+	*nl
 	gs 'arousal', 'bj', 5, 'sub', 'gangbang'
 	gs 'arousal', 'end'
 	gs 'stat'

+ 6 - 6
locations/kotovtalker.qsrc

@@ -2,7 +2,7 @@
 !!!!!!!!!!!!!!!!!
 !!!Vitek Cats!!!
 !!!!!!!!!!!!!!!!!
-if numnpc = 9 and pav_slut < 25 and kotovLoveQW >= 0 and (npc_rel[$static_num] >= 80 or hotcat >= 5):
+if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num] >= 80 or hotcat >= 5):
 	if $loc = 'gdkin':
 		if alko < 3:
 			'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
@@ -89,7 +89,7 @@ if numnpc = 9 and pav_slut < 25 and kotovLoveQW >= 0 and (npc_rel[$static_num] >
 		'<<$npc_firstname[$static_num]>> "Hey <<$pcs_nickname>>, I''m busy. I''ll catch up with you later." He says as he turns back to talk to his friends.'
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	end
-elseif kotovLoveQW > 0 and pav_slut >= 25:
+elseif kotovLoveQW > 0 and pav_slut >= 100:
 	'Vitek scowled and tells you "Well <<$pcs_nickname>>, whats this garbage I hear about what you and <<$gnikname>> did? The whole town already knows, the guys have been telling me all about it. You fucking bitch! "'
 
 	act 'Accuse him of sleeping around':
@@ -107,8 +107,8 @@ elseif kotovLoveQW > 0 and pav_slut >= 25:
 		act 'Argue that it''s not true':
 			cls
 			sub += 20
-			if pav_sex > 25: pav_sex = 25
-			if pav_prostitute > 25: pav_prostitute = 25
+			if pav_sex > 100: pav_sex = 100
+			if pav_prostitute > 100: pav_prostitute = 100
 			gs 'stat'
 			'It takes a bit but you convince Vitek that all this was just gossip and none of it was true. Vitek frowned, "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry, baby I will shut their yapping mouths."'
 
@@ -117,7 +117,7 @@ elseif kotovLoveQW > 0 and pav_slut >= 25:
 		end
 	end
 elseif $loc = 'gdkin':
-	if pav_slut < 50:
+	if pav_slut < 125:
 		'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
 
 		act 'Refuse':npc_rel[$static_num] -= 5 & gt $loc, $metka
@@ -135,7 +135,7 @@ elseif $loc = 'gdkin':
 
 			act 'Move away':gt $loc, $metka
 		end
-	elseif pav_slut >= 50:
+	elseif pav_slut >= 125:
 		'<<$npc_firstname[$static_num]>> "Then what the fuck are you doing here cumwhore? Came to suck some dick?"'
 
 		act 'Leave':npc_rel[$static_num] -= 5 & gt $loc, $metka

+ 57 - 64
locations/mirror.qsrc

@@ -83,6 +83,8 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+	act 'Move away from the mirror':gt 'mirror','fin'
+	
 	! WD: Cheat Unused ~ 'AutoLipBalm'
 
 	!! Added the makeup setting.
@@ -197,8 +199,6 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-
-
 !	if (pcs_makeup <= 1 and kosmetica > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
 !		act 'Do the works': gt 'mirror', 'works'
 !	end
@@ -219,71 +219,63 @@ if $ARGS[0] = 'start':
 !		'Currently the level you have set is for thick make-up.'
 !	end
 
-if $routine1 ! '':
-
-	'Make-up routine 1 is called ''<<$routine1custname>> ''and consists of : '
-	if mid($routine1,1,1) = 0:'No make-up'
-	if mid($routine1,1,1) = 1:'Light make-up'
-	if mid($routine1,1,1) = 2:'Vibrant make-up'
-	if mid($routine1,1,1) = 3:'Thick make-up'
-	if mid($routine1,2,1) = 0:'No Lipbalm'
-	if mid($routine1,2,1) = 1:'Lipbalm'
-	if mid($routine1,3,1) = 0:'No fake lashes'
-	if mid($routine1,3,1) = 1:'Normal fake lashes'
-	if mid($routine1,3,1) = 2:'Mink fake lashes'
-	''
-end
-
-if $routine2 ! '':
-
-	'Make-up routine 2 is called ''<<$routine2custname>>'' and consists of : '
-	if mid($routine2,1,1) = 0:'No make-up'
-	if mid($routine2,1,1) = 1:'Light make-up'
-	if mid($routine2,1,1) = 2:'Vibrant make-up'
-	if mid($routine2,1,1) = 3:'Thick make-up'
-	if mid($routine2,2,1) = 0:'No Lipbalm'
-	if mid($routine2,2,1) = 1:'Lipbalm'
-	if mid($routine2,3,1) = 0:'No fake lashes'
-	if mid($routine2,3,1) = 1:'Normal fake lashes'
-	if mid($routine2,3,1) = 2:'Mink fake lashes'
-	''
-end
-
-if $routine3 ! '':
-
-	'Make-up routine 3 is called ''<<$routine3custname>>'' and consists of : '
-	if mid($routine3,1,1) = 0:'No make-up'
-	if mid($routine3,1,1) = 1:'Light make-up'
-	if mid($routine3,1,1) = 2:'Vibrant make-up'
-	if mid($routine3,1,1) = 3:'Thick make-up'
-	if mid($routine3,2,1) = 0:'No Lipbalm'
-	if mid($routine3,2,1) = 1:'Lipbalm'
-	if mid($routine3,3,1) = 0:'No fake lashes'
-	if mid($routine3,3,1) = 1:'Normal fake lashes'
-	if mid($routine3,3,1) = 2:'Mink fake lashes'
-	''
-end
-
-if $routine4 ! '':
-
-	'Make-up routine 4 is called ''<<$routine4custname>>'' and consists of : '
-	if mid($routine4,1,1) = 0:'No make-up'
-	if mid($routine4,1,1) = 1:'Light make-up'
-	if mid($routine4,1,1) = 2:'Vibrant make-up'
-	if mid($routine4,1,1) = 3:'Thick make-up'
-	if mid($routine4,2,1) = 0:'No Lipbalm'
-	if mid($routine4,2,1) = 1:'Lipbalm'
-	if mid($routine4,3,1) = 0:'No fake lashes'
-	if mid($routine4,3,1) = 1:'Normal fake lashes'
-	if mid($routine4,3,1) = 2:'Mink fake lashes'
-	''
-end
+	if $routine1 ! '':
+		'Make-up routine 1 is called ''<<$routine1custname>> ''and consists of : '
+		if mid($routine1,1,1) = 0:'No make-up'
+		if mid($routine1,1,1) = 1:'Light make-up'
+		if mid($routine1,1,1) = 2:'Vibrant make-up'
+		if mid($routine1,1,1) = 3:'Thick make-up'
+		if mid($routine1,2,1) = 0:'No Lipbalm'
+		if mid($routine1,2,1) = 1:'Lipbalm'
+		if mid($routine1,3,1) = 0:'No fake lashes'
+		if mid($routine1,3,1) = 1:'Normal fake lashes'
+		if mid($routine1,3,1) = 2:'Mink fake lashes'
+		''
+	end
 
+	if $routine2 ! '':
+		'Make-up routine 2 is called ''<<$routine2custname>>'' and consists of : '
+		if mid($routine2,1,1) = 0:'No make-up'
+		if mid($routine2,1,1) = 1:'Light make-up'
+		if mid($routine2,1,1) = 2:'Vibrant make-up'
+		if mid($routine2,1,1) = 3:'Thick make-up'
+		if mid($routine2,2,1) = 0:'No Lipbalm'
+		if mid($routine2,2,1) = 1:'Lipbalm'
+		if mid($routine2,3,1) = 0:'No fake lashes'
+		if mid($routine2,3,1) = 1:'Normal fake lashes'
+		if mid($routine2,3,1) = 2:'Mink fake lashes'
+		''
+	end
 
-	gs 'stat'
+	if $routine3 ! '':
+		'Make-up routine 3 is called ''<<$routine3custname>>'' and consists of : '
+		if mid($routine3,1,1) = 0:'No make-up'
+		if mid($routine3,1,1) = 1:'Light make-up'
+		if mid($routine3,1,1) = 2:'Vibrant make-up'
+		if mid($routine3,1,1) = 3:'Thick make-up'
+		if mid($routine3,2,1) = 0:'No Lipbalm'
+		if mid($routine3,2,1) = 1:'Lipbalm'
+		if mid($routine3,3,1) = 0:'No fake lashes'
+		if mid($routine3,3,1) = 1:'Normal fake lashes'
+		if mid($routine3,3,1) = 2:'Mink fake lashes'
+		''
+	end
 
-	act 'Move away from the mirror':gt 'mirror','fin'
+	if $routine4 ! '':
+		'Make-up routine 4 is called ''<<$routine4custname>>'' and consists of : '
+		if mid($routine4,1,1) = 0:'No make-up'
+		if mid($routine4,1,1) = 1:'Light make-up'
+		if mid($routine4,1,1) = 2:'Vibrant make-up'
+		if mid($routine4,1,1) = 3:'Thick make-up'
+		if mid($routine4,2,1) = 0:'No Lipbalm'
+		if mid($routine4,2,1) = 1:'Lipbalm'
+		if mid($routine4,3,1) = 0:'No fake lashes'
+		if mid($routine4,3,1) = 1:'Normal fake lashes'
+		if mid($routine4,3,1) = 2:'Mink fake lashes'
+		''
+	end
 	
+	gs 'stat'	
 end &! --- start ---
 
 
@@ -317,6 +309,8 @@ $createcustroutine = {
 	
 	$routine = str(makeupSetting) + str(custlipbalm) + str(custlashes)
 	
+	act 'Exit':gt 'mirror','start'
+	
 	if $routine1 ! '':
 		act 'Remove <<$routine1custname>>':
 			killvar '$routine1'
@@ -385,7 +379,6 @@ $createcustroutine = {
 			'max 4 routines allowed, please remove one before adding a new one'
 		end
 	end
-	act 'exit':gt 'mirror','start'
 }
 
 

+ 2 - 1
locations/pavSharedApt.qsrc

@@ -848,7 +848,8 @@ if $ARGS[0] = 'pcsRoom':
 	!gs 'subkid'
 
 	act 'Relax on your bed': gt 'bed', 'start'
-
+end
+	
 if $ARGS[0] = 'sofabed':
 	$menu_loc = 'pavSharedApt'
 	$menu_arg = 'sofabed'

+ 2 - 1
locations/sny.qsrc

@@ -432,7 +432,8 @@ if $ARGS[0] = 'end':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial'+rand(1,23)+'.jpg"></center>'
 	'Having wiped cum from your eyes you see Dimka walk over to the table and take out a hidden camera. He stopped the recording and looked at his friend, "Hey Gosha, the vid came out perfect."'
-
+	if DimaRudeQW = 0: DimaRudeQW += 1
+	if dimafilm = 0: dimaFilm = 1
 	if NosovRevenge = 1:
 		NosovRevenge = 2
 		daynosovrevenge = daystart

+ 1 - 1
locations/street.qsrc

@@ -119,7 +119,7 @@ end
 
 if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
-if hour >= 8 and hour <= 20:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
+if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
 if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''rinok'', ''start''">marketplace</a>.'
 if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec: minut += 10 & gt ''rinok'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'

+ 35 - 20
locations/street_walker.qsrc

@@ -1,9 +1,6 @@
 # street_walker
 
 if $ARGS[0] = 'start':
-	$menu_loc = 'street_walker'
-	$menu_arg = 'work'
-	menu_off = 0
 	if prst_loc = 0:
 		if sound = 0:
 			if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -30,7 +27,7 @@ if $ARGS[0] = 'start':
 		end
 		gs 'stat'
 		'<center><h2>St. Petersburg</h2></center>'
-		'<center><b>City center</b></center>'
+		'<center><b>Red Light District</b></center>'
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/industwn.jpg"></center>'
 		else
@@ -58,6 +55,9 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'work':
+	$menu_loc = 'street_walker'
+	$menu_arg = 'work'
+	menu_off = 0
 	if $loc = 'down':
 		prst_loc = 0
 	elseif $loc = 'Nord':
@@ -221,20 +221,39 @@ if $ARGS[0] = 'event1':
 			'You smile to him. "That depends on what you want to do." You take a little time listening to his wants and telling him the price before he decides.'
 			!!it should be 50/50 is the first one, than 50/50 the second or last
 			if RAND(0,1) = 0:
-				'He decides he wants a blowjob. With that and the price decided you get into the car.'
-				act 'continue': gt 'street_walker', 'blowjob'
+				'He decides he wants a blowjob.'
+				act 'Accept':
+					cla
+					*nl
+					'With that and the price decided you get into the car.'
+					act 'Continue': gt 'street_walker', 'blowjob'
+				end
+				act 'Decline': gt 'street_walker', 'work'
 			elseif RAND(0,1) = 0:
-				'He decides he wants a fuck. With that and the price decided you get into the car.'
-				act 'continue': gt 'street_walker', 'vaginal'
+				'He decides he wants a fuck.'
+				act 'Accept':
+					cla
+					*nl
+					'With that and the price decided you get into the car.'
+					act 'Continue': gt 'street_walker', 'vaginal'
+				end
+				act 'Decline': gt 'street_walker', 'work'
 			else
-				'He decides he wants a anal. With that and the price decided you get into the car.'
-				act 'continue': gt 'street_walker', 'anal'
+				'He decides he wants a anal.'
+				act 'Accept':
+					cla
+					*nl
+					'With that and the price decided you get into the car.'
+					act 'Continue': gt 'street_walker', 'anal'
+				end
+				act 'Decline': gt 'street_walker', 'work'
 			end
 		end
 	else
 		*clr & cla
 		minut += 15
 		city_prostitute += 1
+		gs 'stat'
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/workingw1.jpg"></center>'
 		else
@@ -512,6 +531,7 @@ if $ARGS[0] = 'policeblowjob':
 	else
 		prst_bribe = 1
 		*nl
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		'"What is wrong with you girl? Are you trying to solicitate a member of the law?" the police office angrily responds.'
 		'"N-No officer. I was just thinking the two of us could have a good time..." you try once again, maybe he misunderstood you.'
 		'"That''s it! You''re coming with me, whore!" he turns you around, cuffs you and leads you to the police car. He shoves you in the back and quickly drives off towards the police station.'
@@ -546,7 +566,7 @@ if $ARGS[0] = 'policelie':
 
 			act 'Walk away':gt 'street_walker', 'work'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			*nl
 			'"The only way you''re going to learn is if you''re punished," he shakes his head in disgust. "Turn around, hands behind your back." In a matter of seconds, you''re cuffed and being tossed into the back seat of an unmarked police car. You sit in silence as he drives you back to the police station for booking.'
 
@@ -581,7 +601,7 @@ if $ARGS[0] = 'policeexp':
 
 			act 'Walk away':gt 'street_walker', 'work'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			*nl
 			'"Save it for someone that cares, whore!" Without hesitation, he has you spun around, your arm twisted behind your back as he reaches for his handcuffs. Your crying only gets louder as he drags you to his unmarked police car and shoves you into the back. On the drive back to the station, he gets tired of hearing you and turns on the radio, drowning you out completely.'
 
@@ -590,8 +610,6 @@ if $ARGS[0] = 'policeexp':
 	end
 end
 
-
-
 if $ARGS[0] = 'policebribe':
 	*clr & cla
 	minut += 10
@@ -605,8 +623,6 @@ if $ARGS[0] = 'policebribe':
 	act 'Wait for his reaction': gt 'street_walker', 'briberyreaction'
 end
 
-
-
 if $ARGS[0] = 'briberyreaction':
 	*clr & cla
 	minut += 10
@@ -632,7 +648,7 @@ if $ARGS[0] = 'briberyreaction':
 		prst_bribe = 2
 		gs 'pain', 6, 'armL', 'break'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		*nl
 		'His lips turn up into a disgusted sneer. Before you can react, he slaps your hand away, the money exploding out into the air and onto the ground. "You think I can be paid off, whore?!" he snarls as you stand there holding your red and stinging hand. You knew there was a chance this could happen, but you didn''t expect him to get physical.'
 		*nl
@@ -644,7 +660,7 @@ if $ARGS[0] = 'briberyreaction':
 	elseif temp_rand <= 9:
 	!!elseif he takes the bribe but still arrests you
 		prst_bribe = 2
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		*nl
 		'The cop sighs heavily before taking the money. He takes a moment to count it, occasionally glancing your way as he does. "It''s one thing to be a whore, but to be dumb too?" he laughs cruelly as he pockets the money. You stare at him, hurt and confused before you realize that he''s still planning to arrest you. Your first instinct is to run, maybe he''s just trying to scare you and won''t chase after you, but if he''s being serious then it could mean you getting hurt.'
 		*nl
@@ -672,6 +688,7 @@ if $ARGS[0] = 'briberyreaction':
 			*clr & cla
 			prst_bribe = 2
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			'"No...no, I can''t do that..." You tell him as you pull your hand back and pocket your money again. The officer looks disappointed but doesn''t seem to dwell on it. He probably has another girl like you he''s forced into fucking him...'
 			'"Fine by me, slut. Hands behind your back," he orders and you comply. In a matter of seconds, you''re cuffed and in the back of his unmarked car being driven to the station to be booked.'
 
@@ -680,7 +697,6 @@ if $ARGS[0] = 'briberyreaction':
 	end
 end
 
-
 if $ARGS[0] = 'policesub1':
 	police_sub_counter += 1
 	if police_sub_counter > 4: gt 'street_walker', 'policesub2'
@@ -716,7 +732,6 @@ if $ARGS[0] = 'policesub1':
 	end
 end
 
-
 if $ARGS[0] = 'policesub2':
 	*clr & cla
 	gs 'pain', 5, 'vaginal', 'tear'

+ 1 - 1
locations/swamp.qsrc

@@ -15,7 +15,7 @@ goswamp = 1
 gs 'gadukino_event', 'sound'
 gs 'stat'
 
-*clr * cla
+*clr & cla
 
 '<center><H4>Swamp</H4></center>'
 

+ 2 - 2
locations/swamphouse.qsrc

@@ -133,9 +133,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			act 'Get dressed':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg</center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"</center>'
 				*nl
-				'You put your clothes back on'
+				'You put your clothes back on.'
 				gs 'underwear', 'wear'
 				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 				gs 'stat'