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

locations/MagEncounterFairy.qsrc

@@ -1,5 +1,7 @@
 # MagEncounterFairy
 
+!! 30/07 - image for the fairy now added.
+
 menu_off = 1
 
 if $ARGS[0] = '':
@@ -27,6 +29,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 	cla
 	gs 'stat'
 	knowsfairy = 1
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/fae.jpg"></center>'
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
 	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
@@ -83,6 +86,7 @@ end
 if $ARGS[0] = 'fairy_chat':
 	cla
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/fae.jpg"></center>'
 	'You take the few steps over to the glowing orb that apparently only you can recognize as what it truly is: a fairy.'
 	act 'Chat with the fairy':
 		cla
@@ -301,5 +305,6 @@ if $ARGS[0] = 'teleport':
 end
 
 
+
 --- MagEncounterFairy ---------------------------------
 

locations/city_clinic.qsrc

@@ -47,11 +47,12 @@ if $ARGS[0] = 'start':
 		act 'Go to the breast milk donation office': minut += 5 & gt 'city_clinic','milk_donation_room'
 	end
 
-	if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
+	if (pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10) and clinic['docheal'] ! daystart:
 		act 'See a doctor about your health (1:00)':
 			cla
 			menu_off = 1
 			minut += 60
+			clinic['docheal'] = daystart
 			gs 'medical_din','healthTreatment'
 			gs 'stat'
 

locations/pav_clinic.qsrc

@@ -318,11 +318,12 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
+		if (pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10) and clinic['docheal'] ! daystart:
 			act 'See a doctor about your health (1:00)':
 				cla
 				menu_off = 1
 				minut += 60
+				clinic['docheal'] = daystart
 				gs 'medical_din','healthTreatment'
 				gs 'stat'
 				'After a quick discussion about your health, the doctor gives you an injection of a combined painkiller, steroid and vitamin shot which not only helps the pain, but speeds your recovery too, permanently reducing your current pain and increasing your health. You immediately feel much better, and should recover health faster over the coming days.'