assorted control flow improvements, minor enhancements, and bug fixes

locations/BDSM_Club.qsrc

@@ -41,14 +41,14 @@ if $ARGS[0] = 'start':
 			'You are not wearing a maid uniform and security refuse you entry.'
 		else
 			if $BDSMrole = 's':
-				gt 'BDSM_training', 'start'
+				act 'Starting training': gt 'BDSM_training', 'start'
 			else
-				gt 'BDSM_training', 'd_start'
+				act 'Starting training': gt 'BDSM_training', 'd_start'
 			end
 		end
 	elseif BDSMmeet > 1 and BDSMmeet < 4 and BDSMday ! daystart:
 		if BDSMpayDay >= daystart - 30 or money >= 10000:
-			gt 'BDSM_training', 'start'
+			act 'Starting training': gt 'BDSM_training', 'start'
 		else
 			'You are in a Club but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
 		end

locations/Cheatmenu_din.qsrc

@@ -1109,9 +1109,7 @@ $cheatmenu['setSkills'] = {
 				<<$skl_name[loop_index]>>_lvlst = <<ARGS[0]>>
 			"
 		end
-
-		!! The size of the array is reduced by 1 because we skipped inhibition
-		if loop_index < arrsize('$skl_name') - 1: jump 'set_skills_loop'
+	if loop_index < arrsize('$skl_name'): jump 'set_skills_loop'
 	killvar 'loop_index'
 	dynamic $cheatmenu['stats']
 }

locations/Gnpc.qsrc

@@ -141,7 +141,10 @@ act 'Take a walk through the park':
 	if pcs_hairbsh = 1:otnBoyFrend[numnpc] += 1
 	if pcs_makeup = 2:otnBoyFrend[numnpc] += 1
 	if pcs_makeup = 3:otnBoyFrend[numnpc] += 2
-	if pcs_makeup = 4:otnBoyFrend[numnpc] -= 5
+	if pcs_makeup = 4:otnBoyFrend[numnpc] += 3
+	if pcs_makeup = 4:otnBoyFrend[numnpc] += 3
+	if pcs_makeup = 5:otnBoyFrend[numnpc] += 3
+	if pcs_makeup > 5:otnBoyFrend[numnpc] -= 5
 	if pcs_sweat > 19:
 		otnBoyFrend[numnpc] -= 5
 	elseif pcs_sweat < 10:

locations/Kikatak.qsrc

@@ -4,6 +4,11 @@ if $ARGS[0] = 'player':
 	defkofV = defsumV * 20 / 100
 	defV = rand(defsumV - defkofV, defsumV + defkofV)
 
+	if fight_cheat ! 0: 
+		'<font color="green"><<$boydesc>> is knocked out. You''ve won!</font>'
+		xgt 'enderKik', 'winKO'
+	end
+
 	if popad >= defV * 2:
 		'<b><font color="green">HIT</font></b>'
 		damageKrit = damage * 20 / 100

locations/Voltrener.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] = 'talk':
 		else
 			'Coach looks at you. "Hey <<$pcs_nickname>>. Checking up on your stats?."'
 			'"Your volleyball skill is <<pcs_vball>>, the team has played <<volsesongame>> games: Won - <<volsesonwin>>, lost - <<volsesonloss>>."'
-			if pcs_sleep < 30 and $pantyworntype ! 'none':
+			if (pcs_sleep < 30 or (cheatNoSleep > 0 and rand(0,2) = 0)) and $pantyworntype ! 'none':
 				gt 'Voltrenersex', 'masaj'
 			else
 				act 'Put your hand on coach''s knee':

locations/VoltrenerSexShower.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = '0':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower2.jpg"></center>'
 		'Wiping the steam off the glass, you see only a vaguely outline of a man. The man quickly moves to the exit and leaves before you can tell who it was.'
-		VoltrenerVoyeur += 1
+		if VoltrenerVoyeur = 0: VoltrenerVoyeur = 1
 		trenerlust += 2
 		act 'Finish shower':gt 'gdksport', 'start'
 	end
@@ -45,7 +45,7 @@ if $ARGS[0] = '1':
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower6.jpg"></center>'
 			'You smile at Mikhail Nikolaevich and continue to wash, making a show of cleaning your bulging ass and breasts. The coach watches but stays perfectly still.'
-			VoltrenerVoyeur += 1
+			if VoltrenerVoyeur = 1: VoltrenerVoyeur = 2
 			pcs_horny += 10
 			gs 'stat'
 			act 'Dry yourself off':
@@ -77,6 +77,7 @@ if $ARGS[0] = '2':
 	if (pcs_horny >= 70 or fame['pav_slut'] > 50) and will_cost <= pcs_willpwr:
 		act 'Masturbate (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
+			if IvanShowerYes = 2 and VoltrenerVoyeur = 2: VoltrenerVoyeur = 3
 			npc_rel['A69'] += 1
 			trenerlust += 4
 			minut += 10
@@ -142,7 +143,7 @@ if $ARGS[0] = '3':
 				act 'Cover up (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Comply':
-				VoltrenerVoyeur+=1
+				if VoltrenerVoyeur < 4: VoltrenerVoyeur = 4
 				trenerlust += 2
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower11.mp4"></video></center>'
@@ -191,7 +192,7 @@ if $ARGS[0] = '4':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower17.jpg"></center>'
 						'You turn to see the coach still looking, wide-eyed and with his jaw hanging open. Ivan finally notices this, and oblivious to the fact that your actions were only partially for his benefit, hastily covers up, grabs his things and jumps out of the shower. As soon as the door closes behind Ivan, the coach walks closer to you, pulls his member out of his pants and points it at you. Passion and lust overpower you and you immediately reach for his cock, but unfortunately, it seems the coach was already on the edge, and he begins to cum as soon as your hands envelop his shaft. He sprays your breasts with his spunk, then promptly pulls up his pants and leaves you in the shower. On your knees. Overflowing with arousal.'
-						VoltrenerVoyeur += 1
+				    if VoltrenerVoyeur < 5: VoltrenerVoyeur = 5
 						pcs_horny = 100
 						
 						minut += 15
@@ -236,8 +237,8 @@ if $ARGS[0] = '5':
 				cls
 				gs 'boyStat', 'A69'
 				npc_rel['A69'] += 3
-				VoltrenerVoyeur += 1
-				ShowerIvan = 3 & ! close sex with the coach in the shower
+				if VoltrenerVoyeur < 6: VoltrenerVoyeur = 6
+				if ShowerIvan < 3: ShowerIvan = 3 & ! close sex with the coach in the shower
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower22.jpg"></center>'
 				'Still unsatisfied by the abrupt end of your sex session with Ivan, you make no effort to close the door or hide your body from the coach. Any fool would understand what you wanted in this situation, and it seems the coach has thought about what you said earlier, so he undresses and climbs into the shower.'
 				act 'On your knees':

locations/anushkachat.qsrc

@@ -400,7 +400,7 @@ if $ARGS[0] = 'chat':
 			act 'Keep talking': gt 'anushkachat', 'chat'
 		end
 	end
-	if nush_model >= 1:
+	if nush_model >= 1 and foto_anush_referral = 0:
 		act 'Ask about modeling':
 			*clr & cla
 			foto_anush_referral = 1
@@ -1098,7 +1098,7 @@ end
 
 if $ARGS[0] = 'photoshoot1':
 	*clr & cla
-	nush_photoshoot += 1
+	nush_photoshoot = 2
 	minut += 5
 	photoskl_exp += rand(1,2)
 	gs 'stat'

locations/arturQW.qsrc

@@ -1,7 +1,7 @@
 # arturQW
 if $ARGS[0] = 'arturQW_1':
 	menu_off = 1
-	if arturTimes >= 5 and fame['pav_slut'] >= 150 and hotcat >= 7:
+	if arturTimes >= 5 and hotcat >= 7:
 		*clr & cla
 		minut += 2
 		gs 'stat'
@@ -89,8 +89,8 @@ if $ARGS[0] = 'arturQW_2':
 	'"<<$pcs_nickname>>, you are my treasure! Because of you our profits have doubled. I always said what we need is a sexy girl behind the counter, and I was right!" Arthur declares proudly.'
 	'"Thanks Arturik, but I''m tired of working behind the counter. I think I need to find something else. I''m sorry." You say regretfully, hoping he won''t be upset with you.'
 	'"What? Damn it! I thought you liked it. It is fine, it is fine, a girl like you should have a decent place to work."'
-	'He appears to be thinking to himself before his eyes light up and he quickly adds. "Look, I fired my bookkeeper, the old hag. Now you can take over her job! You will enjoy it much more, I promise. You will receive twice the money and won''t have to deal with asshole customers. Just come every day by 16.00, otherwise I will have to fire you, despite your fine ass." Arthur says.'
-	'You see a look of desperation in his eyes as he finishes the job offer. He clearly doesn''t want to lose having you around every day. You consider your options...'
+	'He appears to be thinking to himself before his eyes light up and he quickly adds. "Look, I fired my bookkeeper, the old hag. Now you can take over her job! You will enjoy it much more, I promise. You will receive twice the money and won''t have to deal with asshole customers." Arthur says.'
+	'You see a look of desperation in his eyes as he finishes the job offer. He clearly doesn''t want to lose having you around. You consider your options...'
 
 	act 'Agree':
 		*clr & cla

locations/arturRinok.qsrc

@@ -75,42 +75,23 @@ if $ARGS[0] = 'start':
 			minut += 5
 			gs 'stat'
 
-			if arturblowday ! daystart:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
-				'Arthur smiles kindly and hands you a particularly juicy looking tangerine. "Sorry, girl, but I have work to do. Unless we make it quick."'
-				
-				gs 'willpower', 'bj', 'resist', 'hard'
-				if will_cost <= pcs_willpwr:
-					act 'Leave (<<will_cost>> Willpower)':
-						gs 'willpower', 'bj', 'resist', 'hard'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						gt 'pav_train_market', 'start'
-					end
-				else
-					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-				act 'Go with Arthur':gt 'arturkiosk'
-			elseif arturblowday = daystart:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
-				'Arthur smiles kindly at you. "There is much work to do, I''m sorry."'
-
-				act 'Leave':gt 'pav_train_market', 'start'
-			end
+      '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
+      'Arthur smiles kindly and hands you a particularly juicy looking tangerine. "Sorry, girl, but I have work to do. Unless we make it quick."'
+      
+      gs 'willpower', 'bj', 'resist', 'hard'
+      if will_cost <= pcs_willpwr:
+        act 'Leave (<<will_cost>> Willpower)':
+          gs 'willpower', 'bj', 'resist', 'hard'
+          gs 'willpower', 'pay', 'resist'
+          gs 'stat'
+          gt 'pav_train_market', 'start'
+        end
+      else
+        act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+      end
+      act 'Go with Arthur':gt 'arturkiosk'
 		end
 	end
-
-!!	gs 'willpower', 'bj', 'resist', 'hard'
-!!	if will_cost <= pcs_willpwr:
-		act 'Leave':
-!!			gs 'willpower', 'bj', 'resist', 'hard'
-!!			gs 'willpower', 'pay', 'resist'
-!!			gs 'stat'
-			gt 'pav_train_market', 'start'
-		end
-!!	else
-!!		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-!!	end
 end
 
 if $ARGS[0] = 'work_1':
@@ -123,14 +104,14 @@ if $ARGS[0] = 'work_1':
 
 	act 'Trade':
 		*clr & cla
-		hour = 18
+		minut += 60*(18 - (hour+1)) + (60-minut)
 		arturDaysWorked1 += 1
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 		'You work until the evening at the counter, selling fresh fruit. It was a rough day as you quarreled with several customers over prices and you find yourself very tired.'
 
-		if arturDaysWorked1 >= 10:
+		if arturDaysWorked1 >= 10 and arturQW = 1:
 			gt 'arturQW', 'arturQW_2'
 		else
 			act 'Go with Arthur':
@@ -164,7 +145,7 @@ if $ARGS[0] = 'work_2':
 
 	act 'Work':
 		*clr & cla
-		hour = 17
+		minut += 60*(17 - (hour+1)) + (60-minut)
 		arturDaysWorked2 += 1
 		gs 'stat'
 

locations/bed.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start':
 	shour = 24 - hour
 	gs 'stat'
 
-	if hour > 22 and rand(0, 100) < 2 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and $loc = 'nichBedroomServant':gt 'bed', 'rab'
+	if hour > 22 and rand(0, 100) < 2 and houserab = 1 and houserabday ! daystart and (pcs_sleep < 50 or cheatNoSleep ! 0) and $loc = 'nichBedroomServant':gt 'bed', 'rab'
 	if hour > 22 and rand(0, 200) = 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husband = 0:gt 'bed', 'vor'
 
 	gt 'bed2'

locations/bed2.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = '':
 
 	if pcs_makeup ! 1 and cosmetic_tattoo = 0:*nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
 
-	if pcs_sleep <= 80:
+	if pcs_sleep <= 80 or cheatNoSleep ! 0:
 		if $clothingworntype = 'nude':
 			$sleep_txt = 'Go to bed'
 		else
@@ -363,7 +363,7 @@ if $ARGS[0] = 'dream':
 			exit
 		end
 	!! Exclusions for succubus dreams as they set horny to 100 and will always get overridden otherwise
-	elseif pcs_horny > 80 and pcs_sleep >= 30 and rand (1,300) = 300 and succubusQW ! 1 and succubusQW ! 2:
+	elseif pcs_horny > 80 and pcs_sleep >= 30 and rand(1,300) = 300 and succubusQW ! 1 and succubusQW ! 2:
 		gs 'stat'
 		$waketext = 'You glance at your alarm clock. It reads <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>.'
 		gt 'bed2', 'wake_horny'

locations/bedrPar.qsrc

@@ -161,6 +161,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				elseif anyaloc = 15:
 					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildo_talk1'
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
+					act 'Talk to Anya': gt 'sister_chat','sister_chat'
 				elseif anyaloc = 26:
 					if sisboypartyQW = 1: sisboypartyQW = 2
 					if sisboyparty = -1: sisboyparty = 1

locations/boy.qsrc

@@ -90,8 +90,8 @@ if $ARGS[0] = 'details':
 
 
 
-	hairBoy = npc_haircol[$npclastgenerated]
-	titBoy = npc_bust[$npclastgenerated]
+	hairBoy = rand(0, 3)
+	titBoy = rand(0, 2)
 	vneshBoy = npc_apprnc[$npclastgenerated]