[changed] New underwear save state backup, switched Kat and Nat scene to use it and updated foto underwear save state to work with bodysuits

locations/foto.qsrc

@@ -71,10 +71,15 @@ if $ARGS[0] = 'start':
 			'You really wish you had brought panties today...'
 		end
 		if mesec > 0 and isprok = 0: msg'As your panties come off you realize you''re going to have a problem when your pad goes with it and blood immediately starts running down your legs. Maybe you should switch to tampons...'
-		$lastwornpantytype['foto'] = $pantyworntype
-		lastwornpantynumber['foto'] = pantywornnumber
-		$lastwornbratype['foto'] = $braworntype
-		lastwornbranumber['foto'] = brawornnumber
+		if underwear['type'] = 2:
+			$lastwornbodysuittype['foto'] = $bodysuitworntype
+			lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+		else
+			$lastwornpantytype['foto'] = $pantyworntype
+			lastwornpantynumber['foto'] = pantywornnumber
+			$lastwornbratype['foto'] = $braworntype
+			lastwornbranumber['foto'] = brawornnumber
+		end
 		gs 'clothing', 'strip_all'
 		gs 'stat'
 		act'Go back to the main floor':gt'foto','studio'
@@ -84,10 +89,15 @@ if $ARGS[0] = 'start':
 		if studio_strip_talk < 3:
 			act'Just strip to your panties':
 				gs 'clothing', 'strip'
-				$lastwornpantytype['foto'] = $pantyworntype
-				lastwornpantynumber['foto'] = pantywornnumber
-				$lastwornbratype['foto'] = $braworntype
-				lastwornbranumber['foto'] = brawornnumber
+				if underwear['type'] = 2:
+					$lastwornbodysuittype['foto'] = $bodysuitworntype
+					lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+				else
+					$lastwornpantytype['foto'] = $pantyworntype
+					lastwornpantynumber['foto'] = pantywornnumber
+					$lastwornbratype['foto'] = $braworntype
+					lastwornbranumber['foto'] = brawornnumber
+				end
 				cla & *clr
 				menu_off = 1
 				inhib_exp += 2
@@ -113,10 +123,15 @@ if $ARGS[0] = 'start':
 		if studio_strip_talk < 2 and $braworntype ! 'none':
 			act'Just strip to your underwear':
 				gs 'clothing', 'strip'
-				$lastwornpantytype['foto'] = $pantyworntype
-				lastwornpantynumber['foto'] = pantywornnumber
-				$lastwornbratype['foto'] = $braworntype
-				lastwornbranumber['foto'] = brawornnumber
+				if underwear['type'] = 2:
+					$lastwornbodysuittype['foto'] = $bodysuitworntype
+					lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+				else
+					$lastwornpantytype['foto'] = $pantyworntype
+					lastwornpantynumber['foto'] = pantywornnumber
+					$lastwornbratype['foto'] = $braworntype
+					lastwornbranumber['foto'] = brawornnumber
+				end
 				gs 'stat'
 				cla & *clr
 				menu_off = 1
@@ -1321,8 +1336,12 @@ end
 
 
 if $ARGS[0] = 'underwear':
-	gs 'panties', 'wear', $lastwornpantytype['foto'], lastwornpantynumber['foto']
-	gs 'bras', 'wear', $lastwornbratype['foto'], lastwornbranumber['foto']
+	if underwear['lastworntype'] = 2:
+		gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['foto'], lastwornbodysuitnumber['foto']
+	else
+		gs 'panties', 'wear', $lastwornpantytype['foto'], lastwornpantynumber['foto']
+		gs 'bras', 'wear', $lastwornbratype['foto'], lastwornbranumber['foto']
+	end
 end
 
 --- foto ---------------------------------

locations/katja_sex.qsrc

@@ -565,11 +565,8 @@ if $ARGS[0] = 'katnatsex1':
 	'You grab Katja''s hand and exit the shop, followed by a meekly Natasha. The journey back seems to take an eternity as the two girls eye one another silently, but finally, you enter Katjas''s room, quickly undress and jump onto the bed.'
 	'"So girls, how do we begin?"'
 	'The girls strip slower than you, and you can see Katja ogling a blushing (but not embarrassed) Natasha. They then jumps on the bed and looks at you expectantly.'
-	$lastwornpantytype['event'] = $pantyworntype
-	lastwornpantynumber['event'] = pantywornnumber
-	$lastwornbratype['event'] = $braworntype
-	lastwornbranumber['event'] = brawornnumber
-	gs 'clothing', 'strip_all'
+	gs 'underwear', 'backup'
+	gs 'clothing', 'strip'
 
 	act 'Katja':
 		menu_off = 1
@@ -843,8 +840,7 @@ if $ARGS[0] = 'katnatsex2':
 	act 'Redress and leave':
 		minut += 20
 		gs 'clothing', 'wear_last_worn'
-		gs 'panties', 'wear', $lastwornpantytype['event'], lastwornpantynumber['event']
-		gs 'bras', 'wear', $lastwornbratype['event'], lastwornbranumber['event']
+		gs 'underwear', 'restore'
 		gt 'pav_residential'
 	end
 end
@@ -872,8 +868,7 @@ if $ARGS[0] = 'katnatsex3':
 	act 'Redress and leave':
 		minut += 20
 		gs 'clothing', 'wear_last_worn'
-		gs 'panties', 'wear', $lastwornpantytype['event'], lastwornpantynumber['event']
-		gs 'bras', 'wear', $lastwornbratype['event'], lastwornbranumber['event']
+		gs 'underwear', 'restore'
 		gt 'pav_residential'
 	end
 end

locations/underwear.qsrc

@@ -3,6 +3,9 @@
 !!gs 'underwear', 'dispose'
 !!gs 'underwear', 'remove'
 !!gs 'underwear', 'wear'
+!! As remove and wear but with a backup in place to ensure the correct underwear state is restored
+!!gs 'underwear', 'backup'
+!!gs 'underwear', 'restore'
 
 if $ARGS[0] = 'dispose':
 	if underwear['type'] = 2:
@@ -13,6 +16,21 @@ if $ARGS[0] = 'dispose':
 	end
 end
 
+if $ARGS[0] = 'backup':
+	if underwear['type'] = 2:
+		$lastwornbodysuittype['backup'] = $bodysuitworntype
+		lastwornbodysuitnumber['backup'] = bodysuitwornnumber
+		gs 'underwear_bodysuits', 'remove'
+	else
+		$lastwornpantytype['backup'] = $pantyworntype
+		lastwornpantynumber['backup'] = pantywornnumber
+		$lastwornbratype['backup'] = $braworntype
+		lastwornbranumber['backup'] = brawornnumber
+		gs 'panties', 'remove'
+		gs 'bras', 'remove'
+	end
+end
+
 if $ARGS[0] = 'remove':
 	!!check for swimwear to prevent duplicate stripping stopping Sveta putting underwear on when she puts her clothes on
 	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
@@ -25,6 +43,15 @@ if $ARGS[0] = 'remove':
 	end
 end
 
+if $ARGS[0] = 'restore':
+	if underwear['lastworntype'] = 2:
+		gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['backup'], lastwornbodysuitnumber['backup']
+	else
+		gs 'panties', 'wear', $lastwornpantytype['backup'], lastwornpantynumber['backup']
+		gs 'bras', 'wear', $lastwornbratype['backup'], lastwornbranumber['backup']
+	end
+end
+
 if $ARGS[0] = 'wear':
 	if underwear['lastworntype'] = 2:
 		gs 'underwear_bodysuits', 'wear'