Browse Source

[fixed] Moved "walk to the bus station" in pav_residential to lower in the list. Removed some floating spaces

anjuna krokus 5 months ago
parent
commit
5bf4762735
3 changed files with 13 additions and 13 deletions
  1. 2 2
      locations/pav_commcenter.qsrc
  2. 8 8
      locations/pav_residential.qsrc
  3. 3 3
      locations/pav_train_hall.qsrc

+ 2 - 2
locations/pav_commcenter.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] ! 'XXX':
 	if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
 	if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
 
 
 	if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt'pav_commclubs'
 	if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt'pav_commclubs'
-	
+
 	act 'Check the noticeboard': gs 'noticeboard','start'
 	act 'Check the noticeboard': gs 'noticeboard','start'
 
 
 	if nerd_game['game_day'] = daystart and hour = 19 and yearstart = 1: act 'Wait for game night to start': minut += 60-minut & gt 'nerd_game_night', 'game'
 	if nerd_game['game_day'] = daystart and hour = 19 and yearstart = 1: act 'Wait for game night to start': minut += 60-minut & gt 'nerd_game_night', 'game'
@@ -67,7 +67,7 @@ if $ARGS[0] ! 'XXX':
 	gs 'core_library', 'init'
 	gs 'core_library', 'init'
 
 
 	act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
 	act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
-	
+
 	act 'Wait': gs 'obj_din', 'wait'
 	act 'Wait': gs 'obj_din', 'wait'
 
 
 	if locat['Anya'] = 10: 'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 	if locat['Anya'] = 10: 'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'

+ 8 - 8
locations/pav_residential.qsrc

@@ -42,7 +42,7 @@ else
 	if daystage = 2 or daystage = 3:
 	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
 	else
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>' 
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>'
 	end
 	end
 end
 end
 
 
@@ -74,7 +74,7 @@ elseif rape > rape_count:
 	end
 	end
 end
 end
 
 
-!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ---- 
+!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ----
 !!if fame['pav_slut'] >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart:
 !!if fame['pav_slut'] >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart:
 !!	pav_residential_prost_day = daystart
 !!	pav_residential_prost_day = daystart
 !!	'A man approaches you, and asks if you want to earn some easy money. He''s offers you 200 <b>₽</b> for a quickie in the bushes.'
 !!	'A man approaches you, and asks if you want to earn some easy money. He''s offers you 200 <b>₽</b> for a quickie in the bushes.'
@@ -118,7 +118,7 @@ if mid($start_type,1,2) = 'sg':
 	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
 	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
 else
 else
 	$schoolname = 'your old school.'
 	$schoolname = 'your old school.'
-end	
+end
 
 
 '<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for local teenagers to hang out after a long day at <<$schoolname>> Also nearby is the drab grey building of Pavlovsk''s dilapidated public <a href="exec: gt ''pav_pool'',''building''">swimming pool</a>. Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
 '<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for local teenagers to hang out after a long day at <<$schoolname>> Also nearby is the drab grey building of Pavlovsk''s dilapidated public <a href="exec: gt ''pav_pool'',''building''">swimming pool</a>. Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
 
 
@@ -145,7 +145,7 @@ else
 end
 end
 !!end of code changes.
 !!end of code changes.
 
 
-if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: 
+if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9:
 	act '<b>Go to school</b>': minut += 2 & gt 'gschool_grounds', 'main'
 	act '<b>Go to school</b>': minut += 2 & gt 'gschool_grounds', 'main'
 end
 end
 
 
@@ -155,12 +155,12 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 	killvar 'InvitationToDimkaNYparty'
 end
 end
 
 
-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 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 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 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 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 park (0:05)': minut += 5 & gt 'pav_park', 'start'
+act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
 act 'Walk to the train station (0:15)': minut += 15 & gt 'pav_train_hall'
 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 'Walk to Pushkin (0:30)': minut += 30 & gt 'pushkin'
 
 
@@ -269,7 +269,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Bely''s Mitsubishi Pajero stops near you.'
 	'As you walk through Pavlovsk, Vadim Bely''s Mitsubishi Pajero stops near you.'
-	act 'Go to the jeep': gt 'belgang', 'payday' 	
+	act 'Go to the jeep': gt 'belgang', 'payday'
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	menu_off = 1
 	menu_off = 1
 	cla & *clr
 	cla & *clr
@@ -278,10 +278,10 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang inside. Your heart skips a beat as you notice one of them pointing at you and they pull over.'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang inside. Your heart skips a beat as you notice one of them pointing at you and they pull over.'
-	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
+	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 end
 
 
-!-- Random prostitution solicitation check ------------------------ 
+!-- Random prostitution solicitation check ------------------------
 gs 'prostitution_functions', 'check_solicitation_event'
 gs 'prostitution_functions', 'check_solicitation_event'
 
 
 gs 'booty_call', 'home_links'
 gs 'booty_call', 'home_links'

+ 3 - 3
locations/pav_train_hall.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 	*nl
 	*nl
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 	*nl
 	*nl
-	
+
 	*nl
 	*nl
 	if rand(0,2) = 0 and week < 5 and hour >= 8 and hour < 18:
 	if rand(0,2) = 0 and week < 5 and hour >= 8 and hour < 18:
 !!a 1 in 3 chances at those times he is here
 !!a 1 in 3 chances at those times he is here
@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 		*nl
 		*nl
 	end
 	end
 
 
-	
+
 	act 'Walk to the Market (0:03)': minut += 3 & gt 'pav_market'
 	act 'Walk to the Market (0:03)': minut += 3 & gt 'pav_market'
 	act 'Walk to the Commercial area (0:10)': minut += 10 & gt 'pav_commercial'
 	act 'Walk to the Commercial area (0:10)': minut += 10 & gt 'pav_commercial'
 	act 'Walk to the Residential area (0:15)': minut += 15 & gt 'pav_residential'
 	act 'Walk to the Residential area (0:15)': minut += 15 & gt 'pav_residential'
@@ -116,7 +116,7 @@ if $ARGS[0] = '':
 
 
 	if poezddalsled = 1:
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
-	
+
 		if mc_inventory['trinkets_home'] > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
 		if mc_inventory['trinkets_home'] > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
 	end
 	end