[added] alternative dynamic for removing underwear and stashing it in your purse + [changed] non-home bathroom dynamics accordingly

locations/bras.qsrc

@@ -39,6 +39,12 @@ end
 if $ARGS[0] = 'view_bra_list':
 	!! ARGS 0 - view_bra_list
 	!! ARGS 1 - action type (draw, store, unwanted)
+	
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
 
 	if $ARGS[1] ! 'bathroom':
 		act 'Return': gt 'wardrobe', 'start'

locations/brothel.qsrc

@@ -569,7 +569,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	if stanok > 0: dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

locations/butoilet.qsrc

@@ -25,7 +25,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-dynamic $removepan
+dynamic $publicpan
 
 --- butoilet ---------------------------------
 

locations/clothing.qsrc

@@ -105,6 +105,13 @@ if $ARGS[0] = 'view_clothing_list':
 	!! ARGS 0 - view_clothing_list
 	!! ARGS 1 - action type (wardrobe, sell, resize, store, unwanted)
 	!! ARGS 2 - Shop name (kats, moncheri, gm, fashionista, sexshop, exhibitshop, dolls, sports)
+	
+	if $pursepantytype ! '' or $pursebratype ! '' and $ARGS[1] ! 'resize' and $ARGS[1] ! 'sell':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+	
 	if $ARGS[1] = 'wardrobe':
 		$ward_list_page = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'

locations/club.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'tou':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'dance':

locations/dimaHome.qsrc

@@ -236,7 +236,7 @@ if $ARGS[0] = 'bathroom2':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	act 'Leave the bathroom': gt 'dimaHome','hallway2'
 end
 

locations/din_bad.qsrc

@@ -221,7 +221,9 @@ if $ARGS[0] = 'd_bag':
 	if foto = 1:'Your purse contains a strange photo'
 	if pattest > 0: 'You have <b><<pattest>></b> unused paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
 	if used_pattest > 0: 'You have <b><<used_pattest>></b> <a href="exec:dynamic $test_purse">used</a> paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
-
+	*nl
+	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
+	
 	act 'Return':gt 'obj_din', 'menu_exit'
 	'</td></tr></table></center>'
 end

locations/din_van.qsrc

@@ -541,6 +541,77 @@ $removepan = {
 	end
 }
 
+!! Meant for non-home bathrooms. If you have a bag stashes the underwear in there and enables putting it back on later.
+!! purse_____ variables get wiped in 'wardrobe', 'clothing', 'panties' and 'bra' so there isn''t a chance of duplication
+$publicpan = {
+	if $pantyworntype ! 'none' and $braworntype ! 'none':
+		act 'Remove underwear' + iif(bag = 1, ' and put it in your purse','') + ' (0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursepantytype = $pantyworntype
+				pursepantynumber = pantywornnumber
+				$pursebratype = $braworntype
+				pursebranumber = brawornnumber
+			end
+			gs 'underwear', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $pantyworntype = 'none' and $braworntype = 'none' and $pursepantytype ! '' and $pursebratype ! '':
+		act 'Put your underwear back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'panties', 'wear', $pursepantytype, pursepantynumber
+			gs 'bras', 'wear', $pursebratype, pursebranumber
+			killvar '$pursepantytype' & killvar 'pursepantynumber'
+			killvar '$pursebratype' & killvar 'pursebranumber'
+			gt $loc, $metka
+		end
+	end
+
+	if $pantyworntype ! 'none':
+		act 'Remove panties ' + iif(bag = 1, ' and put them in your purse','') + '(0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursepantytype = $pantyworntype
+				pursepantynumber = pantywornnumber
+			end
+			gs 'panties', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $pantyworntype = 'none' and $pursepantytype ! '':
+		act 'Put your panties back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'panties', 'wear', $pursepantytype, pursepantynumber
+			killvar '$pursepantytype' & killvar 'pursepantynumber'
+			gt $loc, $metka
+		end
+	end
+
+	if $braworntype ! 'none':
+		act 'Remove bra ' + iif(bag = 1, ' and put it in your purse','') + '(0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursebratype = $braworntype
+				pursebranumber = brawornnumber
+			end
+			gs 'bras', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $braworntype = 'none' and $pursebratype ! '':
+		act 'Put your bra back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'bras', 'wear', $pursebratype, pursebranumber
+			killvar '$pursebratype' & killvar 'pursebranumber'
+			gt $loc, $metka
+		end
+	end
+}
+
 $basin = {
 	if cumloc[12] = 1:
 		act 'Rinse your mouth (0:05)':

locations/gdktoilet.qsrc

@@ -405,7 +405,7 @@ if $ARGS[0] = 'mens':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'mensmast':

locations/gschool_break.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'restroom_actions':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end	
 
 if $ARGS[0] = 'girls_restroom_events':

locations/gschool_grounds.qsrc

@@ -713,7 +713,7 @@ if $ARGS[0] = 'change_room':
 		cla
 		gt 'wardrobe', 'start'
 	end
-	dynamic $removepan
+	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	dynamic $quickwash

locations/kafe2.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'givi':

locations/koncepod1.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'vnr2x':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0]='bdr2x':

locations/laketoilet.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'main':
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
-		dynamic $removepan
+		dynamic $publicpan
 	end
 end
 

locations/leonid.qsrc

@@ -859,7 +859,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 --- leonid ---------------------------------

locations/nordtrain.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'ticket':

locations/panties.qsrc

@@ -43,6 +43,12 @@ end
 if $ARGS[0] = 'view_panty_list':
 	!! ARGS 0 - view_panty_list
 	!! ARGS 1 - action type (clean, dirty, store, bathroom)
+	
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
 
 	if $ARGS[1] ! 'bathroom':
 		act 'Return': gt 'wardrobe', 'start'

locations/pavtrainhall.qsrc

@@ -382,7 +382,7 @@ if $ARGS[0] = 'female':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'male':

locations/qwBarPoletToilet.qsrc

@@ -26,7 +26,7 @@ if temp <= 6:
 	'The <a href="exec:gt ''mirror'', ''start''">mirror</a> you see above the sinks has some cracks radiating from one of the corners, but other than that, it''s perfectly usable.'
 	act 'Return to the main room': minut += 1 & gt 'qwBarPolet'
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	dynamic $quickwash
 elseif temp = 7:
 	if pcs_horny < 90: pcs_horny += 10

locations/rolanbath.qsrc

@@ -400,7 +400,7 @@ if $ARGS[0] = 'start':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
 			cla

locations/sexshop.qsrc

@@ -845,7 +845,7 @@ if $ARGS[0] = 'toi':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'pip':

locations/stwork.qsrc

@@ -280,7 +280,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	gs 'din_van', 'prvt_pee'
 end
 

locations/wardrobe.qsrc

@@ -16,7 +16,13 @@ if $ARGS[0] = 'start':
 		gs 'clothing', 'strip'
 	end
 	if ward_img_hgt = 0:ward_img_hgt = 150
-	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3><br><center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center><center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
+	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3>'
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+	'<center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center><center><table border=0 cellspacing=<<ward_img_hgt/25>> cellpadding=5>'
 	*p '<TH>Bra worn</TH><TH>Outfit worn</TH><TH>Coat (only worn outside when cold)</TH>'
 	*P '<TR><TD><center><a href="exec:gt ''bras'', ''view_bra_list'', ''wardrobe''"><img Height = <<ward_img_hgt>> src="<<FUNC(''$body_image'',''bra'')>>"></a></center></TD><TD><center><a href="exec:gt ''clothing_QV'', ''list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'',''clothes'')>>"></a></center></TD><TD><center>'
 	if defaultcoat = 0:

locations/zaprF.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	gs 'din_van', 'pblc_pee'
 end