Merge remote-tracking branch 'julzor/master'

locations/dimaHome.qsrc

@@ -414,7 +414,20 @@ if $ARGS[0] = 'kitchen1':
 		'Olya smiles back, "Don''t worry <<$pcs_nickname>> it''s my pleasure to serve. My boys already expect me to act that way so I''m more than happy to serve you too, especially since my sweet Dimka has been mentioning you."'
 		act 'He has?':
 			*clr & cla
-			minut += 1
+			frost = 0
+			alko -= 1
+			minut += 10
+			pcs_health += 10
+			pcs_mood += 20
+			pcs_energy += 20
+			if pcs_hydra >= 100:
+				pcs_hydra += 25
+			else
+				pcs_hydra += 50
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
 			gs 'stat'
 			'<center><b><font color = maroon>Kitchen</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/olya.jpg"></center>'

locations/gadbana.qsrc

@@ -100,7 +100,11 @@ if mira = 0:
 
 					if frost > 0:frost = 0
 
-					pcs_skin += 5
+					if sauna_daystart ! daystart:
+						sauna_daystart = daystart
+						pcs_skin += rand(2,4)
+						pcs_willpwr += 3
+					end
 
 					gs 'stat'
 

locations/gdk.qsrc

@@ -72,6 +72,8 @@ if hour >= 8:act 'Go to the toilets': gt 'gdktoilet', 'start'
 
 if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
 
+act 'Wait':gs 'obj_din', 'wait'
+
 gs'family'
 
 --- gdk ---------------------------------

locations/gdktoilet.qsrc

@@ -94,6 +94,7 @@ if $ARGS[0] = 'mens_entrance_events':
 			'You decide to take a closer look, to your surprise, there is a naked man standing with his face to the wall. His body is pressed up close against the wall.'
 			if pcs_vag >= 1:
 				if pcs_horny >=80:
+					act 'Leave': gt'gdktoilet', 'start'
 					gs 'willpower', 'sex', 'force'
 					if will_cost <= pcs_willpwr:
 						act 'Seduce him (<<will_cost>> Willpower)':
@@ -133,7 +134,6 @@ if $ARGS[0] = 'mens_entrance_events':
 					else
 						act 'Seduce him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Leave': gt'gdktoilet', 'start'
 				elseif pcs_horny >=40:
 					gs 'willpower', 'mast', 'self'
 					if will_cost <= pcs_willpwr:
@@ -148,14 +148,13 @@ if $ARGS[0] = 'mens_entrance_events':
 							'<center><b><font color="maroon">Men''s Room</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/masturbate.jpg"></center>'
 							'You decide to masturbate in front of him. You rub your clit while exposing your bare ass. He smile and nods appreciating your body. You start to feel warm as you keep rubbing your clit. Your body gets tense as you approach orgasm.'
-							if pcs_apprnc >= 120:
+							if hotcat >= 6:
 								*clr & cla
 								'<center><b><font color="maroon">Men''s Room</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/1kissing.jpg"></center>'
 								'Unable to resist the man pushes you against the wall kissing you.'
 								gs 'arousal', 'kiss', 5
 								gs 'stat'
-								act 'Give In': gt'gdktoilet', 'mensglory'
 								gs 'willpower', 'sex', 'resist'
 								if will_cost <= pcs_willpwr:
 									act 'Leave (<<will_cost>> Willpower)':
@@ -170,11 +169,11 @@ if $ARGS[0] = 'mens_entrance_events':
 								else
 									act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 								end
-							elseif pcs_apprnc >= 80:
+								act 'Give In': gt'gdktoilet', 'mensglory'
+							elseif hotcat >= 4:
 								cla
 								*nl
 								'The man backs away from the wall and says, "Why don''t you come over here and we can have some fun."'
-								act 'Give In': gt'gdktoilet', 'mensglory'
 								gs 'willpower', 'sex', 'resist'
 								if will_cost <= pcs_willpwr:
 									act 'Leave (<<will_cost>> Willpower)':
@@ -189,6 +188,7 @@ if $ARGS[0] = 'mens_entrance_events':
 								else
 									act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 								end
+								act 'Give In': gt'gdktoilet', 'mensglory'
 							else
 								act 'Leave': gs 'arousal', 'end' & gt'gdktoilet', 'start'
 							end
@@ -729,6 +729,11 @@ if $ARGS[0] = 'emptystall':
 		gs 'stat'
 		'You walk down to the last stall. The large almost perfectly round hole is still there. You wonder how many women have used that hole. You feel a little excited as you contemplate your next move.'
 	end
+	act 'Get Up':
+		cla
+		'You decide not to look in the hole and leave.'
+		act 'Leave': gt'gdktoilet', 'womens'
+	end
 	if pcs_horny >=40:
 		gs 'willpower', 'mast', 'self'
 		if will_cost <= pcs_willpwr:				
@@ -762,11 +767,6 @@ if $ARGS[0] = 'emptystall':
 		end
 	end
 	act 'Look at the Hole': gt 'gdktoilet', 'hole'
-	act 'Get Up':
-		cla
-		'You decide not to look in the hole and leave.'
-		act 'Leave': gt'gdktoilet', 'womens'
-	end
 end
 
 if $ARGS[0] = 'contmast':
@@ -785,6 +785,21 @@ if $ARGS[0] = 'contmast':
 	end
 	gs 'arousal', 'masturbate', 5
 	gs 'stat'
+	gs 'willpower', 'mast', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Stop (<<will_cost>> Willpower)':
+			cla
+			minut += 1
+			gs 'willpower', 'mast', 'self'
+			gs 'willpower', 'pay', 'self'
+			gs 'arousal', 'end'
+			gs 'stat'
+			'You decide that you shouldn''t continue and stop yourself from finishing.'
+			act 'Leave Stall':gt 'gdktoilet', 'womens'
+		end
+	else
+		act 'Stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	if pcs_horny >= 90:
 		act 'Climax':
 			*clr & cla
@@ -801,21 +816,6 @@ if $ARGS[0] = 'contmast':
 	else
 		act 'Continue': gt 'gdktoilet', 'contmast'
 	end
-	gs 'willpower', 'mast', 'self'
-	if will_cost <= pcs_willpwr:
-		act 'Stop (<<will_cost>> Willpower)':
-			cla
-			minut += 1
-			gs 'willpower', 'mast', 'self'
-			gs 'willpower', 'pay', 'self'
-			gs 'arousal', 'end'
-			gs 'stat'
-			'You decide that you shouldn''t continue and stop yourself from finishing.'
-			act 'Leave Stall':gt 'gdktoilet', 'womens'
-		end
-	else
-		act 'Stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
 end
 
 if $ARGS[0] = 'hole':
@@ -834,21 +834,35 @@ if $ARGS[0] = 'hole':
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghstartled.mp4"></video></center>'
 			'While looking through the hole you decided to write something on the wall just above it. While you were focused on writing, you didn''t notice the dick poking through the hole until the tip of it nearly went into your mouth. Startled you jerk away from the offending penis.'
-			act 'Suck it': gt 'gdktoilet', 'blowjob'
-			if pcs_throat = 0:act 'Touch the shaft':gt 'gdktoilet', 'virgin'
-			gs 'willpower', 'bj', 'resist'
+			
+			act 'Quickly leave the stall ':
+				*clr & cla
+				minut += 2
+				gs 'stat'
+				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
+				'You shudder in disgust at the thought that some stranger''s dick was just practically in your mouth, you get up and quickly leave.'
+				act'Leave': gt 'gdktoilet', 'womens'
+			end
+
+			gs 'willpower', 'bj', 'self'
 			if will_cost <= pcs_willpwr:
-				act 'Quickly leave the stall (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'bj', 'resist'
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
-					'You shudder in disgust at the thought that some stranger''s dick was just practically in your mouth, you get up and quickly leave.'
-					act'Leave':gt 'gdktoilet', 'womens'
+				act 'Suck it (<<will_cost>> Willpower)': 
+					gs 'willpower', 'bj', 'self'
+					gs 'willpower', 'pay', 'self'
+					gt 'gdktoilet', 'blowjob'
 				end
 			else
-				act 'Quickly leave the stall (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Suck it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			gs 'willpower', 'hj', 'self', 'easy'
+			if pcs_throat = 0 and will_cost <= pcs_willpwr:
+				act 'Touch the shaft (<<will_cost>> Willpower)':
+					gs 'willpower', 'hj', 'self'
+					gs 'willpower', 'pay', 'self'
+					gt 'gdktoilet', 'virgin'
+				end
+			elseif pcs_throat = 0 and will_cost > pcs_willpwr:
+				act 'Touch the shaft (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	elseif rand(1, 10) >= 7 - (ghnow * 2):
@@ -928,19 +942,13 @@ if $ARGS[0] = 'virgin':
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghvirgin1.mp4"></video></center>'
 	'You tentatively reach out and gently touch the dick, half afraid to, but also half wanting to.'
 	
-	gs 'willpower', 'hj', 'resist'
-	if will_cost <= pcs_willpwr:
-		act 'Quickly leave the stall (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'hj', 'resist'
-			gs 'willpower', 'pay', 'resist'
-			gs 'stat'
-			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
-			'You shudder in disgust at the thought that you were just touching some stranger''s dick. You get up and quickly leave.'
-			act'Leave':gt 'gdktoilet', 'womens'
-		end
-	else
-		act 'Quickly leave the stall (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	act 'Quickly leave the stall':
+		*clr & cla
+		minut += 2
+		gs 'stat'
+		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
+		'You shudder in disgust at the thought that you were just touching some stranger''s dick. You get up and quickly leave.'
+		act'Leave':gt 'gdktoilet', 'womens'
 	end
 	act 'Grab it':
 		*clr & cla

locations/grigory.qsrc

@@ -12,6 +12,7 @@ if $ARGS[0] = 'dummy':
 end
 
 if $ARGS[0] = 'meet':
+	*clr & cla
 	minut += 2
 	npc_qw['A221'] = 1
 	gs 'stat'
@@ -23,8 +24,7 @@ if $ARGS[0] = 'meet':
 	'He''s perhaps in his late thirties, early forties at most. His angular face is framed by his unruly brown hair, and as he draws closer you start to become aware of just how massive this man is.'
 	'"Kiska?" He calls when he gets close, the pet name surprising you.'
 	act '"Grigory?"':
-		*clr
-		cla
+		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
@@ -36,8 +36,7 @@ if $ARGS[0] = 'meet':
 		'Reaching for his back pocket, he pulls a flask. Tipping the flask back, he takes a long pull from it before screwing the cap back in place and returning it to his back pocket.'
 		'"I had a little money saved up, barely enough to make a downpayment on the farm up the road," Ha half smiles, "I''ll be paying on it the rest of my life, but its mine."'
 		act '"That''s great!"':
-			*clr
-			cla
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
@@ -56,8 +55,7 @@ if $ARGS[0] = 'meet':
 			'Finally, the two of you drift into a comfortable silence. Eventually he sighs, "I really need to get back to work my little Kiska," He gives a wistful smile, his eyes drifting over your body for a moment before meeting your eyes again, "You really have grown into an exceptional young woman. I hope you return for another visit soon."'
 
 			act 'Say goodbye':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
 				'"I enjoyed getting to talk to you again," You admit, "I''ll be sure to say hi the next time I see you." With a smile, you wave and start to make your exit.'
 				'Grigory smiles broadly, waving goodbye as you leave.'
@@ -68,8 +66,7 @@ if $ARGS[0] = 'meet':
 			gs 'willpower', 'misc', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Hug him goodbye (<<will_cost>> Willpower)':
-					*clr
-					cla
+					*clr & cla
 					minut += 2
 					gs 'willpower', 'misc', 'self', 'easy'
 					gs 'willpower', 'pay', 'self'
@@ -92,10 +89,9 @@ if $ARGS[0] = 'meet':
 end
 
 if $ARGS[0] = 'barn':
-	grigory_barn = daystart
-	*clr
-	cla
+	*clr & cla
 	minut += 2
+	grigory_barn = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 	'When you start to enter the barn behind your grandparents'' place, you can hear someone or something moving about inside.'
@@ -105,8 +101,7 @@ if $ARGS[0] = 'barn':
 	!!Ends scene, returns to barn exterior
 
 	act 'Say hi':
-		*clr
-		cla
+		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
@@ -122,8 +117,7 @@ if $ARGS[0] = 'barn':
 	if will_cost <= pcs_willpwr:
 		act 'Flirt (<<will_cost>> Willpower)':
 			npc_qw['A221'] = 2
-			*clr
-			cla
+			*clr & cla
 			minut += 2
 			gs 'willpower', 'misc', 'self', 'easy'
 			gs 'willpower', 'pay', 'self'

locations/gschool_grounds.qsrc

@@ -127,7 +127,7 @@ if $ARGS[0] = 'main':
 			elseif hour = 7:
 				if NikoEv = 10:
 					gt 'NikoDates', 'Walk Of Shame'
-				elseif minut <= 45:
+				elseif minut <= 55:
 					act '<b>Go to class</b>': gt 'gschool_grounds', 'bulding'
 				else
 					'You are late for school, you could rush to class or just skip until the second period.'

locations/gschool_lessons.qsrc

@@ -11,6 +11,13 @@ if $ARGS[0] = 'morning':
 		school_lunch = 0
 		if lernHome = 0: petka_homework_need = 0 & pcs_grades += 2
 		if lernHome > 0: petka_homework_need = 1 & pcs_grades -= 1
+		if missing_class > 9:
+			missing_class -= 9
+			pcs_grades -= 3			
+		elseif missing_class > 6:
+			missing_class -= 6
+			pcs_grades -= 2
+		end
 		if pcs_grades > 100: pcs_grades = 100
 		if pcs_grades < 0: pcs_grades = 0
 		lernSkill += 1
@@ -266,11 +273,11 @@ if $ARGS[0] = 'skip':
 	killvar '$breaktype'
 	gs 'stat'
 	'<center><b><font color="maroon">School Hallway</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<rand(0,2)>>.jpg"></center>'
 	'You don''t feel like attending all of your classes this morning. Surely no one will miss you if you skip one of your three morning classes.'
 
-	act 'Go to girl''s bathroom': gt 'gschool_girls_bathroom', 'start'
-	act 'Go to boy''s bathroom': gt 'gschool_boys_bathroom', 'start'
+	act 'Go to girl''s bathroom': missing_class += 1 & gt 'gschool_girls_bathroom', 'start'
+	act 'Go to boy''s bathroom': missing_class += 1 & gt 'gschool_boys_bathroom', 'start'
 !!	act 'Go to old school building': gt
 end
 

locations/journal.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'records':
 	*clr & cla
-	act 'Put your notebook down': gt $loc, $metka
+	act 'Put your notebook down': gt $menu_loc, $menu_arg
 	gs 'housing', 'rent'
 
 	$NoteBookLine = { $result = "<br><<$ARGS[0]>>" }

locations/mother.qsrc

@@ -242,12 +242,12 @@ if $ARGS[0] = '':
 			npc_rel['A29']+=20
 			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. You did really well. Please, take these 7000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			SAtestatGift = 7000
-		elseif pcs_grades > 40:
+		elseif pcs_grades >= 40:
 			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. You did really well. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			SAtestatGift = 5000
 		else
-			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. To be honest I wasn''t sure you would manage to get your diploma. But somehow you did it. Please, take these 5000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
-            SAtestatGift = 5000
+			'Your mother is delighted you graduated. "I''m so happy right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. To be honest I wasn''t sure you would manage to get your diploma. But somehow you did it. Please, take these 3000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+            SAtestatGift = 3000
 		end
 		money += SAtestatGift
 		gs 'stat'

locations/rolanapt.qsrc

@@ -19,8 +19,7 @@ if $ARGS[0] = 'home':
 	minut += 1
 	bonusZ = 0
 	gs 'stat'
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
 	'You walk up to the front door and knock.'
 	if hour >= 23:
@@ -338,6 +337,7 @@ if $ARGS[0] = 'holodil':
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
+			pcs_hydra = 100
 			guavacoco_day = daystart
 			guavacoco_count -= 1
 			gs 'stat'
@@ -354,6 +354,7 @@ if $ARGS[0] = 'holodil':
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
+			pcs_hydra = 100
 			kvass_day = daystart
 			kvass_count -= 1
 			gs 'stat'
@@ -375,6 +376,7 @@ if $ARGS[0] = 'holodil':
 					cumspclnt = 2
 					gs 'cum_cleanup'
 					pcs_breath = 0
+					pcs_hydra = 100
 					kvass_day = daystart
 					kvass_count -= 1
 					gs 'stat'

locations/stat_display.qsrc

@@ -174,7 +174,7 @@ elseif body_write = 0 and face_write > 1:
 	$stat_writing_msg = 'Your face is covered in obscene writing.'
 elseif body_write = 0 and face_write = 1:
 	$stat_writing_msg = 'Your face has a humiliating label written on it.'
-elseif body_write > 1 and face_write > 1:
+elseif body_write > 0 and face_write > 0:
 	$stat_writing_msg = 'Your body and face are covered in obscene graffiti.'
 else
 	$stat_writing_msg = ''
@@ -301,8 +301,8 @@ else
 end
 
 if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
-	$stat_school_msg = 'You have to be at school before 07:45 if you don''t want to be late.'
-	$stat_school_tooltip = 'School starts at 07:45.'
+	$stat_school_msg = 'You have to be at school before 07:55 if you don''t want to be late.'
+	$stat_school_tooltip = 'School starts at 07:55.'
 elseif StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
 	$stat_school_msg = 'You have detention this morning and must be at school before 09:00.'
 	$stat_school_tooltip = 'Detention starts at 09:00.'

locations/succubus.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = 'RapistFight':
 			gs 'arousal', 'vaginal', 10, 'dom'
 			gs 'arousal', 'end'
 			'You quickly drag him out of sight, then rip off his pants and expose your now hungry pussy.'
-			'You force him to the ground and immediately mount him, your now hair-trigger snach sending you into orgasm.'
+			'You force him to the ground and immediately mount him, your now hair-trigger snatch sending you into orgasm.'
 			''
 			'You ride him for some time, your power forcing him to cum <<$scxcum>> pulling every drop of energy out of each eruption, with the rush causing you to orgasm as he does...'
 			''
@@ -223,7 +223,7 @@ if $ARGS[0] = 'tatianaask':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Tatiana</font></b></center>'
-	If sucpcinfo = 2:
+	if sucpcinfo = 2:
 		minut += 10
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main1.jpg"></center>'
 		'You undress and lie down on the couch and Tatiana begins to examine you.'
@@ -234,7 +234,7 @@ if $ARGS[0] = 'tatianaask':
 		$scsubloc = 'tatianasex' & scpopt = 1
 		sucpcinfo = 3
 		act 'Continue': xgt 'succubus', 'init'
-	exit
+		exit
 	elseif sucpcinfo = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main1.jpg"></center>'
 		scpopt = 0
@@ -246,7 +246,7 @@ if $ARGS[0] = 'tatianaask':
 		sucpcinfo = 4
 		sucinfoday = daystart + 10 + rand(0,7)
 		act 'Get dressed': gt 'succubus', 'tatianaask'
-	exit
+		exit
 	end
 	minut += 10
 	'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'

locations/traits.qsrc

@@ -149,10 +149,10 @@ if $ARGS[0] = 'overnight':
 		msg 'You have gained the trait ''Heavyweight''.'
 	elseif alko_trait_counter < -50 and alko_trait > -1:
 		alko_trait = -1	
-		msg 'You have gained the trait ''Lighweight''.'
+		msg 'You have gained the trait ''Lightweight''.'
 	elseif alko_trait = -1 and alko_trait_counter > 0:
 		alko_trait = 0
-		msg 'You have lost the trait ''Lighweight''.'
+		msg 'You have lost the trait ''Lightweight''.'
 	elseif alko_trait = 1 and alko_trait_counter < 0:
 		alko_trait = 0
 		msg 'You have lost the trait ''Heavyweight''.'