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

locations/intro_sg_select.qsrc

@@ -970,7 +970,7 @@ if $ARGS[0] = 'cool':
 	pcs_inhib		+= 5
 
 	! Dance
-	pcs_danc		+= 10
+	pcs_danc		+= 35
 
 	! Sport
 	pcs_icesktng	+= 10
@@ -1158,9 +1158,6 @@ elseif $ARGS[0] = 'anorexic':
 		pcs_inhib		-= 10
 		willpowermax 	-= 15
 
-		! Dance
-		pcs_danc		+= 10
-
 		! Sport
 		pcs_run			+= 15
 
@@ -1224,10 +1221,6 @@ elseif $ARGS[0] = 'bimbo':
 		pcs_inhib		= 35
 		willpowermax 	-= 15
 
-		! Dance
-		pcs_danc		+= 20
-
-
 		! Other
 		pcs_persuas		-= 10
 		pcs_makupskl	+= 50

locations/lover_meet.qsrc

@@ -573,9 +573,9 @@ if $ARGS[0] = 'actions':
 				elseif func('lover_pref', 'check_piercings') = 0 and pierDay <= npc_dates[$npcID]:
 					'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 					'<<$npcdesc>> talks about how you just don''t have the right amount of piercings.'
-					if npc_pref_values['cosmetics_piercing_none'] > 0 or npc_pref_values['cosmetics_piercing_few'] > 0:
+					if npc_pref_values['cosmetics_piercings_none'] > 0 or npc_pref_values['cosmetics_piercings_few'] > 0:
 						'<<$Xec>> tells you that you should have less piercings.'
-					elseif npc_pref_values['cosmetics_piercing_multiple'] > 0:
+					elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
 						if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 							'<<$Xec>> tells you that you should have less piercings.'
 						else
@@ -692,9 +692,9 @@ if $ARGS[0] = 'actions':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 					'<<$npcdesc>> talks about how you just don''t have the right amount of piercings.'
-					if npc_pref_values['cosmetics_piercing_none'] > 0 or npc_pref_values['cosmetics_piercing_few'] > 0:
+					if npc_pref_values['cosmetics_piercings_none'] > 0 or npc_pref_values['cosmetics_piercings_few'] > 0:
 						'<<$Xec>> tells you that you should have less piercings.'
-					elseif npc_pref_values['cosmetics_piercing_multiple'] > 0:
+					elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
 						if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 							'<<$Xec>> tells you that you should have less piercings.'
 						else
@@ -849,9 +849,9 @@ if $ARGS[0] = 'actions':
 					'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 					'<<$npcdesc>> talks about how you just don''t have the right amount of piercings.'
 
-					if npc_pref_values['cosmetics_piercing_none'] > 0 or npc_pref_values['cosmetics_piercing_few'] > 0:
+					if npc_pref_values['cosmetics_piercings_none'] > 0 or npc_pref_values['cosmetics_piercings_few'] > 0:
 						'<<$Xec>> tells you that you should have less piercings.'
-					elseif npc_pref_values['cosmetics_piercing_multiple'] > 0:
+					elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
 						if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 							'<<$Xec>> tells you that you should have less piercings.'
 						else

locations/lover_pref.qsrc

@@ -226,21 +226,21 @@ if $ARGS[0] = 'get_makeup_pref':
 end
 
 if $ARGS[0] = 'get_piercing_pref':
-	if npc_pref_values['cosmetics_piercing_none'] > 0 or npc_pref_values['cosmetics_piercing_few'] > 0:
-		if func('pcs_has_attr', 'OR', 'cosmetics_piercing_none', 'cosmetics_piercing_few'):
+	if npc_pref_values['cosmetics_piercings_none'] > 0 or npc_pref_values['cosmetics_piercings_few'] > 0:
+		if func('pcs_has_attr', 'OR', 'cosmetics_piercings_none', 'cosmetics_piercings_few'):
 			$result = 'the same amount of'
 		else
 			$result = 'less'
 		end
-	elseif npc_pref_values['cosmetics_piercing_multiple'] > 0:
+	elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
 		if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 			$result = 'less'
-		elseif func('pcs_has_attr', 'cosmetics_piercing_multiple'):
+		elseif func('pcs_has_attr', 'cosmetics_piercings_multiple'):
 			$result = 'the same amount of'
 		else
 			$result = 'more'
 		end
-	elseif npc_pref_values['cosmetics_piercing_multiple'] > 0:
+	elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
 		if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 			$result = 'the same amount of'
 		else

locations/pav_disco.qsrc

@@ -120,13 +120,13 @@ if $ARGS[0] = '':
 						inhib_exp += 1
 						'You look around and smile, as no one knows you''re not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
 					end
-					if pcs_danc <= 30:
+					if pcs_danc <= 25:
 						grupvalue[1] -= 1
 						grupvalue[2] -= 2
 						'You''re having a lot of fun out on the dance floor. Your horribly awkward attempt at dancing makes it look like you''re having a seizure, but you don''t care. You''re not paying attention to anyone else or even the music.'
-					elseif pcs_danc <= 60:
+					elseif pcs_danc <= 40:
 						'You''re having a lot of fun out on the dance floor. You barely pay attention to anyone else as you move around on the dance floor.'
-					elseif pcs_dancero <= 40:
+					elseif pcs_dancero <= 30:
 						grupvalue[1] += 1
 						grupvalue[2] += 1
 						'You''re having a lot of fun out on the dance floor. You move your body around in an erotic manner to the beat of the music.'
@@ -142,13 +142,13 @@ if $ARGS[0] = '':
 						inhib_exp += 1
 						'You look around and smile, as no one knows you''re not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
 					end
-					if pcs_danc <= 30:
+					if pcs_danc <= 25:
 						grupvalue[1] -= 1
 						grupvalue[2] -= 2
 						'You''re having a lot of fun out on the dance floor, even though you''re a terrible dancer and being buzzed doesn''t help. Your awkward movements look more like a seizure than dancing, but you don''t care. You''re not paying attention to anyone else or even the music.'
-					elseif pcs_danc <= 60:
+					elseif pcs_danc <= 40:
 						'You''re having a lot of fun out on the dance floor. You barely pay attention to anyone else as you move around on the dance floor, feeling a little buzzed.'
-					elseif pcs_dancero <= 40:
+					elseif pcs_dancero <= 30:
 						grupvalue[1] += 1
 						grupvalue[2] += 1
 						'You''re having a lot of fun out on the dance floor and are dancing pretty well despite how buzzed you are. You move your body around in an erotic manner to the beat of the music.'
@@ -164,13 +164,13 @@ if $ARGS[0] = '':
 						inhib_exp += 1
 						'You look around and smile, as no one knows you''re not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
 					end
-					if pcs_danc <= 30:
+					if pcs_danc <= 25:
 						grupvalue[1] -= 1
 						grupvalue[2] -= 2
 						'You''re having a lot of fun out on the dance floor, even though you''re a terrible dancer and being tipsy doesn''t help. Your awkward movements look more like a seizure than dancing, but you don''t care. You''re not paying attention to anyone else or even the music.'
-					elseif pcs_danc <= 60:
+					elseif pcs_danc <= 40:
 						'You''re having a lot of fun out on the dance floor. You barely pay attention to anyone else as you move around on the dance floor, feeling a little tipsy.'
-					elseif pcs_dancero <= 40:
+					elseif pcs_dancero <= 30:
 						grupvalue[1] += 1
 						grupvalue[2] += 1
 						'You''re having a lot of fun out on the dance floor and are dancing pretty well despite how tipsy you are. You move your body around in an erotic manner to the beat of the music.'
@@ -186,17 +186,17 @@ if $ARGS[0] = '':
 						inhib_exp += 1
 						'You look around and smile, as no one knows you''re not wearing any panties. You feel a thrilling sensation rush through your body as you think about it.'
 					end
-					if pcs_danc <= 30:
+					if pcs_danc <= 25:
 						grupvalue[1] -= 3
 						grupvalue[2] -= 3
 						grupvalue[4] += 1
 						'You''re having a lot of fun out on the dance floor, even though you''re a terrible dancer and being drunk doesn''t help. Your awkward movements look more like a seizure than dancing, but you don''t care. You''re not paying attention to anyone else or even the music.'
-					elseif pcs_danc <= 60:
+					elseif pcs_danc <= 40:
 						grupvalue[1] -= 2
 						grupvalue[2] -= 2
 						grupvalue[4] += 1
 						'You''re having a lot of fun out on the dance floor. You barely pay attention to anyone else as you move around on the dance floor, feeling rather drunk.'
-					elseif pcs_dancero <= 40:
+					elseif pcs_dancero <= 30:
 						grupvalue[1] -= 1
 						grupvalue[2] -= 1
 						grupvalue[4] += 1
@@ -220,17 +220,17 @@ if $ARGS[0] = '':
 						inhib_exp += 3
 						'<center><b><font color="maroon">Disco</font></b></center>'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/very_drunk_dance.mp4"></video></center>'
-						if pcs_danc <= 30:
+						if pcs_danc <= 25:
 							grupvalue[1] -= 6
 							grupvalue[2] -= 6
 							grupvalue[4] += 2
 							'You''re very drunk and forget that you don''t have any panties on. As you awkwardly attempt to dance, you''re too drunk to notice your skirt riding up, exposing your pussy to the observant people on the dance floor with you.'
-						elseif pcs_danc <= 60:
+						elseif pcs_danc <= 40:
 							grupvalue[1] -= 5
 							grupvalue[2] -= 5
 							grupvalue[4] += 2
 							'You''re very drunk and forget that you don''t have any panties on. As you drunkenly dance around, your skirt rides up, exposing your pussy to the observant people on the dance floor with you.'
-						elseif pcs_dancero <= 40:
+						elseif pcs_dancero <= 30:
 							grupvalue[1] -= 4
 							grupvalue[2] -= 4
 							grupvalue[4] += 2
@@ -254,15 +254,15 @@ if $ARGS[0] = '':
 						*clr & cla
 						'<center><b><font color="maroon">Disco</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/very_drunk_dance.jpg"></center>'
-						if pcs_danc <= 30:
+						if pcs_danc <= 25:
 							grupvalue[1] -= 4
 							grupvalue[2] -= 4
 							'You''re very drunk, but are having a lot of fun out on the dance floor anyway. You''re a terrible dancer, and being drunk doesn''t help. Your awkward movements look more like a seizure than dancing, but you don''t care. You''re not paying attention to anyone else or even the music.'
-						elseif pcs_danc <= 60:
+						elseif pcs_danc <= 40:
 							grupvalue[1] -= 3
 							grupvalue[2] -= 3
 							'You''re very drunk, but are having a lot of fun out on the dance floor anyway. As you dance around, you barely pay attention to anyone else.'
-						elseif pcs_dancero <= 40:
+						elseif pcs_dancero <= 30:
 							grupvalue[1] -= 2
 							grupvalue[2] -= 2
 							'You''re very drunk, but are having a lot of fun out on the dance floor anyway. You dance pretty well for how drunk you are, and move your body around in an erotic manner to the beat of the music.'