[fixed]cleaned up dibodi and liames, fixed a dead end and small

locations/dibodi.qsrc

@@ -13,14 +13,11 @@ if $ARGS[0] = 'os1':
 	if pcs_inhib < 50:'You are considering it, having your naked body painted and then walking around in public, sounds a little shameful, but it''d be really interesting too.'
 	act 'Decline':gt'ugol' & bodimodel1 = 1
 	act 'Doubt':gt 'dibodi', 'bodiart1'
-	if pcs_inhib > 30:
-		act 'Agree':gt 'dibodi', 'bodiart'
-	end
+	if pcs_inhib > 30: act 'Agree':gt 'dibodi', 'bodiart'
 end
 
 if $ARGS[0] = 'bodiart':
 	*clr & cla
-	cla
 	gs'stat'
 	bodimodel = 1
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artstudio/downud1.jpg"></center>'
@@ -29,7 +26,7 @@ if $ARGS[0] = 'bodiart':
     if lesbian > 0:'She chatted about a variety of things, using her hands to gesture often, which caused her breasts to move in pleasant ways, you barely pay attention to what she says as you find yourself staring at her chest.'
     'After a few minutes, perhaps noticing you paying more attention to her body than to what she is saying she falls silent.'
     'Several minutes of silence pass before she speaks again. "Our place is in the old town, you can come anytime, it was nice meeting you, but I need to get back to work."'
-	act 'Escape':gt'ugol'
+	act 'Leave': gt'ugol'
 end
 
 if $ARGS[0] = 'bodiart1':
@@ -45,11 +42,11 @@ if $ARGS[0] = 'bodiart1':
         'She chatted about a variety of things, using her hands to gesture often, which caused her breasts to move in pleasant ways, you barely pay attention to her as you find yourself starting at her chest.'
         'After a bit, perhaps noticing you watching her body more than paying attention to her she falls silent.'
         'Several minutes of silence pass before she speaks up again. "Our place is in the old town, you can come visit anytime, it was nice meeting you, but I need to get back to work."'
-	    if pcs_inhib > 30:
-			act 'Agree':gt'ugol'
-		end
+		act 'Refuse':gt'ugol' & bodimodel1 = 1
 	    act 'I''ll think about it':gt'ugol' & bodimodel2 = 1
-	    act 'Refuse':gt'ugol' & bodimodel1 = 1
+	     if pcs_inhib > 30: act 'Agree':gt'ugol'
+	else
+		act 'Continue': gt'liames'
 	end
 end
 
@@ -60,33 +57,31 @@ if $ARGS[0] = 'sgtusa':
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
     'You walked over to a group of girls and boys talking and introduced yourself.'
     'You were surprisingly well received.'
-	act 'Further':gt'liames'
+	act 'Continue': gt'liames'
 end
 
 if $ARGS[0] = 'sotusa':
     *clr & cla
-	cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
 	if sttan = 0 and $pantyworntype = 'none':
-	    gs'stat'
 	    sttan = 1
 	    '"Hey <<$pcs_nickname>> what''s with the no panties?" The crowd laughed out loud, noticing your lack of panties.'
-	    act 'Further':gt'liames'
+	    act 'Continue':gt'liames'
 	end
 end
 
 if $ARGS[0] = 'sptusa':
     *clr & cla
-	cla
-	gs'stat'
 	arts = 1
 	minut += 5
+	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/oldtown/marinka/marinka.jpg"></center>'
-	'You asked Marinka whether Masya''s studio was around here. In response Marinka shook her head, "I do not know."'
+	'You asked Marinka whether Masya''s studio was around here. In response Marinka shook her head, "I don''t know."'
 	act 'You live around here?':
-		'"Yes." said Marinka.'
-		act 'Good':gt'liam'
+		cla
+		'"Yes," Marinka says.'
+		act 'Say goodbye and leave': gt 'liam'
     end    
 end
 

locations/liames.qsrc

@@ -57,9 +57,9 @@ else
 	'The old theatre housing a burlesque club is closed now. It is open every day 18:00 - 22:00'
 end
 
-if home_owned[4] = 1: act '<b>Go home.</b>':gt'korr2x'
+if home_owned[4] = 1: act '<b>Go home</b>':gt'korr2x'
 
-if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya.': gt 'exhibitionistshop', 'start'
+if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
 
 act 'wait':gs 'obj_din', 'wait'
 
@@ -69,35 +69,22 @@ if home_owned[4] = 1 and hour = meethour:
 	if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & gt ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
 end
 
-streetrand = RAND(0,100)
-if streetrand >= 60 and pcs_lover < 3:
-	vnerand = RAND(0,1200)
-	if vnerand <= pcs_apprnc:
-		gs'boy'
-		'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
-		'The guy introduced himself as <<$boydesc>> and I asked for your telephone number.'
-
-		act 'Tell him your telephone number.':
-			cla
-			gs'boyfrend', 'start'
-			stopboy = 0
-			'<<$boydesc>> saved your phone number and left.'
-			act 'Complete outing.':gt 'liames'
-		end
+if rand(0,100) >= 60 and pcs_lover < 3 and rand(0,1200) <= pcs_apprnc:
+	gs 'boy'
+	'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
+	'The guy introduced himself as <<$boydesc>> and asks you for your telephone number.'
+
+	act 'Walk away': gt 'liames'
+	act 'Tell him your telephone number.':
+		cla
+		gs'boyfrend', 'start'
+		stopboy = 0
+		'<<$boydesc>> saved your phone number and left.'
+		act 'Continue': gt 'liames'
 	end
 end
 
-if stallionQ = 3:
-	*clr
-	cla
-	'There is a rumbling in your stomach, you need to use the restroom. There appears to be a public restroom tucked into the corner of a building. Unfortunately, the female one has a sign reading, "Out of order."'
-	act 'Use the Men''s Restroom':gt 'stallion','start'
-	act 'Hold it':stallionQ = 1 & gt 'liames'
-end
-
-
-temp = RAND(1,100)
-if temp >= 90:
+if rand(1,100) >= 95:
 	*clr & cla
 	minut += 5
 	gs'stat'
@@ -105,37 +92,38 @@ if temp >= 90:
 
 	'Making your way down High Street, you see a woman waiting patiently while an artist paints her portrait.'
 
-	act 'Further':gt'liames'
+	act 'Continue': gt'liames'
 end
 
 
 if hour >= 15 and hour <= 22 and tusa = 0:
-	act'Local Hangout':
+	act 'Go to the local hangout':
 		*clr & cla
-		gs'stat'
-		gs'dibodi'
+		menu_off = 1
 		minut += 20
 		tusa = 1
+		gs 'dibodi'
+		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
 		'Local youth get-together.'
-		act 'Discovering':gt 'dibodi', 'sgtusa'
+		act 'Explore it': gt 'dibodi', 'sgtusa'
 	end
-end
-
-
-
-if hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
-	act'Local Hangout':
+elseif hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
+	act 'Go to the local hangout':
 		*clr & cla
-		gs'stat'
-		gs'dibodi'
+		menu_off = 1
 		minut += 20
+		gs'dibodi'
+		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
 		'The girls and boys at the local hangout happily greet you.'
 
+		act'Leave': gt 'liames'
+		
 		if $pantyworntype = 'none' and sttan = 0:
-			'- A <<$pcs_nickname>> campaign wears panties - said one of the boys.'
-			act 'And she trusted you with this?':gt 'dibodi', 'sotusa'
+			cla
+			'"Hey guys, <<$pcs_nickname>> is going commando," one of the boys says.'
+			act 'Continue':gt 'dibodi', 'sotusa'
 		end
 
 !!		if sttan = 1 and $pantyworntype = 'none':
@@ -148,9 +136,23 @@ if hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
 !!			'- Vav <<$pcs_nickname>> truselya put.'
 !!			act 'Answer':gt'etoexhib','pos3'
 !!		end
+	end
+end
 
-		act'Escape':gt 'liames'
+if stallionQ = 3:
+	*clr & cla
+	'There is a rumbling in your stomach, you need to use the restroom. There appears to be a public restroom tucked into the corner of a building. Unfortunately, the female one has a sign reading, "Out of order."'
+	gs 'willpower', 'misc', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Hold it (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
+			stallionQ = 1
+			gt 'liames'
+		end
+	else
+		act 'Hold 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 'Use the Men''s Restroom': gt 'stallion','start'
 end
 
 --- liames ---------------------------------