Browse Source

Changes to Pav pool. Should be good to go now.

Vengeance_11 8 months ago
parent
commit
5753022275
3 changed files with 59 additions and 396 deletions
  1. 15 139
      locations/pav_pool.qsrc
  2. 34 243
      locations/pav_pool_events.qsrc
  3. 10 14
      locations/pav_residential.qsrc

+ 15 - 139
locations/pav_pool.qsrc

@@ -8,22 +8,17 @@
 
 $loc = 'pav_pool'
 
-
 if $ARGS[0] = 'building' or $ARGS[0] = '':
 	$loc_arg = 'building'
 	$location_type = 'public_outdoors'
-
 	minut += 4
 	if hour >= 8 and hour <= 20:
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 		'Pavlovsk''s public swimming pool is rather dated, but still serves it''s purpose quite well.'
 		'The entrance fee is 100 <b>₽</b> for the full day, but students get a discount and it only costs you 60 <b>₽</b>.'
-
 		if SchoolAtestat = 0:
 			pav_swimpool['entrancefee'] = 60
-
 		else
 			pav_swimpool['entrancefee'] = 100
 		end
@@ -31,11 +26,9 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 		if pav_swimpool['entrancepaid'] = daystart:
 			'<b>You''ve already paid the fee, so you can enter.</b>'
 			act 'Enter': gt 'pav_pool', 'entrance'
-
 		else
 			if money < pav_swimpool['entrancefee']:
 				act 'Pay and enter': '<br><font color="red">You don''t have enough money to pay for entrance!</font>'
-
 			else
 				act 'Pay and enter':
 					money -= pav_swimpool['entrancefee']
@@ -45,28 +38,20 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 				end
 			end
 		end
-
 		act 'Leave': gt 'pav_residential'
-
 	else
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 		'The swimming pool is currently closed. Opening hours are from 08:00 to 21:00.'
-
 		act 'Leave': gt 'pav_residential'
 	end
 end
 
-
-
 if $ARGS[0] = 'entrance':
 	minut += 2
-	
 	$loc_arg = 'entrance'
 	$location_type = 'public_indoors'
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 	'You''re currently inside the entrance to the swimming pool.'
 	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">girls locker room</a>, visit the <a href="exec:minut += 1 & gt ''pav_pool'', ''cafeteria''">cafeteria</a> or browse the pool''s <a href="exec:minut += 1 & gt ''pav_pool'', ''store''">store</a>.'
@@ -76,54 +61,41 @@ if $ARGS[0] = 'entrance':
 	act 'Leave': gt 'pav_pool', 'building'
 end
 
-
-
 if $ARGS[0] = 'store':
 	!! Outside of the first visit. Clerk has an 80% chance of being away in the busy times and a 30% in the down times.
 	minut += 1
-
 	$loc_arg = 'store'
 	$location_type = 'public_indoors'
 
 	if pav_swimpool['storeclerkvisit'] > 0 and (( (hour >= 8 and hour <= 10) or hour >= 17) and rand(1, 10) <= 8) or rand(1, 10) <= 3:
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/store.jpg"></center>'
 		'The store is closed right now. The clerk must be doing janitor work somewhere.'
-
 		act 'Leave': gt 'pav_pool', 'entrance'
-
 	else
 		gs 'stat'
-
 		'<center><h3Pool Store</h3></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/store.jpg"></center>'
 		'The store is small and barely has anything on display, but they might have some swimwear available. There is a divider if you wish to try anything on, but it doesn''t seem to offer much privacy.'
 
-		!!Buy one specific swimsuit.
+		!!Buy one specific swimsuit
 		act 'Ask for swimwear':
 			if scandalicious_bikinis[46] = 1:
 				*clr & cla
 				minut += 1
 				gs 'stat'
-
 				'<center><h3>Pool Store</h3></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/storeclerk.jpg"></center>'
 				'You already own a bikini which looks similar to the one they have on sale here.'
-
 				act 'Continue': gt 'pav_pool', 'store'
-
 			else
 				gt 'pav_pool_events', 'store_simsuit_buy'
 			end
 		end
-
 		act 'Leave': gt 'pav_pool', 'entrance'
 	end
 end
 
-
-
 if $ARGS[0] = 'lockerfemale':
 	!! Clothing change events
 	!!-------------------------------------------------------------------!!
@@ -138,7 +110,6 @@ if $ARGS[0] = 'lockerfemale':
 		if PCloswimwear = 1:
 			!! Locker events nude -> swimwear
 
-
 		elseif $clothingworntype ! 'nude' or $pantyworntype ! 'none':
 			!! Locker events nude -> normal clothing
 			gt 'pav_pool_events', 'locker_nude_to_clothed'
@@ -150,7 +121,6 @@ if $ARGS[0] = 'lockerfemale':
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			!! Locker events swim -> nude
 			gt 'pav_pool_events', 'locker_swim_to_nude'
-
 		elseif PCloswimwear ! 1:
 			!! Locker events swim -> clothing
 		end
@@ -161,7 +131,6 @@ if $ARGS[0] = 'lockerfemale':
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			!! Locker events clothing -> nude
 			gt 'pav_pool_events', 'locker_clothed_to_nude'
-
 		elseif PCloswimwear = 1:
 			!! Locker events clothing -> swim
 		end
@@ -170,20 +139,19 @@ if $ARGS[0] = 'lockerfemale':
 
 
 	!!ARGS[1] = 1 prevents this event from triggering repeatedly
-	if rand(1, 10) = 1 and $clothingworntype = 'nude' and $pantyworntype = 'none' and ARGS[1] = 0:
+	if rand(1,10) = 1 and $clothingworntype = 'nude' and $pantyworntype = 'none' and ARGS[1] = 0:
 		gt 'pav_pool_events', 'naked_locker'
 	end
 
 	minut += 1
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/lockers.jpg"></center>'
 	'The changing rooms are old and murky. They are uncomfortable, cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only in swimwear.'
+	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
 
 	if func('changingroom','count_swim_item') > 0:
 		act 'Change your clothes':
-			!!Remember current clothes for clothing change events.
+			!!Remember current clothes for clothing change events
 			if $clothingworntype = 'nude' and $pantyworntype = 'none':
 				$temp_curclothes = 'nude'
 			elseif PCloswimwear = 1:
@@ -195,7 +163,7 @@ if $ARGS[0] = 'lockerfemale':
 			$loc = 'pav_pool'
 			$loc_arg = 'lockerfemale'
 
-			!!Ignore Inhibition through willpower.
+			!!Ignore Inhibition through willpower
 			gt 'changingroom', 'view_swim_list', 1
 		end
 
@@ -205,7 +173,6 @@ if $ARGS[0] = 'lockerfemale':
 		*nl
 	end
 
-
 	if PCloswimwear = 1:
 		gs 'shoes', 'strip'
 		act 'Enter the pool area':
@@ -218,7 +185,6 @@ if $ARGS[0] = 'lockerfemale':
 		*nl
 	end
 
-
 	act 'Leave':
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			cla
@@ -233,53 +199,40 @@ if $ARGS[0] = 'lockerfemale':
 
 end
 
-
-
 if $ARGS[0] = 'showerfemale':
 	$loc_arg = 'showerfemale'
 	$location_type = 'private'
-
 	menu_off = 1
 	minut += 1
 	gs 'stat'
-	
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/showergirl.jpg"></center>'
 	'The showers have seen better days. Thankfully, the water from the shower is very warm and feels great on your skin.'
 	
 	if $clothingworntype ! 'nude':
 		'You need to strip before you can shower.'
-
 	else
 		act 'Take a shower':
 			*clr & cla
 			minut += 15
 			dynamic $showerdin
 			gs 'stat'
-
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
-
-			if     hour >=  8 and hour < 10:
+			if hour >= 8 and hour < 10:
 				'Almost nobody comes here this early in the morning, so you have the shower to yourself.'
-
 			elseif hour >= 10 and hour < 12:
 				'The pool is rather busy at this time, mostly with families with children and a few older people. An older woman is showering right now, but it''s otherwise quiet.'
-
 			elseif hour >= 12 and hour < 18:
 				'The pool and showers are crowded and you have to wait for someone else to finish first.'
-			
 			elseif hour >= 18 and hour < 20:
 				'Not many people visit the pool this late in the evening, with only a handful of adults coming for an after work swim. You have the shower to yourself.'
-
 			elseif hour >= 20 and hour < 21:
 				'It''s rather late and the pool will be closing soon. You think you''re among the last people in the building, so you''re alone and can enjoy the shower all to yourself.'
 			end
 
-
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
 			if rand(1,3) = 1 and hour >= 18 and hour < 21:
 				act 'Finish': gt 'pav_pool_event', 'shower_late'
-
 			else
 				act 'Finish': gt 'pav_pool', 'showerfemale'
 			end
@@ -289,25 +242,19 @@ if $ARGS[0] = 'showerfemale':
 	act 'Go back to the changing room': gt 'pav_pool', 'lockerfemale'
 end
 
-
-
 if $ARGS[0] = 'mirror':
 	!! ARGS[1] = 1 prevents the same event from triggering repeatedly.
 	$loc_arg = 'mirror'
 	$location_type = 'private'
-
 	if rand(1,10) = 1 and $clothingworntype = 'nude' and $pantyworntype = 'none' and ARGS[1] = 0:
 		gt 'pav_pool_event', 'naked_mirror'
 	end
-
 	minut += 1
 	gs 'stat'
 	$locM = 'pav_pool'
 	$locM_arg = 'mirror'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/mirrorsink.jpg"></center>'
 	'The area where the <a href="exec:minut += 1 & gt ''mirror'', ''start''">mirrors</a> are is just as murky as the rest of the changing room. It''s almost like the owners don''t care about the dilapidated appearance.'
-
 	if $clothingworntype = 'nude':
 		*nl
 		'You are completely naked.'
@@ -315,158 +262,117 @@ if $ARGS[0] = 'mirror':
 
 	act 'Go back to the changing room': gt 'pav_pool', 'lockerfemale'
 	if cumloc[11] = 1 or cumloc[12] or cumloc[16] = 1:
-			act 'Clean the cum from your face':
+		act 'Clean the cum from your face':
 			*clr & cla
 			menu_off = 1
 			minut += 5
-
 			pcs_makeup = 1
-
 			cumspclnt = 9
 			gs 'cum_cleanup'
 			cumspclnt = 13
 			gs 'cum_cleanup'
-
 			if pcs_sweat > 19 : pcs_sweat -= 5
-
 			gs 'stat' 
-
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/washface.jpg"></center>'
 			'You carefully wash the cum from your face at the sink.'
-
 			act 'Finish': gt 'pav_pool', 'mirror'
 		end
 	end
 end	
 
-
-
 if $ARGS[0]= 'cafeteria':
 	*clr & cla
-
 	$loc_arg = 'cafetaria'
 	$location_type = 'public_indoors'
 	minut += 1
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteria<<rand(1,2)>>.jpg"></center>'
-	'You are in the cafeteria. They don''t have a lot on the menu, just some snacks.'
+	'The cafeteria doesn''t have a lot on the menu and only offers some basic snacks.'
 	'Two girls are currently ordering from the cashier.'
 
 	act 'Order':
-		!!Removed rand()... No event, just sometimes it doesn''t work. 
-		!!if rand(1,100) < 93:
-	
 		*clr & cla
 		minut += 1
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteriaturn.jpg"></center>'
-		'It''s finally your turn. You sit on one of the stools while you order.'
+		'It''s finally your turn and you sit on one of the stools while you order.'
 
 		if money < 100:
 			'You don''t have enough money to buy a snack.'
 			act 'Return': gt 'pav_pool', 'cafeteria'
-
 		else
 			act 'Buy a snack (100 <b>₽</b>) (0:05)':
 				*clr & cla
 				gs 'stat'
-
 				minut += 5
 				money -= 100
 				pcs_health += 10
 				pcs_mood += 20
 				fat += 6
 				pcs_energy += 20
-
 				if pcs_hydra >= 100:
 					pcs_hydra += 10
-
 				else
 					pcs_hydra += 20
 				end
-
 				cumspclnt = 2
 				gs 'cum_cleanup'
 				pcs_breath = 0
 				gs 'food', 'aftermeal'
-
 				'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
 				'You enjoy a small tasty, but somewhat fattening, snack.'
-
 				gs 'stat'
-
 				act 'Return': gt 'pav_pool', 'cafeteria'
 			end
 		end
 
-
 		act 'Drink some water (0:05)':
 			*clr & cla
 			frost = 1
 			if alko > 0: alko -= 1
-
 			minut += 5
 			pcs_health += 10
 			pcs_energy += 4
-
 			if pcs_hydra >= 100:
 				pcs_hydra += 25
-
 			else
 				pcs_hydra += 50
 			end
-
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
 			gs 'beverage', 'afterdrink'
-
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barorderwater.jpg"></center>'
 			'You enjoy a glass of water.'
-
-			gs 'stat'
-
 			act 'Return': gt 'pav_pool', 'cafeteria'
 		end
-
-
 		act 'Leave': gt 'pav_pool', 'pool'
 	end
 end
 
-
-
 if $ARGS[0] = 'pool':
 	*clr & cla
-
 	$loc_arg = 'pool'
 	$location_type = 'public_indoors'
 	minut += 1
 	gs 'stat'
-
-
-	if     hour >=  8 and hour < 10:
+	
+	if hour >= 8 and hour < 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool1.jpg"></center>'
 		'The pool is almost empty this early in the morning. You can enjoy it almost all to yourself.'
-
 	elseif hour >= 10 and hour < 12:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool2.jpg"></center>'
 		'The pool is mostly used by families with children and older people at this time.'
-
 	elseif hour >= 12 and hour < 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool3.jpg"></center>'
 		'The pool is crowded with all kinds of people. This won''t be a relaxing swim...'
-
 	elseif hour >= 18 and hour < 20:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool4.jpg"></center>'
 		'Not many visit the pool this late in the evening, with only a few adults coming for an after work swim.'
-
 	elseif hour >= 20 and hour < 21:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool5.jpg"></center>'
 		'It''s rather late and the pool will be closing soon, so you''re mostly alone and can enjoy the pool all to yourself.'
 	end
 
-
 	'The pool is rather old, but still has a certain charm to it. The wall to wall windows allow for a nice atmosphere during the day and there is an upper balcony where people often watch from above.'
 	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">female locker room</a>.'
 	
@@ -496,7 +402,6 @@ if $ARGS[0] = 'pool':
 					'As you enter the water, your bikini bottom slides down your legs and leaves your ass exposed. Thankfully, nobody seems to notice and you quickly pull it up before anyone sees you.'
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
-
 			elseif temp_rand => 20 and temp_rand < 40:
 				act 'Continue':
 					*clr & cla
@@ -504,7 +409,6 @@ if $ARGS[0] = 'pool':
 					'As you enter the water, the knot of your bikini top loosens and your breasts pop out. Thankfully, nobody seems to notice and you quickly tie it back on before anyone sees you.'
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
-
 			elseif temp_rand => 40 and temp_rand < 50:
 				act 'Continue':
 					*clr & cla
@@ -514,7 +418,6 @@ if $ARGS[0] = 'pool':
 					pcs_mood -= 3
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
-
 			elseif temp_rand => 50 and temp_rand < 60:
 				act 'Continue':
 					*clr & cla
@@ -525,63 +428,46 @@ if $ARGS[0] = 'pool':
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
 			end
-
 		elseif pcs_agil >= 45 and pcs_agil <= 70:
 			'You climb up to the top of the diving board and jump, but end up painfully bellyflopping into the water. You need to practice being more agile.'
-
 		else
 			'You climb up to the top of the diving board and make a very elegant jump, sliding into the water without causing a single ripple.'
 		end
-
-
 		act 'Continue': gt 'pav_pool', 'poolwater' 
 	end
 
 	act 'Sit with your feet in the water': gt 'pav_pool_events', 'feetwater' 
 end
 
-
-
 if $ARGS[0]= 'poolwater':
 	minut += 1
 	$loc_arg = 'poolwater'
 	$location_type = 'public_indoors'
-
 	pcs_hairbsh = 0
 	cumspclnt = 10
 	gs 'cum_cleanup'
-
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/inwater1.jpg"></center>'
 	'You are in the water. It feels very relaxing.'
-
-
-	if     hour >=  8 and hour < 10:
+	
+	if hour >= 8 and hour < 10:
 		'The pool is almost empty this early in the morning, so you have it almost all to yourself.'
-
 	elseif hour >= 10 and hour < 12:
 		'The pool mostly contains families with children and older people swimming.'
-
 	elseif hour >= 12 and hour < 18: 
 		'The pool is crowded with all kinds of people. It''s difficult to move around and exercising will be impossible.'
-
 	elseif hour >= 18 and hour < 20: 
 		'Not many visit the pool this late in the evening, with only a few adults in the water.'
-
 	elseif hour >= 20 and hour < 21: 
 		'It''s rather late and the pool will be closing soon. You are among the last people in the building, so you can enjoy the pool all to yourself.'
 	end
 
-
 	if hour >= 10 and hour < 18:
 		'It''s rather busy, but you can try to do a bit of swimming or dive for a bit of fun. You could also just try to relax at the edge of the pool or right here in the water.'
-
 	else
 		'The pool is almost empty, so you''re free to do a bit of relaxed swimming, exercise with a more powerful swim or dive for a bit of fun. You could also just relax at the edge of the pool or right here in the water.'
 	end
 
-
 	if hour >= 8 and hour < 21:
 		act 'Relaxed swim': gt 'pav_pool_events', 'relaxedswim' 
 
@@ -597,14 +483,10 @@ if $ARGS[0]= 'poolwater':
 	act 'Exit pool': gt 'pav_pool', 'exitpool'
 end
 
-
-
 if $ARGS[0]= 'exitpool':
 	minut += 1
 	$loc_arg = 'exitpool'
-
 	gs 'stat'
-
 	temp_rand = rand(1,15)
 	if temp_rand <= 4 and PCloOnePiece = 0 and hour >= 10 and hour < 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/exitloosebra.jpg"></center>'
@@ -626,7 +508,6 @@ if $ARGS[0]= 'exitpool':
 
 		act 'Continue':
 			*clr & cla
-
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/bratkid.jpg"></center>'
 			'You finally notice when your top falls off and your breasts are completely exposed. You cover them as best as you can and turn around to look for your top just in time to see a boy pick it up with a devious smile.'
 			'"If you want it back, come and get it!" He then jumps in the water and swims off.'
@@ -634,30 +515,25 @@ if $ARGS[0]= 'exitpool':
 			act 'Run to the locker room':
 				cla
 				'Blushing in embarrassment, you run to the locker room. Once there you strip naked. You can get rid of this bottom since it''s useless now.'
-
 				dynamic $clothingworntype + '[<<clothingwornnumber>>] = 0'
 				gs 'clothing', 'strip'
-
 				act 'Continue': gt 'pav_pool', 'lockerfemale'
 			end
+			
 			act 'Jump into the water after him':
 				pav_swimpool['boystole'] = 1
 				pav_swimpool['toplost'] = 1
 				*clr & cla
-
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/toplesspool.jpg"></center>'
 				'You jump bravely into the water after him. He swims off towards the other side of the pool and you attempt to follow, but the pool is full and many notice your lewdness. You suddenly realize, stop and cover yourself as a number of people stare at you.'
 				'You could try to reach the edge of the pool, but you would have to get very close to other people. You could also wait and hope that the pool empties a little without calling attention to yourself.'
-
 				act 'Wait': gt 'pav_pool_events', 'watertoplost'
 				act 'Try to reach the edge': gt 'pav_pool_events', 'tryreachedge'
 			end
 		end
-
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/ladder<<rand(1,2)>>.jpg"></center>'
 		'You climb out of the pool.'
-
 		act 'Continue': gt 'pav_pool', 'pool'
 	end
 end

File diff suppressed because it is too large
+ 34 - 243
locations/pav_pool_events.qsrc


+ 10 - 14
locations/pav_residential.qsrc

@@ -90,16 +90,16 @@ end
 !!	exit
 !!end
 
-if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
-if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events', 'start'
+if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters plastered on walls all over town. They say: "Vote Boris Barlovsky for mayor!" Wait a minute... isn''t that Albina''s father?'
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14: gt 'albina_election_events', 'start'
 
 if rand(1, 5) >= 4 and fame['pav_slut'] >= 150:
 	if fame['pav_slut'] < 200:
-		'<br>You catch people staring at you intently, as if they''re supposed to know who you are but can''t quite remember why. You sincerely hope they don''t realize your promiscuous adventures are the reason why. The occasional person chuckling and pointing at you crushes those hopes, and you quickly keep walking before they get a chance to say anything.'
+		'<br>You catch people staring at you intently, as if they''re supposed to know who you are but can''t quite place you. You sincerely hope they don''t realize your promiscuous adventures are the reason why they recognize you, but the occasional person chuckling and pointing at you crushes those hopes, and you quickly keep walking before they get a chance to say anything.'
 	elseif fame['pav_slut'] < 250:
-		'<br>People look at you with lewd grins on their faces, some of them even making vulgar gestures. Looks like they know what you''ve been up to.'
+		'<br>People look at you with lewd grins on their faces, some of them even making vulgar gestures. Your reputation appears to be the talk of the town.'
 	else
-		'<br>Everywhere you go, people recognize you as a whore. Some even come over and slap you on the ass, claiming they know you like it when they do, or claiming they want to sample your goods. An elderly woman sitting on a bench calls out to you, loudly calling you a slut and a whore. You hide your face and run away as fast as you can, before she can draw too much attention to you.'
+		'<br>Everywhere you go, people recognize you as a whore. Some even come over and slap you on the ass, claiming they know you like it or asking to ''sample your goods''. An elderly woman sitting on a bench calls out to you, loudly calling you a slut and a whore. You hide your face and run away as fast as you can before she can draw too much attention to you.'
 	end
 end
 
@@ -117,7 +117,7 @@ else
 	$schoolname = 'your old school.'
 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 the local teenagers to hang out after a long day at <<$schoolname>> or the <a href="exec: gt ''pav_pool'',''building''">local 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. 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.'
 
 *nl
 !!made changes here, to remove direct links to the kids in the apartment complex, make sure this will work with the code left.
@@ -160,7 +160,7 @@ 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 'Wait':gs 'obj_din', 'wait'
+act 'Wait': gs 'obj_din', 'wait'
 
 if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	act 'Go hunting near the community center (this can take a lot of time)':
@@ -227,12 +227,12 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,2) = 'sg' and $start_type
 	exit
 end
 
-if mid($start_type,1,2) = 'sg' and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 90 and AndRevstart ! daystart:
+if mid($start_type,1,2) = 'sg' and AndRev = 1 and (hour >= 22 or hour <= 2) and rand(1,100) >= 90 and AndRevstart ! daystart:
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
-	'It is late and you are hurrying to get home when you are suddenly grabbed from behind. A large hand covers your mouth and you cannot scream. A powerful arm wraps around you and lifts you from your feet. You are dragged into an alleyway between two buildings and the arm around you loosens for just a minute.'
+	'It''s late and you''re hurrying to get home when you''re suddenly grabbed from behind. A large hand covers your mouth and you''re unable to scream as a powerful arm wraps around you and lifts you from your feet. You''re dragged into an alleyway between two buildings and the arm around you loosens for just a minute.'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
@@ -249,10 +249,8 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	daybelisex = daystart
 	minut += 1
 	gs 'stat'
-	
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
-	'As you walk through Pavlovsk, Vadim Belys 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' 	
 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
@@ -260,10 +258,8 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	daybelisex = daystart
 	minut += 1
 	gs 'stat'
-	
 	'<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.'
-		
 	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end
 

Some files were not shown because too many files changed in this diff