Merge remote-tracking branch 'sepis/master'

locations/mother.qsrc

@@ -293,7 +293,39 @@ if $ARGS[0] = '':
 				act 'Move away':gt $loc, $loc_arg
 			end
 		end
-
+      
+		!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
+		if motherKnowRaped = 0 and (rape > 0 or hidden_rape > 0):
+			act 'Tell that you were raped':
+				*clr & cla
+				minut+=rand(1,3)
+				!used only to tell older events that you are no longer virgin
+				motherKnowSpravka = 1 
+				!new variable to tell if mother now that sveta were raped
+				motherKnowRaped = 1 
+				!skipping to the end of 'mother being angry because you are sexualy active quest'
+				npc_QW['A29'] = 2
+				gs 'stat'
+				'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+				'<<$npc_nickname[''A29'']>> sees you with tears in your your eyes.  '
+				'"<<$pcs_nickname>>, what happaned? Why are you crying?"'
+			
+			act 'Tell her':
+				cla
+				'You tell her that you were rapped.'
+				'<<$npc_nickname[''A29'']>> freezes in shock. Few second later, after understanding what you just said, she hugs you.'
+				'"Do not worry, <<$pcs_nickname>>. You are safe now, everyting will be ok."'
+				'She keeps hugging you firmly for few minutes, talking to you, tryiong to make you feel better. <<$npc_nickname[''A29'']>> asks you to try to be more cerefull so this situation would not repeat for you.'
+				'"Please, take this pill, we do not want that you become pregnant because of a raper."'
+				minut+=rand(8,12)
+				gs 'npc_relationship', 'modify', 'A29', 4
+				act 'Take Morning after pill and leave':gt $loc, $loc_arg
+				morning_after_pill +=1
+				end
+			end
+		end
+      
 		act 'Chat':
 			*clr & cla
 			minut+=rand(10,15)

locations/wardrobe.qsrc

@@ -828,6 +828,9 @@ if $ARGS[0] = 'default_entry_delete':
 	$defcoattype[i] = ''
 	defcoatnumber[i] = ''
 	$def_clothing_name[i] = ''
+    if default_sport_number = i: 
+		default_sport_number = 0
+	end
 	gt 'wardrobe', $wloc
 end
 
@@ -893,6 +896,7 @@ if $ARGS[0] = 'default_sport_options':
 				lastworndefpursenumber['sport'] = currentpursenumber
 				$lastworncoattype['sport'] = $coatworntype
 				lastworndefcoatnumber['sport'] = coatwornnumber
+      			gs  'wardrobe', 'default_entry_wear', default_sport_number
 				gt $loc, $loc_arg
 			end
 		else