Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/Gnpc.qsrc

@@ -323,7 +323,7 @@ if sub < 20 and ((boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boyti
 			end
 		end
 
-		if  otnBoyFrend[numnpc] >= 40 and gnpcSex[numnpc] > 0:
+		if otnBoyFrend[numnpc] >= 40 and gnpcSex[numnpc] > 0:
 			act 'Just be friends':
 				cla
 				temprand = rand(0, 4)

locations/Gshveyfab.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'tailor':
 	'"Hello there young lady, do you want to adjust some of your clothing? It''ll cost you 500 <b>₽</b> per item."'
 
 	act 'Leave': gt 'pavIndustrial'
-	
+
 	if money >= 500:
 		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 			*clr & cla
@@ -53,16 +53,16 @@ if $ARGS[0] = 'enter':
 	'First shift - 08:00 to 16:00.'
 	'Second shift - 16:00 to 20:00.'
 	*nl
-	if workFabrika = 0 and age >= 16 and age < 18:'You can apply for a <a href="exec:minut += 15 & gt ''Gshveyfab'', ''job_start''">part-time job</a> here.'
+	if workFabrika = 0 and age < 18:'You can apply for a <a href="exec:minut += 15 & gt ''Gshveyfab'', ''job_start''">part-time job</a> here.'
 	if work = 0 and workFabrika = 0 and age >= 18:'You can apply for a <a href="exec:minut += 15 & gt ''Gshveyfab'', ''job_start''">full-time job</a> here.'
 
 	act 'Leave': minut += 5 & gt 'pavIndustrial'
-	
+
 	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 8 and hour < 9 and age >= 18:
 		'Your shift is starting now.'
 		act 'Start shift': gt'Gshveyfab','job'
 	end
-	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 16 and hour < 17 and age >= 16 and age < 18:
+	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 16 and hour < 17 and age < 18:
 		'Your shift is starting now.'
 		act 'Start shift': gt'Gshveyfab','job'
 	end
@@ -70,7 +70,7 @@ if $ARGS[0] = 'enter':
 		'You can quit your job, but quitting will lead to a deducted wage.'
 		act 'Quit job':
 			menu_off = 1
-			if age >= 16 and age < 18:
+			if age < 18:
 				smenaFabrika -= 1
 			elseif age >= 18:
 				smenaFabrika -= 2
@@ -100,10 +100,10 @@ if $ARGS[0] = 'job_start':
 	'<center><B>FOREMAN''S OFFICE</B></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/stepan/nachalnik.jpg" ></center>'
 	'You head into the factory foreman, Stepan Sergeyevich office, and ask him if there''s an available job.'
-	
+
 	act 'Leave': gt'Gshveyfab', 'enter'
-	
-	if age >= 16 and age < 18 and workFabrika = 0:
+
+	if age < 18 and workFabrika = 0:
 		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult yet, you can only work half-time, and the pay is 105 <b>₽</b> per hour. Once you become an adult, we can transfer you to full-time. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 08:00 to 16:00, but you will be working the second shift, from 16:00 to 20:00.'
 		'But beware, if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
 
@@ -144,7 +144,7 @@ if $ARGS[0] = 'job':
 	menu_off = 1
 	FabrikaProgul -= 1
 	if FabrikaProgul < 0: FabrikaProgul = 0
-	if age >= 16 and age < 18:
+	if age < 18:
 		minut += 240
 		smenaFabrika += 1
 	end

locations/HotelHole.qsrc

@@ -12,7 +12,7 @@ $location_type = 'public_indoors'
 $receptionName = 'Elisabet'
 gs'stat'
 
-! use this args if  some event  transfers you directly to the lobby  and it is can happen  between  midnight and 01:00.
+! use this args if some event  transfers you directly to the lobby  and it is can happen  between  midnight and 01:00.
 if $ARGS[0] = 'skip_resepevent': jump 'skipresepevent'
 
 if hour = 0 and $prevloc ! 'HotelRoom':

locations/Katja_Tanga.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'school':
 		*clr & cla
 		if KatjaSlut > 80 and n_tanga >= 4:
 			gt 'Katja_Tanga', 'school5'
-		elseif  katschoolsex >= 1 and KatjaSlut > 60 and param = 0:
+		elseif katschoolsex >= 1 and KatjaSlut > 60 and param = 0:
 			gt 'Katja_Tanga', 'school4'
 		elseif KatjaSlut > 40 and katschoolsex = 0:
 			gt 'Katja_Tanga', 'school3'

locations/arousal.qsrc

@@ -138,8 +138,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		!! when the boy is skilled, he does not harm PC with his long dick
 		if (temp_silavag = 2) and (altdif > 0): altdif = 0
 		!! lube can compensate the difference a bit
-		if  agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
+		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
 		!! if the dick is smaller, it cannot harm PC
@@ -175,7 +175,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		altdif = altdif / (temp_silavag+1)
 		agrdif = agrdif *(5/4 - 1/(4 - temp_silavag))
 		if (temp_silavag = 2) and (altdif > 0): altdif = 0
-		if  agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
+		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
 		if agrdif < 0: agrdif = 0
@@ -193,7 +193,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		altdif = altdif / (temp_silavag+1)
 		agrdif = agrdif *(5/4 - 1/(4 - temp_silavag))
 		if (temp_silavag = 2) and (altdif > 0): altdif = 0
-		if  agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
+		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
 		if agrdif < 0: agrdif = 0
@@ -237,7 +237,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		!! when the boy is skilled, he does not harm PC with his long dick
 		if (temp_silavag = 2) and (vltdif > 0): vltdif = 0
 		!! even PC horniness can compensate the difference 
-		if    vgrdif > vaginal_slip: vgrdif = vgrdif - vaginal_slip else if (vgrdif > 0): vgrdif = 0
+		if vgrdif > vaginal_slip: vgrdif = vgrdif - vaginal_slip else if (vgrdif > 0): vgrdif = 0
 		if -1*vgrdif > vaginal_slip: vgrdif = vgrdif + vaginal_slip else if (vgrdif < 0): vgrdif = 0
 
 		stim['act'] = 80 - (iif(vltdif>0,vltdif,-vltdif) + iif(vgrdif >0,vgrdif,-vgrdif)) + temp_silavag*8
@@ -274,7 +274,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		vltdif = vltdif / (temp_silavag+1)
 		vgrdif = vgrdif *(5/4 - 1/(4 - temp_silavag))
 		if (temp_silavag = 2) and (vltdif > 0): vltdif = 0
-		if    vgrdif > vaginal_slip: vgrdif = vgrdif - vaginal_slip else if (vgrdif > 0): vgrdif = 0
+		if vgrdif > vaginal_slip: vgrdif = vgrdif - vaginal_slip else if (vgrdif > 0): vgrdif = 0
 		if -1*vgrdif > vaginal_slip: vgrdif = vgrdif + vaginal_slip else if (vgrdif < 0): vgrdif = 0
 		stim['act'] = 80 - (iif(vltdif>0,vltdif,-vltdif) + iif(vgrdif >0,vgrdif,-vgrdif)) + temp_silavag*8
 		if vgrdif < 0: vgrdif = 0
@@ -295,7 +295,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		vltdif = vltdif / (temp_silavag+1)
 		vgrdif = vgrdif *(5/4 - 1/(4 - temp_silavag))
 		if (temp_silavag = 2) and (vltdif > 0): vltdif = 0
-		if    vgrdif > vaginal_slip: vgrdif = vgrdif - vaginal_slip else if (vgrdif > 0): vgrdif = 0
+		if vgrdif > vaginal_slip: vgrdif = vgrdif - vaginal_slip else if (vgrdif > 0): vgrdif = 0
 		if -1*vgrdif > vaginal_slip: vgrdif = vgrdif + vaginal_slip else if (vgrdif < 0): vgrdif = 0
 		stim['act'] = 80 - (iif(vltdif>0,vltdif,-vltdif) + iif(vgrdif >0,vgrdif,-vgrdif)) + temp_silavag*8
 		if vgrdif < 0: vgrdif = 0

locations/bedrPar.qsrc

@@ -79,7 +79,7 @@ if popugai2 = 1:
 	if daystart - parbuydate > 40 and daystart - parbuydate <= 50: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
 	if daystart - parbuydate > 50 and daystart - parbuydate <= 55: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
 	if daystart - parbuydate > 55 and saveparQW < 3: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
-	if  saveparQW = 3:
+	if saveparQW = 3:
 		parfixrand = rand(0,9)
 		if parfixrand = 0:'When <<$namepopu2>> sees you he starts ''speaking''. He  is saying "<b>What Did You Say To Me?</b>"'
 		if parfixrand = 1:'When <<$namepopu2>> sees you he starts ''speaking''. He  is saying "<b>3.1415926535897932384 ....</b>"'
@@ -165,7 +165,7 @@ else
 
 	gs 'events', 'read'
 
-	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
+	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
 	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
 	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'

locations/beg1.qsrc

@@ -252,7 +252,7 @@ if $ARGS[0] = '1':
 	elseif begresult < 46:
 		gs 'fame', 'city', 'running', 5
 		silverbeg += 1 & money += 3000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 3, 000 <b>₽</b>'
-	elseif  begresult >= 46:
+	elseif begresult >= 46:
 		gs 'fame', 'city', 'running', 6
 		razradbeg = 4 & goldbeg += 1 & money += 4000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 4000 <b>₽</b> and became the "Track Champion of the Leningrad Oblast", not only putting you on the list of the 50 best track athletes in the Russian Federation but also qualifying you for the next district championship!'
 	end

locations/gpoli.qsrc

@@ -1653,7 +1653,7 @@ if $ARGS[0] = 'maternity_ward':
 							'Nurse: You can buy it in the pharmacy...'
 							pcs_knows_nipplecream = 1
 							'The nurse finishes rubbing you nipples with the nipple balm.'
-						elseif  pain['nipples'] >= 60:
+						elseif pain['nipples'] >= 60:
 							'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipple.jpg"></center>'
 							'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit of the yellowish cream from the tin.'
 							'She applies the cream to your nipples. It feels nice on your nipples and they hurt less.'

locations/gschool_detention.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'handjob':
 		if $rand_boy = 'Niko' and jump_counter < 1000: jump_counter += 1 & jump 'boy_jump'
 	else
 		gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 0, 0, 0
-		if  $rand_boy ! 'Dimka' and $rand_boy ! 'Andrey' and $rand_boy ! 'Ivan' and $rand_boy ! 'Lazar' and $rand_boy ! 'Svyatoslav' and jump_counter < 1000: jump_counter += 1 & jump 'boy_jump'
+		if $rand_boy ! 'Dimka' and $rand_boy ! 'Andrey' and $rand_boy ! 'Ivan' and $rand_boy ! 'Lazar' and $rand_boy ! 'Svyatoslav' and jump_counter < 1000: jump_counter += 1 & jump 'boy_jump'
 	end
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'

locations/katja_sex.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'park':
 	end
 	!_________________Change the date\nights, seasons. End.___________________________
 
-	if  flag_KissEV = 3:
+	if flag_KissEV = 3:
 		'You and Katja arrive at the park hand in hand, she looks to you. "Ready?"'
 		'You nod your head, ready to play your little game. Then she asks "How do we know who wins?"'
 		'You replied to her with smile. "Who ever kisses the most boys win of course."'

locations/npcgeneratec.qsrc

@@ -36,7 +36,7 @@ npctempc1[1] = year - npctempgage
 npctempc1[2] = rand(1,12)
 if npctempc1[2] = 4 or npctempc1[2] = 6 or npctempc1[2] = 9 or npctempc1[2] = 11:
 	npctempc1[3] = rand(1,30)
-elseif  npctempc1[2] = 1 or npctempc1[2] = 3 or npctempc1[2] = 5 or npctempc1[2] = 7 or npctempc1[2] = 8 or npctempc1[2] = 10  or npctempc1[2] = 12:
+elseif npctempc1[2] = 1 or npctempc1[2] = 3 or npctempc1[2] = 5 or npctempc1[2] = 7 or npctempc1[2] = 8 or npctempc1[2] = 10  or npctempc1[2] = 12:
 	npctempc1[3] = rand(1,31)
 elseif ((npctempc1[1] mod 4 = 0) and (npctempc1[1] mod 100 ! 0)) or (npctempc1[1] mod 400 = 0):
 	npctempc1[3] = rand(1,29)

locations/parkM.qsrc

@@ -235,7 +235,7 @@ if $ARGS[0] = 'aa':
 			loverrelation[lover_number] -= 1
 			act '<<$loverdesc[lover_number]>> takes you home...': gt 'sexm', 'start'
 		end
-	elseif  loverrelation[lover_number] < 75:
+	elseif loverrelation[lover_number] < 75:
 		'<center>While walking for an hour <<$loverdesc[lover_number]>> stops occassionally to give you a tender kiss.</center>'
 		act 'Gladly accept with a warm smile':
 			cls

locations/pod_whore.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'client_talk':
 	else
 		if $clothingworntype = 'nude':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_nude'+rand(1,3)+'.jpg"></center>'
-		elseif  $clothingworntype = 'formal' or $clothingworntype = 'expensive':
+		elseif $clothingworntype = 'formal' or $clothingworntype = 'expensive':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_glamur.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door.jpg"></center>'

locations/reks.qsrc

@@ -21,13 +21,13 @@ if $ARGS[0] = 'rexGdkTalk':
 		rexTalk = rand(1,10)
 		if rexTalk <= 5:
 			'You talk with Rex about different topics.'
-		elseif  rexTalk = 6:
+		elseif rexTalk = 6:
 			'You talk with Rex, and he tells you that last summer he went to Abkhazia with his parents.'
-		elseif  rexTalk = 7:
+		elseif rexTalk = 7:
 			'You talk with Rex and find out he loves photography and wants to become a photographer.'
-		elseif  rexTalk = 8:
+		elseif rexTalk = 8:
 			'You talk with Rex. He says that his dad has a garage, and he sometimes moonlights there. He''s not too bad.'
-		elseif  rexTalk = 9:
+		elseif rexTalk = 9:
 			'You talk with Rex. He tells you about how he got into an accident.'
 		elseif rexTalk = 10:
 			'You talk with Rex. He says that his name is actually Egor. "Rex" is just his street name.'
@@ -116,15 +116,15 @@ if $ARGS[0] = 'rexGdkTalk':
 		end
 		if rexTalk = 1:
 			'You talk with Rex. He tells you that some nights he "borrows" the keys to his dad''s car while his parents aren''t home and goes driving without a license.'
-		elseif  rexTalk = 2:
+		elseif rexTalk = 2:
 			'You talk with Rex about various topics, and he sometimes gives you compliments inbetween.'
-		elseif  rexTalk = 3:
+		elseif rexTalk = 3:
 			'You talk with Rex. He tells you about the awesome camera his parents gave him for his birthday.'
-		elseif  rexTalk = 4:
+		elseif rexTalk = 4:
 			'You talk with Rex, "You know, my sister''s away at the University, but I think you two definitely have a lot in common..."'
-		elseif  rexTalk = 5:
+		elseif rexTalk = 5:
 			'You talk with Rex. He says, that he''s taking classes at a driving school and, if he''s lucky, he''ll get his license soon.'
-		elseif  rexTalk = 6:
+		elseif rexTalk = 6:
 			'You talk with Rex, and each time you find yourself liking him a little more. It turns out he isn''t so strange.'
 		end
 

locations/stat.qsrc

@@ -928,7 +928,7 @@ if rape > 0 and rape ! rape_count and orgasm = orgasm_count:
 elseif orgasm > 0 and orgasm ! orgasm_count:
 	pcs_mood = 100
 	orgasm_count = orgasm
-elseif  rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
+elseif rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 	pcs_mood = 100
 	orgasm_count = orgasm
 	rape_count = rape

locations/stwork.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'start':
 
 			if pcs_leghair <= 3:
 				if fingal <= 0:
-					if  strippermission = 0:
+					if strippermission = 0:
 						act 'Go see the manager':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripinspection.jpg"></center>'

locations/telefon.qsrc

@@ -402,7 +402,7 @@ if $ARGS[0] = 'SvetaCallsNPC':
 		end
 	end
 
-	if  $home_town = 'city':
+	if $home_town = 'city':
 		act 'Invite to the bar':
 			cla
 			'"Let''s go to the bar."'
@@ -819,7 +819,7 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 		end
 	end
 
-	if  $home_town = 'city':
+	if $home_town = 'city':
 		act 'Invite to the pool hall':
 			cla
 			'"Let''s play pool."'
@@ -911,7 +911,7 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 		end
 	end
 
-	if  $home_town = 'city':
+	if $home_town = 'city':
 		act 'Invite to the pool hall':
 			cla
 			'"Let''s play pool."'