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

locations/body.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	pcs_hips  = (pcs_hgt   * bodyVars['hratio']) / 100 + bodyVars['vhips']
 	pcs_waist = (pcs_hips  * bodyVars['wratio']) / 100 + bodyVars['vofat']
 	pcs_band  = (pcs_waist * bodyVars['bratio']) / 100 + bodyVars['vofat']
-	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + pcs_mass['preg'] / 5
+	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + pcs_mass['preg'] / 5 + bodyVars['bust_lact']
 	pcs_butt  = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-10, min(bodyVars['butt_other'], 10))
 
 	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']

locations/body_desc.qsrc

@@ -388,23 +388,52 @@ if $ARGS[0] = 'breasts':
 end
 
 if $ARGS[0] = 'butt':
-	!natural butt
-	if pcs_butt <= 14:
-		$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
-	elseif pcs_butt <= 25:
-		$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>.'
-	elseif pcs_butt <= 40:
-		$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average.'
-	elseif pcs_butt <= 59:
-		$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
+	if 1:
+		!natural butt
+		if pcs_butt <= 14:
+			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
+		elseif pcs_butt <= 29:
+			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>.'
+		elseif pcs_butt <= 44:
+			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average.'
+		elseif pcs_butt <= 59:
+			$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
+		else
+			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
+		end
+
+		!have butt implant
+		if bodyVars['butt_silicone'] > 0:
+			buttpic = 4
+			$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a>.'
+		end
 	else
-		$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
-	end
+		!natural butt
+		if pcs_butt <= 7:
+			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
+		elseif pcs_butt <= 14:
+			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a> is square but not completely flat.'
+		elseif pcs_butt <= 21:
+			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a>.'
+		elseif pcs_butt <= 29:
+			$pcs_butt = 'You have an above-average, feminine looking <a href="exec:view''images/pc/body/ass/4.jpg''">ass</a>.'
+		elseif pcs_butt <= 36:
+			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/5.jpg''">ass</a> is bigger, rounder and firmer than average.'
+		elseif pcs_butt <= 44:
+			$pcs_butt = 'Your ample <a href="exec:view''images/pc/body/ass/6.jpg''">ass</a> is bigger, rounder and firmer than most.'
+		elseif pcs_butt <= 51:
+			$pcs_butt = 'You have a heart-shaped <a href="exec:view''images/pc/body/ass/7.jpg''">butt</a> that jiggles as you walk.'
+		elseif pcs_butt <= 59:
+			$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/8.jpg''">butt</a> that jiggles and sways as you walk.'
+		else
+			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/9.jpg''">butt</a> that jiggles and sways as you walk.'
+		end
 
-	!have butt implant
-	if bodyVars['butt_silicone'] > 0:
-		buttpic = 4
-		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a>.'
+		!have butt implant
+		if bodyVars['butt_silicone'] > 0:
+			buttpic = 4
+			$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
+		end
 	end
 end
 

locations/booty_call_sms.qsrc

@@ -760,13 +760,15 @@ if $ARGS[0] = 'new_delayed':
 	gs 'SMStext_builder', 'start'
 		if $ARGS[1] = '1':
 			gs 'SMStext_builder', 'send', $SMSTree['f2']
-			gs 'SMStext_builder', 'add_reply', $SMSTree['f3'], 'booty_call_sms', 'new_delayed', '2', $ARGS[2], $ARGS[3]
-		elseif $ARGS[2] = '2':
-			gs 'SMStext_builder', 'send', $SMSTree['f3']
-			gs 'SMStext_builder', 'add_reply', $SMSTree['fa4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fa4', ''
-			gs 'SMStext_builder', 'add_reply', $SMSTree['fb4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fb4', ''
-			gs 'SMStext_builder', 'add_reply', $SMSTree['fc4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fc4', ''
-			gs 'SMStext_builder', 'add_reply', $SMSTree['fd4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'fd4', ''
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fa3'], 'booty_call_sms', 'new_delayed', 'a', $ARGS[2], $ARGS[3]
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fb3'], 'booty_call_sms', 'new_delayed', 'b', $ARGS[2], $ARGS[3]
+			gs 'SMStext_builder', 'add_reply', $SMSTree['fc3'], 'booty_call_sms', 'new_delayed', 'c', $ARGS[2], $ARGS[3]
+			if (schoolAtestat = 0 or university['student'] = 1) and kanikuli = 0:
+				gs 'SMStext_builder', 'add_reply', $SMSTree['fd3'], 'booty_call_sms', 'new_delayed', 'd', $ARGS[2], $ARGS[3]
+			end
+		else
+			gs 'SMStext_builder', 'send', $SMSTree['f' + $ARGS[1] + '3']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['f' + $ARGS[1] + '4'], 'booty_call_sms', 'new_routing2', $ARGS[2], $ARGS[3], 'f'+$ARGS[1]+'4', ''
 		end
 		gs 'SMStext_builder', 'show_sms', ARGS[4]
 	gs 'SMStext_builder', 'end'

locations/lact_lib.qsrc

@@ -45,7 +45,7 @@
 if $ARGS[0] = 'init_breasttissue':
 	!!	use func('lact_lib','init_breasttissue')
 	!!	getting the useable tissue
-	lactation['useable_cupsize'] = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_other'] - bodyVars['vofat']
+	lactation['useable_cupsize'] = pcs_mass['bust'] + bodyVars['bust_lact'] + bodyVars['bust_magic'] + bodyVars['bust_other'] - bodyVars['vofat']
 	!!	checking the variable. If it is greater 0, sveta has natural breast tissue to work with.
 	!!	else she has fake breasts or no breasts at all and no ability to lactate
 	if lactation['useable_cupsize'] > 0:
@@ -102,7 +102,7 @@ if $ARGS[0] = 'bsizetoccm':
 	!!	Getting breast ccm per breast function based on the bra size chart in here https://en.wikipedia.org/wiki/Bra_size
 	!!	I tried to create a math polynom for this, but ended up with x^16 monsters and inaccurate numbers, so I am going this approach.
 	!!	This is the most accurate function I was able to make, and is doing the job really good. So please do not touch it.
-	!!	usage func('lact_lib','bsizetoccm', (pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone']))
+	!!	usage func('lact_lib','bsizetoccm', (pcs_mass['bust'] + bodyVars['bust_lact'] + bodyVars['bust_magic'] + bodyVars['bust_silicone']))
 	if ARGS[1] < 0:
 		result = 100
 	elseif ARGS[1] <= 15:
@@ -143,7 +143,7 @@ if $ARGS[0] = 'bsizetoccm':
 end
 
 if $ARGS[0] = 'bccmtosize':
-	!!	backwardsfunction of bsizetoccm. It just reverts breast ccm to "pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone']" 
+	!!	backwardsfunction of bsizetoccm. It just reverts breast ccm to "pcs_mass['bust'] + bodyVars['bust_lact'] + bodyVars['bust_magic'] + bodyVars['bust_silicone']" 
 	!!	func('lact_lib','bccmtosize',lactation['breastccm'])
 	if ARGS[1] < 0:
 		result = 0
@@ -188,18 +188,18 @@ end
 if $ARGS[0] = 'lactationBreastGrowth':
 	if lactation['maturebreast'] = 1 and lactation['preggrowth'] > 0:
 !!		lactation['lactlib_change'] = 1
-		lactation['useable_cupsize'] = pcs_mass['bust'] + bodyVars['bust_magic'] - bodyVars['vofat']
-		pcs_mass['bust'] += func('lact_lib','bccmtosize',(func('lact_lib','bsizetoccm', lactation['useable_cupsize']) + (lactation['preggrowth']/100))) + bodyVars['vofat'] - bodyVars['bust_magic'] - pcs_mass['bust']
+		lactation['useable_cupsize'] = pcs_mass['bust'] + bodyVars['bust_lact'] + bodyVars['bust_magic'] - bodyVars['vofat']
+		bodyVars['bust_lact'] += func('lact_lib','bccmtosize',(func('lact_lib','bsizetoccm', lactation['useable_cupsize']) + (lactation['preggrowth']/100))) + bodyVars['vofat'] - bodyVars['bust_magic'] - pcs_mass['bust'] - bodyVars['bust_lact']
 		lactation['result'] = func('lact_lib','init_breasttissue')
 	end
 	if lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
 		!!	lactlib makes a change. we need to flag that, else checkExtBreastGrowth will go off and mess up everything.
 !!		lactation['lactlib_change'] = 1
 		if lactation['alveoliexpandlvl'] mod 3 = 0 and lactation['alveoliexpandlvl_change'] + 1 = lactation['alveoliexpandlvl']:
-			pcs_mass['bust'] += 5
+			bodyVars['bust_lact'] += 5
 			'<b>Your breasts seem fuller.</b>'
-		elseif lactation['alveoliexpandlvl_change'] mod 3 = 0 and lactation['alveoliexpandlvl'] + 1 = lactation['alveoliexpandlvl_change'] and lactation['alveoliexpandlvl_change'] > 0 and pcs_mass['bust'] > 10:
-			pcs_mass['bust'] -= 5
+		elseif lactation['alveoliexpandlvl_change'] mod 3 = 0 and lactation['alveoliexpandlvl'] + 1 = lactation['alveoliexpandlvl_change'] and lactation['alveoliexpandlvl_change'] > 0 and bodyVars['bust_lact'] >= 5:
+			bodyVars['bust_lact'] -= 5
 			'<b>Your breasts seem to be getting smaller.</b>'
 		end	
 		lactation['alveoliexpandlvl_change'] = lactation['alveoliexpandlvl'] 	
@@ -306,7 +306,7 @@ if $ARGS[0] = 'prod_milk':
 			else
 				!!	If energy is too low, milk will be produced but there is a chance that pcs_mass['body'] will shrink.
 				pcs_energy = 1
-				if rand(0,100) > 95: pcs_mass['body'] -= 1
+				if rand(0, 100) < 5: pcs_mass['body'] -= 1
 				if pain['breasts'] < 20: pain['breasts'] += 1
 			end
 			if pcs_energy < 1: pcs_energy = 1

locations/pcs_has_attr.qsrc

@@ -163,7 +163,6 @@ if $ARGS[0] = 'AND':
 	if pha_AND_i < pha_AND_maxi: jump 'pha_AND_loop'
 	result = 1
 
-
 	:pha_AND_killvar
 	killvar 'pha_AND_maxi'
 	killvar 'pha_AND_i'
@@ -189,6 +188,50 @@ elseif $ARGS[0] = 'OR':
 	:pha_OR_killvar
 	killvar 'pha_OR_maxi'
 	killvar 'pha_OR_i'
+
+elseif $ARGS[0] = 'NAND':
+	pha_NAND_maxi = arrsize('ARGS')
+
+	if pha_NAND_maxi = 1:
+		result = 0
+		jump 'pha_NAND_killvar'
+	end
+
+	pha_NAND_i = 1
+	:pha_NAND_loop
+		if func('pcs_has_attr', $ARGS[pha_NAND_i]) = 1:
+			result = 0
+			jump 'pha_AND_killvar'
+		end
+		pha_NAND_i += 1
+	if pha_NAND_i < pha_NAND_maxi: jump 'pha_AND_loop'
+	result = 1
+
+	:pha_NAND_killvar
+	killvar 'pha_NAND_maxi'
+	killvar 'pha_NAND_i'
+
+elseif $ARGS[0] = 'NOR':
+	pha_NOR_maxi = arrsize('ARGS')
+
+	if pha_NOR_maxi = 1:
+		result = 0
+		jump 'pha_NOR_killvar'
+	end
+
+	pha_NOR_i = 1
+	:pha_OR_loop
+		if func('pcs_has_attr', $ARGS[pha_NOR_i]) = 0:
+			result = 1
+			jump 'pha_OR_killvar'
+		end
+		pha_NOR_i += 1
+	if pha_NOR_i < pha_NOR_maxi: jump 'pha_OR_loop'
+	result = 0
+
+	:pha_OR_killvar
+	killvar 'pha_NOR_maxi'
+	killvar 'pha_NOR_i'
 end
 
 
@@ -211,7 +254,7 @@ if $ARGS[0] = 'body_ass_flat':
 
 elseif $ARGS[0] = 'body_ass_average':
 	!! average feminine butt
-	if pcs_butt >= 15 and pcs_butt <= 25:
+	if pcs_butt >= 15 and pcs_butt <= 29:
 		result = 1
 	else
 		result = 0
@@ -219,7 +262,7 @@ elseif $ARGS[0] = 'body_ass_average':
 
 elseif $ARGS[0] = 'body_ass_big':
 	!! Big round butt
-	if pcs_butt >= 26 and pcs_butt <= 40:
+	if pcs_butt >= 30 and pcs_butt <= 44:
 		result = 1
 	else
 		result = 0
@@ -227,7 +270,7 @@ elseif $ARGS[0] = 'body_ass_big':
 
 elseif $ARGS[0] = 'body_ass_heart':
 	!! Heart-shaped butt
-	if pcs_butt >= 41 and pcs_butt <= 59:
+	if pcs_butt >= 45 and pcs_butt <= 59:
 		result = 1
 	else
 		result = 0

locations/vasilyhome.qsrc

@@ -1307,9 +1307,9 @@ if $ARGS[0] = 'sleep_vasily_bed':
 	cla
 	npc_rel['A11'] += 1
 	gs 'sleep_simple', 'forced', 240
+
 	'You lay down and sleep for a few hours.'
 	act 'Get up': gt 'vasilyhome', 'vasily_room'
-	gs 'stat'
 end
 
 if $ARGS[0] = 'vasily_asleep':