소스 검색

[fixed] Uses of 'bed2' that should have been converted to 'sleep'

Kevin_Smarts 1 년 전
부모
커밋
eab95e9cad
3개의 변경된 파일18개의 추가작업 그리고 18개의 파일을 삭제
  1. 3 3
      locations/city_sauna.qsrc
  2. 2 2
      locations/marisha_ev.qsrc
  3. 13 13
      locations/mother_sextalk.qsrc

+ 3 - 3
locations/city_sauna.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'saunaroom':
 				$lastwornbratype['bed'] = $braworntype
 				lastwornbranumber['bed'] = brawornnumber
 				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				gt 'bed2', 'succhoice'
+				gt 'sleep', 'succhoice'
 			end
 		else
 			if workDolg > 0 or money >= 850:
@@ -238,9 +238,9 @@ if $ARGS[0] = 'saunaroom':
 					end
 					if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 					if magf2bdo = 2:
-						gt 'bed2', 'magbstchoice'
+						gt 'sleep', 'magbstchoice'
 					else
-						gt 'bed2', 'sleep'
+						gt 'sleep', 'sleep'
 					end
 				end
 				killvar '$sleep_txt'

+ 2 - 2
locations/marisha_ev.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = 'Mall':
 				$loc_arg = 'start'
 				MarishaQW["marisha_sleepover"] = 1
 				gs 'stat'
-				gt 'bed2', 'sleep'
+				gt 'sleep', 'sleep'
 			end
 		end
 
@@ -178,7 +178,7 @@ if $ARGS[0] = 'Mall':
 				$loc_arg = 'start'
 				MarishaQW["marisha_sleepover"] = 1
 				gs 'stat'
-				gt 'bed2', 'sleep'
+				gt 'sleep', 'sleep'
 			end
 		end
 	end

+ 13 - 13
locations/mother_sextalk.qsrc

@@ -469,7 +469,7 @@ if $ARGS[0] = 'dildo_wakeup1':
 		vanrPar_suction_dildo = 0
 		motherQW['bathroom_dildos'] = 0
 		motherKnowDildo = 1
-		act'Continue':gt 'bed2', 'wake'
+		act'Continue':gt 'sleep', 'wake'
 	end
 end
 
@@ -500,7 +500,7 @@ if $ARGS[0] = 'dildo_wakeup2':
 			'She walks out of your bedroom and shuts the door.'
 			*nl
 			'<i>Well, so much for that...</i>'
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		end
 	else
 		vanrPar_bathtub_dildo = 0
@@ -515,7 +515,7 @@ if $ARGS[0] = 'dildo_wakeup2':
 			'"No..." you say dejectedly.'
 			'"Honestly," she huffs, shaking her head in disappointment. "I expected more of you <<$pcs_firstname>>."'
 			'She walks out of your bedroom and shuts the door.'
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		end
 		
 		act'Well I need some kind of outlet!':
@@ -536,7 +536,7 @@ if $ARGS[0] = 'dildo_wakeup2':
 			'She walks out of your bedroom and shuts the door.'
 			*nl
 			'<i>Ugh. Great.</i> you think, throwing your head back against your pillow. <i>Now I need a new one. But maybe at least this gets <<$npc_nickname[''A29'']>> off my back...</i>'
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		end		
 	end
 end
@@ -558,7 +558,7 @@ if $ARGS[0] = 'dildo_wakeup3':
 		'"Again, <<$pcs_firstname>>?" Looking up, you see your mother sighing in the doorway to your bedroom with a hand on her forehead. "God, I hope you washed everything before I touched those. I''m not going to throw them away this time because I know you''re just going to buy more. But please <<$pcs_nickname>>. Think of your brother and father. Stop leaving these lying around like that."'
 	end
 	'She walks out of your bedroom and shuts the door.'
-	act'Continue':gt 'bed2', 'wake'
+	act'Continue':gt 'sleep', 'wake'
 end
 
 !! branching path if a SINGLE dildo was left in the bathroom
@@ -586,7 +586,7 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 				'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 			end
 			if motherQW['dildo_wakeup'] = 1:
-				act'Continue':gt 'bed2', 'wake'
+				act'Continue':gt 'sleep', 'wake'
 			else
 				act'Continue':gt $loc, $loc_arg
 			end
@@ -624,7 +624,7 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 			'<i>Great. Now I''m going to get in even bigger trouble. <b>And</b> I lost my dildo...</i>'
 		end
 		if motherQW['dildo_wakeup'] = 1:
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		else
 			act'Continue':gt $loc, $loc_arg
 		end
@@ -653,7 +653,7 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 			'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 		end
 		if motherQW['dildo_wakeup'] = 1:
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		else
 			act'Continue':gt $loc, $loc_arg
 		end
@@ -685,7 +685,7 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 		*nl
 		'<i>Ugh. Great. Now I need a new one.</i>'
 		if motherQW['dildo_wakeup'] = 1:
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		else
 			act'Continue':gt $loc, $loc_arg
 		end
@@ -718,7 +718,7 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 				'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 			end
 			if motherQW['dildo_wakeup'] = 1:
-				act'Continue':gt 'bed2', 'wake'
+				act'Continue':gt 'sleep', 'wake'
 			else
 				act'Continue':gt $loc, $loc_arg
 			end
@@ -756,7 +756,7 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 			'<i>Great. Now I''m going to get in even bigger trouble. <b>And</b> I lost my dildo...</i>'
 		end
 		if motherQW['dildo_wakeup'] = 1:
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		else
 			act'Continue':gt $loc, $loc_arg
 		end
@@ -786,7 +786,7 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 			'<i>Great. Now I have to do that too. I didn''t even get to use it...</i>'
 		end
 		if motherQW['dildo_wakeup'] = 1:
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		else
 			act'Continue':gt $loc, $loc_arg
 		end
@@ -819,7 +819,7 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 		motherKnowDildo = 1
 		
 		if motherQW['dildo_wakeup'] = 1:
-			act'Continue':gt 'bed2', 'wake'
+			act'Continue':gt 'sleep', 'wake'
 		else
 			act'Continue':gt $loc, $loc_arg
 		end