[changed] merged `parks` and `lug` into `pushkin_parks`.

glife.qproj

@@ -1341,8 +1341,7 @@
 		<Location name="rasputin_show_var"/>
 		<Location name="exhibitionistshop"/>
 		<Location name="kseniyaQW"/>
-		<Location name="parks"/>
-		<Location name="lug"/>
+		<Location name="pushkin_parks"/>
 		<Location name="dibodi"/>
 		<Location name="city_suburbs"/>
 		<Location name="din_pav"/>

locations/din_pav.qsrc

@@ -7,8 +7,8 @@ $pavserjil = {
 	
 	set pavserhom = 1
 	'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil2.jpg" ></center>'
-    'It is not clear why you you are drawn to him, but you can barely take you eyes off him.'
-	act 'Overnutsya':gt'lug', 'start'
+	'It is not clear why you you are drawn to him, but you can barely take you eyes off him.'
+	act 'Overnutsya': gt 'pushkin_parks', 'lug'
 }
 
 $koncepodos = {

locations/parkM.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'sexrand3':
 		if $home['town'] = 'pavlovsk':
 			gt 'pav_park', 'start'
 		elseif $home['town'] = 'oldtown':
-			gt 'parks', 'start'
+			gt 'pushkin_parks', 'start'
 		else
 			gt 'city_park', 'start'
 		end
@@ -174,7 +174,7 @@ if $ARGS[0] = 'sexrand4':
 		if $home['town'] = 'pavlovsk':
 			gt 'pav_park', 'start'
 		elseif $home['town'] = 'oldtown':
-			gt 'parks', 'start'
+			gt 'pushkin_parks', 'start'
 		else
 			gt 'city_park', 'start'
 		end

locations/parks.qsrc

@@ -1,80 +0,0 @@
-# parks
-!!2021/05/12
-
-if $ARGS[0] = 'start':
-	*clr & cla
-	$location_type = 'public_outdoors'
-	$loc_arg = 'start'
-	$loc = 'parks'
-	$menu_loc = 'parks'
-	$menu_arg = 'start'
-	$locclass = 'city_park'
-	menu_off = 0
-	gs'stat'
-	'<center><B>Pushkin Town Park</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/parkus.jpg" ></center>'
-	'The gardens of the old palace have been sculpted over many years into a wonder landscape with a tranquil atmosphere.'
-	'The Pushkin Park is a must-see for tourists and servers as the main attraction of Pushkin.'
-
-	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a>.'
-
-
-	act 'Go to Okhlopkov Square (0:05)': minut += 5 &  gt 'pushkin_sq'
-
-	act 'Go to Town Center (0:10)': minut += 10 & gt 'pushkin'
-
-	act 'Walk around the park (1 hour)':
-		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
-		cla
-		minut += 60
-		pcs_mood += 10
-		gs'stat'
-		'You leisurely stroll through Pushkin Park, breathing in the fresh air, and reflecting on the vicissitudes of fate.'
-
-		act 'Complete outing.':gt 'parks','start'
-	end
-
-	gs 'park_walkevents', 'run'
-
-	if hour >= 20 or hour < 6 :
-		if func('homes_properties', 'has_access', 'old_town_apartment') = 0 :
-			!nowhere to live in town
-			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
-		else
-			'It''s quite dark now, and you don''t feel like walking. Maybe you should try sleeping on a bench?'
-		end
-		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
-	end
-
-	act 'Sit down on the bench':gs 'placer_sex', 'sitting_park_bench'
-	
-	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
-
-	if pcs_inhib >= 35 or exhibitionist_lvl > 0:
-		act 'Flash your tits':
-			menu_off = 1
-			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-			*clr & cla
-			inhib_exp += rand(1,3)
-			gs 'flash', 'tits', 'outdoors', 5
-			gs 'stat'
-
-			act 'Continue': gt 'parks', 'start'
-		end
-	end
-
-	if exhibitionist_lvl > 1:
-		act 'Flash your pussy':
-			menu_off = 1
-			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-			*clr & cla
-			gs 'flash', 'pussy', 'outdoors', 5
-			gs 'stat'
-
-			act 'Continue': gt 'parks', 'start'
-		end
-	end
-end
-
---- parks ---------------------------------
-

locations/lug.qsrc → locations/pushkin_parks.qsrc

@@ -1,11 +1,83 @@
-# lug
-!!2021/04/15
+# pushkin_parks
+!!2021/05/12
+
 if $ARGS[0] = 'start':
-	$loc_arg = 'start'
-	$loc = 'lug'
+	*clr & cla
+	$location_type = 'public_outdoors'
+	gs 'shortgs', 'setloc', 'pushkin_parks', 'start'
+	$region = 'pushkin'
+	$locclass = 'city_park'
+	menu_off = 0
+	gs'stat'
+	'<center><B>Pushkin Town Park</B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/parkus.jpg" ></center>'
+	'The gardens of the old palace have been sculpted over many years into a wonder landscape with a tranquil atmosphere.'
+	'The Pushkin Park is a must-see for tourists and servers as the main attraction of Pushkin.'
+
+	'Wander deeper into the <a href="exec:gt ''pushkin_parks'', ''lug''">park</a>.'
+
+
+	act 'Go to Okhlopkov Square (0:05)': minut += 5 & gt 'pushkin_sq'
+
+	act 'Go to Town Center (0:10)': minut += 10 & gt 'pushkin'
+
+	act 'Walk around the park (1 hour)':
+		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
+		cla
+		minut += 60
+		pcs_mood += 10
+		gs'stat'
+		'You leisurely stroll through Pushkin Park, breathing in the fresh air, and reflecting on the vicissitudes of fate.'
+
+		act 'Complete outing.':gt 'pushkin_parks','start'
+	end
+
+	gs 'park_walkevents', 'run'
+
+	if hour >= 20 or hour < 6 :
+		if func('homes_properties', 'has_access', 'old_town_apartment') = 0 :
+			!nowhere to live in town
+			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
+		else
+			'It''s quite dark now, and you don''t feel like walking. Maybe you should try sleeping on a bench?'
+		end
+		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
+	end
+
+	act 'Sit down on the bench':gs 'placer_sex', 'sitting_park_bench'
+	
+	if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
+
+	if pcs_inhib >= 35 or exhibitionist_lvl > 0:
+		act 'Flash your tits':
+			menu_off = 1
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			*clr & cla
+			inhib_exp += rand(1,3)
+			gs 'flash', 'tits', 'outdoors', 5
+			gs 'stat'
+
+			act 'Continue': gt 'pushkin_parks', 'start'
+		end
+	end
+
+	if exhibitionist_lvl > 1:
+		act 'Flash your pussy':
+			menu_off = 1
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			*clr & cla
+			gs 'flash', 'pussy', 'outdoors', 5
+			gs 'stat'
+
+			act 'Continue': gt 'pushkin_parks', 'start'
+		end
+	end
+end
+
+if $ARGS[0] = 'lug':
 	$location_type = 'public_outdoors'
-	$menu_loc = 'lug'
-	$menu_arg = 'start'
+	gs 'shortgs', 'setloc', 'pushkin_parks', 'lug'
+	$region = 'pushkin'
 	$locclass = 'city_park'
 	menu_off = 0
 	gs'stat'
@@ -22,10 +94,10 @@ if $ARGS[0] = 'start':
 
 			act 'Tell him your number':
 				cla
-				gs'boyfrend', 'start'
+				gs 'boyfrend', 'start'
 				stopboy = 0
 				'<<$boydesc>> thanks you and leaves.'
-				act 'Complete outing':gt'lug', 'start'
+				act 'Complete outing': gt 'pushkin_parks', 'lug'
 			end
 		end
 
@@ -51,7 +123,7 @@ if $ARGS[0] = 'start':
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 
-			act 'Continue': gt 'lug', 'start'
+			act 'Continue': gt 'pushkin_parks', 'lug'
 		end
 	end
 
@@ -62,18 +134,18 @@ if $ARGS[0] = 'start':
 			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
-			act 'Continue': gt 'lug', 'start'
+			act 'Continue': gt 'pushkin_parks', 'lug'
 		end
 	end
 
 	act 'Visit the pond':
 		set minut += 10
-		gt 'lug', 'prut'
+		gt 'pushkin_parks', 'prut'
 	end
 
 	act 'Go toward the park entrance':
 		set minut += 5
-		gt 'parks', 'start'
+		gt 'pushkin_parks', 'start'
 	end
 	
 	gs 'events', 'street_cum'
@@ -81,45 +153,48 @@ end
 
 
 if $ARGS[0] = 'prut':
-    cls
-    gs'stat'
-    $location_type = 'public_outdoors'
+	cls
+	gs 'shortgs', 'setloc', 'pushkin_parks', 'prut'
+	gs 'stat'
+	$location_type = 'public_outdoors'
 
-    '<center><B>Park Pond</B></center>'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/park/prut.jpg" ></center>'
+	'<center><B>Park Pond</B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/prut.jpg" ></center>'
 	'A large and pretty pond near the end of the park, it continues off in to a wooded area.'
 
 
-    act 'Explore the wooded area':
-        set minut += 10
-        gt 'lug', 'prut2'
-    end
+	act 'Explore the wooded area':
+		set minut += 10
+		gt 'pushkin_parks', 'prut2'
+	end
 
-    act 'Return to the small meadow':
-        set minut += 10
-        gt'lug', 'start'
-    end
+	act 'Return to the small meadow':
+		set minut += 10
+		gt'pushkin_parks', 'start'
+	end
 end
 
 if $ARGS[0] = 'prut2':
-    cls
-    gs'stat'
-    $location_type = 'public_outdoors'
+	cls
+	gs 'shortgs', 'setloc', 'pushkin_parks', 'prut2'
+	$region = 'pushkin'
+	gs 'stat'
+	$location_type = 'public_outdoors'
 
-    '<center><B>Woodland Pond</B></center>'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/park/prut2.jpg" ></center>'
+	'<center><B>Woodland Pond</B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/prut2.jpg" ></center>'
 	'The pond is still and beautiful here and the trees offer some privacy, it feels quite magical.'
 	'There is a large field beyond that is hidden from the tourist trail.'
 
-    act 'Go to the field':
-        set minut += 15
-        gt 'lug', 'luzhayka'
-    end
+	act 'Go to the field':
+		set minut += 15
+		gt 'pushkin_parks', 'luzhayka'
+	end
 
-    act 'Follow the pond back out of the woods':
-        set minut += 10
-        gt 'lug', 'prut'
-    end
+	act 'Follow the pond back out of the woods':
+		set minut += 10
+		gt 'pushkin_parks', 'prut'
+	end
 
 	! Setup for teleport circle
 	if tpKnown['PushkinPark'] = 1:
@@ -140,8 +215,7 @@ if $ARGS[0] = 'prut2':
 	if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 		if pcs_inhib > 30:
 			act 'Strip off and skinny dip (1:00)':
-				cla
-				*clr
+				*clr & cla
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 60
@@ -156,7 +230,7 @@ if $ARGS[0] = 'prut2':
 					'Once you are naked you play around and have fun in the pond, enjoying the feel of the warm water on your body. The clean pond water refreshes and invigorates you.'
 				elseif pcs_inhib >= 60:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-					'Not caring if anyone is looking at you, you slowly take off your clothes.  You peel off each item like a stripper. Soon, you are completely naked.'
+					'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
 					'You play around and have fun in the pond, enjoying the feel of the warm water on your naked body. The clean pond water refreshes and invigorates you.'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
@@ -166,7 +240,7 @@ if $ARGS[0] = 'prut2':
 				act'Get out and dressed':
 					gs 'underwear', 'wear'
 					gs 'clothing', 'wear_last_worn'
-					gt 'lug', 'prut2'
+					gt 'pushkin_parks', 'prut2'
 				end
 			end
 		else
@@ -176,17 +250,18 @@ if $ARGS[0] = 'prut2':
 end
 
 if $ARGS[0] = 'luzhayka':
-    cls
-    gs'stat'
+	cls
+	gs 'shortgs', 'setloc', 'pushkin_parks', 'luzhayka'
+	gs'stat'
 
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/park/luzhayka.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/luzhayka.jpg" ></center>'
 	'A quiet hidden field that is well maintained but apart from the occasional grounds keeper you feel like it is all yours.'
 
-    act 'Return to the woodland pond':
-        set minut += 15
-        gt 'lug', 'prut2'
-    end
+	act 'Return to the woodland pond':
+		set minut += 15
+		gt 'pushkin_parks', 'prut2'
+	end
 end
 
---- lug ---------------------------------
+--- pushkin_parks ---------------------------------
 

locations/pushkin_sq.qsrc

@@ -13,7 +13,7 @@ gs'stat'
 'There are many small cafes and shops also a flourishing nightlife and entertainment activities.'
 
 'Another street runs straight back to the <a href="exec:minut += 5 & gt ''pushkin''">Pushkin Town Center</a>.'
-'Okhlopkov Square itself leads to the <a href="exec:minut += 5 & gt ''parks'',''start''">Pushkin Park</a>.'
+'Okhlopkov Square itself leads to the <a href="exec:minut += 5 & gt ''pushkin_parks'',''start''">Pushkin Park</a>.'
 if hour >= 8 and hour <= 20:
 	'A small <a href="exec:gt ''larek'',''start''">grocery store</a> is currently open.'
 else

locations/succubus.qsrc

@@ -1042,7 +1042,7 @@ if $args[0] = 'sucwalkinggo':
 		elseif sucslpzone = 4:
 			if sctemp = 1: $sucgoloc = 'pushkin' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'pushkin_sq' & $sucgometka = ''
-			if sctemp = 3: $sucgoloc = 'parks' & $sucgometka = ''
+			if sctemp = 3: $sucgoloc = 'pushkin_parks' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'pav_market' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'city_industrial' & $sucgometka = ''
 		elseif sucslpzone = 5:

locations/treeCircle.qsrc

@@ -29,7 +29,7 @@ $treeCircLoc['GadForest'] = 'gadforest'
 $treeCircArg['GadForest'] = 'forest_edge'
 !Pushkin Park Location
 $treeCircName['PushkinPark'] = 'Pushkin Park'
-$treeCircLoc['PushkinPark'] = 'lug'
+$treeCircLoc['PushkinPark'] = 'pushkin_parks'
 $treeCircArg['PushkinPark'] = 'prut2'
 !Communal Village Spring Location
 $treeCircName['Village'] = 'Communal Village Spring'