Browse Source

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

Kevin_Smarts 1 year ago
parent
commit
f7bd4adfd3
2 changed files with 14 additions and 16 deletions
  1. 7 8
      locations/city_clinic.qsrc
  2. 7 8
      locations/pav_clinic.qsrc

+ 7 - 8
locations/city_clinic.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'start':
 
 
 	if katjob > 0:act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 	if katjob > 0:act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 
 
-	if (pcs_teeth > -1 and (dentistday + 90 < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
+	if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
 		act 'Go to the dentist':
 		act 'Go to the dentist':
 			*clr & cla
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
@@ -212,7 +212,6 @@ if $ARGS[0] = 'start':
 			if pcs_brace = 1:
 			if pcs_brace = 1:
 				pcs_brace = 0
 				pcs_brace = 0
 				pcs_teeth -= 1
 				pcs_teeth -= 1
-				dentistday = daystart
 				'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 				'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 				gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 				gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 				gs 'stat'
 				gs 'stat'
@@ -244,11 +243,11 @@ if $ARGS[0] = 'start':
 								pcs_missing_teeth = 0
 								pcs_missing_teeth = 0
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 							elseif pcs_teeth > 0:
 							elseif pcs_teeth > 0:
-								dentistday = daystart
+								dentistday = daystart + 180
 								pcs_brace = 1
 								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 							else
 							else
-								dentistday = daystart
+								dentistday = daystart + 90
 								pcs_teeth = -1
 								pcs_teeth = -1
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 							end
 							end
@@ -267,12 +266,12 @@ if $ARGS[0] = 'start':
 								pcs_missing_teeth = 0
 								pcs_missing_teeth = 0
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 							elseif pcs_teeth > 0:
 							elseif pcs_teeth > 0:
-								dentistday = daystart
+								dentistday = daystart + 180
 								pcs_brace = 1
 								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 							else
 							else
 								pcs_teeth = -1
 								pcs_teeth = -1
-								dentistday = daystart
+								dentistday = daystart + 90
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 							end
 							end
 							gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 							gs 'AppearanceSystem', 'UpdateBaseAppearnce'

+ 7 - 8
locations/pav_clinic.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = '':
 			end
 			end
 		end
 		end
 
 
-		if (pcs_teeth > -1 and (dentistday + 90 < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
+		if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
 			act 'Go to the dentist':
 			act 'Go to the dentist':
 				*clr & cla
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
@@ -150,7 +150,6 @@ if $ARGS[0] = '':
 				if pcs_brace = 1:
 				if pcs_brace = 1:
 					pcs_brace = 0
 					pcs_brace = 0
 					pcs_teeth -= 1
 					pcs_teeth -= 1
-					dentistday = daystart
 					'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 					'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 					gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 					gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 					gs 'stat'
 					gs 'stat'
@@ -182,11 +181,11 @@ if $ARGS[0] = '':
 									pcs_missing_teeth = 0
 									pcs_missing_teeth = 0
 									'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 									'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 								elseif pcs_teeth > 0:
 								elseif pcs_teeth > 0:
-									dentistday = daystart
+									dentistday = daystart + 180
 									pcs_brace = 1
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 								else
 								else
-									dentistday = daystart
+									dentistday = daystart + 90
 									pcs_teeth = -1
 									pcs_teeth = -1
 									'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 									'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 								end
 								end
@@ -205,12 +204,12 @@ if $ARGS[0] = '':
 									pcs_missing_teeth = 0
 									pcs_missing_teeth = 0
 									'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 									'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 								elseif pcs_teeth > 0:
 								elseif pcs_teeth > 0:
-									dentistday = daystart
+									dentistday = daystart + 180
 									pcs_brace = 1
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 								else
 								else
 									pcs_teeth = -1
 									pcs_teeth = -1
-									dentistday = daystart
+									dentistday = daystart + 90
 									'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 									'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 								end
 								end
 								gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 								gs 'AppearanceSystem', 'UpdateBaseAppearnce'