Browse Source

It's not a number, It's a Room!

Derryth_Love 1 year ago
parent
commit
be40ace8ac
3 changed files with 38 additions and 38 deletions
  1. 27 27
      locations/mey_home.qsrc
  2. 3 3
      locations/mey_tamara_events.qsrc
  3. 8 8
      locations/mey_vika_events.qsrc

+ 27 - 27
locations/mey_home.qsrc

@@ -123,14 +123,14 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	act 'Kitchen': minut += 1 & gt 'mey_home', '1'
-	act 'Bathroom': minut += 1 & gt 'mey_home', '2'
-	act 'Guest room': minut += 1 & gt 'mey_home', '3'
-	act 'Lounge': minut += 1 & gt 'mey_home', '4'
-	act 'Katja''s room': minut += 1 & gt 'mey_home', '5'
-	act 'Vicky''s room': minut += 1 & gt 'mey_home', '6'
-	act 'Tamara Meynold''s room': minut += 1 & gt 'mey_home', '7'
-	act 'Garden': minut += 1 & gt 'mey_home', '8'
+	act 'Kitchen': minut += 1 & gt 'mey_home', 'kitchen'
+	act 'Bathroom': minut += 1 & gt 'mey_home', 'bathroom'
+	act 'Guest room': minut += 1 & gt 'mey_home', 'guest_bedroom'
+	act 'Lounge': minut += 1 & gt 'mey_home', 'lounge'
+	act 'Katja''s room': minut += 1 & gt 'mey_home', 'katja_bedroom'
+	act 'Vicky''s room': minut += 1 & gt 'mey_home', 'vicky_bedroom'
+	act 'Tamara Meynold''s room': minut += 1 & gt 'mey_home', 'tamara_bedroom'
+	act 'Garden': minut += 1 & gt 'mey_home', 'garden'
 	if func('homes_properties', 'is_current_home') = 0 and func('homes_properties', 'can_live_here'):
 		act 'Set this household as your main home':gs 'homes_properties', 'set_home' & gt 'mey_home', 'start'
 	end
@@ -139,7 +139,7 @@ if $ARGS[0] = 'start':
 end
 
 ! kitchen
-if $ARGS[0] = '1':
+if $ARGS[0] = 'kitchen':
 	*clr & cla
 	$loc = 'mey_home'
 	$loc_arg = '1'
@@ -166,7 +166,7 @@ if $ARGS[0] = '1':
 			gs 'stat'
 			'<br>You take out the food from the refrigerator and start cooking for the whole family. It takes you about an hour to finish.'
 
-			act 'Finish': gt 'mey_home', '1'
+			act 'Finish': gt 'mey_home', 'kitchen'
 		end
 	end
 
@@ -189,7 +189,7 @@ if $ARGS[0] = '1':
 
 end
 
-if $ARGS[0] = '2':
+if $ARGS[0] = 'bathroom':
 	!bathroom
 	$locM = 'mey_home'
 	$locM_arg = '2'
@@ -213,7 +213,7 @@ if $ARGS[0] = '2':
 end
 
 ! guestroom
-if $ARGS[0] = '3':
+if $ARGS[0] = 'guest_bedroom':
 	cls
 	$locM = 'mey_home'
 	$locM_arg = '3'
@@ -273,7 +273,7 @@ if $ARGS[0] = '3':
 			*nl
 			'You snort some White Lady, feeling dizzy for a moment. After that, you feel fantastic and incredibly horny.'
 
-			act 'Continue':gt 'mey_home', '3'
+			act 'Continue':gt 'mey_home', 'guest_bedroom'
 		end
 	end
 	act 'Relax on your bed': gt 'bed', 'start'
@@ -283,7 +283,7 @@ if $ARGS[0] = '3':
 	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
-if $ARGS[0] = '4':
+if $ARGS[0] = 'lounge':
 	cls
 	$loc = 'mey_home'
 	$loc_arg = '4'
@@ -297,10 +297,10 @@ if $ARGS[0] = '4':
 	'Spacious room with a sofa and armchairs, on the wall, hangs a large <a href="exec:gt ''TV'',''meyhome''">Plasma TV</a>, located next to the bookcase, and on the opposite side is the fireplace. From the hall, there is access to a bright garden overgrown with grapes.'
 
 	act 'Return to hallway': minut += 1 & gt 'mey_home', 'start'
-	act 'Garden': minut += 1 & gt 'mey_home', '8'
+	act 'Garden': minut += 1 & gt 'mey_home', 'garden'
 end
 
-if $ARGS[0] = '5':
+if $ARGS[0] = 'katja_bedroom':
 	cls
 	$loc = 'mey_home'
 	$loc_arg = '5'
@@ -328,7 +328,7 @@ if $ARGS[0] = '5':
 	act 'Return to the hallway': minut += 1 & gt 'mey_home', 'start'
 end
 
-if $ARGS[0] = '6':
+if $ARGS[0] = 'vicky_bedroom':
 	cls
 	$loc = 'mey_home'
 	$loc_arg = '6'
@@ -345,7 +345,7 @@ if $ARGS[0] = '6':
 	act 'Return to hallway': minut += 1 & gt 'mey_home', 'start'
 end
 
-if $ARGS[0] = '7':
+if $ARGS[0] = 'tamara_bedroom':
 	cls
 	$loc = 'mey_home'
 	$loc_arg = '7'
@@ -362,7 +362,7 @@ if $ARGS[0] = '7':
 end
 
 ! courtyard
-if $ARGS[0] = '8':
+if $ARGS[0] = 'garden':
 	cls
 	$loc = 'mey_home'
 	$loc_arg = '8'
@@ -381,7 +381,7 @@ if $ARGS[0] = '8':
 	act 'Return to hallway':
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
-			gt 'mey_home', '8'
+			gt 'mey_home', 'garden'
 		else
 			minut += 1
 			gt 'mey_home', 'start'
@@ -390,10 +390,10 @@ if $ARGS[0] = '8':
 	act 'Return to lounge':
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
-			gt 'mey_home', '8'
+			gt 'mey_home', 'garden'
 		else
 			minut += 1
-			gt 'mey_home', '4'
+			gt 'mey_home', 'lounge'
 		end
 	end
 	if PCloswimwear = 1 or $clothingworntype = 'nude':
@@ -402,7 +402,7 @@ if $ARGS[0] = '8':
 			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
 			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
 			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
-			gt 'mey_home', '8'
+			gt 'mey_home', 'garden'
 		end
 	end
 	if temper >= 15 and daystage < 5 and sunWeather = 1:
@@ -415,7 +415,7 @@ if $ARGS[0] = '8':
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/meynolds/strippy.mp4"></video></center>'
 				'You strip out of your clothes and feel the warmth on your naked skin.'
-				act 'Continue':gt 'mey_home', '8'
+				act 'Continue':gt 'mey_home', 'garden'
 			end
 		end
 		if pcs_inhib > 30:
@@ -447,7 +447,7 @@ if $ARGS[0] = '8':
 					pcs_tan += 3
 					'You strip out of your clothes until you are naked, then put sunblock on your body and lie down next to the pool to sunbathe.'
 				end
-				act 'Get Up':gt 'mey_home', '8'
+				act 'Get Up':gt 'mey_home', 'garden'
 			end
 		end
 		
@@ -469,7 +469,7 @@ if $ARGS[0] = '8':
 					pcs_tan += 3
 					'You put sunblock on your body and lie down next to the pool to sunbathe.'
 				end
-				act 'Get Up':gt 'mey_home', '8'
+				act 'Get Up':gt 'mey_home', 'garden'
 			end
 		end
 	end
@@ -507,7 +507,7 @@ if $ARGS[0] = '8':
 			'You swim in the pool. The water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Get out of the water':gt 'mey_home', '8'
+			act 'Get out of the water':gt 'mey_home', 'garden'
 		end
 	end
 end	

+ 3 - 3
locations/mey_tamara_events.qsrc

@@ -651,7 +651,7 @@ if $args[0] = 'party3':
 
 	act 'Fall asleep':
 		msg 'End of current story'
-		gt 'mey_home', '3'
+		gt 'mey_home', 'guest_bedroom'
 	end
 end
 
@@ -757,7 +757,7 @@ if $args[0] = 'party4a':
 
 									act 'Go to the car':
 										msg 'End of current story'
-										gt 'mey_home', '3'
+										gt 'mey_home', 'guest_bedroom'
 									end
 								end
 							end
@@ -901,7 +901,7 @@ if $args[0] = 'reputation':
 			minut += rand(20,40)
 			pcs_horny = 0
 			spanked = 2
-			gt 'mey_home', '3'
+			gt 'mey_home', 'guest_bedroom'
 		end
 	end
 end

+ 8 - 8
locations/mey_vika_events.qsrc

@@ -1097,7 +1097,7 @@ end
 if $ARGS[0] = 'case_gift_ender':
 	mey_vika['qw_day'] = daystart
 	killvar 'zz_stage'
-	gt 'mey_home', '3'
+	gt 'mey_home', 'guest_bedroom'
 end
 
 if $ARGS[0] = 'learning0':
@@ -1111,13 +1111,13 @@ if $ARGS[0] = 'learning0':
 		'You walk around the house, hearing the voices of aunt Tamara, Vanya and Vicky. They''re whispering something, trying to explain how Vicky should carry herself. The door is closed but not locked.'
 		'Your curiosity comes over you and you sneak up to the door wanting to eavesdrop.'
 
-		act 'Pass by': gt 'mey_home', '3'
+		act 'Pass by': gt 'mey_home', 'guest_bedroom'
 		act 'Open the door':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/learning1.jpg"></center>'
 			'As you look through the crack your eyes widen as you see something very interesting, Tamara is sitting on the sofa dressed in a light robe. She is sternly instructing Vanya, tapping her sleek nails on her knee, like she''s trying to keep a beat.'
 
-			act 'Move away': gt 'mey_home', '3'
+			act 'Move away': gt 'mey_home', 'guest_bedroom'
 			act 'Keep watching':
 				*clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/learning2.jpg"></center>'
@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'learning0':
 								'"What about my parents? Won''t they wonder why I''m always here?" You ask Tamara.'
 								'"I have a solution for that, I''ll give you a job as an au pair. You will get a room here and we''ll say you''re helping around the house. Now let''s talk about your pay, my first offer is 10 thousand rubles a month, it might not sound like much, but you''re still in school. We generally do everything ourselves around the house, so your "focus" will solely be on your studies. Well, if you want to help, we would appreciate it, but it''s not necessary."'
 
-								act 'Go to your room': gt 'mey_home', '3'
+								act 'Go to your room': gt 'mey_home', 'guest_bedroom'
 							end
 							act 'Cry from shame and resentment':
 								*clr & cla
@@ -1208,14 +1208,14 @@ if $ARGS[0] = 'learning0':
 								'"What about my parents? Won''t they wonder why I''m always here?" You ask Tamara.'
 								'"I have a solution for that, I''ll give you a job as an au pair. You will get a room here and we''ll say you''re helping around the house. Now let''s talk about your pay, my first offer is 10 thousand rubles a month, it might not sound like much, but you''re still in school. We generally do everything ourselves around the house, so your "focus" will solely be on your studies. Well, if you want to help, we would appreciate it, but it''s not necessary."'
 
-								act 'Go to your room': gt 'mey_home', '3'
+								act 'Go to your room': gt 'mey_home', 'guest_bedroom'
 							end
 						end
 					end
 				else
 					cla
 					mey_vika['mey_vika_qw'] += 1
-					act 'Return to your room': gt 'mey_home', '3'
+					act 'Return to your room': gt 'mey_home', 'guest_bedroom'
 				end
 			end
 		end
@@ -1553,7 +1553,7 @@ if $ARGS[0] = 'bang_katya':
 			'"I''m sorry, but not today. I don''t feel up for it today."'
 			'"Don''t worry! Next time then!" Vicky chuckles, grabbing Vanya by the pants, dragging him to the gym.'
 
-			act 'Go to your room': gt 'mey_home', '3'
+			act 'Go to your room': gt 'mey_home', 'guest_bedroom'
 		end
 		act 'Agree':
 			cla
@@ -1639,7 +1639,7 @@ if $ARGS[0] = 'bang_katya2':
 
 						end
 
-						act 'Return to your room': gt 'mey_home', '3'
+						act 'Return to your room': gt 'mey_home', 'guest_bedroom'
 					end
 				end
 			end