Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife

locations/Gadsarai.qsrc

@@ -356,7 +356,7 @@ if $ARGS[0] = '':
 					observ_exp += 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/pc/purses/cheap/5.jpg"></center>'
-					'In a far corner of the barn you find a burlap sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
+					'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
 					cheap_purses[5] = 1
 					$currentpursetype = 'cheap'
 					currentpursenumber = 5

locations/abduction.qsrc

@@ -537,7 +537,8 @@ if $ARGS[0] = 'abdFood':
 		cla
 		*clr
 		minut += 15
-		pcs_health += 30
+		frost = 0
+		pcs_health += 10
 		pcs_mood += 10
 		pcs_energy += 25
 		if pcs_hydra >= 100:
@@ -547,6 +548,8 @@ if $ARGS[0] = 'abdFood':
 		end
 		pcs_breath = 0
 		fat += 4
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/driedbread1.jpg"></center>'
 		'You ate the dried meat and bread. Your throat is dry and some water could come in handy.'
@@ -558,7 +561,8 @@ if $ARGS[0] = 'abdFood':
 		cla
 		*clr
 		minut += 5
-		pcs_health += 30
+		frost = 1
+		pcs_health += 10
 		pcs_mood += 10
 		if pcs_hydra >= 100:
 			pcs_hydra += 50
@@ -592,15 +596,17 @@ if $ARGS[0] = 'abdFood':
 				vitaminday = daystart
 				vitamin -= 1
 				frost = 0
-				if pcs_hydra < 50 : pcs_hydra += 30 else pcs_hydra +=15
-				if pcs_hydra > 100: pcs_hydra = 100
-
+				if pcs_hydra >= 100:
+					pcs_hydra += 25
+				else
+					pcs_hydra += 50
+				end
 				if KandidozOnce = 1:Kandidoz -= 2
 				if GerpesOnce = 1:Gerpes -= 2
 				if SifacOnce = 1 and Sifilis >= 10:Sifilis -= rand(0, 1)
 
 				pcs_skin += 1
-
+				gs 'stat'
 				'You take some vitamins to stay healthy.'
 
 				act 'Continue':gt 'abduction', 'abdFood'

locations/brother.qsrc

@@ -283,19 +283,22 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-
-	if $loc = 'sitrPar':
-
-		gs 'brother', 'pregreact'
-		gs 'brother', 'brotherSexCount'
+	
+	 if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 		
 		if hour >= 7 and hour < 23:
-			act'Chat with him':gt'brother2','chat'
+			act'Chat with Kolka':gt'brother2','chat'
 		end
 		
 		!if father_go = 1 and hour >= 7:
 		!	act'Play video games with him':gt'video_games','brother'
 		!end
+	end
+
+	if $loc = 'sitrPar':
+
+		gs 'brother', 'pregreact'
+		gs 'brother', 'brotherSexCount'
 
 		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and father_go = 1 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
 			act 'Show off your nipple piercings ':

locations/brother2.qsrc

@@ -1,6 +1,8 @@
 # brother2
 
 if $ARGS[0] = 'chat':
+	minut += 15
+	gs 'stat'
 	'<center><b><font color="maroon">Kolka</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 	'You casually talk to him about whatever topics come up.'

locations/gpoli.qsrc

@@ -104,20 +104,8 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if pcs_health < (pcs_vital * 10 + pcs_stren * 5):
-			act 'Get treated for your poor health (1:00)':
-				cla
-				minut += 60
-				pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
-				if pillcon > 0 and rand(0,4) = 0:pillcon -= 2500
-				'After a quick discussion about your health, the doctor gives you an injection with a strange pink fluid. You immediately feel much better.'
-
-				act 'Leave':gt $curloc
-			end
-		end
-
-		if pain['total'] > 10:
-			act 'Pain relief (1:00)':
+		if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
+			act 'See a Doctor about your health (1:00)':
 				cla
 				minut += 60
 				if pain['head'] > 0:pain['head'] -= rand(7,13)
@@ -157,7 +145,10 @@ if $ARGS[0] = '':
 				if pain['clitoris'] > 0:pain['clitoris'] -= rand(7,13)
 				if pain['urethra'] > 0:pain['urethra'] -= rand(7,13)
 				if pain['cervix'] > 0:pain['cervix'] -= rand(7,13)
-				'You receive a combined painkiller, steroid and vitamin shot which not only helps the pain but speeds your recovery too permanently reducing your current pain.'
+				pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
+				if pillcon > 0 and rand(0,4) = 0:pillcon -= 2500
+				gs 'stat'
+				'After a quick discussion about your health, the doctor gives you an injection with a strange pink fluid, 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.'
 
 				act 'Leave':gt 'gpoli'
 			end

locations/gschool_lessons.qsrc

@@ -485,7 +485,7 @@ if $ARGS[0] = 'math':
 					*nl
 					'Christina replies back, "Bella better hope that you are right. I will find out one way or another." Christina quickly turns off her phone then slams her hand on the table, causing Anatoly to jump up in surprise before quickly looking around the room for the source of the noise before shrugging and continuing with his lesson.'
 				else
-					'As you are browsing the web, you receive a text message from Christina Zvereva, reading; "Have you seen what Zinaida was wearing this morning? Another burlap sack. Doesn''t she realize how bad she looks, and would it kill her to comb her hair? She looks like a fucking scarecrow." You reply, "Yeah she doesn''t really seem to care about her appearance at all." Christina replies, "Exactly! She is such an eyesore, anyway have you been watching my races? I have been undefeated since I have started." You text back, "I have seen a few and I am always impressed at how fast you can move." Christina gives you a wink before replying, "Keep training and maybe you and I will keep the first two spots reserved for us. You can be the one in second of course."'
+					'As you are browsing the web, you receive a text message from Christina Zvereva, reading; "Have you seen what Zinaida was wearing this morning? Another hessian sack. Doesn''t she realize how bad she looks, and would it kill her to comb her hair? She looks like a fucking scarecrow." You reply, "Yeah she doesn''t really seem to care about her appearance at all." Christina replies, "Exactly! She is such an eyesore, anyway have you been watching my races? I have been undefeated since I have started." You text back, "I have seen a few and I am always impressed at how fast you can move." Christina gives you a wink before replying, "Keep training and maybe you and I will keep the first two spots reserved for us. You can be the one in second of course."'
 					*nl
 					'You giggle as you reply, "Sure sounds like fun." While sticking your tongue out at her, causing you both to giggle before turning back to your phones.'
 				end

locations/poli.qsrc

@@ -44,8 +44,6 @@ if $ARGS[0] = 'start':
 		act 'Ask the doctor for a health treatment (1:00)':
 			cla
 			minut += 60
-			pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
-			if pillcon > 0 and rand(0,4) = 0:pillcon -= 2500
 			if hosprand = 0:gt 'poli', '0'
 			if hosprand = 1:gt 'poli', '1'
 			if hosprand = 2:gt 'poli', '2'
@@ -56,8 +54,8 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if pain['total'] > 10:
-		act 'Ask the doctor to treat your pains (1:00)':
+	if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
+		act 'See a Doctor about your health (1:00)':
 			cla
 			minut += 60
 			if pain['head'] > 0:pain['head'] -= rand(7,13)
@@ -97,12 +95,15 @@ if $ARGS[0] = 'start':
 			if pain['clitoris'] > 0:pain['clitoris'] -= rand(7,13)
 			if pain['urethra'] > 0:pain['urethra'] -= rand(7,13)
 			if pain['cervix'] > 0:pain['cervix'] -= rand(7,13)
-			'The doctor guides you to a bed and tells you to lie down, after which he gives you a combined painkiller, steroid and vitamin shot.'
-			'You feel drowsy for a little while, but afterwards you feel a lot better. The shot sped up your aching body''s recovery by a lot, meaning the pain probably won''t come back nearly as strongly when the shot wears off.'
+			pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
+			if pillcon > 0 and rand(0,4) = 0:pillcon -= 2500
+			gs 'stat'
 
 			if hosprand = 0:gt 'poli', '0'
 			if hosprand = 1:gt 'poli', '1'
 			if hosprand = 2:gt 'poli', '2'
+			'The doctor guides you to a bed and tells you to lie down, after which he gives you a combined painkiller, steroid and vitamin shot.'
+			'You feel drowsy for a little while, but afterwards you feel a lot better. The shot sped up your aching body''s recovery by a lot, meaning the pain probably won''t come back nearly as strongly when the shot wears off, and should aid your health recovery over the coming days.'
 
 			act 'Return to the entrance':gt 'poli', 'start'
 		end

locations/swamphouse.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				swamp_clothes = 1
 				!gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouse_tkancloth.jpg"></center>'
-				'You find a piece of burlap... "Well, at least it''s something." you say to yourself.'
+				'You find a piece of hessian... "Well, at least it''s something." you say to yourself.'
 				act 'Back.': gt 'swamphouse', 'start'
 			end
 		end
@@ -426,7 +426,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 					minut+=5
 					swamp_clothes = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-					'You look around searching for your clothes but can''t seem to find them, instead you hide behind a piece of burlap... It''s better than nothing.'
+					'You look around searching for your clothes but can''t seem to find them, instead you hide behind a piece of hessian... It''s better than nothing.'
 					act 'Further': gt 'swamphouse', 'start'
 				end
 			end