[Fixed] made Havana prices more consistent

locations/havana.qsrc

@@ -73,21 +73,21 @@ if $ARGS[0] = 'start':
 	$temp_table =	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'
 	$temp_table +=	'<tr>'
 	$temp_table +=		'<td>'
-	if money >= 1500 or karta => 1500:
+	if money >= 1500 or karta >= 1500:
 		$temp_table +=		'<a href="exec: epayments[''value''] = 1500 & epayments[''quantity''] = 10 & gs ''shortgs'',''payments'' ">1,500<b> ₽</b> for 10 lessons</a>'
 	else
 		$temp_table +=		'1,500<b> ₽</b> for 10 lessons'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
-	if money >= 2250 or karta => 2250:
-		$temp_table +=		'<a href="exec: epayments[''value''] = 2250 & epayments[''quantity''] = 20 & gs ''shortgs'',''payments'' ">2,250<b> ₽</b> for 20 lessons</a>'
+	if money >= 3000 or karta >= 3000:
+		$temp_table +=		'<a href="exec: epayments[''value''] = 3000 & epayments[''quantity''] = 20 & gs ''shortgs'',''payments'' ">3,000<b> ₽</b> for 20 lessons</a>'
 	else
-		$temp_table +=		'2,250<b> ₽</b> for 20 lessons'
+		$temp_table +=		'3,000<b> ₽</b> for 20 lessons'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
-	if money >= 3000 or karta => 3000:
+	if money >= 7500 or karta >= 7500:
 		$temp_table +=		'<a href="exec: epayments[''value''] = 7500 & epayments[''quantity''] = 50 & gs ''shortgs'',''payments'' ">7,500<b> ₽</b> for 50 lessons</a>'
 	else
 		$temp_table +=		'7,500<b> ₽</b> for 50 lessons'
@@ -96,24 +96,24 @@ if $ARGS[0] = 'start':
 	$temp_table +=	'</tr>'
 	$temp_table +=	'<tr>'
 	$temp_table +=		'<td>'
-	if money >= 1500 or karta => 1500:
-		$temp_table +=		'<a href="exec: epayments[''value''] = 15000 & epayments[''quantity''] = 100 & gs ''shortgs'',''payments'' ">15,000<b> ₽</b> for 100 lessons</a>'
+	if money >= 14500 or karta >= 14500:
+		$temp_table +=		'<a href="exec: epayments[''value''] = 14500 & epayments[''quantity''] = 100 & gs ''shortgs'',''payments'' ">14,500<b> ₽</b> for 100 lessons</a>'
 	else
-		$temp_table +=		'15,000<b> ₽</b> for 100 lessons'
+		$temp_table +=		'14,500<b> ₽</b> for 100 lessons'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
-	if money >= 2250 or karta => 2250:
-		$temp_table +=		'<a href="exec: epayments[''value''] = 22500 & epayments[''quantity''] = 200 & gs ''shortgs'',''payments'' ">22,500<b> ₽</b> for 200 lessons</a>'
+	if money >= 28500 or karta >= 28500:
+		$temp_table +=		'<a href="exec: epayments[''value''] = 28500 & epayments[''quantity''] = 200 & gs ''shortgs'',''payments'' ">28,500<b> ₽</b> for 200 lessons</a>'
 	else
-		$temp_table +=		'22,500<b> ₽</b> for 200 lessons'
+		$temp_table +=		'28,500<b> ₽</b> for 200 lessons'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=		'<td>'
-	if money >= 3000 or karta => 3000:
-		$temp_table +=		'<a href="exec: epayments[''value''] = 75000 & epayments[''quantity''] = 500 & gs ''shortgs'',''payments'' ">75,000<b> ₽</b> for 500 lessons</a>'
+	if money >= 69000 or karta >= 69000:
+		$temp_table +=		'<a href="exec: epayments[''value''] = 69000 & epayments[''quantity''] = 500 & gs ''shortgs'',''payments'' ">69,000<b> ₽</b> for 500 lessons</a>'
 	else
-		$temp_table +=		'75,000<b> ₽</b> for 500 lessons'
+		$temp_table +=		'69,000<b> ₽</b> for 500 lessons'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
@@ -123,6 +123,7 @@ if $ARGS[0] = 'start':
 	killvar '$temp_table'
 end
 
+
 if $ARGS[0] = 'dressing_room':
 	menu_off = 0
 	gs 'shortgs', 'setloc', 'havana', 'dressing_room'

locations/pav_pool.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 		else
 			pav_swimpool['entrancefee'] = 100
 		end
-		
+
 		if pav_swimpool['entrancepaid'] = daystart:
 			'<b>You''ve already paid the fee, so you can enter.</b>'
 			act 'Enter': gt 'pav_pool', 'entrance'
@@ -99,7 +99,7 @@ end
 if $ARGS[0] = 'lockerfemale':
 	!! Clothing change events
 	!!-------------------------------------------------------------------!!
-	
+
 	$loc = 'pav_pool'
 	$loc_arg = 'lockerfemale'
 	$location_type = 'private'
@@ -174,7 +174,7 @@ if $ARGS[0] = 'lockerfemale':
 		'You should buy some swimwear if you intend on spending time at the pool.'
 		*nl
 	end
-	
+
 !!	act 'Go to the mirrors':
 !!		gt 'pav_pool', 'mirror'
 !!	end
@@ -183,8 +183,8 @@ if $ARGS[0] = 'lockerfemale':
 		act 'Enter the pool area': gs 'shoes', 'strip' & gt 'pav_pool', 'pool'
 	else
 		*nl
-		if PCloswimwear = 0: 'You need to put some swimwear on first if you want to go in the pool.'
-		if pcs_makeup <> 1 and cosmetic_tattoo = 0: 'You need to wash your make-up off first if you want to go in the pool.'
+		if PCloswimwear = 0: 'You need to put some swimwear on first if you want to go into the pool.'
+		if pcs_makeup <> 1 and cosmetic_tattoo = 0: 'You need to wash your make-up off first if you want to go into the pool.'
 		*nl
 	end
 
@@ -212,7 +212,7 @@ if $ARGS[0] = 'showerfemale':
 	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
@@ -277,7 +277,7 @@ if $ARGS[0] = 'mirror':
 			cumspclnt = 13
 			gs 'cum_cleanup'
 			if pcs_sweat > 19: pcs_sweat -= 5
-			gs 'stat' 
+			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'
@@ -289,13 +289,13 @@ if $ARGS[0] = 'mirror':
 			minut += 5
 			pcs_makeup = 1
 			if pcs_sweat > 19: pcs_sweat -= 5
-			gs 'stat' 
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/washface.jpg"></center>'
 			'You carefully wash away your make-up at the sink.'
 			act 'Finish': gt 'pav_pool', 'mirror'
 		end
 	end
-end	
+end
 
 if $ARGS[0]= 'cafeteria':
 	*clr & cla
@@ -374,7 +374,7 @@ if $ARGS[0] = 'pool':
 	$location_type = 'public_indoors'
 	minut += 1
 	gs 'stat'
-	
+
 	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.'
@@ -406,7 +406,7 @@ if $ARGS[0] = 'pool':
 			'You slowly climb down the ladder into the pool, probing the temperature as you go down.'
 			act 'Continue': gt 'pav_pool', 'poolwater'
 		end
-		
+
 		act 'Dive into the water':
 			*clr & cla
 			minut += 1
@@ -457,10 +457,10 @@ if $ARGS[0] = 'pool':
 			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' 
+			act 'Continue': gt 'pav_pool', 'poolwater'
 		end
 
-		act 'Sit with your feet in the water': gt 'pav_pool_events', 'feetwater' 
+		act 'Sit with your feet in the water': gt 'pav_pool_events', 'feetwater'
 	end
 	act 'Go to female locker room': minut += 1 & gt 'pav_pool', 'lockerfemale'
 end
@@ -475,16 +475,16 @@ if $ARGS[0]= 'poolwater':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/inwater.jpg"></center>'
 	'You are in the water. It feels very relaxing.'
-	
+
 	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: 
+	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: 
+	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: 
+	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
 
@@ -495,13 +495,13 @@ if $ARGS[0]= 'poolwater':
 	end
 
 	if hour >= 8 and hour < 21:
-		act 'Relaxed swim': gt 'pav_pool_events', 'relaxedswim' 
+		act 'Relaxed swim': gt 'pav_pool_events', 'relaxedswim'
 
 		if hour < 12 or hour >= 18:
 			act 'Exercise': gt 'pav_pool_events', 'exerciseswim'
 		end
 
-		act 'Dive': gt 'pav_pool_events', 'dive' 
+		act 'Dive': gt 'pav_pool_events', 'dive'
 		act 'Relax at the edge of the pool': gt 'pav_pool_events', 'edgepool'
 		act 'Relax in the water': gt 'pav_pool_events', 'relaxedwater'
 	end
@@ -545,7 +545,7 @@ if $ARGS[0]= 'exitpool':
 				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