locations/abduction.qsrc

@@ -545,7 +545,6 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	'On your left, you can see the dust and pollution of what could be a large city.'
 	'You can''t see anything to your right, but something is pulling you that way...'
 	'You decide to...'
-	nroad = 12
 	minut += 180
 	if pcs_hydra >= 100:
 		pcs_hydra -= 25
@@ -564,10 +563,10 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	mc_inventory['razor'] =  stanok_bak
 	mc_inventory['deodorant'] =  deodorant_bak
 
-	act 'Turn and run the opposite direction':gt 'road'
-	act 'Run left':gt 'city_industrial'
-	act 'Run right':gt 'pav_commercial'
-	act 'Run forward':gt 'city_lake', 'start'
+	act 'Turn and run the opposite direction': nroad = 12 & gt 'road'
+	act 'Run left': gt 'city_industrial'
+	act 'Run right': gt 'pav_commercial'
+	act 'Run forward': gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'abdFood':

locations/belpicknick.qsrc

@@ -23,8 +23,7 @@ if $ARGS[0] = '':
 		act 'Run away from them (<<will_cost>> Willpower)':
 			gs 'willpower', 'drink', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
-			nroad = rand(1,19)
-			gt 'road'
+			gt 'belpicknick', 'leave'
 		end
 	else
 		act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -66,8 +65,7 @@ if $ARGS[0] = '1':
 				gs 'willpower', 'voyeur', 'resist', 'hard'
 			end
 			gs 'willpower', 'pay', 'resist'
-			nroad = rand(1,19)
-			gt 'road'
+			gt 'belpicknick', 'leave'
 		end
 	else
 		act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -90,8 +88,7 @@ if $ARGS[0] = 'vb_light':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'gangbang', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -106,8 +103,7 @@ if $ARGS[0] = 'vb_light':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'mast', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -134,8 +130,7 @@ if $ARGS[0] = 'vb_hard':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'gangbang', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -149,8 +144,7 @@ if $ARGS[0] = 'vb_hard':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'mast', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -177,8 +171,7 @@ if $ARGS[0] = 'ab_light':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'gangbang', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -191,8 +184,7 @@ if $ARGS[0] = 'ab_light':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'mast', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -218,8 +210,7 @@ if $ARGS[0] = 'ab_hard':
 		act 'Run away from them (<<will_cost>> Willpower)':
 			gs 'willpower', 'gangbang', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
-			nroad = rand(1,19)
-			gt 'road'
+			gt 'belpicknick', 'leave'
 		end
 	else
 		act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -260,8 +251,7 @@ if $ARGS[0] = 'dance':
 			act 'Run away from them (<<will_cost>> Willpower)':
 				gs 'willpower', 'sex', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
-				nroad = rand(1,19)
-				gt 'road'
+				gt 'belpicknick', 'leave'
 			end
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -312,8 +302,7 @@ if $ARGS[0] = 'missionary':
 				act 'Run away from them (<<will_cost>> Willpower)':
 					gs 'willpower', 'sex', 'resist', 'hard'
 					gs 'willpower', 'pay', 'resist'
-					nroad = rand(1,19)
-					gt 'road'
+					gt 'belpicknick', 'leave'
 				end
 			else
 				act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -378,8 +367,7 @@ if $ARGS[0] = 'doggy':
 				act 'Run away from them (<<will_cost>> Willpower)':
 					gs 'willpower', 'sex', 'resist', 'hard'
 					gs 'willpower', 'pay', 'resist'
-					nroad = rand(1,19)
-					gt 'road'
+					gt 'belpicknick', 'leave'
 				end
 			else
 				act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -519,12 +507,23 @@ if $ARGS[0] = 'end':
 		minut += 10
 		'Siple looks at your face in disgust. "That looks fucking disgusting... there''s no way you''re getting in our car. Find your own way home, slut!"'
 		'The guys get in the car and drive off, leaving you alone in the woods. You take a moment to clean yourself up at least a little and put your clothes back on, before you start wandering. You have no clue where you are. Luckily you hear a road in the distance, and decide to head in that direction... once you find the road, you can hopefully find your way home from there.'
-		act'Go to the road':
-			nroad = rand(1,19)
-			gt 'road'
-		end
+
+		act'Go to the road': gt 'belpicknick', 'leave', 1
 	end
 end
 
+if $ARGS[0] = 'leave':
+	!!	If you run away you will be punished by ending up away from pav, gad, and St. P
+	!!	If you stay (ARGS[1] = 1) you most likely end up around gad
+	if ARGS[1] = 1:
+		nroad = (rand(1, 19) + rand(1, 19)) / 2
+	else
+		nroad = (rand(1, 9) + rand(1, 9)) / 2
+		if rand(0, 1) = 0: nroad += 10
+	end
+
+	gt 'road'
+end
+
 --- belpicknick ---------------------------------
 

locations/brothel.qsrc

@@ -65,8 +65,7 @@ if $ARGS[0] = 'lobby':
 	'Next to a bar are doors leading to a <a href="exec:gt ''brothel'', ''toilet''">toilet</a>.'
 	*nl
 	'Alongside the windows are tables, each for about four to six people.'
-	nroad = 20
-	act 'Leave the hotel':gt 'road'
+	act 'Leave the hotel': nroad = 20 & gt 'road'
 	act 'Visit the hotel bar': gt 'brothel', 'bar'
 	act 'Visit the bathroom': gt 'brothel', 'toilet'
 end

locations/bus.qsrc

@@ -40,6 +40,7 @@ if $ARGS[0] = 'community':
 	gs 'transport_functions', 'set_bus_wait_time', 'community'
 
 	act 'Walk to the community center (0:01)': minut += 1 & gt 'pav_commcenter', ''
+	act 'Walk to the Residential area (0:01)': minut += 1 & gt 'pav_residential', ''
 
 	if temp_transportVars['bus_wait_gadukino'] <= 60:
 		'The next bus in the direction of Gadukino ' + iif(temp_transportVars['bus_wait_gadukino'] = 0, 'is leaving now!', 'leaves in <<temp_transportVars[''bus_wait_gadukino'']>> minutes.')

locations/pav_commercial.qsrc

@@ -153,7 +153,7 @@ act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
 act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'pushkin'
+act 'Walk to Pushkin (0:25)':minut += 25 & gt 'pushkin'
 
 gs 'music_actions', 'music_icon'
 

locations/pav_complex.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
+	act 'Walk to Pushkin (0:30)':minut += 30 gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):

locations/pav_industrial.qsrc

@@ -80,7 +80,7 @@ act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
+act 'Walk to Pushkin (0:30)':minut += 30 & gt 'pushkin'
 
 if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'pav_factory', 'tailor'

locations/pav_market.qsrc

@@ -312,7 +312,7 @@ act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'pushkin'
+act 'Walk to Pushkin (0:20)':minut += 20 & gt 'pushkin'
 
 gs 'camera', 'check_location'
 

locations/pav_residential.qsrc

@@ -155,13 +155,14 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pav_complex', 'start'
-act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
-act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
-act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
-act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
+act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
+act 'Walk to the Five Eight estate (0:02)': minut += 2 & gt 'pav_complex', 'start'
+act 'Walk to the Commercial area (0:05)': minut += 5 & gt 'pav_commercial'
+act 'Walk to the Industrial region (0:05)': minut += 5 & gt 'pav_industrial'
+act 'Walk to the Market (0:15)': minut += 15 & gt 'pav_market'
+act 'Walk to the park (0:05)': minut += 5 & gt 'pav_park', 'start'
+act 'Walk to the train station (0:15)': minut += 15 & gt 'pav_train_hall'
+act 'Walk to Pushkin (0:30)': minut += 30 & gt 'pushkin'
 
 act 'Wait': gs 'obj_din', 'wait'
 

locations/pav_train_hall.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = '':
 	act 'Walk to the Industrial region (0:15)': minut += 15 & gt 'pav_industrial'
 	act 'Walk to the Five Eight estate (0:15)': minut += 15 & gt 'pav_complex', 'start'
 	act 'Walk to the highway (0:15)': minut += 15 & nroad = 20 & gt 'road'
-	act 'Walk to Pushkin (0:15)': minut += 15 & nroad = 19 & gt 'pushkin'
+	act 'Walk to Pushkin (0:15)': minut += 15 & gt 'pushkin'
 	act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pavstation'
 
 	if transportVars['trainpass_day'] > daystart: