Slimmed down the old town locations, so make navigation alot easier

glife-notepad++

@@ -187,7 +187,6 @@
             <File name="locations\down" />
             <File name="locations\dreams" />
             <File name="locations\dvor" />
-            <File name="locations\dvorik" />
             <File name="locations\elevator" />
             <File name="locations\ender" />
             <File name="locations\enderKik" />
@@ -404,7 +403,6 @@
             <File name="locations\lesbisubhouse" />
             <File name="locations\lezbsex" />
             <File name="locations\liam" />
-            <File name="locations\liamel" />
             <File name="locations\liamelkafe" />
             <File name="locations\liames" />
             <File name="locations\loadg" />
@@ -633,7 +631,6 @@
             <File name="locations\spalnya" />
             <File name="locations\spell" />
             <File name="locations\sportShop" />
-            <File name="locations\spusk" />
             <File name="locations\starenie" />
             <File name="locations\start" />
             <File name="locations\StasQW" />

glife.qproj

@@ -870,11 +870,8 @@
     </Folder>
     <Folder name="Old Town">
       <Location name="liam"/>
-      <Location name="liamel"/>
       <Location name="liamelkafe"/>
       <Location name="stallion"/>
-      <Location name="dvorik"/>
-      <Location name="spusk"/>
       <Location name="larek"/>
       <Location name="dvor"/>
       <Location name="ugol"/>

locations/dina

@@ -39,7 +39,7 @@ $brodilr = {
 	if StoryLine = 1 and ParHomeBlock = 0:
 		gt 'pavResidential'
     elseif housr = 2:
-        gt'liamel','start'
+        gt'liames'
     else
         gt'street','start'
 	end

locations/dvor

@@ -2,10 +2,10 @@
 set minut += 5
 gs 'stat'
 gs 'outdoors'
+'<center><B>Vacant house</B></center>'
 '<center><img src="images/pic/dvor1.jpg" ></center>'
 
-act 'By area':gt 'liamel' & minut += 5
-act 'By Subway':gt 'spusk','start' & minut += 5 
+act 'Go to town center':gt 'liam' & minut += 5
 
 if hour >= 7 and hour <= 21 and pavserhom = 0 and koncepo = 0 or mesec = 1:
     act 'Announcement on the door':dynamic $koncepodos

locations/korr2x

@@ -16,7 +16,7 @@ end
 act '<b><font color = maroon>OUTSIDE</font></b>':
 	cls
 	if sick <= 72 and $clothingworntype ! 'nude':
-		xgt'liamel'
+		xgt'liames'
 	elseif $clothingworntype ! 'nude':
 		'<b><font color = red>YOU TOO MUCH THAT sick to walk down the street.</font></b>'
 		xgt $curloc

locations/liam

@@ -27,9 +27,9 @@ houseob = 0
 borMir = 0
 minut += 10
 
-!'On narrow <a href="exec:GT ''dvor'',''start''">street</a> .'
-'Closeby is a quiet <a href="exec:GT ''liamel'',''start''">street</a> .'
-'You can <a href="exec:GT ''spusk'',''start''">Climb to the top</a> .'
+'Not far from here is the quiet <a href="exec:GT ''liames'',''start''">high street</a>.'
+'Close by is a narrow street leading to a <a href="exec:GT ''dvor'',''start''">vacant house</a>.'
+'You see a <a href="exec:GT ''ugol'',''start''">passage</a> between the houses lead to a courtyard.'
 if car > 0 and cardrive = 24:
     cardrive = 24
     'I parked at the curb <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'

locations/liamel

@@ -1,80 +0,0 @@
-# liamel
-$metka = $ARGS[0]
-$loc = $CURLOC
-gs'dinam'
-'<center><B>Quiet Street</B></center>'
-'<center><img src="images/lmps/liamel.jpg" ></center>'
-'Pretty, quiet street of the old town'
-CLOSE ALL
-clr
-
-gs'stat'
-gs 'outdoors'
-set palMir=0
-set bordysh=0
-set housrA=0
-set palMir=0
-set obdysh=0
-set tanhouse1=0
-set obMir=0
-set obLoker=0
-set houseob=0
-set borMir=0
-set borLoker=0
-set minut+=10
-'<a href="exec:GT ''larek'',''start''">shop</a>'
-'Close by is a narrow <a href="exec:GT ''dvor'',''start''">street</a> looping between houses.'
-'A street runs straight to the <a href="exec:GT ''liam'',''start''">Town center</a>.'
-'A street leading to the <a href="exec:GT ''liames'',''start''">High Street</a>.'
-if hour >= 10 and hour <= 22: 'A <a href="exec:GT ''liamelkafe'',''start''">tiny cafe</a> displays a street sign outside it''s door.'
-if housr = 2:
-    act '<b>Go home</b>':gt'korr2x'
-end
-
-act 'Stand':
-	cla
-	waiting = input ("How many minutes to wait? (Not more 120 minutes)")
-
-	if waiting <= 0 or waiting > 120:
-		minut = minut + 15
-	elseif waiting > 0 and waiting <= 120:
-		minut = minut + waiting
-	end
-
-	act 'Consult a watch':gt curloc
-end
-
-if housr = 2 and hour = meethour:
-	if svidanieA = 1:'<b>Near the entrance you expect <a href="exec:GT ''meet'',''start''"><<$boyA>></a></b>'
-	if svidanieB = 1:'<b>Near the entrance you expect <a href="exec:GT ''svidan'',''start''"><<$boyB>></a></b>'
-	if svidanieC = 1:'<b>Near the entrance you expect <a href="exec:GT ''svidan'',''start''"><<$boyC>></a></b>'
-end
-
-streetrand = RAND(0,100)
-if streetrand >= 10 and bfa < 1:
-	vnerand = RAND(0,1200)
-	if vnerand <= vnesh:
-		gs'boy'
-		'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
-		'The guy introduced himself as <<$boy>> and I asked for your telefonchik.'
-
-		act 'Tell him your phone':
-			cla
-			gs'boyfrend','start'
-			stopboy = 0
-			'<<$boyA>> record your phone and left.'
-			act 'Complete outing':gt $locM, $metkaM
-		end
-	end
-end
-
-if stallionQ = 3: 
-	*clr & cla
-	'There is a rumbling in your stomach. You need to use the restroom. Luckily there appears to be a public restroom tucked into the corner of a building. Unluckily, the female one has a sign saying it is out of order.'
-	act 'Use the Men''s Restroom':GT 'stallion','start'
-	act 'Hold it':stallionQ = 1 & gt 'liamel'
-end
-
-
---- liamel ---------------------------------
-

locations/liamelkafe

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	if money > 45:
 		act 'Sit down for a meal': money -= 45 & gt 'liamelkafe', 'food'
 	end
-	act 'Leave':gt 'liamel'
+	act 'Leave':gt 'liam'
 end
 
 if $ARGS[0] = 'food':
@@ -30,7 +30,7 @@ if $ARGS[0] = 'food':
 	end
 	'You sat for a meal in the tiny cafe. You enjoyed the beautiful scenery as you ate.'
 	if stallionQ = 0: StallionQ = 1
-	act 'Leave':gt 'liamel'
+	act 'Leave':gt 'liam'
 end
 
 

locations/liames

@@ -1,13 +1,9 @@
 # liames
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metka = ''
+$loc = 'liames'
 gs'dinam'
-'<center><B>High street</B></center>'
-'<center><img src="images/pic/liames.jpg" ></center>'
-'If so it can be called,connection of several streets where there are cafe and a small <a href="exec:GT ''larek'',''start''">shop</a> '
 CLOSE ALL
 clr
-
 gs'stat'
 gs 'outdoors'
 set palMir=0
@@ -23,9 +19,62 @@ set borMir=0
 set borLoker=0
 set minut+=10
 
-'Turn <a href="exec:GT ''liamel'',''start''">street</a> looping between houses.'
-'<a href="exec:GT ''spusk'',''start''">Climb to the top</a> .'
+'<center><B>High street</B></center>'
+'<center><img src="images/pic/liames.jpg" ></center>'
+'Not so much of a street, more of a connection of several streets including cafes and shops.'
+'A street runs straight to the <a href="exec:GT ''liam'',''start''">Town center</a>.'
 'Street leads to the Old Town <a href="exec:GT ''parks'',''start''">park</a>.'
+if hour >= 8 and hour <= 20:'A small <a href="exec:GT ''larek'',''start''">shop</a> is currently open.'
+if hour >= 10 and hour <= 22: 'A <a href="exec:GT ''liamelkafe'',''start''">tiny cafe</a> displays a street sign outside it''s door.'
+
+if housr = 2:
+    act '<b>Go home</b>':gt'korr2x'
+end
+
+act 'Kill some time looking the shops':
+	cla
+	waiting = input ("How many minutes do you wish to spend looking around the shops? (Not more 120 minutes)")
+
+	if waiting <= 0 or waiting > 120:
+		minut = minut + 15
+	elseif waiting > 0 and waiting <= 120:
+		minut = minut + waiting
+	end
+
+	act 'Consult a watch':gt curloc
+end
+
+if housr = 2 and hour = meethour:
+	if svidanieA = 1:'<b>Near the entrance you expect <a href="exec:GT ''meet'',''start''"><<$boyA>></a></b>'
+	if svidanieB = 1:'<b>Near the entrance you expect <a href="exec:GT ''svidan'',''start''"><<$boyB>></a></b>'
+	if svidanieC = 1:'<b>Near the entrance you expect <a href="exec:GT ''svidan'',''start''"><<$boyC>></a></b>'
+end
+
+streetrand = RAND(0,100)
+if streetrand >= 10 and bfa < 1:
+	vnerand = RAND(0,1200)
+	if vnerand <= vnesh:
+		gs'boy'
+		'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
+		'The guy introduced himself as <<$boy>> and I asked for your telefonchik.'
+
+		act 'Tell him your phone':
+			cla
+			gs'boyfrend','start'
+			stopboy = 0
+			'<<$boyA>> record your phone and left.'
+			act 'Complete outing':gt liames
+		end
+	end
+end
+
+if stallionQ = 3: 
+	*clr & cla
+	'There is a rumbling in your stomach. You need to use the restroom. Luckily there appears to be a public restroom tucked into the corner of a building. Unluckily, the female one has a sign saying it is out of order.'
+	act 'Use the Men''s Restroom':GT 'stallion','start'
+	act 'Hold it':stallionQ = 1 & gt 'liames'
+end
+
 
 temp = RAND(1,100)
 	if temp >= 90:

locations/parks

@@ -13,9 +13,9 @@ act 'Elite settlement':gt'psiklin','start'
 
 act 'Walk 1 h':
     cla
-    set minut+=60
-	set manna = manna + 10
-	set willpower = willpower + 10
+    minut+=60
+	manna += 10
+	willpower += 10
 	gs'stat'
 	'You leisurely stroll through the park of the Old Town. Breathe in the fresh air, reflecting on the vicissitudes of fate.'
 	act 'Complete outing':gt'parks','start'
@@ -23,7 +23,7 @@ end
 
 if month = 5 or month = 6 or month = 7 or month = 8 or month = 9:
 	if hour > 6 and hour < 23:
-		act 'Crouch on the bench':
+		act 'Rest on the bench':
 			cla
         	*clr
         	'<center><img src="images/lmps/сидит.jpg"></center>'
@@ -44,12 +44,11 @@ if month = 5 or month = 6 or month = 7 or month = 8 or month = 9:
 	end	
 end
 
-act 'Abandoned building':gt'psiklin','ps2'
+act 'View the abandoned building':gt'psiklin','ps2'
 
-act 'Escape':
-    setminut += 10
-    gt'liames'
-end
+act 'Go to the high street': minut += 10 &  gt 'liames'
+
+act 'Go to the town center': minut += 10 & gt 'liam'
 
 --- parks ---------------------------------
 

locations/spusk

@@ -1,31 +0,0 @@
-# spusk
-$metka = $ARGS[0]
-$loc = $CURLOC
-
-if $ARGS[0]='start':
-	cla
-	*clr
-	gs'stat'
-	gs 'outdoors'
-	'<center><B>Hill top street</B></center>'
-	'<center><img src="images/pic/liam1.jpg" ></center>'
-	'The transportation does not go up here, and the air is clean, the atmosphere of antiquity fills the air is not the usual flavors'
-
-	act 'Go to the High street':minut += 10 & gt'liames'
-	act 'Back to Town center':minut += 10 & gt'liam'
-    
-	'Close to the narrow <a href="exec:GT ''dvor'',''start''">street</a> looping between houses.'
-	'You see a <a href="exec:GT ''ugol'',''start''">passage</a> between the houses lead to a courtyard.'
-end
-
-if $ARGS[0]='dvr':
-	cla
-	*clr
-	set minut = minut + 1
-	gs'stat'
-	gs 'outdoors'
-!    '<center><img src="images/lmps/liamel.jpg" ></center>'
-end
-
---- spusk ---------------------------------
-

locations/stallion

@@ -173,7 +173,7 @@ if $ARGS[0] = 'awaken':
 	if stallionQ = 4: $temp[1] = 'I am called Stallion, and you have become my victim. I am called Stallion because I impregnate those whom I target. Today, that was you. ' & StallionQ = 5
 	'There is a note next to your clothing. ''<<$temp[1]>>You were a pretty good fuck. I''ll be keeping my eye on you. I look forward to see you growing large with my baby. If you go get an abortion to stop it, <<$temp>>. Go to the cops if you want, you''ll never stop me. The door is unlocked, you can leave now. -Stallion'''
 	
-	act 'Leave':gt 'liamel'
+	act 'Leave':gt 'liam'
 end
 
 --- stallion ---------------------------------

locations/ugol

@@ -4,7 +4,7 @@ gs'stat'
 '<center><img src="images/pic/ugelm1.jpg" ></center>'
 'Entering the passage into yards, you discover an eerie contrast obsharpannosti, covered in streaks and cracks, places obbivsheysya plaster, wall, it is not known on what to keep doors and dirt under your feet, and painted, plastered walls seen from the street.'
 
-act 'Escape':gt 'spusk','start'
+act 'Leave':gt 'liam'
 
 '<a href="exec:GT ''artstudia'',''bodimod1''">Quiet courtyard</a>.'