Merge remote-tracking branch 'sovietmercader/master'

locations/gadforest.qsrc

@@ -583,11 +583,11 @@ if $ARGS[0] = 'torncloth':
 	if $clothingworntype ! 'nude':
 		if (PCloThinness = 1 or PCloSkirt > 0) and PCloQuality < 5:
 			!skirts, not fit, and not high-class enough by illume
-			'Oops, your clothes get snagged and tear slightly.'
+			'<font color="red">Your clothes get caught on some brush and tear slightly.</font>'
 			dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 1'
 			!add remove clothes if worn out
 			if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
-				'Your ripped clothes were barely holding together, but now they have finally fell apart. You are naked now.'
+				'<font color="red">Your clothes were barely holding together, but now they have fallen apart completely. You discard the remains and are left naked.</font>'
 				gadforest_clothestorn = 1
 				gs 'clothing', 'strip', 'gadforest'
 				gs 'stat'

locations/gadhouse.qsrc

@@ -128,8 +128,8 @@ if $ARGS[0] = 'start':
 		'As you turn to leave, she stops you, "One last thing, here are some rubles for the train ticket to get you back to Pavlovsk."'
 
 		act 'Leave': gadstay = 0 & gt 'gaddvor'
-	!! Returning home after being lost; no penalty for not doing chores or disappointing either grandparent
-	elseif lost_girl = 1 and hour >= 6 and hour < 20:
+	!! Returning home after being lost at least overnight; no penalty for not doing chores or disappointing either grandparent
+	elseif lost_girl = 1 and hour >= 6 and hour < 20 and daystart > forest_lostday:
 		*clr & cla
 		lost_girl = 0
 		grandmaQW['disappointment'] = 0
@@ -143,9 +143,13 @@ if $ARGS[0] = 'start':
 		*nl
 		'"<<$pcs_firstname>>, your grandfather and I were so worried when you didn''t come back home from the forest."'
 		'"We are so glad you are back safe and sound. Go have a hot meal and shower and relax."'
-		'"Also, don''t worry about any chores today or tomorrow, just focus on recovering."'
+		'"Also, don''t worry about any chores today, just focus on recovering."'
 
 		act 'Continue':gt 'gadhouse', 'main'
+	!! Returning home after being lost but escaped within the same day; no reaction from grandparents and still expected to get chores done
+	elseif lost_girl = 1:
+		lost_girl = 0
+		gt 'gadhouse', 'main'
 	!!Grandma kicks Sveta out for being a whore
 	elseif grandmaQW['nudity_trouble_limit'] = 50 and hour >= 6 and hour < 20:
 		*clr & cla

locations/miroslava.qsrc

@@ -1098,7 +1098,7 @@ if $ARGS[0] = 'miratalk':
 	else
 		*clr & cla
 		minut += 10
-		if npc_QW['A63'] > 0 and npc_QW['A63'] < 13 and npc_rel['A60'] < 50: npc_rel['A60'] += 1
+		if (npc_QW['A63'] > 0 and npc_QW['A63'] < 13) and npc_rel['A60'] < 50: npc_rel['A60'] += 1
 		if npc_QW['A63'] >= 13 and npc_QW['A60'] > 15 and npc_rel['A60'] < 50:npc_rel['A60'] += 1
 		if Mira_no > 0 and miraday ! daystart:miraday = daystart & Mira_no -= 1
 		gs 'stat'
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'miratalk':
 		if MiraLoc = 1:gs 'miroslava', 'mira_river'
 		if npc_QW['A60'] < 20 and npc_QW['A63'] < 13:
 			'You spend ten minutes talking about trivia, you often refer to Mira as a whore, but she just pretends not to hear.'
-		elseif npc_QW['A60'] >= 20 and npc_QW['A60'] < 30 and npc_QW['A63'] < 13:
+		elseif (npc_QW['A60'] >= 20 and npc_QW['A60'] < 30) and npc_QW['A63'] < 13:
 			'You spend ten minutes talking about trivia, Mira tries her best not to look you in the eyes, she seems distracted by other thoughts.'
 		elseif npc_QW['A60'] >= 30 and npc_QW['A63'] < 13:
 			'You spend ten minutes talking about trivia, but Mira isn''t listening, all she wants to talk about is sex.'

locations/mitkabuh.qsrc

@@ -1107,8 +1107,8 @@ if $ARGS[0] = 'mira_5':
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirawish1_2.jpg"></center>'
 		*nl
 		'By the time you catch up and find a good hiding spot, Mitka and Mira have already started. Mira is naked, lying on a wooden table with her fit up in the air.'
-		'Mitka is nailing her in the ass with his cock, just like Mira promised he would. Each time he pushes into her, Mira softly moans and the table creaks uder her.'
-		'The loud sounds of Mitka''s thursts can easily be heard from you where you are spying from. After 15 minutes Mira is wriggling her ass and mooing, having the time of her life.'
+		'Mitka is nailing her in the ass with his cock, just like Mira promised he would. Each time he pushes into her, Mira softly moans and the table creaks under her.'
+		'The loud sounds of Mitka''s thrusts can easily be heard from you where you are spying from. After 15 minutes Mira is wriggling her ass and mooing, having the time of her life.'
 		'This is too much for Mitka and he begins to noisily cum in her ass, not even bothering to pull out. He makes her clean his cock before heading back to drink with the other boys some more.'
 		'Mira looks around to try and spot you, but cannot see you in her drunk state.'