Merge remote-tracking branch 'Hornguy6/master'

locations/brother_voyeur.qsrc

@@ -62,11 +62,11 @@ if $ARGS[0] = 'showertalk1':
 		'"You''re not?" he says, looking up at you before blushing at your exposed body and turning away again.'
 		'"Of course not silly! I''m not even mad! I just wanted to catch up with my favorite little brother and I thought, since you were right there, why not now?"'
 		'"Oh, okay..." he nods, still looking away.'
-		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,3)
+		if npc_rel['A34'] <50: gs 'npc_relationship', 'modify', 'A34', 'like'
 
 		if pcs_inhib >= 40 or npc_rel['A34'] >= 90:
 			act'"You can look at me you know"':
-				npc_rel['A34'] += 5
+				gs 'npc_relationship', 'modify', 'A34', 'love'
 				*clr & cla
 				brothershowerlook = 1
 				if brotherSex < 2:brotherSex = 2
@@ -124,7 +124,7 @@ end
 if $ARGS[0] = 'showertalk2':
 	if npc_QW['A34'] <= 1: npc_QW['A34'] = 2
 	brothershowertalk += 1
-	npc_rel['A34'] += rand(2,3)
+	gs 'npc_relationship', 'modify', 'A34', 'like'
 	if brothershowerlook = 1:gt 'brother_voyeur', 'brothershowerlook'
 	cla & *clr
 	if brothershowerask ! daystart:
@@ -145,7 +145,7 @@ if $ARGS[0] = 'showertalk2':
 	act'Continue':
 		if brothershowerlook >= 1:gt 'brother_voyeur', 'brothershowerlook'
 		*clr & cla
-		if npc_rel['A34'] < 50:npc_rel['A34'] += rand(1,2)
+		if npc_rel['A34'] < 50: gs 'npc_relationship', 'modify', 'A34', 'like'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk3.jpg"></center>'
 		'He slips inside and sits on the toilet again, staring at the wall, though not before "sneaking" a peek at your exposed breasts.'
 		*nl
@@ -154,7 +154,7 @@ if $ARGS[0] = 'showertalk2':
 			*clr & cla
 			brothershowerlook = 1
 			if brotherSex < 2:brotherSex = 2
-			npc_rel['A34'] += 5
+			gs 'npc_relationship', 'modify', 'A34', 'love'
 			bro_ass_compliment = rand(1,3)
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
 
@@ -272,7 +272,7 @@ if $ARGS[0] = 'brothershowerlook':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk3.jpg"></center>'
 	brother_shower['look'] = daystart
 	inhib_exp += rand(1,3)
-	if npc_rel['A34'] <50 and brothershowerask ! daystart:npc_rel['A34'] += rand(1,2)
+	if npc_rel['A34'] <50 and brothershowerask ! daystart: gs 'npc_relationship', 'modify', 'A34', 'like'
 	if brothershowertalk < 10 and brothershowerask ! daystart:
 		'He slips inside and takes his usual place on the toilet along with the traditional quick glance at your breasts. He''s gripping the edge of the seat and leaning forward with an eager smile. If nothing else, he''s certainly happy to be here.'
 	elseif brothershowertalk >= 10 and brothershowerask ! daystart:
@@ -592,7 +592,7 @@ if $ARGS[0] = 'brother_shower_together':
 		if pcs_inhib >= 50 or npc_rel['A34'] > 80:
 			if pcs_horny >= 50:
 				act'Use the showerhead on your pussy':
-					npc_rel['A34'] += 5
+					gs 'npc_relationship', 'modify', 'A34', 'love'
 					cla
 					*nl
 					'"Hey, hand me the showerhead will you?" you say to your brother.'
@@ -630,7 +630,7 @@ if $ARGS[0] = 'brother_shower_together':
 			end
 			act'Give him shower head':
 				cla
-				npc_rel['A34'] += 5
+				gs 'npc_relationship', 'modify', 'A34', 'love'
 				if brotherbj < 1 and brotherfuck < 1:
 					'"Hey Kolka, want to see something cool?"'
 					'"Huh?" He asks, confused. "What is it?"'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'brother_wash_first':
 end
 
 if $ARGS[0] = 'brother_wash':
-	npc_rel['A34'] += 5
+	gs 'npc_relationship', 'modify', 'A34', 'love'
 	if brotherSex < 4:brotherSex = 4
 	cla & *clr
 	brotherwash += 1
@@ -746,12 +746,13 @@ if $ARGS[0] = 'brother_wash':
 					end
 				end
 			end
+			if pcs_pubes >= shave_trigger:
+				act 'I should shave': gt 'brother_voyeur', 'brother_shower_shave'
 
-			act 'I should shave': gt 'brother_voyeur', 'brother_shower_shave'
-
-			act'Just for you':
-				brother_shower['shave_ask1'] = daystart
-				gt 'brother_voyeur', 'brother_shower_shave'
+				act'Just for you':
+					brother_shower['shave_ask1'] = daystart
+					gt 'brother_voyeur', 'brother_shower_shave'
+				end
 			end
 		end
 	end
@@ -806,7 +807,7 @@ if $ARGS[0] = 'shave_both':
 	if mc_inventory['razor'] >= razors_to_use['all']:
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			act 'Shave your legs and pussy (0:15)':
-				npc_rel['A34'] += 3
+				gs 'npc_relationship', 'modify', 'A34', 'like'
 				cla & *clr
 				minut += 15
 				pcs_leghair = 0
@@ -854,7 +855,7 @@ end
 if $ARGS[0] = 'shave_legs':
 	if pcs_leghair > 3 and mc_inventory['razor'] >= razors_to_use['legs']:
 		act 'Shave your legs (0:05)':
-			npc_rel['A34'] += 2
+			gs 'npc_relationship', 'modify', 'A34', 'like'
 			cla & *clr
 			minut += 5
 			pcs_leghair = 0
@@ -956,7 +957,7 @@ if $ARGS[0] = 'shave_legs':
 					end
 
 					act'"Hmm, maybe you''re right" (0:05)':
-						npc_rel['A34'] += 2
+						gs 'npc_relationship', 'modify', 'A34', 'like'
 						cla & *clr
 						pcs_pubes = 0
 						pcs_horny += 5
@@ -996,7 +997,7 @@ end
 if $ARGS[0] = 'shave_pussy':
 	if pcs_pubes > shave_trigger and mc_inventory['razor'] >= razors_to_use['pussy']:
 		act 'Shave your pussy (0:05)':
-			npc_rel['A34'] += 3
+			gs 'npc_relationship', 'modify', 'A34', 'love'
 			cla & *clr
 			minut += 5
 			if pubestyle > 0 or pubestyle = 10:
@@ -1170,7 +1171,7 @@ if $ARGS[0] = 'showerfun':
 end
 
 if $ARGS[0] = 'brother_shower_end':
-	npc_rel['A34'] += 5
+	gs 'npc_relationship', 'modify', 'A34', 'love'
 	brother_shower_times += 1
 	if hypnoAddict = 0:
 		cumspclnt = 1

locations/outdoors.qsrc

@@ -337,10 +337,14 @@ if $ARGS[0] = 'main':
 		if outdoors_checks + 15 < totminut:
 			outdoors_checks = totminut
 			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
-				'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
-
-				if $pantyworntype ! 'none':gs 'panties', 'dispose' & '<b><font color="red">Your panties have been ruined and you discreetly remove and dispose of them.</font></b>'
 
+				if $pantyworntype ! 'none':
+					$stat_panty_msg = '<b><font color="red">You''re not using any menstrual products during your period and blood is soaking your panties!</font></b>'
+				elseif PCloSkirt > 0:
+					'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
+				else
+					'<b><font color="red">You have blood flowing from your snatch and staining your pants.</font></b>'
+				end
 				gs 'sweat', 'add', 10
 				if pcs_mood > 20: pcs_mood -= 20
 				dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] -= 1'

locations/stat_display.qsrc

@@ -683,6 +683,9 @@ if $clothingworntype ! 'nude':
 		$stat_panty_text = '<br><font color = <<iif(PCloCoverFront = 1, ''#0064FF'', ''#FF0000'')>>><<$stat_panty_msg>></font>'
 		killvar '$temp_sdp_text'
 	end
+	if $pantyworntype ! 'none' and (isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1))):
+		$stat_panty_msg = 'You''re not using any menstrual products during your period and blood is soaking your panties!'
+	end
 end
 
 !!--------------- CLOTHING ---------------!!
@@ -1515,8 +1518,10 @@ else
 	if $stat_bra_msg ! '' and $braworntype ! 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/bra.png"></a></td>'
 
 	if $stat_bra_msg ! '' and $braworntype = 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/boobs_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
-
-	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
+	
+	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and (isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'gad_gpyard' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1))):
+		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties_red.png"></a></td>'
+	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
 		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties.png"></a></td>'
 	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
 		$statusIconBarTab += '<td><a href="exec: msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/clothing/panties_red.png"></a></td>'