Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

anjuna krokus 11 months ago
parent
commit
d0f749b01c
2 changed files with 36 additions and 36 deletions
  1. 18 18
      locations/city_clinic.qsrc
  2. 18 18
      locations/pav_clinic.qsrc

+ 18 - 18
locations/city_clinic.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = 'start':
 					'The dentist examinees you and says it will cost 4500 <b>₽</b> to straighten your teeth and that you''ll have to wear a brace for three months. However, he states that he can''t promise they will be completely straight after one treatment.'
 				end
 
-				if money < zubpay and karta < zubpay:
+				if money < zubpay and karta + bankDebtLimit < zubpay:
 					*nl
 					'You do not have enough money to fix your teeth.'
 				else
@@ -265,7 +265,7 @@ if $ARGS[0] = 'start':
 							act 'Leave the clinic': minut += 5 & gt 'city_residential'
 						end
 					end
-					if karta >= zubpay:
+					if karta + bankDebtLimit >= zubpay:
 						act 'Sort out your teeth (card)':
 							*clr & cla
 							karta -= zubpay
@@ -302,7 +302,7 @@ if $ARGS[0] = 'start':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
 			'The optometrist takes you through a series of tests to measure the condition of your eyes.'
-			'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave.' 
+			'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave."' 
 			'He hands you a piece of paper. "Of course you can get a different pair elsewhere if you want better looking ones, the details for which ones you need are on your prescription. You can also get laser vision correction if you really don''t want to use glasses, but I''m going to be honest with you: that''s a very expensive procedure."'
 			pcs_nerd += 1
 			glassqw = 2
@@ -325,7 +325,7 @@ if $ARGS[0] = 'start':
 			act 'Return to the entrance': gt 'city_clinic', 'start'
 
 			if glass = 1:
-				if money < 4500 and karta < 4500:
+				if money < 4500 and karta + bankDebtLimit < 4500:
 					*nl
 					'You can''t afford the more stylish glasses.'
 				else
@@ -342,7 +342,7 @@ if $ARGS[0] = 'start':
 							act 'Return to the entrance': gt 'city_clinic', 'start'
 						end
 					end
-					if karta >= 4500:
+					if karta + bankDebtLimit >= 4500:
 						act 'Buy glasses (4,500 <b>₽</b>) (card)':
 							cla
 							karta -= 4500
@@ -359,7 +359,7 @@ if $ARGS[0] = 'start':
 			end
 
 			if glass ! 0:
-				if money < 75000 and karta < 75000:
+				if money < 75000 and karta + bankDebtLimit < 75000:
 					*nl
 					'You can''t afford the laser eye correction surgery.'
 				else
@@ -376,7 +376,7 @@ if $ARGS[0] = 'start':
 							act 'Return to the entrance': gt 'city_clinic', 'start'
 						end
 					end
-					if karta >= 75000:
+					if karta + bankDebtLimit >= 75000:
 						act 'Pay for laser correction (75,000 <b>₽</b>) (card)':
 							cla
 							karta -= 75000
@@ -419,7 +419,7 @@ if $ARGS[0] = 'stdclinic':
 		end
 	end
 
-	if karta >= 1000:
+	if karta + bankDebtLimit >= 1000:
 		act 'Get tested for STDs (1,000 <b>₽</b>) (card)':
 			karta -= 1000
 			gs 'city_clinic', 'stdcheck'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'stdclinic':
 	end
 
 	if GerpesNapr > 0 and GerpesUkolDay ! daystart:
-		if money < 450 and karta < 450: *nl & 'You can''t afford your herpes shot.'
+		if money < 450 and karta + bankDebtLimit < 450: *nl & 'You can''t afford your herpes shot.'
 
 		if money >= 450:
 			act 'Get herpes shot (450 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
@@ -436,7 +436,7 @@ if $ARGS[0] = 'stdclinic':
 			end
 		end
 
-		if karta >= 450:
+		if karta + bankDebtLimit >= 450:
 			act 'Get herpes shot (450 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
 				karta -= 450
 				gs 'city_clinic', 'herpes_shot'
@@ -445,7 +445,7 @@ if $ARGS[0] = 'stdclinic':
 	end
 
 	if TriperNapr > 0 and TriperUkolDay ! daystart:
-		if money < 750 and karta < 750: *nl & 'You can''t afford your gonorrhea shot.'
+		if money < 750 and karta + bankDebtLimit < 750: *nl & 'You can''t afford your gonorrhea shot.'
 
 		if money >= 750:
 			act 'Get gonorrhea shot (750 <b>₽</b>) (cash) You need <<TriperNapr>> more injections to complete the treatment':
@@ -454,7 +454,7 @@ if $ARGS[0] = 'stdclinic':
 			end
 		end
 
-		if karta >= 750:
+		if karta + bankDebtLimit >= 750:
 			act 'Get gonorrhea shot (750 <b>₽</b>) (card) You need <<TriperNapr>> more injections to complete the treatment':
 				karta -= 750
 				gs 'city_clinic', 'gonorrhea_shot'
@@ -463,7 +463,7 @@ if $ARGS[0] = 'stdclinic':
 	end
 
 	if SifNapr = 1:
-		if money < 1000 and karta < 1000: *nl & 'You can''t afford your syphilis shot.'
+		if money < 1000 and karta + bankDebtLimit < 1000: *nl & 'You can''t afford your syphilis shot.'
 
 		if money >= 1000:
 			act 'Get syphilis shot (1,000 <b>₽</b>) (cash)':
@@ -472,7 +472,7 @@ if $ARGS[0] = 'stdclinic':
 			end
 		end
 
-		if karta >= 1000:
+		if karta + bankDebtLimit >= 1000:
 			act 'Get syphilis shot (1,000 <b>₽</b>) (card)':
 				karta -= 1000
 				gs 'city_clinic', 'syphilis_shot'
@@ -481,7 +481,7 @@ if $ARGS[0] = 'stdclinic':
 	end
 
 	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.'
+		if money < 45000 and karta + bankDebtLimit < 45000: *nl & 'You to go to private clinic and completely cure your herpes.'
 
 		if money >= 45000:
 			act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (cash)':
@@ -490,7 +490,7 @@ if $ARGS[0] = 'stdclinic':
 			end
 		end
 
-		if karta >= 45000:
+		if karta + bankDebtLimit >= 45000:
 			act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (card)':
 				karta -= 45000
 				gs 'city_clinic', 'herpes_cure'
@@ -499,7 +499,7 @@ if $ARGS[0] = 'stdclinic':
 	end
 
 	if KandidozOnce = 1 and week = 1 and day <= 10:
-		if money < 15000 and karta < 15000: *nl & 'You can''t afford to go to the private clinic and completely cure your yeast infection.'
+		if money < 15000 and karta + bankDebtLimit < 15000: *nl & 'You can''t afford to go to the private clinic and completely cure your yeast infection.'
 
 		if money >= 15000:
 			act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (cash)':
@@ -508,7 +508,7 @@ if $ARGS[0] = 'stdclinic':
 			end
 		end
 
-		if karta >= 15000:
+		if karta + bankDebtLimit >= 15000:
 			act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (card)':
 				karta -= 15000
 				gs 'city_clinic', 'yeast_cure'

+ 18 - 18
locations/pav_clinic.qsrc

@@ -193,7 +193,7 @@ if $ARGS[0] = '':
 								act 'Leave the clinic': minut += 5 & gt 'pav_commercial'
 							end
 						end
-						if karta >= zubpay:
+						if karta + bankDebtLimit >= zubpay:
 							act 'Sort out your teeth (card)':
 								*clr & cla
 								karta -= zubpay
@@ -230,7 +230,7 @@ if $ARGS[0] = '':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
 				'The optometrist takes you through a series of tests to measure the condition of your eyes.'
-				'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave.' 
+				'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave."' 
 				'He hands you a piece of paper. "Of course you can get a different pair elsewhere if you want better looking ones, the details for which ones you need are on your prescription. You can also get laser vision correction if you really don''t want to use glasses, but I''m going to be honest with you: that''s a very expensive procedure."'
 				pcs_nerd += 1
 				glassqw = 2
@@ -269,7 +269,7 @@ if $ARGS[0] = '':
 								act 'Return to the entrance': gt 'pav_clinic'
 							end
 						end
-						if karta >= 4500:
+						if karta + bankDebtLimit >= 4500:
 							act 'Buy glasses (4,500 <b>₽</b>) (card)':
 								cla
 								karta -= 4500
@@ -301,7 +301,7 @@ if $ARGS[0] = '':
 								act 'Return to the entrance': gt 'pav_clinic'
 							end
 						end
-						if karta >= 75000:
+						if karta + bankDebtLimit >= 75000:
 							act 'Pay for laser correction (75,000 <b>₽</b>) (card)':
 								cla
 								karta -= 75000
@@ -706,7 +706,7 @@ if $ARGS[0] = 'sexual_health':
 		end
 	end
 
-	if karta >= 1000:
+	if karta + bankDebtLimit >= 1000:
 		act 'Get tested for STDs (1,000 <b>₽</b>) (card)':
 			karta -= 1000
 			gs 'pav_clinic', 'std_test'
@@ -723,7 +723,7 @@ if $ARGS[0] = 'sexual_health':
 			end
 		end
 
-		if karta >= 450:
+		if karta + bankDebtLimit >= 450:
 			act 'Get herpes shot (450 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
 				karta -= 450
 				gs 'pav_clinic', 'herpes_shot'
@@ -732,7 +732,7 @@ if $ARGS[0] = 'sexual_health':
 	end
 
 	if TriperNapr > 0 and TriperUkolDay ! daystart:
-		if money < 750 and karta < 750: *nl & 'You can''t afford your gonorrhea shot.'
+		if money < 750 and karta + bankDebtLimit < 750: *nl & 'You can''t afford your gonorrhea shot.'
 
 		if money >= 750:
 			act 'Get gonorrhea shot (750 <b>₽</b>) (cash) You need <<TriperNapr>> more injections to complete the treatment':
@@ -741,7 +741,7 @@ if $ARGS[0] = 'sexual_health':
 			end
 		end
 
-		if karta >= 750:
+		if karta + bankDebtLimit >= 750:
 			act 'Get gonorrhea shot (750 <b>₽</b>) (card) You need <<TriperNapr>> more injections to complete the treatment':
 				karta -= 750
 				gs 'pav_clinic', 'gonorrhea_shot'
@@ -750,7 +750,7 @@ if $ARGS[0] = 'sexual_health':
 	end
 
 	if SifNapr = 1:
-		if money < 1000 and karta < 1000: *nl & 'You can''t afford your syphilis shot.'
+		if money < 1000 and karta + bankDebtLimit < 1000: *nl & 'You can''t afford your syphilis shot.'
 
 		if money >= 1000:
 			act 'Get syphilis shot (1,000 <b>₽</b>) (cash)':
@@ -759,7 +759,7 @@ if $ARGS[0] = 'sexual_health':
 			end
 		end
 
-		if karta >= 1000:
+		if karta + bankDebtLimit >= 1000:
 			act 'Get syphilis shot (1,000 <b>₽</b>) (card)':
 				karta -= 1000
 				gs 'pav_clinic', 'syphilis_shot'
@@ -1226,7 +1226,7 @@ if $ARGS[0] = 'spravka_money':
 				act 'Leave':gt 'pav_clinic'
 			end
 		end
-		if karta >= 2000:
+		if karta + bankDebtLimit >= 2000:
 			act 'Pay him the 2,000 <b>₽</b> (card)':
 				*clr & cla
 				minut += 5
@@ -1275,7 +1275,7 @@ if $ARGS[0] = 'spravka_money_pale':
 				gs 'pav_clinic', 'spravka_money_pale2'
 			end
 		end
-		if karta >= 2000:
+		if karta + bankDebtLimit >= 2000:
 			act 'Pay him the 2,000 <b>₽</b> (card)':
 				*clr & cla
 				minut += 5
@@ -1625,7 +1625,7 @@ if $ARGS[0] = 'maternity_ward':
 							'The nurse looks up at you with a caring expression. "No worries, this can happen from time to time."'
 							'You''re still surprised and perplexed by what you''re seeing. "I''m lactating!"'
 							'The nurse takes a small wet wipe and cleans your breasts, then signals that you can cover yourself up.'
-							'""We always need breast milk here. You should think about donating your milk. We will even compensate you for your efforts."'
+							'"We always need breast milk here. You should think about donating your milk. We will even compensate you for your efforts."'
 							'She cleans her hands. "But I think you should leave for now, so you can get used to your new ability."'
 							'She opens the door to let you out of the room.'
 							act 'Leave': gt 'pav_clinic'
@@ -1681,7 +1681,7 @@ if $ARGS[0] = 'maternity_ward':
 										'"You''re able to produce a good amount of milk. You could breastfeed a baby with no issue."'
 									elseif lact_ev['gpoli_milkedvolume'] >= 500 and lact_ev['gpoli_milkedvolume'] < 1000:
 										'Your breasts aren''t able to fill both small bottles and the nurse raises an eyebrow at you.'
-										'"You''re able to produce enough milk for a 50ml donation, but you might have trouble breastfeeding a baby properly.'
+										'"You''re able to produce enough milk for a 50ml donation, but you might have trouble breastfeeding a baby properly."'
 									else
 										'You have trouble filling the bottles to the first mark and the nurse shakes her head.'
 										'"Mhmm... Your breasts don''t seem to produce enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation."'
@@ -1758,7 +1758,7 @@ if $ARGS[0] = 'maternity_ward':
 										'"You''re able to produce a good amount of milk. You could breastfeed a baby with no issue."'
 									elseif lact_ev['gpoli_milkedvolume'] >= 500 and lact_ev['gpoli_milkedvolume'] < 1000:
 										'Your breasts aren''t able to fill both small bottles and the nurse raises an eyebrow at you.'
-										'"You''re able to produce enough milk for a 50ml donation, but you might have trouble breastfeeding a baby properly.'
+										'"You''re able to produce enough milk for a 50ml donation, but you might have trouble breastfeeding a baby properly."'
 									else
 										'You have trouble filling the bottles to the first mark and the nurse shakes her head.'
 										'"Mhmm... Your breasts don''t seem to produce enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation."'
@@ -1840,7 +1840,7 @@ if $ARGS[0] = 'maternity_ward':
 							'"You''re able to produce a good amount of milk. You could breastfeed a baby with no issue."'
 						elseif lact_ev['gpoli_milkedvolume'] >= 50 and lact_ev['gpoli_milkedvolume'] < 1000:
 							'Your breasts aren''t able to fill both small bottles and the nurse raises an eyebrow at you.'
-							'"You''re able to produce enough milk for a 50ml donation, but you might have trouble breastfeeding a baby properly.'
+							'"You''re able to produce enough milk for a 50ml donation, but you might have trouble breastfeeding a baby properly."'
 						else
 							'You have trouble filling the bottles to the first mark and the nurse shakes her head.'
 							'"Mhmm... Your breasts don''t seem to produce enough milk. You can still come here and get yourself pumped, but we need at least 50ml for a valid donation."'
@@ -1935,7 +1935,7 @@ if $ARGS[0] = 'maternity_ward_donation':
 				end
 			elseif lact_ev['gpoli_milkedvolume'] < 50000 and lact_ev['gpoli_milkedvolume'] > 0:
 				'She looks at you in disappointment.'
-				'"Mhmm... I''m sorry, but this isn''t enough milk for a valid donation. You only provided <<lact_ev[''gpoli_milkedvolume'']/1000>>ml of breast milk.'
+				'"Mhmm... I''m sorry, but this isn''t enough milk for a valid donation. You only provided <<lact_ev[''gpoli_milkedvolume'']/1000>>ml of breast milk."'
 			else
 				'She looks at you in disappointment.'
 				'"Mhmm... I''m sorry, but this isn''t enough milk for a valid donation. You provided no breast milk at all."'
@@ -1997,7 +1997,7 @@ if $ARGS[0] = 'std_check':
 
 	if SifacOnce = 1:
 		sifNapr = 1
-		'"You have syphilis. The cure for this disease used to be expensive. However, this deadly disease can now be with a single shot. The injection will cost 1,000 <b>₽</b>.'
+		'"You have syphilis. The cure for this disease used to be expensive. However, this deadly disease can now be with a single shot. The injection will cost 1,000 <b>₽</b>."'
 	end
 
 	if TriperOnce = 1: