Pavlovsk - eliminate garmassiv

glife-notepad++

@@ -263,7 +263,6 @@
 			<File name="locations\gaptek" />
 			<File name="locations\garfather" />
 			<File name="locations\gargazel" />
-			<File name="locations\garmassiv" />
 			<File name="locations\gdk" />
 			<File name="locations\gdkbibl" />
 			<File name="locations\gdkin" />

glife.qproj

@@ -474,7 +474,6 @@
       <Location name="pavCommercial"/>
       <Location name="pavCommercialOffices"/>
       <Location name="leonid"/>
-      <Location name="garmassiv"/>
       <Location name="gargazel"/>
       <Location name="garfather"/>
       <Location name="Gshveyfab"/>

locations/artemhome

@@ -131,7 +131,7 @@ if $ARGS[0] = 'inside':
 							'Artem chuckles: "Delete the video? <<$pcs_nickname>>, please... we''re just getting started. Me and Petka have big plans with you."'
 							'He continues: "Don''t worry, it will be our little secret. Next Monday, we will continue our anatomy lessons. I''ll be waiting for you after school."'
 
-							act 'Leave the garage':gt 'garmassiv'
+							act 'Leave the garage':gt 'pavComplex', 'garages'
 						end
 					end
 				end

locations/artgar

@@ -37,7 +37,7 @@ if apmeet = 0:
 		'"Hmm, I don''t know... I''ll give it some thought", Peter shrugs. Then he turns to you and smiles: "Don''t worry <<$pcs_nickname>>, you''ll love it. See you next week?"'
 		'As if you have a choice! You meekly nod: "Yea... see you next week..."'
 
-		act 'Leave the garage':gt 'garmassiv'
+		act 'Leave the garage':gt 'pavComplex', 'garages'
 	end
 elseif apmeet = 1:
 	apmeet = 2
@@ -87,7 +87,7 @@ elseif apmeet = 1:
 			'You quickly gather some things and only do the necessities in the garage, wanting to be gone as quickly as you can. You fix your clothes as you walk between the garages.'
 			'You think to yourself: "This is getting out of hand! At first I thought they just wanted to have some fun, but they''re becoming more and more sadistic by the week! I have to do something... but what?"'
 
-			act 'Walk between the garages':gt 'garmassiv'
+			act 'Walk between the garages':gt 'pavComplex', 'garages'
 		end
 	end
 elseif apmeet = 2:
@@ -155,7 +155,7 @@ elseif apmeet = 2:
 					'The only thing you can think of right now, is to get something to blackmail them with in return. Maybe you could somehow film one of the sessions? If you could threaten them with that, surely they would back down! The camera would have to be small easy to hide though, you don''t want to know what happens if the boys find it!'
 					'Unfortunately, you don''t know where you would be able to buy such a camera... the one on your phone would be way too obvious. Perhaps someone in school knows?'
 
-					act 'Leave the garage':gt 'garmassiv'
+					act 'Leave the garage':gt 'pavComplex', 'garages'
 				end
 			end
 		end
@@ -285,7 +285,7 @@ elseif apmeet = 3:
 											artemIzdev = 5
 											microcamera = 0
 											apmeet = 4
-											act 'Leave the garage':gt 'garmassiv'
+											act 'Leave the garage':gt 'pavComplex', 'garages'
 										end
 									else
 									'You quickly throw your clothes on and leave. You can''t keep doing this! Their fantasies are getting more and more perverted. What can you do, though?'
@@ -293,7 +293,7 @@ elseif apmeet = 3:
 									'Unfortunately, you don''t know where you would be able to buy such a camera... the one on your phone would be way too obvious. Perhaps someone in school knows?'
 									end
 
-									act 'Leave the garage':gt 'garmassiv'
+									act 'Leave the garage':gt 'pavComplex', 'garages'
 								end
 							end
 						end

locations/gargazel

@@ -16,7 +16,7 @@ else
 	'A large garage that belongs to your stepfather. He spends time in there working on his beloved Gazelle pickup truck whenever he can in the late afternoons and evenings. Right now the garage is closed, and the door is locked with a large padlock.'
 end
 
-act 'Leave the garage':minut += 5 & gt 'garmassiv'
+act 'Leave the garage':minut += 5 & gt 'pavComplex', 'garages'
 
 if father_go = 1 and hour >= 16 and hour < 20:
 	'Your <a href="exec:GT ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'

locations/garmassiv

@@ -1,23 +0,0 @@
-# garmassiv
-
-$metka = ''
-$loc = 'garmassiv'
-$location_type = 'public_outdoors'
-clr
-gs 'stat'
-'<center><h4>Garage array</h4></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/garmassiv.jpg"></center>'
-'A large area near the edge of Pavlovsk filled with garages. The weather in Pavlovsk can be brutal especially in the winter, so people who own a car often have a garage to put it away safely.'
-
-if StoryLine = 1:'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
-
-if (week < 6 and hour => 18 and hour < 20) or (week >= 6 and hour >= 15 and hour < 18) and seenEd = 0 and rand(0,5) = 0:
-	'As you''re walking around the garages, you notice a garage door open. You see a tattooed man working on a bike. He looks really ruff and dangerous. He looks at you smiling, who knows what he''s thinking...'
-	'You throw a quick glance towards him, nervously smile at him and quickly move on towards your fathers garage.'
-	seenEd = 1
-end
-
-act 'Go back to town':minut += 5 & gt 'pavResidential'
-
---- garmassiv ---------------------------------
-

locations/pavComplex

@@ -151,14 +151,13 @@ if $ARGS[0] = 'courtyard':
 end
 
 if $ARGS[0] = 'garages':
-	*clr
-	cla
-	gs 'stat'
-	'<center>Courtyard</center>'
+	*clr & cla
+	'<center>Garage array</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garages.jpg"></center>'
-	'Along the back street is a row of garages for rent to the residents of the apartments. Between the garages and the courtyard is a series of smaller storage buildings that can be rented as well as the complex maintenance building and laundry. The buildings layout leaves of a bit of a maze of walkways between them, which is a popular place for the kids to play or for teenagers to hang out.'
+	'Along the back street is a row of garages for rent to the residents of the apartments. The weather in Pavlovsk can be brutal especially in the winter, so people who own a car often have a garage to put it away safely. Between the garages and the courtyard is a series of smaller storage buildings that can be rented as well as the complex maintenance building and laundry. The buildings layout leaves of a bit of a maze of walkways between them, which is a popular place for the kids to play or for teenagers to hang out.'
 
-	if StoryLine = 1 and ParHomeBlock = 0: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 5 & GT 'korrPar'
+	gs 'stat'
+	if StoryLine = 1 and ParHomeBlock = 0: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 5 & gt 'korrPar'
 	act 'Return to the residential street':minut += 1 & gt 'pavResidential'
 	act 'Go to your apartment building':minut += 3 & gt 'pod_ezd', 'etaj_1'
 	act 'Go to the Eastern apartment building':
@@ -171,6 +170,14 @@ if $ARGS[0] = 'garages':
 	end
 	act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
 	act 'Go to the courtyard':minut += 1 & gt 'pavComplex', 'courtyard'
+	if StoryLine = 1:'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
+
+	if (week < 6 and hour => 18 and hour < 20) or (week >= 6 and hour >= 15 and hour < 18) and seenEd = 0 and rand(0,5) = 0:
+		'As you''re walking around the garages, you notice a garage door open. You see a tattooed man working on a bike. He looks really ruff and dangerous. He looks at you smiling, who knows what he''s thinking...'
+		'You throw a quick glance towards him, nervously smile at him and quickly move on towards your fathers garage.'
+		seenEd = 1
+	end
+
 end
 
 --- pavComplex ---------------------------------

locations/pavResidential

@@ -152,7 +152,7 @@ end
 'The town square features a <a href="exec:gt ''gdk''">community center</a><<$schoolname>>'
 	
 
-'A <a href="exec:minut += 15 & gt ''Gshveyfab'', ''start''">garment factory</a> named Paris Commune is situated in the industrial area on the outskirts of town. Inhabitants of Pavlovsk can store their cars in the <a href="exec:minut += 5 & gt ''garmassiv''">garages</a>.'
+'A <a href="exec:minut += 15 & gt ''Gshveyfab'', ''start''">garment factory</a> named Paris Commune is situated in the industrial area on the outskirts of town. Inhabitants of Pavlovsk can store their cars in the <a href="exec:minut += 5 & gt ''pavComplex'', ''garages''">garages</a>.'
 
 ''
 !!made changes here, to remove direct links to the kids in the apartment complex, make sure this will work with the code left.