Merge remote-tracking branch 'julzor/master'

locations/gschool_break.qsrc

@@ -227,7 +227,6 @@ if $ARGS[0] = 'girls_restroom_events':
 					'You shake your head. "What? No I''m not going to eat your pussy."'
 					'She takes a step towards you. "You better, if you know what''s good for you."'
 					'You know these gopnik girls are dangerous, most of them like to fight for fun and many of them carry knives. Not sure how serious she is about this, you know that you are far enough away that you can just dash out of the restroom, but she might come after you later, or you could do what she says and lick her pussy.'
-					act 'Submit': gt 'gschool_break', 'lena_dom'
 !!ToDo: Add in a option to fight once we revamp fighting (nutluck)
 					gs 'willpower', 'cuni', 'resist', 'easy'
 					if will_cost <= pcs_willpwr:
@@ -242,6 +241,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					else
 						act 'Make a run for it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
+					act 'Submit': gt 'gschool_break', 'lena_dom'
 				end
 			else
 				act 'Tell her no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/gschool_events.qsrc

@@ -655,7 +655,7 @@ if $ARGS[0] = 'break_events':
 			grupvalue[2] -= 2
 			grupvalue[3] += 3
 			grupvalue[4] -= 5
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big32.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 			'You look away from Lazar and then keep walking, ignoring what just happened.'
 			gs 'gschool_events', 'leave_break_events'
 		end

locations/gschool_lessons.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'morning':
 	end
 end
 
-if $ARGS[2] = 'uniform_check':
+if $ARGS[0] = 'uniform_check':
 	if PCloInhibit <= 10:
 		grupvalue[3] += 1
 		grupvalue[5] += 1

locations/sexshop.qsrc

@@ -140,44 +140,32 @@ if $ARGS[0] = 'start':
 	act 'Look through the bras': minut += 1 & gt 'sexshop', 'bras'
 	act 'Look through the fetish shoes': minut += 1 & gt 'sexshop', 'shoes'
 	
-	if money < 300 and karta + bankDebtLimit < 300:
+	if money < 145 and karta + bankDebtLimit < 145:
 		'You cannot afford lubricant.'
 	else
-		if money >= 300:
-			act 'Buy lubricant 300 <b>₽</b> (cash)':
+		if money >= 145:
+			act 'Buy lubricant 145 <b>₽</b> (cash)':
 				*clr & cla
 				menu_off = 1
-				portion = input ("How much you want to buy?")
-
-				if portion * 300 > money:
-					'You do not have enough money.'
-				else
-					lubri += portion * 5
-					money -= portion * 300
-					minut += 5
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-					'You buy some lubricant and pay the cashier.'
-				end
+				lubri += 20
+				money -= 145
+				minut += 5
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You buy some lubricant and pay the cashier.'
 				gs 'stat'
 
 				act 'Move away from the counter':gt 'sexshop', 'start'
 			end
 		end
-		if karta + bankDebtLimit >= 300:
-			act 'Buy lubricant 300 <b>₽</b> (card)':
+		if karta + bankDebtLimit >= 145:
+			act 'Buy lubricant 145 <b>₽</b> (card)':
 				*clr & cla
 				menu_off = 1
-				portion = input ("How much you want to buy?")
-
-				if portion * 300 > karta + bankDebtLimit:
-					'You do not have enough credit.'
-				else
-					lubri += portion * 5
-					karta -= portion * 300
-					minut += 5
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-					'You buy some lubricant and pay the cashier.'
-				end
+				lubri += 20
+				karta -= 145
+				minut += 5
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You buy some lubricant and pay the cashier.'
 				gs 'stat'
 
 				act 'Move away from the counter':gt 'sexshop', 'start'