[changed] merge gadukino_wip into master

locations/cikl.qsrc

@@ -1553,7 +1553,7 @@ if Mira_no > 0: Mira_no -= 1
 if Mira_no < 0: Mira_no = 0
 
 !! new grandparent chore stuff, for 0.8.0
-if gadstay = 1:
+if gadstay = 1 and lost_girl = 0:
 	if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
 		if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
 			'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'

locations/gaddvor.qsrc

@@ -12,18 +12,6 @@ if $ARGS[0]='':
 	gs 'stat'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	if hour >= 6 and hour < 22:
-		if grandmaQW['nudity_trouble'] = 10:
-			*clr & cla
-			menu_off = 1
-			grandmaQW['nudity_trouble'] = 0
-			'<center><h4>Your grandparents'' yard</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma_trouble.jpg"></center>'
-			'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me AND your grandfather! Unlike you, we have to live in this village, and with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. Go and get dressed immediately!" She then walks off. You are too ashamed to say anything.'
-			act 'Continue': gt 'gaddvor'
-			exit
-		end
-	end
 
 	if StoryLine = 1:
 		'<center><h4>Your grandparents'' yard</h4></center>'

locations/mother.qsrc

@@ -613,13 +613,13 @@ if $ARGS[0] = '':
 
 	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
-	if week = 5 and dostupindorf = 1:
+	if week = 5 and dostupindorf = 1 and grandaQW['block'] = 0:
 		if hour > 9:'While your <<$npc_nickname[''A29'']>> is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'
-	elseif week = 6 and dostupindorf = 1:
+	elseif week = 6 and dostupindorf = 1 and grandaQW['block'] = 0:
 		if hour > 9 and hour < 12:
 			'Your <<$npc_nickname[''A29'']>> is finishing up on some meals before leaving for Gadukino and puts down her work for a second. "<<$pcs_nickname>>, well? Do you want to come with us to Gadukino or would you rather stay home with Anya?"'
 
-			act 'Go to Gadukino':hour = 12 & minut = 0 & indorf = 1 & gt 'famdorfride'
+			act 'Go to Gadukino':gt 'gadhouse', 'to_gadukino'
 		end
 	end
 

locations/saveupdater.qsrc

@@ -729,6 +729,8 @@ end
 ! Switching from tracking relationship with Rex from rex to npc_rel['A57']
 if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
 
+!!------------------------------village variable clean up/translation---------------------------------------
+if findvel > 0: BikeLoc = findvel & killvar findvel
 !!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
 !!---Grandpa
 If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'

locations/stat_display.qsrc

@@ -2019,18 +2019,17 @@ if npc_QW['A113'] = 1: $stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b
 
 !!------------------ Gadukino chores and such -------------------
 if display_bb = 1:
-	if boletus + bilberry > 0:
-		if boletus + bilberry >= 10:
-			$stat_msg +='<br><font color = Olive>You have a full basket. </font> '
+	if boletus + boletus_cooked + bilberry > 0:
+		$stat_msg += '<br> '
+		if boletus + boletus_cooked + bilberry >= 5:
+			$stat_msg +='<br><font color = Olive>Your basket is full and you cannot carry more. </font> '
 		else
-			$stat_msg +='<br><font color = Olive>In Your basket: </font>'
+			$stat_msg +='<br><font color = Olive>Your basket is partially full. </font>'
 		end
-		if hour > 6 and (month < 6 or month > 9) and boletus + bilberry > 0:
-			boletus = 0 & bilberry = 0
-			'<br>You throw away your mushrooms and berries.'
-		end
-		if boletus > 0:$stat_msg +='Mushrooms: <b><<boletus>></b> kg. '
-		if bilberry > 0:$stat_msg +='Berries: <b><<bilberry>></b> kg. '
+		$stat_msg += '<br><font color = Olive>(Click numbers to throw away one a time) </font>'
+		if boletus > 0:$stat_msg +='<br><font color = Olive>Mushrooms: <a href="exec:boletus -= 1 & gs ''stat''"><b><<boletus>></b></a> kg. </font>'
+		if boletus_cooked > 0:$stat_msg +='<br><font color = Olive>Cooked Mushrooms: <a href="exec:boletus_cooked -= 1 & gs ''stat''"><b><<boletus_cooked>></b></a> kg. </font>'
+		if bilberry > 0:$stat_msg +='<br><font color = Olive>Berries: <a href="exec:bilberry -= 1 & gs ''stat''"><b><<bilberry>></b></a> kg. </font>'
 	end
 end