Reordered choices in mitkabuh (drinking with Mitka and the boys)

locations/mitkabuh.qsrc

@@ -68,6 +68,20 @@ if $ARGS[0] = 'partyalone':
 	
 	! Sveta is not drunk
 	if alko < 10:
+		gs 'willpower', 'drink', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)':
+				mitkabuhday = 0
+				minut += 15
+				gs 'willpower', 'drink', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				
+				gt 'gadroad'
+			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 'Drink with the boys':
 			*clr & cla
 			menu_off = 1
@@ -92,20 +106,6 @@ if $ARGS[0] = 'partyalone':
 
 			act 'Continue drinking':gt 'mitkabuh', 'partyalone'
 		end
-		gs 'willpower', 'drink', 'resist'
-		if will_cost <= pcs_willpwr:
-			act 'Leave (<<will_cost>> Willpower)':
-				mitkabuhday = 0
-				minut += 15
-				gs 'willpower', 'drink', 'resist'
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				
-				gt 'gadroad'
-			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
 	! Sveta is drunk and already had sex with Mitka or is the village whore
 	elseif npc_QW['A63'] > 0 and gadriver_gang < 3:
 		*clr & cla
@@ -149,7 +149,7 @@ if $ARGS[0] = 'partyalone':
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
 		*nl
-		'You are way too drunk, and can barely stand. Mitka, noticing your condition, walks over to you and laughs, "It seems, you''ve had enough for tonight. Get out of here."'
+		'You are way too drunk, and can barely stand. Mitka, noticing your condition, walks over to you and laughs, "It seems you''ve had enough for tonight. Get out of here."'
 		
 		act 'Leave': mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 	end
@@ -214,18 +214,6 @@ if $ARGS[0] = 'partywithMira':
 			*nl
 			'You attempt to pass Mira a shot glass full of liquor, but she refuses. She has already had too much tonight and is happy to just chat the rest of the night.'
 			if alko < 10:
-				act 'Drink the shot yourself':
-					cla
-					minut += 30
-					npc_rel['A63'] += rand(0,1)
-					npc_rel['A62'] += rand(0,1)
-					npc_rel['A61'] += rand(0,1)
-					npc_rel['A60'] += rand(0,1)
-					gs 'drugs', 'alcohol', 'moonshine', 1
-					gs 'stat'
-					
-					act 'Continue drinking':gt 'mitkabuh','partywithMira'
-				end
 				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Leave (<<will_cost>> Willpower)':
@@ -243,6 +231,18 @@ if $ARGS[0] = 'partywithMira':
 				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 'Drink the shot yourself':
+					cla
+					minut += 30
+					npc_rel['A63'] += rand(0,1)
+					npc_rel['A62'] += rand(0,1)
+					npc_rel['A61'] += rand(0,1)
+					npc_rel['A60'] += rand(0,1)
+					gs 'drugs', 'alcohol', 'moonshine', 1
+					gs 'stat'
+					
+					act 'Continue drinking':gt 'mitkabuh','partywithMira'
+				end
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
@@ -278,6 +278,7 @@ if $ARGS[0] = 'partywithMira':
 			*nl
 			'Mira attempts to pass you another shot glass full of liquor, but you refuse. You have already had too much tonight and are happy to just chat the rest of the night.'
 			if npc_drunk['A60'] < 10:
+				act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 				gs 'willpower', 'drink', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make Mira drink the shot instead (<<will_cost>> Willpower)':
@@ -298,7 +299,6 @@ if $ARGS[0] = 'partywithMira':
 					act 'Make Mira drink the shot instead (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
-				act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
@@ -312,6 +312,23 @@ if $ARGS[0] = 'partywithMira':
 	else
 		! Sveta is not drunk and Mira is not drunk
 		if alko < 10 and npc_drunk['A60'] < 10:
+			gs 'willpower', 'drink', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					MiraLoc = 0
+					npc_drunk['A60'] = 0
+					mitkabuhmiraday = 0
+					mitkabuhday = 0
+					minut += 15
+					gs 'willpower', 'drink', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					
+					gt 'gadroad'
+				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 'Drink with Mira and the boys':
 				*clr & cla
 				menu_off = 1
@@ -325,27 +342,6 @@ if $ARGS[0] = 'partywithMira':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drinking.jpg"></center>'
 				*nl
 				'Mitka pours some of the brew into a clear plastic shot glass and hands it over to you.'
-				act 'Drink the shot yourself':
-					cla
-					minut += 30
-					npc_rel['A63'] += rand(0,1)
-					npc_rel['A62'] += rand(0,1)
-					npc_rel['A61'] += rand(0,1)
-					npc_rel['A60'] += rand(0,1)
-					gs 'drugs', 'alcohol', 'moonshine', 1
-					gs 'stat'
-					
-					'You take the shot glass full of moonshine and quickly gulp it down, you cough and suck in your breath. Mira chats with the boys as they drink as well.'
-					'Mitka looks at you approvingly, "Good shit, right?"'
-					if mitka_first_drink = 1:
-						mitka_first_drink = 2
-						'"That was stronger than I expected!" you reply.'
-					else
-						'"Just as good as the last batch you made!" you reply.'
-					end
-					
-					act 'Continue drinking':gt 'mitkabuh','partywithMira'
-				end
 				gs 'willpower', 'drink', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make Mira drink the shot instead (<<will_cost>> Willpower)':
@@ -367,9 +363,30 @@ if $ARGS[0] = 'partywithMira':
 				else
 					act 'Make Mira drink the shot instead (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-
-				act 'Continue drinking':gt 'mitkabuh','partywithMira'
+				act 'Drink the shot yourself':
+					cla
+					minut += 30
+					npc_rel['A63'] += rand(0,1)
+					npc_rel['A62'] += rand(0,1)
+					npc_rel['A61'] += rand(0,1)
+					npc_rel['A60'] += rand(0,1)
+					gs 'drugs', 'alcohol', 'moonshine', 1
+					gs 'stat'
+					
+					'You take the shot glass full of moonshine and quickly gulp it down, you cough and suck in your breath. Mira chats with the boys as they drink as well.'
+					'Mitka looks at you approvingly, "Good shit, right?"'
+					if mitka_first_drink = 1:
+						mitka_first_drink = 2
+						'"That was stronger than I expected!" you reply.'
+					else
+						'"Just as good as the last batch you made!" you reply.'
+					end
+					
+					act 'Continue drinking':gt 'mitkabuh','partywithMira'
+				end
 			end
+		! Sveta is not drunk
+		elseif alko < 10:
 			gs 'willpower', 'drink', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave (<<will_cost>> Willpower)':
@@ -387,8 +404,6 @@ if $ARGS[0] = 'partywithMira':
 			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
-		! Sveta is not drunk
-		elseif alko < 10:
 			act 'Drink with the boys':
 				*clr & cla
 				menu_off = 1
@@ -414,25 +429,9 @@ if $ARGS[0] = 'partywithMira':
 
 				act 'Continue drinking':gt 'mitkabuh', 'partywithMira'
 			end
-			gs 'willpower', 'drink', 'resist'
-			if will_cost <= pcs_willpwr:
-				act 'Leave (<<will_cost>> Willpower)':
-					MiraLoc = 0
-					npc_drunk['A60'] = 0
-					mitkabuhmiraday = 0
-					mitkabuhday = 0
-					minut += 15
-					gs 'willpower', 'drink', 'resist'
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					
-					gt 'gadroad'
-				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
 		! Mira is not drunk
 		elseif npc_drunk['A60'] < 10:
+			act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 			act 'Watch Mira drink with the boys':
 				*clr & cla
 				menu_off = 1
@@ -451,7 +450,6 @@ if $ARGS[0] = 'partywithMira':
 				
 				act 'Continue watching':gt 'mitkabuh','partywithMira'
 			end
-			act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 		end
 	end
 end
@@ -635,44 +633,6 @@ if $ARGS[0] = 'solo_10':
 		'He turns to his friends, "Here," pointing to a drunken Kolyamba. "Get yourself over here and have some fun with this cunt," Kolyamba stumbles forward pulling his pants down as he approaches. "We may be drunk, but we can still have fun with this whore''s pussy..."'
 		'"Well, that''s a beautiful sight," Mitka stammers smugly as he exposes you for everyone to see. "Let''s get this party started!"'
 
-		act 'Bend over':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkasexpublic.jpg"></center>'
-			*nl
-			'Kolyamba bends you over a nearby log. He places one hand on your back to steady himself while guiding his dick into your '+iif(mesec=0,'pussy','ass')+'.'
-			'All you can manage are moans as Kolyamba fucks you, but you can''t help but think to yourself that the other guys may start treating you differently after tonight.'
-			'You are both so drunk that any type of rhythm is hard to maintain. Eventually Kolyamba speeds up a little and finishes inside of your '+iif(mesec=0,'pussy','ass')+'.'
-			'He gets up and goes back to drinking with Mitka and Vasyan, leaving you naked outside. After a little while you sober up enough to get dressed and go sit back by the boys.'
-			
-			npc_rel['A63'] += 1
-			npc_rel['A61'] += 5
-			npc_QW['A63'] = 11
-			gs 'boyStat', 'A61'
-			npc_sex['A61'] += 1
-			if mesec = 0:
-				gs 'cum_call','vagina','A61',1
-				gs 'arousal', 'vaginal', 10, 'sub'
-			else
-				gs 'cum_call','anus','A61',1
-				gs 'arousal', 'anal', 10, 'sub'
-			end
-			gs 'arousal', 'end'
-			gs 'stat'
-
-			if sunWeather = 1:
-				if MiraLoc ! 5:
-					act 'Sit down outside':gt 'mitkabuh','partyalone'
-				else
-					act 'Sit down outside':gt 'mitkabuh','partywithMira'
-				end
-			else
-				if MiraLoc ! 5:
-					act 'Sit down in the trailer':gt 'mitkabuh','partyalone'
-				else
-					act 'Sit down in the trailer':gt 'mitkabuh','partywithMira'
-				end
-			end
-		end
 		act 'Protest':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunkgirl.jpg"></center>'
@@ -719,6 +679,44 @@ if $ARGS[0] = 'solo_10':
 				end
 			end
 		end
+		act 'Bend over':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkasexpublic.jpg"></center>'
+			*nl
+			'Kolyamba bends you over a nearby log. He places one hand on your back to steady himself while guiding his dick into your '+iif(mesec=0,'pussy','ass')+'.'
+			'All you can manage are moans as Kolyamba fucks you, but you can''t help but think to yourself that the other guys may start treating you differently after tonight.'
+			'You are both so drunk that any type of rhythm is hard to maintain. Eventually Kolyamba speeds up a little and finishes inside of your '+iif(mesec=0,'pussy','ass')+'.'
+			'He gets up and goes back to drinking with Mitka and Vasyan, leaving you naked outside. After a little while you sober up enough to get dressed and go sit back by the boys.'
+			
+			npc_rel['A63'] += 1
+			npc_rel['A61'] += 5
+			npc_QW['A63'] = 11
+			gs 'boyStat', 'A61'
+			npc_sex['A61'] += 1
+			if mesec = 0:
+				gs 'cum_call','vagina','A61',1
+				gs 'arousal', 'vaginal', 10, 'sub'
+			else
+				gs 'cum_call','anus','A61',1
+				gs 'arousal', 'anal', 10, 'sub'
+			end
+			gs 'arousal', 'end'
+			gs 'stat'
+
+			if sunWeather = 1:
+				if MiraLoc ! 5:
+					act 'Sit down outside':gt 'mitkabuh','partyalone'
+				else
+					act 'Sit down outside':gt 'mitkabuh','partywithMira'
+				end
+			else
+				if MiraLoc ! 5:
+					act 'Sit down in the trailer':gt 'mitkabuh','partyalone'
+				else
+					act 'Sit down in the trailer':gt 'mitkabuh','partywithMira'
+				end
+			end
+		end
 	end
 end