MakeQSP.bat

@@ -1,4 +1,5 @@
 @ECHO off
+setlocal
 
 :: Set batch file path
 set BATDir=%~dp0
@@ -98,31 +99,53 @@ goto menu
 echo.
 echo Building ...
 
+:: Start timer
+set start=%time%
+
 @ECHO ON
-python tools\txtmerge.py locations glife.txt
-tools\txt2gam.exe glife.txt %QSPFILE% > nul
+tools\Textmerge.exe locations glife.txt glife.qproj
+
+tools\cli-win.exe glife.txt
+
 @ECHO OFF
 
+
 echo.
 if defined CP_TO ( echo Copying %QSPFILE% to "%CP_TO%" ... & copy %QSPFILE% %CP_TO% > nul )
 
+:: End timer
+set end=%time%
+
+call :elapsedtime
 echo.
 echo Done.
 pause
+
+
 if %action% == f ( goto run ) else ( goto menu )
 
+
 :build_debug
+
+:: Start timer
+set start=%time%
+
 echo.
 echo Building DEBUG ...
 
 @ECHO ON
 python tools\build_debug.py locations glife.txt
-tools\txt2gam.exe glife.txt %QSPFILE% > nul
+tools\cli-win.exe glife.txt
 @ECHO OFF
 
 echo.
 if defined CP_TO ( echo Copying %QSPFILE% to "%CP_TO%" ... & copy %QSPFILE% %CP_TO% > nul )
 
+:: End timer
+set end=%time%
+
+call :elapsedtime
+
 echo.
 echo Done.
 pause
@@ -136,12 +159,22 @@ pause
 goto menu
 
 :parser
+
+:: Start timer
+set start=%time%
+
 echo.
 echo validating...
 
 @ECHO ON
 "%BATDir%%QSPParser%" --level warn "%BATDir%glife.txt" > "%BATDir%validation.log"
 @ECHO off
+
+:: End timer
+set end=%time%
+
+call :elapsedtime
+
 pause
 goto menu
 
@@ -152,6 +185,65 @@ echo Running ...
 if defined CP_TO ( start "%BATDir%%QSPGUI%" %CP_TO%\%QSPFILE% ) else ( start "%BATDir%%QSPGUI%" %QSPFILE% )
 
 
+:exit
+
+
+:elapsedtime
+set options="tokens=1-4 delims=:.,"
+for /f %options% %%a in ("%start%") do (
+    set start_h=%%a
+    set /a start_m=100%%b %% 100
+    set /a start_s=100%%c %% 100
+    set /a start_ms=100%%d %% 100
+)
+for /f %options% %%a in ("%end%") do (
+    set end_h=%%a
+    set /a end_m=100%%b %% 100
+    set /a end_s=100%%c %% 100
+    set /a end_ms=100%%d %% 100
+)
+
+set /a ms=end_ms-start_ms
+if %ms% lss 0 (
+    set /a ms+=100
+    set /a end_s-=1
+)
+
+set /a secs=end_s-start_s
+if %secs% lss 0 (
+    set /a secs+=60
+    set /a end_m-=1
+)
+
+set /a mins=end_m-start_m
+if %mins% lss 0 (
+    set /a mins+=60
+    set /a end_h-=1
+)
+
+set /a hours=end_h-start_h
+if %hours% lss 0 (
+    set /a hours+=24
+)
+
+if %ms% lss 10 set ms=0%ms%
+if %secs% lss 10 set secs=0%secs%
+if %mins% lss 10 set mins=0%mins%
+if %hours% lss 10 set hours=0%hours%
+
+
+if %hours% neq 0 (
+    set elapsedtime=%hours%:%mins%:%secs%.%ms%
+) else if %mins% neq 0 (
+    set elapsedtime=%mins%:%secs%.%ms%
+) else (
+    set elapsedtime=%secs%.%ms%
+)
+
+
+echo Elapsed time: %elapsedtime%
+
+endlocal & set elapsedtime=%elapsedtime%
 
 
 :exit

locations/LOCA.qsrc

@@ -9,32 +9,27 @@ end
 if settingmode = 0: killvar 'cheatmenu'
 
 !{
-msg "Changed Location 
-	$menu_loc		<<$menu_loc>> 
-	$menu_arg		<<$menu_arg>> 
-	$loc_arg		<<$loc_arg>> 
-	$loc			<<$loc>> 
-	$location_type	<<$location_type>> 
+msg "Changed Location
+	$menu_loc		<<$menu_loc>>
+	$menu_arg		<<$menu_arg>>
+	$loc_arg		<<$loc_arg>>
+	$loc			<<$loc>>
+	$location_type	<<$location_type>>
 	$locM			<<$locM>>
 	$locclass		<<$locclass>>"
 
-msg "Changed Location 
-	$loc			<<$loc>> 
-	$location_type	<<$location_type>> 
+msg "Changed Location
+	$loc			<<$loc>>
+	$location_type	<<$location_type>>
 	$locclass		<<$locclass>>"
 }
 
 if mod_list > 0:
-	mod_i=1
+	mod_i = 1
 	:mod_exec
-	if $mod_name[mod_i] ! '':
-		gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
-	end
-	
-	if mod_list > mod_i:
-		mod_i+=1
-		jump 'mod_exec'
-	end
+		if $mod_name[mod_i] ! '': gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
+		mod_i += 1
+	if mod_i <= mod_list: jump 'mod_exec'
 end
 
 --- LOCA ---------------------------------

locations/albina_chat.qsrc

@@ -934,7 +934,7 @@ if $ARGS[0] = 'lazar_conversation':
 			end
 			*nl
 			'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
-			gt 'albina_chat', 'lover_conversation'
+			gs 'albina_chat', 'lover_conversation'
 		end
 	end
 end

locations/albinahome.qsrc

@@ -52,6 +52,8 @@ if $ARGS[0] = 'maid_greet':
 			'"Please make yourself at home Miss <<$pcs_lastname>>," she says, motioning for you to enter and taking your coat.'
 			act 'Continue': gt 'albinahome', 'hallway'
 		end
+	else
+		gt 'albinahome', 'hallway'
 	end
 end
 

locations/bank.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 					karta += kartaIN
 					money -= kartaIN
 
-					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= 0,'<<karta>>','<font color="red"><<karta>></font>') + ' <b>₽</b>.'
+					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
 				end
 				killvar 'kartaIN'
 				gs 'stat'

locations/booty_call_sms.qsrc

@@ -491,6 +491,8 @@ if $ARGS[0] = 'new_booty_call':
 							else
 							end
 						end
+					else
+						$SMSTree['b12'] = 'PLACEHOLDER 2'
 					end
 				end
 
@@ -523,17 +525,17 @@ if $ARGS[0] = 'new_booty_call':
 	elseif $npc_rel_type[$ARGS[1]] = 'boyfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = boyfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER3'
 
 	elseif $npc_rel_type[$ARGS[1]] = 'girlfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = girlfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER4'
 
 	else
 		!! temp
 		$SMSTree['10'] = 'PLACEHOLDER3'
-			$SMSTree['11'] = 'PLACEHOLDER4'
+			$SMSTree['11'] = 'PLACEHOLDER5'
 	end
 
 

locations/brother.qsrc

@@ -406,6 +406,7 @@ if $ARGS[0] = 'playfootball':
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 		gs 'exercise', 'tier1', 60, 'agil', 'vital'
 		gs 'exp_gain', 'run', rand(0, 2)
+		if ftball_lvl < 20: gs 'exp_gain', 'ftball', rand(0, 2)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'

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/dimaEv.qsrc

@@ -279,6 +279,7 @@ if $ARGS[0] = 'blackmail':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+	nodimkaK = 0
 	if dimkawarn = 1:
 		*clr & cla
 		minut += 5

locations/gschool_chats.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'nerds':
 					if soniaQW['slut'] > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'npc_relationship', 'modify', 'A159', 'like'
 					if grupTipe = 3:
-						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem struggle to conceal their disapproving stares at your chosen uniform, while Julia''s eyes linger on your attire a bit longer; her gaze doesn''t feel all that welcoming either.'
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end
@@ -56,9 +56,9 @@ if $ARGS[0] = 'nerds':
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					if grupTipe = 3:
-						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares at your chosen uniform, while Julia''s eyes seem to linger on you a fraction longer. However, you can see that she''s wary of you and doesn''t approve of your attire, and her gaze isn''t all that welcoming either.'
 					else
-						'You go to the classrooms that the nerdy students like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares at your chosen uniform, while Julia''s eyes seem to linger on you a fraction longer. However, you can see that she''s wary of you and doesn''t approve of your attire, and her gaze isn''t all that welcoming either.'
 					end
 				else
 					gs 'npc_relationship', 'modify', 'A12', 'like'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'nerds':
 					if soniaQW['slut'] > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'npc_relationship', 'modify', 'A159', 'like'
 					if grupTipe = 3:
-						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem struggle to conceal their disapproving stares at your chosen uniform, while Julia''s eyes linger on your attire a bit longer; her gaze doesn''t feel all that welcoming either.'
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end
@@ -88,9 +88,9 @@ if $ARGS[0] = 'nerds':
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					if grupTipe = 3:
-						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares at your chosen uniform, while Julia''s eyes seem to linger on you a fraction longer. However, you can see that she''s wary of you and doesn''t approve of your attire, and her gaze isn''t all that welcoming either.'
 					else
-						'You go to the classrooms that the nerdy students like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares at your chosen uniform, while Julia''s eyes seem to linger on you a fraction longer. However, you can see that she''s wary of you and doesn''t approve of your attire, and her gaze isn''t all that welcoming either.'
 					end
 				else
 					grupvalue[3] -= 1
@@ -98,7 +98,7 @@ if $ARGS[0] = 'nerds':
 					if soniaQW['slut'] > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'npc_relationship', 'modify', 'A159', 'like'
 					if grupTipe = 3:
-						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem struggle to conceal their disapproving stares at your chosen uniform, while Julia''s eyes linger on your attire a bit longer; her gaze doesn''t feel all that welcoming either.'
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end

locations/gschool_lessonsev2.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = 'geography':
 					elseif grupTipe = 5:
 						'You''re forced to sit next to Vitek and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
 					else
-						npc_rel['A156'] += 1
+						npc_rel['A9'] += 1
 						'You sit next to Vitek. He''s a little surprised that you chose to do so, but you''re able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
 					end
 				end

locations/gschool_lunch.qsrc

@@ -100,6 +100,7 @@ if $ARGS[0] = 'cafeteria':
 			menu_off = 1
 			money -= 50
 			gs 'food', 'm_meal'
+			delact 'Finish'
 			gs 'gschool_gossip', 'buying'
 			act 'Continue': gt 'gschool_lunch', 'break'
 		end

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/library_functions.qsrc

@@ -152,7 +152,14 @@ if $ARGS[0] = 'set_home_read_acts':
 			'<center><img <<$set_imgh>> src="images/pc/activities/reading/bed_book_dressed.jpg"></center>'
 		end
 
-		if mc_inventory['fantasy_books'] <= 0 and BookVars['fantasy_pages'] <= 0 and mc_inventory['romance_books'] = 0 and BookVars['romance_pages'] = 0 and artem_borrowed_book = 0 and BookVars['artem_pages'] <= 0:'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
+		if mc_inventory['adventure_books'] <= 0 and BookVars['adventure_pages'] <= 0 and _
+				mc_inventory['fantasy_books'] <= 0 and BookVars['fantasy_books'] <= 0 and _
+				mc_inventory['romance_books'] <= 0 and BookVars['romance_pages'] <= 0 and _
+				mc_inventory['science_books'] <= 0 and BookVars['science_pages'] <= 0 and _
+				mc_inventory['scifi_books'] <= 0 and BookVars['scifi_pages'] <= 0 and _
+				artem_borrowed_book <= 0 and BookVars['artem_pages'] <= 0:
+			'You scratch your head looking at the book you already read, thinking. "Damn, nothing to read, maybe I''ll take a walk or search the market for a new book?"'
+		end
 
 		if mc_inventory['science_books'] > 0:
 			if BookVars['science_pages'] <= 0:
@@ -225,7 +232,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (70 + rand(0, 40) + pcs_traits['nerd_status'] * 10)
 				BookVars['science_pages'] -= temp_pages_read
-				if BookVars['science_pages'] = 0: totalbook += 1
+				if BookVars['science_pages'] <= 0:
+					BookVars['science_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'a science book': lib_book_read = 2
+				end
 
 				gs 'exp_gain', 'intel', rand(3,6) + rand(0, drugVars['mentats_dose'])
 				gs 'library_functions', 'read_book'
@@ -246,7 +257,7 @@ if $ARGS[0] = 'set_home_read_acts':
 					if pcs_stren > 1:stren_deg -= 1
 					if pcs_vital > 5:vital_deg -= 1
 
-					if BookVars['science_pages'] = 0:
+					if BookVars['science_pages'] <= 0:
 						'You read the final chapters of the science book, completely immersed in the conclusions the authors make.'
 					else
 						'For an hour you enthusiastically read the book, completely immersed in absorbing the knowledge within. By the end you''ve read <<temp_pages_read>> pages.'
@@ -254,8 +265,8 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 3
-					if BookVars['science_pages'] = 0:
-						'You read the final chapters of the adventure novel.'
+					if BookVars['science_pages'] <= 0:
+						'You read the final chapters of the science book.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
 					end
@@ -271,8 +282,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['adventure_pages'] -= temp_pages_read
-				if BookVars['adventure_pages'] = 0: totalbook += 1
-
+				if BookVars['adventure_pages'] <= 0:
+					BookVars['adventure_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'an adventure novel': lib_book_read = 2
+				end
 				gs 'library_functions', 'read_book'
 				gs 'stat'
 
@@ -288,10 +302,10 @@ if $ARGS[0] = 'set_home_read_acts':
 					pcs_mood = 100
 					pcs_horny += 10
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['adventure_pages'] = 0:
+					if BookVars['adventure_pages'] <= 0:
 						'You read the final chapters of the adventure novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -299,7 +313,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 3
-					if BookVars['adventure_pages'] = 0:
+					if BookVars['adventure_pages'] <= 0:
 						'You read the final chapters of the adventure novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -317,6 +331,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['fantasy_pages'] -= temp_pages_read
 				if BookVars['fantasy_pages'] <= 0:
+					BookVars['fantasy_pages'] = 0
 					totalbook += 1
 					if lib_book_read = 1 and $lib_book_loaned = 'a fantasy novel': lib_book_read = 2
 				end
@@ -338,7 +353,7 @@ if $ARGS[0] = 'set_home_read_acts':
 					if pcs_stren > 1: stren_deg -= 1
 					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['fantasy_pages'] = 0:
+					if BookVars['fantasy_pages'] <= 0:
 						'You read the final chapters of the fantasy novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -346,7 +361,7 @@ if $ARGS[0] = 'set_home_read_acts':
 
 				else
 					pcs_mood += 10
-					if BookVars['fantasy_pages'] = 0:
+					if BookVars['fantasy_pages'] <= 0:
 						'You read the final chapters of the fantasy novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -363,7 +378,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['scifi_pages'] -= temp_pages_read
-				if BookVars['scifi_pages'] = 0: totalbook += 1
+				if BookVars['scifi_pages'] <= 0:
+					BookVars['scifi_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'a science fiction novel': lib_book_read = 2
+				end
 
 				gs 'library_functions', 'read_book'
 				gs 'stat'
@@ -380,10 +399,10 @@ if $ARGS[0] = 'set_home_read_acts':
 					pcs_mood = 100
 					pcs_horny += 10
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['scifi_pages'] = 0:
+					if BookVars['scifi_pages'] <= 0:
 						'You read the final chapters of the science fiction novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -391,7 +410,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 3
-					if BookVars['scifi_pages'] = 0:
+					if BookVars['scifi_pages'] <= 0:
 						'You read the final chapters of the science fiction novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -408,7 +427,11 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['romance_pages'] -= temp_pages_read
-				if BookVars['romance_pages'] = 0: totalbook += 1
+				if BookVars['romance_pages'] <= 0:
+					BookVars['romance_pages'] = 0
+					totalbook += 1
+					if lib_book_read = 1 and $lib_book_loaned = 'a romance novel': lib_book_read = 2
+				end
 
 				gs 'library_functions', 'read_book'
 				gs 'stat'
@@ -425,10 +448,10 @@ if $ARGS[0] = 'set_home_read_acts':
 					pcs_mood = 100
 					pcs_horny += 20
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['romance_pages'] = 0:
+					if BookVars['romance_pages'] <= 0:
 						'You read the final chapters of the romance novel, completely immersed in the climactic ending to the authors entralling story.'
 					else
 						'For an hour you enthusiastically read the novel, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
@@ -436,7 +459,7 @@ if $ARGS[0] = 'set_home_read_acts':
 				else
 					pcs_mood += 10
 					pcs_horny += 10
-					if BookVars['romance_pages'] = 0:
+					if BookVars['romance_pages'] <= 0:
 						'You read the final chapters of the romance novel.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -455,7 +478,10 @@ if $ARGS[0] = 'set_home_read_acts':
 				menu_off = 1
 				temp_pages_read = (80 + rand(0, 40) + pcs_traits['nerd_status'] * 5)
 				BookVars['artem_pages'] -= temp_pages_read
-				if BookVars['artem_pages'] = 0: totalbook += 1
+				if BookVars['artem_pages'] <= 0:
+					BookVars['artem_pages'] = 0
+					totalbook += 1
+				end
 
 				gs 'library_functions', 'read_book'
 				gs 'stat'
@@ -471,17 +497,17 @@ if $ARGS[0] = 'set_home_read_acts':
 				if pcs_nerd > 0:
 					pcs_mood = 100
 
-					if pcs_stren > 1:stren_deg -= 1
-					if pcs_vital > 5:vital_deg -= 1
+					if pcs_stren > 1: stren_deg -= 1
+					if pcs_vital > 5: vital_deg -= 1
 
-					if BookVars['artem_pages'] = 0:
+					if BookVars['artem_pages'] <= 0:
 						'You read the final chapters of the book, completely immersed in the climactic ending to the authors entralling story'
 					else
 						'For an hour you enthusiastically read the book, completely immersed in the authors world. By the end you''ve read <<temp_pages_read>> pages.'
 					end
 				else
 					pcs_mood += 10
-					if BookVars['romance_pages'] = 0:
+					if BookVars['romance_pages'] <= 0:
 						'You read the final chapters of the book.'
 					else
 						'Over the course of an hour you read <<temp_pages_read>> pages.'
@@ -490,7 +516,6 @@ if $ARGS[0] = 'set_home_read_acts':
 
 				act 'Close the book': gt $loc, $loc_arg
 			end
-
 		end
 
 		if tractatus > 0:

locations/lover_change.qsrc

@@ -220,35 +220,35 @@ if $ARGS[0] = 'Pier':
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist takes a look at your unpierced ears, and with a quick sharp pain, pierces them.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/c1.jpg"></center>'
-									gs 'piercing_management', 'add', 'ears', '1'
+									gs 'piercing_management', 'add', 'ears', 1
 									gs 'pain', 7, 'ears', 'pierce'
 								end
 							elseif randchan = 1 and pcs_piercings['tongue'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'He asks you to stick out your tongue. You comply and then start to regret it as he pierces your tongue.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/a1.jpg"></center>'
-									gs 'piercing_management', 'add', 'tongue', '1'
+									gs 'piercing_management', 'add', 'tongue', 1
 									gs 'pain', 7, 'tongue', 'pierce'
 								end
 							elseif randchan = 2 and pcs_piercings['lip'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist gently holds your lip as he drives the needle through to pierce it.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/b1.jpg"></center>'
-									gs 'piercing_management', 'add', 'lip', '1'
+									gs 'piercing_management', 'add', 'lip', 1
 									gs 'pain', 7, 'lips', 'pierce'
 								end
 							elseif randchan = 3 and pcs_piercings['nose'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'You feel a sharp pain in your nose as he pierces your nose.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/d1.jpg"></center>'
-									gs 'piercing_management', 'add', 'nose', '1'
+									gs 'piercing_management', 'add', 'nose', 1
 									gs 'pain', 7, 'nose', 'pierce'
 								end
 							elseif randchan = 4 and pcs_piercings['brow'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist moves to above your eyes and quickly pierces your eyebrow.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/e1.jpg"></center>'
-									gs 'piercing_management', 'add', 'brow', '1'
+									gs 'piercing_management', 'add', 'brow', 1
 									gs 'pain', 7, 'eyebrows', 'pierce'
 								end
 							elseif randchan = 5 and pcs_piercings['navel'] = 0:
@@ -256,7 +256,7 @@ if $ARGS[0] = 'Pier':
 									'He positions himself to pierce your belly button. You feel a sharp pain through your navel as he pierces it.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/n1.jpg"></center>'
 									pcs_horny += 2
-									gs 'piercing_management', 'add', 'navel', '1'
+									gs 'piercing_management', 'add', 'navel', 1
 									gs 'pain', 7, 'tummy', 'pierce'
 								end
 							elseif randchan = 6 and pcs_piercings['nipples'] = 0:
@@ -264,7 +264,7 @@ if $ARGS[0] = 'Pier':
 									'He motions for you to lift up your shirt. After you do the man grabs your breasts rather softly and carefully pierces each nipple.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
 									pcs_horny += 5
-									gs 'piercing_management', 'add', 'nipples', '1'
+									gs 'piercing_management', 'add', 'nipples', 1
 									gs 'pain', 7, 'nipples', 'pierce'
 								end
 							elseif randchan = 7 and pcs_piercings['pussy'] = 0:
@@ -273,7 +273,7 @@ if $ARGS[0] = 'Pier':
 									'You cover your mouth as you let out a quick "Eep!", as you feel a quick pain through your labia, but in a second, it''s over.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
 									pcs_horny += 7
-									gs 'piercing_management', 'add', 'pussy', '1'
+									gs 'piercing_management', 'add', 'pussy', 1
 									gs 'pain', 7, 'pubic', 'pierce'
 								end
 							elseif pcs_piercings['total'] < pierPrefTmpMin:

locations/lover_meet.qsrc

@@ -573,10 +573,10 @@ 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:
-						if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+					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
 							'<<$Xec>> tells you that you should have more piercings.'
@@ -593,7 +593,7 @@ if $ARGS[0] = 'actions':
 					if npc_pref_values['cosmetics_tattoos_none'] > 0 or npc_pref_values['cosmetics_tattoos_few'] > 0:
 						'<<$Xec>> tells you that you should have less tattoos.'
 					elseif npc_pref_values['cosmetics_tattoos_multiple'] > 0:
-						if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+						if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 							'<<$Xec>> tells you that you should have less tattoos.'
 						else
 							'<<$Xec>> tells you that you should have more tattoos.'
@@ -692,10 +692,10 @@ 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:
-						if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+					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
 							'<<$Xec>> tells you that you should have more piercings.'
@@ -849,10 +849,10 @@ 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:
-						if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+					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
 							'<<$Xec>> tells you that you should have more piercings.'
@@ -870,7 +870,7 @@ if $ARGS[0] = 'actions':
 					if npc_pref_values['cosmetics_tattoos_none'] > 0 or npc_pref_values['cosmetics_tattoos_few'] > 0:
 						'<<$Xec>> tells you that you should have less tattoos.'
 					elseif npc_pref_values['cosmetics_tattoos_multiple'] > 0:
-						if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+						if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 							'<<$Xec>> tells you that you should have less tattoos.'
 						else
 							'<<$Xec>> tells you that you should have more tattoos.'

locations/lover_pref.qsrc

@@ -226,22 +226,22 @@ 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:
-		if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+	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:
-		if func('pcs_has_attr', 'cosmetics_piercing_lot'):
+	elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
+		if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 			$result = 'the same amount of'
 		else
 			$result = 'more'

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/pav_beach_chat.qsrc

@@ -424,13 +424,13 @@ if $ARGS[0] = 'fedor':
 	menu_off = 1
 	gs 'exp_gain', 'chrsm', rand(1,2)
 	minut += 20
-	gs 'npc_relationship', 'modify', 'A3', 'like'
+	gs 'npc_relationship', 'modify', 'A5', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/beach_chat.jpg"></center>'
-	if npc_rel['A13'] >= 50:
+	if npc_rel['A5'] >= 50:
 		'"Hey <<$pcs_nickname>>!" Fedor smiles at you.'
 		'You take a seat next to him on the sand and quickly find yourself in a deep conversation with him for a while before things start to wind down and you bid him farewell as you get up.'
-	elseif npc_rel['A13'] <= 20:
+	elseif npc_rel['A5'] <= 20:
 		'You sit down and try to talk to him, but he just ignores you until he finally gets up and walks away, leaving you sitting in the sand alone.'
 	else
 		'"What''s up, <<$pcs_nickname>>?" he asks.'

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.'
@@ -710,11 +710,7 @@ if $ARGS[0] = 'dance_partner':
 			end
 		elseif DaPaTipeRand >= 90:
 			!!traveling_expenses
-			if rand(0, 1) = 0:
-				$npc_residence[$boy] = 'city_residential'
-			else
-				$npc_residence[$boy] = 'city_center'
-			end
+			$npc_residence[$boy] = 'city_center'
 			npc_finance[$boy] = 2
 			bmtimeTipe = 2
 			DrunkDPTrand = rand(0,100)

locations/pav_lake_nude.qsrc

@@ -52,7 +52,7 @@ if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and h
 		act 'Run away': ivanfedorseennaked = daystart & gt 'pav_lake_nude'
 		act 'Greet them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
 	else
-		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ''gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
+		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ivanfedorseennaked = daystart &''gt gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end
 

locations/praiders_garage.qsrc

@@ -4,6 +4,7 @@
 !!this is one of the pav garages converted into a place for the band to practice and hang out.
 
 if $ARGS[0] = 'band_garage':
+	$hangout_rand = 'hangout<<rand(1,9)>>'
 	$menu_loc = 'praiders_garage'
 	$menu_arg = 'band_garage'
 	menu_off = 0

locations/praiders_garage_chat.qsrc

@@ -443,6 +443,7 @@ if $ARGS[0] = 'chat_valentin':
 	menu_off = 0
 	gs 'npc_relationship', 'modify', 'A158', 'like'
 	minut += 30
+	gs 'stat'
 	*clr & cla
 	'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
 	'You take a seat next to Valentin as everyone spreads out. He makes space as you sit next to him. "Oh man, that was so good! We finally managed to hit that hard part!" he gleams with satisfaction. You respond positively telling him that you''re all doing great. He listens attentively and knows how to drive a conversation forward. The two of you chat for some time, enjoying each other''s company.'

locations/saveupdater.qsrc

@@ -4132,7 +4132,7 @@ if temp_current_save_version < 00090304:
 		$lover[] = $husID
 
 		npc_rel[$husID]			= husband
-		npc_rel_type[$husID]	= 'husband'
+		$npc_rel_type[$husID]	= 'husband'
 		$npc_usedname[$husID]	= $husname
 		if $husHair = 'black':
 			npc_haircol[$husID] = 0

locations/shortgs.qsrc

@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'color_is_dark':
 	killvar 'shortgs_cid_b'
 end
 
-!! func('shortgs', 'enumerate_list', '$arrname', {start}, {number}, {oxford_comma})
+!! func('shortgs', 'enumerate_list', '$arrname', {start}, {number}, ', ', ' and ', ', and ')
 !! returns a string with the array entries listed:
 !! $arr[0] = 'Sidisi'	-> returns: 'Sidisi'
 !! $arr[1] = 'Eriette'	-> returns: 'Sidisi and Eriette'
@@ -1195,16 +1195,21 @@ end
 !! $ARGS[4] is the small separator (defaults to ', ')
 !! $ARGS[5] is the final separator for 2 items (defaults to ' and ')
 !! $ARGS[6] is the final seperator for more items (defaults to ', and ')
+!!
+!! If you want to list the entries of an array, you can use
+!! func('shortgs', 'enumerate_list', '$arrname', 0, 0, '<br>', '<br>', '<br>')
+
+
 if $ARGS[0] = 'enumerate_list':
 	$temp_sgs_text = ''
 	$sgs_arrname = $ARGS[1]
 
-	if ARGS[2] = 0:
+	if ARGS[2] <= 0:
 		temp_sgs_i = 0
 	else
 		temp_sgs_i = ARGS[2]
 	end
-	if ARGS[3] = 0:
+	if ARGS[3] <= 0:
 		temp_sgs_max_i = arrsize($sgs_arrname)
 	else
 		temp_sgs_max_i = temp_sgs_i + ARGS[3]

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>'

locations/stwork.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	CLOSE 'sound/street_club.mp3'
 	'<center><b><font color="maroon">Dressing Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/backstage.jpg"></center>'
-	'The room has <a href="exec:gt ''mirror'', ''start''">mirrors</a> all along the walls, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in. The whiteboard serving as the signup sheet for <a href="exec:gt ''stripclub_schedule'', ''set_schedule''">this week</a> and <a href="exec:gt ''stripclub_schedule'', ''next_week_set_schedule''">next week</a> is suctioned to one of the mirrors with a pen on top.'
+	'The room has <a href="exec:gt ''mirror'', ''start''">mirrors</a> all along the walls, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in. The whiteboard serving as the signup sheet for <a href="exec: gt ''stwork'', ''set_schedule'', ''this_week'' ">this week</a> and <a href="exec: gt ''stwork'', ''set_schedule'', ''next_week'' ">next week</a> is suctioned to one of the mirrors with a pen on top.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'
 	if $clothingworntype = 'nude':
 		'To the side is a door which overlooks the staff parking lot to the rear, used as a private entrance so girls don''t to deal with scummy customers queuing out front. Always standing by this entrance is a <a href="exec:gt ''stwork'', ''guard''">security guard</a>, who isn''t going to let you walk outside unless you put some clothes on.'
@@ -55,6 +55,16 @@ if $ARGS[0] = 'start':
 	if hour < 3 or (hour = 2 and minut < 45): act 'Take a break': gt 'stwork', 'rest'
 end
 
+if $ARGS[0] = 'set_schedule':
+	if $ARGS[1] = 'this_week':
+		gs 'stripclub_schedule', 'set_schedule'
+	elseif $ARGS[1] = 'next_week':
+		gs 'stripclub_schedule', 'next_week_set_schedule'
+	end
+
+	act 'Return': gt $loc, $loc_arg
+end
+
 if $ARGS[0] = 'set_perform_acts':
 	!! Private dance available
 	if strip_club['lapdance_chance'] > 0:
@@ -75,8 +85,9 @@ if $ARGS[0] = 'set_perform_acts':
 
 	if kosmetica >= 3 or pcs_makeup >= 4:
 		act 'Prepare for your show':
-			*clr & cla
+			cla
 			if pcs_sweat >= 20 or (pcs_leghair > 3 or ((pcs_pubes > 3 and pubestyle = 1) or (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11)):
+				*clr
 				dynamic $showerdin
 				minut += 5
 				'<h3>Staff Bathroom</h3>'
@@ -100,7 +111,7 @@ if $ARGS[0] = 'set_perform_acts':
 			!!'You put your clothes back on before heading back onto the stage.'
 			act 'Go on stage':
 				if pcs_leghair <= 3 and pcs_pubes <= 25:
-					gt 'stwork2', 'strip'
+					gt 'stwork2', 'strip_show_start'
 				else
 					*clr & cla
 					!! IMAGE
@@ -302,7 +313,7 @@ if $ARGS[0] = 'stripgirl':
 	elseif temp_rand = 13:
 		'"I caught Ruby snorting shit right here on the make-up table! Can she at least do it in the fucking bathroom?"'
 	elseif temp_rand = 14:
-		'"Diamond needs to get some respect for herself. I saw her flirting with some old man, trying to sweet talk him into being her sugar daddy. Fucking perv was eating it all up."' 
+		'"Diamond needs to get some respect for herself. I saw her flirting with some old man, trying to sweet talk him into being her sugar daddy. Fucking perv was eating it all up."'
 	elseif temp_rand = 15:
 		'"I saw a guy basically salivating at Opal''s huge tits while throwing all his money at her feet. Some girls have it fucking easy..."'
 	else

locations/stwork2.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = 'strip_show_start':
 	*clr & cla
 	strip_club['cust_boos'] = 0
 	strip_club['strip_tips'] = 0
+	strip_club['dancing_rounds'] = 3
 	$strip_club['bra_type'] = $braworntype
 	strip_club['bra_number'] = brawornnumber
 	$strip_club['panty_type'] = $pantyworntype
@@ -14,7 +15,7 @@ if $ARGS[0] = 'strip_show_start':
 	'<center><b><font color="maroon">Stage</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub1.jpg"></center>'
 	'You''re ready to go as the music starts. It''s now or never.'
-	act 'Go on stage': gs 'stwork2', 'strip_hub2', 1
+	gs 'stwork2', 'strip_hub2', 1
 end
 
 if $ARGS[0] = 'strip_show_end':
@@ -68,7 +69,10 @@ if $ARGS[0] = 'strip_hub2':
 			'There are men sitting in front of the stage, cheering as soon as your name is announced. Some stand to applaud while chanting your name and whistling.'
 		end
 	end
-	if hour < 2 or (hour = 2 and minut < 45):
+	if (hour > 2 or hour = 2 and minut > 45) and (hour < 17 or (hour = 17 and minut < 30)):
+		pcs_hairbsh = 0 & strip_club['total_stripshows'] += 1
+		'Your shift is over for tonight. Time to head home.'
+	else
 		if strip_club['dancing_rounds'] = 3: lapdance = 0
 		if strip_club['dancing_rounds'] > 0:
 			if $clothingworntype ! 'nude':
@@ -123,9 +127,6 @@ if $ARGS[0] = 'strip_hub2':
 				end
 			end
 		end
-	else
-		pcs_hairbsh = 0 & strip_club['total_stripshows'] += 1
-		'Your shift is over for tonight. Time to head home.'
 	end
 
 	act 'Leave the stage': gt 'stwork2', 'strip_show_end'