[fixed] Couple of misplaced cash and card labels

[added] Card payment for permanent treatments in city clinic

locations/city_clinic.qsrc

@@ -295,8 +295,8 @@ if $ARGS[0] = 'start':
 					*nl
 					'You can not afford the more stylish glasses.'
 				else
-					if money >= 4500 (cash):
-						act 'Buy glasses (4,500 <b>₽</b>)':
+					if money >= 4500:
+						act 'Buy glasses (4,500 <b>₽</b>) (cash)':
 							cls
 							money -= 4500
 							minut += 60
@@ -307,8 +307,8 @@ if $ARGS[0] = 'start':
 							act 'Return to the entrance':gt 'city_clinic', 'start'
 						end
 					end
-					if karta >= 4500 (card):
-						act 'Buy glasses (4,500 <b>₽</b>)':
+					if karta >= 4500:
+						act 'Buy glasses (4,500 <b>₽</b>) (card)':
 							cls
 							karta -= 4500
 							minut += 60
@@ -327,8 +327,8 @@ if $ARGS[0] = 'start':
 					*nl
 					'You can not afford the laser eye correction surgery.'
 				else
-					if money >= 75000 (cash):
-						act 'Pay for laser correction (75,000 <b>₽</b>)':
+					if money >= 75000:
+						act 'Pay for laser correction (75,000 <b>₽</b>) (cash)':
 							cls
 							money -= 75000
 							minut += 60
@@ -339,8 +339,8 @@ if $ARGS[0] = 'start':
 							act 'Return to the entrance':gt 'city_clinic', 'start'
 						end
 					end
-					if karta >= 75000 (card):
-						act 'Pay for laser correction (75,000 <b>₽</b>)':
+					if karta >= 75000:
+						act 'Pay for laser correction (75,000 <b>₽</b>) (card)':
 							cls
 							karta -= 75000
 							minut += 60
@@ -355,7 +355,6 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	
 end
 
 if $ARGS[0] = 'stdclinic':
@@ -443,40 +442,39 @@ if $ARGS[0] = 'stdclinic':
 		end
 	end
 
-	if GerpesOnce = 1 and money >= 45000 and week = 1 and day <= 10:
-		act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>)':
-			cla
-			menu_off = 1
-			money -= 45000
-			day += 3
-			week += 3
-			GerpesOnce = 0
-			Gerpes = 0
-			OrHerpes = 0
-			GenHerpes = 0
-			Venera -= 1
-			gs 'stat'
-			'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
-			'After a long recovery, you have been completely cured of your herpes.'
+	if GerpesOnce = 1 and week = 1 and day <= 10:
+		if money < 45000 and karta < 45000: *nl & 'You to go to private clinic and completely cure your herpes.'
 
-			act 'Leave':gt 'city_clinic', 'start'
+		if money >= 45000:
+			act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (cash)':
+				money -= 45000
+				gs 'city_clinic', 'herpes_cure'
+			end
+		end
+
+		if karta >= 45000:
+			act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (card)':
+				karta -= 45000
+				gs 'city_clinic', 'herpes_cure'
+			end
 		end
 	end
 
-	if KandidozOnce = 1 and money >= 15000 and week = 1 and day <= 10:
-		act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>)':
-			cla
-			menu_off = 1
-			money -= 15000
-			day += 3
-			week += 3
-			KandidozOnce = 0
-			Kandidoz = 0
-			gs 'stat'
-			'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
-			'After a long recovery, you have been completely cured of your yeast infection.'
+	if KandidozOnce = 1 and week = 1 and day <= 10:
+		if money < 15000 and karta < 15000: *nl & 'You cannot afford to go to private clinic and completely cure your yeast infection.'
 
-			act 'Leave':gt 'city_clinic', 'start'
+		if money >= 15000:
+			act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (cash)':
+				money -= 15000
+				gs 'city_clinic', 'yeast_cure'
+			end
+		end
+
+		if karta >= 15000:
+			act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (card)':
+				karta -= 15000
+				gs 'city_clinic', 'yeast_cure'
+			end
 		end
 	end
 end
@@ -618,6 +616,37 @@ if $ARGS[0] = 'syphilis_shot':
 	act 'Leave':gt 'city_clinic'
 end
 
+if $ARGS[0] = 'herpes_cure':
+	*clr & cla
+	menu_off = 1
+	day += 3
+	week += 3
+	KandidozOnce = 0
+	Kandidoz = 0
+	gs 'stat'
+	'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
+	'After a long recovery, you have been completely cured of your yeast infection.'
+
+	act 'Leave':gt 'city_clinic', 'start'
+end
+
+if $ARGS[0] = 'yeast_cure':
+	*clr & cla
+	menu_off = 1
+	day += 3
+	week += 3
+	GerpesOnce = 0
+	Gerpes = 0
+	OrHerpes = 0
+	GenHerpes = 0
+	Venera -= 1
+	gs 'stat'
+	'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
+	'After a long recovery, you have been completely cured of your herpes.'
+
+	act 'Leave':gt 'city_clinic', 'start'
+end
+
 if $ARGS[0] = 'ven1':
 	*clr & cla
 	menu_off = 1

locations/pav_clinic.qsrc

@@ -233,8 +233,8 @@ if $ARGS[0] = '':
 						*nl
 						'You can not afford the more stylish glasses.'
 					else
-						if money >= 4500 (cash):
-							act 'Buy glasses (4,500 <b>₽</b>)':
+						if money >= 4500:
+							act 'Buy glasses (4,500 <b>₽</b>) (cash)':
 								cls
 								money -= 4500
 								minut += 60
@@ -245,8 +245,8 @@ if $ARGS[0] = '':
 								act 'Return to the entrance':gt 'pav_clinic'
 							end
 						end
-						if karta >= 4500 (card):
-							act 'Buy glasses (4,500 <b>₽</b>)':
+						if karta >= 4500:
+							act 'Buy glasses (4,500 <b>₽</b>) (card)':
 								cls
 								karta -= 4500
 								minut += 60
@@ -265,8 +265,8 @@ if $ARGS[0] = '':
 						*nl
 						'You can not afford the laser eye correction surgery.'
 					else
-						if money >= 75000 (cash):
-							act 'Pay for laser correction (75,000 <b>₽</b>)':
+						if money >= 75000:
+							act 'Pay for laser correction (75,000 <b>₽</b>) (cash)':
 								cls
 								money -= 75000
 								minut += 60
@@ -277,8 +277,8 @@ if $ARGS[0] = '':
 								act 'Return to the entrance':gt 'pav_clinic'
 							end
 						end
-						if karta >= 75000 (card):
-							act 'Pay for laser correction (75,000 <b>₽</b>)':
+						if karta >= 75000:
+							act 'Pay for laser correction (75,000 <b>₽</b>) (card)':
 								cls
 								karta -= 75000
 								minut += 60