[changed] universal `stol`

locations/bedrPar.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home':
 			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 			*nl
-			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(mc_inventory['strapon'] = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
+			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''start''">desk</a> is next to it'+iif(mc_inventory['strapon'] = 1, '. You keep your strapon inside it.', '.')+' Your sister''s bed is in the other corner.'
 		else
 			'This small bedroom you used to share with your sister, Anya. The furniture is old and basic.'
 		end

locations/mey_home.qsrc

@@ -227,7 +227,7 @@ if $ARGS[0] = 'guest_bedroom':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	*nl
 	'It feels and looks like a standard room in a hotel.'
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''start''">desk</a>.'
 	*nl
 	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl

locations/sitr2x.qsrc

@@ -37,7 +37,7 @@ end
 
 'luxurious <a href="exec:gt ''divan'',''start''">leather sofa</a>'
 
-'modern <a href="exec:gt ''stol'',''stolPar''">desk</a>' + iif($komp = '', '.', $komp)
+'modern <a href="exec:gt ''stol'',''start''">desk</a>' + iif($komp = '', '.', $komp)
 
 if mc_inventory['hula_hoop'] > 0:'Your hula hoop stands in a corner.'
 if mc_inventory['skipping_rope'] > 0:'Your jump rope is on a shelf.'

locations/stol.qsrc

@@ -3,16 +3,14 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	menu_off = 1
+	gs 'stat'
 	'<center><h1>Desk</h1></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
 	*nl
-	gs 'stat'
-	'Bric-a-brac drawer.'
+	'You sit down at your desk.'
 
-	if mc_inventory['lubricant'] > 0:'Lubricant, enough for <<mc_inventory[''lubricant'']>> time(s).'
-	if  mc_inventory['suncream'] > 0:'Sunblock, enough for <<mc_inventory[''suncream'']>> more application(s).'
-	if abonement > 0:'Fitness center subscription, valid for <<abonement>> more visit(s)'
-	if mc_inventory['dildo_small'] > 0:'Realistic Dildo.'
+	act 'Get up': gt $loc, $loc_arg
+	act 'Check your birth control': gt 'stol', 'bc'
 
 	if mentats_have > 0:
 		'<a href="exec:gs ''drugs'', ''mentats'' & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
@@ -24,10 +22,6 @@ if $ARGS[0] = 'start':
 		'<a href="exec:gs ''drugs'', ''aphrodisiac'' & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	end
 
-	act 'Close the drawer':	gt $loc, $loc_arg
-	
-	act 'Check birth control': gt 'stol', 'bc'
-	
 	killvar '$stol_loc_temp'
 	if mc_inventory['strapon'] = 1:
 		if mc_inventory['dildo_small'] + mc_inventory['dildo_normal'] + mc_inventory['dildo_big'] + mc_inventory['dildo_large'] + mc_inventory['dildo_huge'] + mc_inventory['dildo_enormous'] + mc_inventory['dildo_gigantic'] > 0:
@@ -36,46 +30,46 @@ if $ARGS[0] = 'start':
 			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
 		end
 	end
-	
+
 	if mc_inventory['cigarettes'] > 0:
-        act 'Hide some cigarettes in your drawer':
-            cla
-            cigIN = input('How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)')
+		act 'Hide some cigarettes in your drawer':
+			cla
+			cigIN = input('How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)')
 
-            if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
-                'You can''t put this amount into the drawer.'
-            else
-                stolcigarettes += cigIN
-                mc_inventory['cigarettes'] -= cigIN
-            end
+			if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
+				'You can''t put this amount into the drawer.'
+			else
+				stolcigarettes += cigIN
+				mc_inventory['cigarettes'] -= cigIN
+			end
 
-            gt 'stol', 'start'
-        end
-    end
+			gt 'stol', 'start'
+		end
+	end
 
 	if stolcigarettes > 0:
-        act 'Take some cigarettes from your drawer':
-            cla
-            cigOUT = input ("How many cigarettes do you want to put in your purse? (There are <<stolcigarettes>> cigarettes here.)")
+		act 'Take some cigarettes from your drawer':
+			cla
+			cigOUT = input ("How many cigarettes do you want to put in your purse? (There are <<stolcigarettes>> cigarettes here.)")
 
-            if cigOUT <= 0 or cigOUT > stolcigarettes:
-                'You can''t take this amount from your drawer.'
-            else
-                stolcigarettes -= cigOUT
-                mc_inventory['cigarettes'] += cigOUT
-            end
+			if cigOUT <= 0 or cigOUT > stolcigarettes:
+				'You can''t take this amount from your drawer.'
+			else
+				stolcigarettes -= cigOUT
+				mc_inventory['cigarettes'] += cigOUT
+			end
 
-            gt 'stol', 'start'
-        end
-    end
+			gt 'stol', 'start'
+		end
+	end
 
 	if money > 0:
-		act 'Put some money in the drawer':
+		act 'Put some money in the desk drawer':
 			cla
-			stolIN = input ("How much money you want to put in the desk drawer? (Your purse contains <<money>> <b>₽</b>.)")
+			stolIN = input ("How much money you want to put in the drawer? (Your purse contains <<money>> <b>₽</b>.)")
 
 			if stolIN <= 0 or stolIN > money:
-				!!'Not correct operation.'
+				'You can''t put this amount into the drawer.'
 			else
 				stolmoney += stolIN
 				money -= stolIN
@@ -86,22 +80,23 @@ if $ARGS[0] = 'start':
 	end
 
 	if stolmoney > 0:
-		act 'Take some money from the desk':
+		act 'Take some money from the desk drawer':
 			cla
 			stolOUT = input ("How much money do you want to put in your purse? (There is <<stolmoney>> <b>₽</b> here.)")
 
 			if stolOUT <= 0 or stolOUT > stolmoney:
-				!!'Not correct operation.'
+				'You can''t take this amount from the drawer.'
 			else
 				stolmoney -= stolOUT
 				money += stolOUT
-				!!'You debited <<kartaOUT>> <b>₽</b>, now on your account <<karta>> <b>₽</b>.'
+				if stolmoney > 0: 'You have <<stolmoney>> <b>₽</b> hiden in the drawer.'
 			end
 
 			gt 'stol', 'start'
 		end
 	end
 
+	!! uni homework
 	if university['enrolled_in_semester'] > university['semester_passed']:
 		if university['semester_week'] > 0:
 			i = 0
@@ -130,24 +125,8 @@ if $ARGS[0] = 'start':
 			killvar 'i'
 		end
 	end
-end
 
-if $ARGS[0] = 'stolPar':
-	*clr & cla
-	menu_off = 1
-	gs'stat'
-	'<center><h1>Desk</h1></center>'
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
-	*nl
-	'You sit down at your desk.'
-	
-	act 'Get up':gt $loc, $loc_arg
-	act 'Check your birth control': gt 'stol', 'bc'
-	
-	if mentats_have > 0: '<a href="exec:gs ''drugs'', ''mentats'' & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
-	if steroid_have > 0: '<a href="exec:gs ''drugs'', ''steroids'' & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
-	if aphrodisiac_have > 0: '<a href="exec:gs ''drugs'', ''aphrodisiac'' & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
-	
+	!! school homework
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if lernHome > 0 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
@@ -169,12 +148,12 @@ if $ARGS[0] = 'stolPar':
 				gs 'grades', 'homework', 'school', 'no', 1, 0, 0
 				'You spend an hour '+iif(lernHome = 0, 'completing', 'doing part of')+' your homework. The part for computer class is not as good as it could be since you don''t have a computer. You could do your homework at the library at the community center in the future since there is a computer available to use there.'
 			end
-			act 'Continue':gt 'stol', 'stolPar'
+			act 'Continue':gt 'stol', 'start'
 		end
 	elseif lernHome > 0 and will_cost > pcs_willpwr:
 		act 'Do some homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	will_cost = will_cost * lernHome
 	if lernHome > 1 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
 		act 'Finish all of your homework (<<lernHome>>:00'+iif(pcs_traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
@@ -191,114 +170,12 @@ if $ARGS[0] = 'stolPar':
 			else
 				gs 'grades', 'homework', 'school', 'no', lernHome, 0, 0
 				'It took you <<lernHome>> hours to complete your homework. The part for computer class is not as good as it could be since you don''t have a computer. You could do your homework at the library at the community center in the future since there is a computer available to use there.'
-			end			
-			
-			act 'Continue':gt 'stol', 'stolPar'
-		end
-	elseif lernHome > 1 and will_cost > pcs_willpwr:
-		act 'Finish all of your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-
-	if university['enrolled_in_semester'] > university['semester_passed']:
-		if university['semester_week'] > 0:
-			i = 0
-			:study_loop
-			if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
-				if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
-					dynamic '	act ''Study for your <<$class_list_name[i]>> class'': gt ''stol'', ''studying'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'', ''stolPar'' '
-				else
-					*nl
-					'You don''t need to study more this week for your <<$class_list_name[i]>> class.'
-				end
-			end
-
-			i += 1
-			if ARRSIZE('class_list_institution') >= i: jump 'study_loop'
-			killvar 'i'
-		elseif university['exam_week'] > 0:
-			i = 0
-			:exam_loop
-			if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>' and func('uni_programs', 'exam', 'is_over', $class_list_name[i]) = 0:
-				dynamic '	act ''Study intensely for your <<$class_list_name[i]>> exam'': gt ''stol'', ''studying_exam'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'', ''stolPar'' '
 			end
 
-			i += 1
-			if ARRSIZE('class_list_institution') >= i: jump 'exam_loop'
-			killvar 'i'
-		end
-	end
-
-	killvar '$stol_loc_temp'
-	if mc_inventory['strapon'] = 1:
-		if mc_inventory['dildo_small'] + mc_inventory['dildo_normal'] + mc_inventory['dildo_big'] + mc_inventory['dildo_large'] + mc_inventory['dildo_huge'] + mc_inventory['dildo_enormous'] + mc_inventory['dildo_gigantic'] > 0:
-			act 'Check out your strapon harness': $stol_loc_temp = 'stolPar' & gt 'stol', 'strapon'
-		else
-			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
-		end
-	end
-	
-	if mc_inventory['cigarettes'] > 0:
-        act 'Hide some cigarettes in your drawer':
-            cla
-            cigIN = input('How many cigarettes do you want to hide in your drawer? (Your purse contains <<mc_inventory[''cigarettes'']>> cigarettes.)')
-
-            if cigIN <= 0 or cigIN > mc_inventory['cigarettes']:
-                'You can''t put this amount into the drawer.'
-            else
-                stolcigarettes += cigIN
-                mc_inventory['cigarettes'] -= cigIN
-            end
-            gt 'stol', 'stolPar'
-        end
-    end
-
-	if stolcigarettes > 0:
-        act 'Take some cigarettes from your drawer':
-            cla
-            cigOUT = input ("How many cigarettes do you want to put in your purse? (There are <<stolcigarettes>> cigarettes here.)")
-
-            if cigOUT <= 0 or cigOUT > stolcigarettes:
-                'You can''t take this amount from your drawer.'
-            else
-                stolcigarettes -= cigOUT
-                mc_inventory['cigarettes'] += cigOUT
-            end
-
-            gt 'stol', 'stolPar'
-        end
-    end
-	
-	if money > 0:
-		act 'Hide some money in your drawer':
-			cla
-			stolIN = input ("How much money you want to hide in your drawer? (Your purse contains <<money>> <b>₽</b>.)")
-
-			if stolIN <= 0 or stolIN > money:
-				'You can''t put this amount into the drawer.'
-			else
-				stolmoney += stolIN
-				money -= stolIN
-			end
-
-			gt 'stol', 'stolPar'
-		end
-	end
-
-	if stolmoney > 0:
-		act 'Take some money from your drawer':
-			cla
-			stolOUT = input ("How much money do you want to put in your purse? (There is <<stolmoney>> <b>₽</b> here.)")
-
-			if stolOUT <= 0 or stolOUT > stolmoney:
-				'You can''t take this amount from your drawer.'
-			else
-				stolmoney -= stolOUT
-				money += stolOUT
-				if stolmoney > 0: 'You have <<stolmoney>> <b>₽</b> hiden in your drawer.'
-			end
-
-			gt 'stol', 'stolPar'
+			act 'Continue':gt 'stol', 'start'
 		end
+	elseif lernHome > 1 and will_cost > pcs_willpwr:
+		act 'Finish all of your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -329,7 +206,7 @@ if $ARGS[0] = 'bc':
 	gs 'din_bad'
 	'In the drawer of your desk, you store your birth control.'
 	act 'Close the drawer':gt $loc, $loc_arg
-	act'Check your condoms':		
+	act'Check your condoms':
 		if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 			if $locclass = 'bedr':
 				*clr
@@ -349,7 +226,7 @@ if $ARGS[0] = 'bc':
 			'You are out of condoms.'
 		end
 	end
-	
+
 	act'Check your birth control pills':
 		if mc_inventory['contraceptive_pill'] > 0 or pillsleft[ptype] > 0:
 			if $locclass = 'bedr':
@@ -469,7 +346,7 @@ if $ARGS[0] = 'studying_exam':
 		'Your pain a constantly bothering and it makes it harder to study.'
 	end
 	*nl
- 	study_mod = max(0,rand(30 + study_mod,pcs_intel + study_mod)/33)
+	study_mod = max(0,rand(30 + study_mod,pcs_intel + study_mod)/33)
 	if no_study = 1:
 		'You try to study for half an hour, but gets nothing done.'
 	else
@@ -481,12 +358,12 @@ if $ARGS[0] = 'studying_exam':
 			'You study for half an hour, and think you are doing good progress in getting ready for the exam.'
 		else
 			'You study for half an hour, and think you are improving a lot.'
-		end		
+		end
 		gs 'grades', 'grade_award', '<<$ARGS[1]>>', '<<$ARGS[2]>>', study_mod
 	end
-	
+
 	gs 'stat'
-	
+
 	killvar 'study_mod'
 	killvar 'nod_study'
 

locations/uni_dorm.qsrc

@@ -562,7 +562,7 @@ if $ARGS[0] = 'dorm_room':
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_room/room.jpg"></center>'
 	'This is the dorm room you share with Vika.'
-	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room. Your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> sits at the foot of it.'
+	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room. Your <a href="exec:gt ''stol'' ,''start''">desk</a> sits at the foot of it.'
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	if mc_inventory['mag_porn'] > 0:'You''ve hidden your porn magazines under the mattress of your bed.'
 	

validcallsfortesting.txt

@@ -9531,7 +9531,6 @@ stihi:
 stol:
 stol:bc
 stol:start
-stol:stolPar
 stol:strapon
 stol:studying
 stol:studying_exam