Browse Source

[fixed] Underwear going poof after hookups and fuckbuddies, removed loop and re-did in a simplified way that works in testing.

Kevin_Smarts 1 year ago
parent
commit
324e43f0a4
4 changed files with 61 additions and 79 deletions
  1. 24 42
      locations/booty_call_after.qsrc
  2. 2 0
      locations/booty_call_stats.qsrc
  3. 2 0
      locations/hookup.qsrc
  4. 33 37
      locations/hookup_after.qsrc

+ 24 - 42
locations/booty_call_after.qsrc

@@ -2206,59 +2206,41 @@ if $ARGS[0] = 'dress_image':
 end
 
 if $ARGS[0] = 'dress_loop':
-	:dress_loop_start
-	if $lastwornpantytype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! 'none' and $pantyworntype = 'none'and booty_call['panty_wear'] ! 1 and booty_call['bra_wear'] ! 1:
-		booty_call['panty_wear'] = 1
-		booty_call['bra_wear'] = 1
-		killvar 'lastwornpantytype'
-		killvar 'lastwornpantynumber'
-		killvar 'lastwornbratype'
-		killvar 'lastwornbranumber'
-		$booty_call['dress_describe'] = 'pulling your panties up your legs and fastening your bra around your chest'
-	elseif $lastwornpantytype['booty_call'] ! 'none' and $pantyworntype = 'none' and booty_call['panty_wear'] ! 1:
+	$booty_call['dress_describe'] = ''
+	if $clothingworntype = 'nude':
+		if $lastwornpantytype['booty_call'] ! 'none':
+			$booty_call['dress_describe'] += 'pulling your panties up your legs'
+			if $lastwornbratype['booty_call'] ! 'none' or $clothingworntype = 'nude': $booty_call['dress_describe'] += ' and '
+		end
 		gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
 		killvar 'lastwornpantytype'
 		killvar 'lastwornpantynumber'
-		booty_call['panty_wear'] = 1
-		$booty_call['dress_describe'] = 'pulling your panties up'
-	elseif $lastwornbratype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! '' and $braworntype = 'none' and booty_call['bra_wear'] ! 1:
+		
+		if $lastwornbratype['booty_call'] ! 'none':
+			$booty_call['dress_describe'] += 'fastening your bra around your chest'
+			if $clothingworntype = 'nude': $booty_call['dress_describe'] += ' then '
+		end
 		gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
 		killvar 'lastwornbratype'
 		killvar 'lastwornbranumber'
-		booty_call['bra_wear'] = 1
-		$booty_call['dress_describe'] = 'fastening your bra around your chest'
-	elseif $clothingworntype = 'nude':
-		gs'clothing', 'wear_last_worn'
-		jump 'dress_loop_start'
-	elseif $clothingworntype ! 'nude' and booty_call['dress_end'] ! 1:
-		if CloDress = 1 and (booty_call['dress_top_wear'] ! 1 or booty_call['dress_skirt_wear'] ! 1):
-			if booty_call['dress_top_wear'] ! 1:
-				booty_call['dress_top_wear'] = 1
-				$booty_call['dress_describe'] = 'pulling your dress over your shoulders'
-			elseif booty_call['dress_skirt_wear'] ! 1:
-				booty_call['dress_skirt_wear'] = 1
-				booty_call['dress_end'] = 1
-				$booty_call['dress_describe'] = 'smoothing your skirt out'
-			end
+
+		gs'clothing', 'wear', $lastwornclothingtype['booty_call'], lastwornclothingnumber['booty_call']
+		if CloDress = 1:
+			$booty_call['dress_describe'] += 'pulling your dress over your shoulders'
+		elseif CloSkirtShortness > 0:
+			$booty_call['dress_describe'] = 'slipping your skirt up your legs'
+			$booty_call['dress_describe'] += ' and pulling your top over your breasts'
 		else
-			if CloSkirtShortness > 0 and booty_call['skirt_wear'] ! 1 and booty_call['dress_end'] ! 1:
-				booty_call['skirt_wear'] = 1
-				$booty_call['dress_describe'] = 'slipping your skirt up your legs'
-			elseif CloSkirtShortness = 0 and booty_call['dress_end'] ! 1 and booty_call['pants_wear'] ! 1:
-				booty_call['pants_wear'] = 1
-				$booty_call['dress_describe'] = 'tugging your pants over your hips'
-			else
-				booty_call['dress_end'] = 1
-				$booty_call['dress_describe'] = 'pulling your top over your breasts'
-			end
+			$booty_call['dress_describe'] += 'tugging your pants over your hips'
+			$booty_call['dress_describe'] += ' and pulling your top over your breasts'
 		end
-	elseif booty_call['dress_end'] = 1:
+	else
 		if CloDress = 1:
-			$booty_call['dress_describe'] = 'checking your dress'
+			$booty_call['dress_describe'] += 'checking your dress'
 		elseif CloSkirtShortness > 0:
-			$booty_call['dress_describe'] = 'smoothing your skirt'
+			$booty_call['dress_describe'] += 'smoothing your skirt'
 		else
-			$booty_call['dress_describe'] = 'checking your clothes'
+			$booty_call['dress_describe'] += 'checking your clothes'
 		end
 	end
 	gs'stat'

+ 2 - 0
locations/booty_call_stats.qsrc

@@ -10,6 +10,8 @@ if $ARGS[0] = 'starting_stats':
 	lastwornpantynumber['booty_call'] = pantywornnumber
 	$lastwornbratype['booty_call'] = $braworntype
 	lastwornbranumber['booty_call'] = brawornnumber
+	$lastwornclothingtype['booty_call'] = $clothingworntype
+	lastwornclothingnumber['booty_call'] = clothingwornnumber
 	booty_call['starting_makeup'] = pcs_makeup
 	booty_call['cum_vagina'] = cum_loc['vagina']
 	booty_call['cum_labia'] = cum_loc['labia']

+ 2 - 0
locations/hookup.qsrc

@@ -16,6 +16,8 @@ if $ARGS[0] = 'start':
 	lastwornpantynumber['hookup'] = pantywornnumber
 	$lastwornbratype['hookup'] = $braworntype
 	lastwornbranumber['hookup'] = brawornnumber
+	$lastwornclothingtype['hookup'] = $clothingworntype
+	lastwornclothingnumber['hookup'] = clothingwornnumber
 	gs 'clothing', 'strip'
 	gs 'underwear', 'remove'
 	gs 'stat'

+ 33 - 37
locations/hookup_after.qsrc

@@ -48,9 +48,9 @@ if $ARGS[0] = 'exit':
 end
 
 if $ARGS[0] = 'dress':
-	gs 'clothing', 'wear_last_worn'
-	if $lastwornpantytype['hookup'] ! '' and $lastwornpantytype['hookup'] ! 'none': gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-	if $lastwornbratype['hookup'] ! '' and $lastwornbratype['hookup'] ! 'none': gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
+	gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+	gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
+	gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
 	gs 'stat'
 end
 
@@ -1978,45 +1978,41 @@ if $ARGS[0] = 'dress_image':
 end
 
 if $ARGS[0] = 'dress_loop':
-	:dress_loop_start
-	if $lastwornpantytype['hookup'] ! 'none' and $pantyworntype = 'none' and hookup['panty_wear'] ! 1:
+	$hookup['dress_describe'] = ''
+	if $clothingworntype = 'nude':
+		if $lastwornpantytype['hookup'] ! 'none':
+			$hookup['dress_describe'] += 'pulling your panties up your legs'
+			if $lastwornbratype['hookup'] ! 'none' or $clothingworntype = 'nude': $hookup['dress_describe'] += ' and '
+		end
 		gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-		hookup['panty_wear'] = 1
-		$hookup['dress_describe'] = 'pulling your panties up your legs'
-	elseif $lastwornbratype['hookup'] ! 'none' and $braworntype = 'none' and hookup['bra_wear'] ! 1:
+		killvar 'lastwornpantytype'
+		killvar 'lastwornpantynumber'
+		
+		if $lastwornbratype['hookup'] ! 'none':
+			$hookup['dress_describe'] += 'fastening your bra around your chest'
+			if $clothingworntype = 'nude': $hookup['dress_describe'] += ' then '
+		end
 		gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
-		hookup['bra_wear'] = 1
-		$hookup['dress_describe'] = 'throwing your arms through the straps of your bra and clasping it behind your back'
-	elseif $clothingworntype = 'nude':
-		gs 'clothing', 'wear_last_worn'
-		jump 'dress_loop_start'
-	elseif $clothingworntype ! 'nude' and hookup['dress_end'] ! 1:
-		if CloDress = 1 and $hookup['dress_top_wear'] ! 1 and $hookup['dress_skirt_wear'] ! 1:
-			if $hookup['dress_top_wear'] ! 1:
-				hookup['dress_top_wear'] = 1
-				$hookup['dress_describe'] = 'pulling your dress over your shoulders'
-			elseif $hookup['dress_skirt_wear'] ! 1:
-				hookup['dress_skirt_wear'] = 1
-				hookup['dress_end'] = 1
-				$hookup['dress_describe'] = 'smoothing your skirt out'
-			end
+		killvar 'lastwornbratype'
+		killvar 'lastwornbranumber'
+
+		gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+		if CloDress = 1:
+			$hookup['dress_describe'] += 'pulling your dress over your shoulders'
+		elseif CloSkirtShortness > 0:
+			$hookup['dress_describe'] = 'slipping your skirt up your legs'
+			$hookup['dress_describe'] += ' and pulling your top over your breasts'
 		else
-			if CloSkirtShortness > 0 and hookup['skirt_wear'] = 0 and hookup['dress_end'] ! 1:
-				hookup['skirt_wear'] = 1
-				$hookup['dress_describe'] = 'zipping your skirt up over your hips'
-			elseif hookup['pants_wear'] = 0 and hookup['dress_end'] ! 1:
-				hookup['pants_wear'] = 1
-				$hookup['dress_describe'] = 'tugging your pants over your hips'
-			else
-				hookup['dress_end'] = 1
-				$hookup['dress_describe'] = 'pulling your top over your breasts'
-			end
+			$hookup['dress_describe'] += 'tugging your pants over your hips'
+			$hookup['dress_describe'] += ' and pulling your top over your breasts'
 		end
-	elseif hookup['dress_end'] = 1:
-		if CloSkirtShortness > 0:
-			'smoothing out your skirt'
+	else
+		if CloDress = 1:
+			$hookup['dress_describe'] += 'checking your dress'
+		elseif CloSkirtShortness > 0:
+			$hookup['dress_describe'] += 'smoothing your skirt'
 		else
-			'straightening out your clothes'
+			$hookup['dress_describe'] += 'checking your clothes'
 		end
 	end
 	gs 'stat'