Explorar o código

[changed] Replaced clothing dependent pregnancy checks with the new body_din function

Sicaa %!s(int64=4) %!d(string=hai) anos
pai
achega
c5e8a0b32c

+ 6 - 6
locations/KatjaHomeTalk.qsrc

@@ -230,7 +230,7 @@ if $ARGS[0] = '':
 	end
 
 	if npc_pregtalk['A14'] = 0 and KatjaConflict = 0 and kid = 0:
-		if knowKatjaPreg = 1 and pregchem >= 3600:
+		if knowKatjaPreg = 1 and func('body_din','pregnancyVisibility') = 1:
 			cla
 			gs 'stat'
 			minut += 5
@@ -243,7 +243,7 @@ if $ARGS[0] = '':
 			else
 				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
 			end
-		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
+		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -252,7 +252,7 @@ if $ARGS[0] = '':
 				*nl
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows'
 			end
-		elseif KatjaPreg = 0 and pregchem >= 3600:
+		elseif KatjaPreg = 0 and func('body_din','pregnancyVisibility') = 1:
 			cla
 			*nl
 			minut += 5
@@ -265,7 +265,7 @@ if $ARGS[0] = '':
 			else
 				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
 			end
-		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
+		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -278,7 +278,7 @@ if $ARGS[0] = '':
 	end
 
 	if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and kid > 0:
-		if knowKatjaPreg = 1 and pregchem >= 3600:
+		if knowKatjaPreg = 1 and func('body_din','pregnancyVisibility') = 1:
 			cla
 			gs 'stat'
 			minut += 5
@@ -290,7 +290,7 @@ if $ARGS[0] = '':
 			else
 				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
 			end
-		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and pregchem < 3600:
+		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				cls
 				gs 'stat'

+ 1 - 1
locations/bass.qsrc

@@ -137,7 +137,7 @@ if $ARGS[0] = 'a':
 		gs 'exercise', 'tier1', 60, 'stren_exp'
 		pcs_sweat = 10 + rand(0,4)
 		if pcs_inhib < 50:inhib_exp += rand(1,2)
-		if pregchem < 3600:	
+		if func('body_din','pregnancyVisibility') = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/poolswim.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/poolswimpreg.jpg"></center>'

+ 2 - 2
locations/father.qsrc

@@ -134,14 +134,14 @@ if tatlip>0 and fatherTatLip=0 and npc_rel['A28']>=60:
     end
 end
 
-if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and pregchem > 2688:
+if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
     'Your stepfather looks at your belly with a surprised look on his face: "<<$pcs_nickname>>, you''re pregnant?"'
     if npc_sex['A28']!0:
         'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "It''s not mine, I hope?"'
     end
     npc_pregtalk['A28'] = 1
     
-elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and pregchem > 3600:
+elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
     'Your stepfather looks at your belly with a surprised look on his face: "<<$pcs_nickname>>, you''re pregnant?"'
     if npc_sex['A28']!0:
         'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "It''s not mine, I hope?"'

+ 3 - 3
locations/mother.qsrc

@@ -708,7 +708,7 @@ if $ARGS[0] = 'pregreact':
 	menu_off = 1
 	*nl
 	if pregTalkFamily = 0 and npc_pregtalk['A29'] = 0 and kid = 0:
-		if ($clothingworntype = 'nude' and pregchem > 2688) or ($clothingworntype ! 'nude' and pregchem > 3600):
+		if func('body_din','pregnancyVisibility') = 1:
 			cla
 			gs 'stat'
 			minut += 5
@@ -723,7 +723,7 @@ if $ARGS[0] = 'pregreact':
 
 				act 'Go get dressed':pregTalkFamily = 1 & npc_pregtalk['A29'] = 1 & gt 'mother', 'pregreactnude'
 			end
-		elseif knowpreg = 1 and $clothingworntype ! 'nude' and pregchem <= 3600:
+		elseif knowpreg = 1 and $clothingworntype ! 'nude' and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell your mother you are pregnant':
 				*clr & cla
 				minut += 5
@@ -743,7 +743,7 @@ if $ARGS[0] = 'pregreact':
 
 				act 'Tell her':pregTalkFamily = 1 & npc_pregtalk['A29'] = 1 & gt 'mother', 'pregreact1'
 			end
-		elseif knowpreg = 1 and $clothingworntype = 'nude' and pregchem <= 2688:
+		elseif knowpreg = 1 and $clothingworntype = 'nude' and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell your mother you are pregnant':
 				*clr & cla
 				minut += 5

+ 5 - 5
locations/natbelapt.qsrc

@@ -231,7 +231,7 @@ if $ARGS[0] = 'ask_state':
 		'"<<$NatashaMotherNickname>>... You uhm... don''t look very pleased to see me. Did I... Is it something I did?"'
 		if natpregday > 0 and (daystart-natpregday) > 120:
 			'"Well <<$pcs_nickname>>, I''m still trying to adjust to the fact that my daughter is pregnant. Excuse me if I haven''t embraced that little fact yet."'
-			if pregchem > 3600:
+			if func('body_din','pregnancyVisibility') = 1:
 				'"I don''t know what you girls were thinking. The least you could have done was use protection. Getting pregnant when you''re <<age>>, you''re not ready to raise a baby!" She says angrily, looking at your obviously swollen belly.'
 				'You lower your head at the accusation in her tone and mumble "S-Sorry..." as you pass by her into the hallway.'
 			else
@@ -1110,11 +1110,11 @@ if $ARGS[0] = 'chat':
 	act 'Stop talking': gt 'natbelapt','natroom'
 
 	if npc_pregtalk['A16'] = 0 and kid = 0:
-		if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregchem >= 3600:
+		if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and func('body_din','pregnancyVisibility') = 1:
 			*clr & cla
 			'"<<$pcs_nickname>>, are you pregnant, too? Well, I guess I don''t have to worry about being the only pregnant girl at school," she giggles.'
 			act 'Continue':gt 'natbelapt', 'natknows'
-		elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
+		elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				'"If you were worried about being the only pregnant girl at school, that won''t be a problem anymore." You smirk while rubbing your midriff. "It looks like I got myself knocked up as well."'
@@ -1153,11 +1153,11 @@ if $ARGS[0] = 'chat':
 	end
 
 	if npc_pregtalk['A16'] = 0 and kid > 0:
-		if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregchem >= 3600:
+		if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and func('body_din','pregnancyVisibility') = 1:
 			*clr & cla
 			'"Wow, <<$pcs_nickname>>, you''re pregnant again? You''re really committed to making sure I''m not the only young mother around here, huh?" She playfully smiles and puts a hand on your shoulder. "It''s good to know you''re looking out for me."'
 			act 'Next':gt 'natbelapt', 'natknows1'
-		elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
+		elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				'"Hey, guess who''s pregnant again. You know, I''m glad I forced you to let Kolka impregnate you so that I could have someone I can relate to."'

+ 2 - 2
locations/sister_chat.qsrc

@@ -146,9 +146,9 @@ if $ARGS[0] = 'checks':
 		end
 		
 		!! If you are visibly pregnant:
-		if npc_pregtalk['A33'] = 0 and (($clothingworntype = 'nude' and pregchem > 2688) or ($clothingworntype ! 'nude' and pregchem > 3600)):
+		if npc_pregtalk['A33'] = 0 and func('body_din','pregnancyVisibility') = 1:
 			npc_pregtalk['A33'] = 1
-			if $clothingworntype ! 'nude' and pregchem > 3600:
+			if $clothingworntype ! 'nude':
 				'With surprise your sister says, "You''re pregnant, <<$pcs_nickname>>!"'
 				'"How the hell can you tell?"'
 				'With a smile, she says, "I have a bionic eye." As she reaches out and rubs your protruding belly, "So, do you know who the father is?"'