Browse Source

[fixed] forgot to add in conditions regarding "never shave"

hornguy6 3 years ago
parent
commit
4b3165d9e0
2 changed files with 5 additions and 5 deletions
  1. 3 3
      locations/din_van.qsrc
  2. 2 2
      locations/stat_display.qsrc

+ 3 - 3
locations/din_van.qsrc

@@ -266,8 +266,8 @@ $bath = {
 
 $brit = {
 	if shave_menu = 1  and stanok > 1:
-		if pcs_leghair > 3 or (pcs_pubes >= shave_trigger):
-			if pcs_leghair > 3 and pcs_pubes >= shave_trigger:
+		if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
+			if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
 				if daystart < 10 and StoryLine = 0 and ntstart = 0:
 					$shave_act = 'Shave your legs and pussy'
 					$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -359,7 +359,7 @@ $brit = {
 			'<br>You don''t need to shave.'
 		end
 	elseif shave_menu = 2 and stanok > 0:
-		if pcs_pubes >= shave_trigger:
+		if (pubestyle > 0 and pcs_pubes >= shave_trigger):
 			if pubestyle = 1 or pubestyle = 11:
 				$shave_act = 'Shave your pussy'
 				if pcs_pubes > 10:

+ 2 - 2
locations/stat_display.qsrc

@@ -760,8 +760,8 @@ if cheatStatusIcons = 0:
 
 	if pcs_sweat > 19: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/need_shower.png"></a></td>'
 
-	if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12) and pcs_pubes > 19) or (pubestyle = 10 and pcs_pubes > 29) or (pubestyle = 11 and pcs_pubes > 10):
-		if pcs_pubes >= shave_trigger:
+	if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
+		if (pubestyle > 0 and pcs_pubes >= shave_trigger):
 			$stat_shave_msg = 'You need to shave your'+iif(pcs_leghair > 3, ' legs and ', ' ')+'pussy.'
 		elseif pcs_leghair > 3:
 			$stat_shave_msg = 'You need to shave your legs.'