fix typos, superfluous ends, and simplyfy code

locations/gaddvor.qsrc

@@ -54,59 +54,59 @@ if $ARGS[0]='':
 		end
 	end
 
-		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
-		if MiraLoc ! 7: mira_guest = 0
-
-		act '<b>Leave and go into the village</b>':minut += 5 & gt 'gadukino'
-		if 	grandpaQW['chore_clean_yard'] = 1:
-			act 'Clean up the yard for Grandpa (1:00)':
-				*clr & cla
-				if month >= 4 and month <= 10:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-					'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-					'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
-				end
-				minut += 60
-				grandpaQW['chore_clean_yard'] = 2
-				if month >= 4 and month <= 10:
-					fat -= rand(1,3)
-					pcs_stam -= 5
-					gs 'sweat', 'add', 10
-				else
-					stren_exp += 1
-					fat -= rand(1,5)
-					pcs_stam -= 10
-					gs 'sweat', 'add', 5
-				end
-				gs'stat'
+	if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
+	if MiraLoc ! 7: mira_guest = 0
 
-				act 'Finish':gt'gaddvor'
-				act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
-			end
-		end
-		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-		act 'Enter the banya':minut += 1 & gt 'gadbana'
-		act 'Go to the barn':minut += 1 & gt 'gadsarai'
-		act 'Go to the root cellar': minut += 1 & gt 'gaddvor', 'root_cellar'
-		act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
-		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):act 'Look at your grandparents'' chickens':gt 'gaddvor','chickens'
-		mira_temp = rand(1,5)
-		if mira_temp = 3 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+	act '<b>Leave and go into the village</b>':minut += 5 & gt 'gadukino'
+	if 	grandpaQW['chore_clean_yard'] = 1:
+		act 'Clean up the yard for Grandpa (1:00)':
 			*clr & cla
-			menu_off = 1
-			gs 'miroslava', 'miraclothes'
-			'You went out into the yard and noticed Mira standing there.'
-			'"Oh, <<$pcs_nickname>> hi, hope you don’’t mind me visiting. I was bored being home alone." she said smiling.'
-			mira_guestday = daystart
-			minut += 5
-			mira_guest = 1
-			gs 'stat'
-
-			act 'Continue':gt'gaddvor'
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
+				'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
+				'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
+			end
+			minut += 60
+			grandpaQW['chore_clean_yard'] = 2
+			if month >= 4 and month <= 10:
+				fat -= rand(1,3)
+				pcs_stam -= 5
+				gs 'sweat', 'add', 10
+			else
+				stren_exp += 1
+				fat -= rand(1,5)
+				pcs_stam -= 10
+				gs 'sweat', 'add', 5
+			end
+			gs'stat'
+			act 'Finish':gt'gaddvor'
+			act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
 		end
 	end
+	act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
+	act 'Enter the banya':minut += 1 & gt 'gadbana'
+	act 'Go to the barn':minut += 1 & gt 'gadsarai'
+	act 'Go to the root cellar': minut += 1 & gt 'gaddvor', 'root_cellar'
+	act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
+
+	if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):act 'Look at your grandparents'' chickens':gt 'gaddvor','chickens'
+
+	if rand(1,5) = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+		*clr & cla
+		menu_off = 1
+		gs 'miroslava', 'miraclothes'
+		'You went out into the yard and noticed Mira standing there.'
+		'"Oh, <<$pcs_nickname>> hi, hope you don’’t mind me visiting. I was bored being home alone." she said smiling.'
+		mira_guestday = daystart
+		minut += 5
+		mira_guest = 1
+		gs 'stat'
+
+		act 'Continue':gt'gaddvor'
+	end
+
 
 	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 	if clothesAtLocation = 1:

locations/gadhouse.qsrc

@@ -96,7 +96,6 @@ if $ARGS[0] = 'start':
 
 	display_bb = 1
 	frost = 0
-	mira_temp = rand(1,10)
 	home_owned[14] = 1
 	gs 'gadhouse', 'nudity_trouble_limit'
 
@@ -273,7 +272,7 @@ if $ARGS[0] = 'start':
 		end
 
 		act 'Continue': gt 'gadhouse', 'main'
-	elseif mira_temp = 1 and MiraLoc = 0 and hour >= 8 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
+	elseif rand(1,10) = 1 and MiraLoc = 0 and hour >= 8 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
 		*clr & cla
 		mira_guestday = daystart
 		minut += 5

locations/gadriver.qsrc

@@ -177,7 +177,6 @@ if $ARGS[0] = 'gadbitch':
 
 	'A small country beach, where you can sunbathe and swim.'
 
-	mira_temp = rand(1,10)
 	if MiraLoc = 1:temp_gr = rand(0,20)
 
 	if sunWeather = 1 and MiraLoc = 1:

locations/pet_dog.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'gadukino':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/rex/rex_gadukino_'+iif(month > 3 and month < 11, 'summer', 'winter')+'.jpg"></center>'
 	'<<$wl_rex[''name'']>> is running around '+iif(month > 3 and month < 11, 'sniffing everything', 'playing in the snow')+'. Your grandmother loves taking care of him, so you don''t have to worry about him while you''re in Gadukino.'
-	
+
 	act 'Continue': gt $loc, $loc_arg
 end
 
@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	$location_type = 'privat'
 	gs 'stat'
-	
+
 	if wl_objects['chew'] > 0 and rand(1,10) > 5 and wl_rex['chew_day'] ! daystart:
 		wl_rex['relationship'] += 1
 		wl_objects['chew'] -= 1
@@ -27,9 +27,9 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pet shop/pets/dog.jpg"></center>'
 	end
 	'Your dog''s name is <<$wl_rex[''name'']>> and taking care of him is your responsibility. He needs to be fed and walked two times per day and bathed once per week.'+iif((wl_rex['count_walk'] + wl_rex['count_feed'] + wl_rex['count_bath']) = 0, ' You have done all necessary chores.', '')
-		
+
 	*nl
-		
+
 	if (wl_rex['count_walk'] + wl_rex['count_feed'] + wl_rex['count_bath']) > 0:
 		'<b>Chores:</b>'
 		if wl_rex['count_walk'] > 0: '- You have to walk him <<wl_rex[''count_walk'']>>x today.'
@@ -37,53 +37,51 @@ if $ARGS[0] = 'start':
 		if wl_rex['count_bath'] > 0: '- You have to bath him <<wl_rex[''count_bath'']>>x this week.'
 		*nl
 	end
-	
-	if  wl_rex['relationship'] < 10:
+
+	if wl_rex['relationship'] < 10:
 		'<<$wl_rex[''name'']>> ignores you when you approach. '+iif(wl_objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')
 	elseif wl_rex['relationship'] < 30:
 		'<<$wl_rex[''name'']>> looks up when you approach. '+iif(wl_objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')
 	elseif wl_rex['relationship'] < 60:
-		'<<$wl_rex[''name'']>> looks up and wags his tail'+iif(wl_rex['relationship'] > 45, ',', ' a bit')+' when you approach. '+iif(wl_objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')	
+		'<<$wl_rex[''name'']>> looks up and wags his tail'+iif(wl_rex['relationship'] > 45, ',', ' a bit')+' when you approach. '+iif(wl_objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')
 	else
-		'<<$wl_rex[''name'']>> jumps up and'+iif(wl_rex['relationship'] > 80, ' happily ', ' ')+'wags his tail when you approach. '+iif(wl_objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')		
+		'<<$wl_rex[''name'']>> jumps up and'+iif(wl_rex['relationship'] > 80, ' happily ', ' ')+'wags his tail when you approach. '+iif(wl_objects['chew'] = 0, 'His old chew toy has seen better days. Maybe it''s time to buy him a new one?', '')
 	end
-		
+
 	act 'Leave': gt $loc, $loc_arg
-	
-	    end
-	end
+
 end
 
 !!--- Activities: Actions ---
 
-if $ARGS[0] = 'activities_normal':	
-	if wl_rex['count_feed'] > 0 and hour > (wl_rex['timer_feed'] + 3) and (curr_home = 2 or (curr_home ! 2 and wl_objects['dog_food'] > 0)): 
+if $ARGS[0] = 'activities_normal':
+	if wl_rex['count_feed'] > 0 and hour > (wl_rex['timer_feed'] + 3) and (curr_home = 2 or (curr_home ! 2 and wl_objects['dog_food'] > 0)):
 		act 'Feed him (0:03)': gt 'pet_dog', 'feed'
 	elseif wl_rex['count_feed'] > 0 and hour > (wl_rex['timer_feed'] + 3) and curr_home ! 2 and wl_objects['dog_food'] <= 0:
 		'<br>You don''t have dog food to feed him.'
 	end
-		
-	if wl_objects['treats'] > 0 and wl_rex['timer_treat'] ! daystart: 
+
+	if wl_objects['treats'] > 0 and wl_rex['timer_treat'] ! daystart:
 		act 'Give him a treat (0:01)': gt 'pet_dog', 'treat'
 	elseif wl_objects['treats'] = 0 and wl_rex['timer_treat'] ! daystart:
 		'<br>You don''t have any treats to give him.'
 	end
-	
+
 	if $clothingworntype = 'nude':
-		'<br>You should put some clothes on if you want to go for a walk with <<§wl_rex[''name'']>>.'
+		'<br>You should put some clothes on if you want to go for a walk with <<$wl_rex[''name'']>>.'
 	else
-		if wl_rex['count_walk'] > 0 and hour > (wl_rex['timer_walk'] + 3): 
+		if wl_rex['count_walk'] > 0 and hour > (wl_rex['timer_walk'] + 3):
 			act 'Go for a walk with him '+iif(daystage = 5 or sunWeather = 0, '(0:10)', '(0:15)')+' ': gt 'pet_dog', 'exercise', 'walk'
-			if wl_rex['count_run'] = 0 and $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and daystage ! 5: 
+			if wl_rex['count_run'] = 0 and $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and daystage ! 5:
 				act 'Go for a run with him (1:00)': gt 'pet_dog', 'exercise', 'run'
-			elseif wl_rex['count_run'] = 0 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 6 and hour < 22: 
+			elseif wl_rex['count_run'] = 0 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 6 and hour < 22:
 				'<br>It''s too '+iif(hour < 7, 'early', 'late')+' to go for a run with him.'
 			end
 		end
 	end
-		
+
 	if wl_rex['count_bath'] > 0: act 'Bath <<$wl_rex[''name'']>> (0:25)': gt 'pet_dog', 'bath'
-	
+
 	if wl_rex['play_inside'] ! daystart and hour < 23 and wl_objects['toys'] = 1: act 'Play with him inside (0:20)': gt 'pet_dog', 'play_inside'
 end
 !!--- Activities ---
@@ -100,7 +98,7 @@ if $ARGS[0] = 'feed':
 	'"Come '+iif(rand(0,1) = 0, 'boy', '<<$wl_rex[''name'']>>')+' let''s get you something to eat," you say and go into the kitchen. He '+iif(rand(0,1) = 0, 'follows and watches you fill his bowl with big thankful eyes', 'runs into the kitchen the second he hears you filling his bowl')+' before he eagerly digs in.'
 	*nl
 	if curr_home ! 2: 'You have enough dog food for <<wl_objects[''dog_food'']>> meals.'
-	
+
 	act 'Let him eat': gt $loc, $loc_arg
 end
 
@@ -113,7 +111,7 @@ if $ARGS[0] = 'treat':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/rex/treat.jpg"></center>'
 	'"Who''s a good boy?" you ask with a smile and pull one of his favorite treats out of your pocket. He sniffs and his tail wags back and forth. "Who''s a good boy?" you ask again and he barks in response. "Yes, you are!" you agree and hold out the treat. He snatches it right out of your hand and happily goes back to his dog basket.'
-	
+
 	act 'Continue': gt 'pet_dog', 'start'
 end
 
@@ -121,24 +119,24 @@ if $ARGS[0] = 'exercise':
 	*clr & cla
 	wl_rex['count_walk'] -= 1
 	$location_type = 'public_outside'
-	
+
 	if $ARGS[1] = 'walk':
 		wl_rex['timer_walk'] = hour
 		wl_rex['relationship'] += 1
 		minut += iif(daystage = 5 or sunWeather = 0, 10, 15)
-		
+
 		act 'Return home': gt $loc, $loc_arg, 'check'
-		
-		if daystage = 5:	
+
+		if daystage = 5:
 			'<center><img <<$set_imgh>> src="images/characters/shared/rex/walk_night_'+rand(0,2)+'.jpg"></center>'
 			'It''s too '+iif(hour < 9, 'early', 'late')+' to go for a long walk or play with him. You only take him around the neighborhood until he has finished his business.'
 		elseif sunWeather = 0:
 			'<center><img <<$set_imgh>> src="images/characters/shared/rex/walk_rain.jpg"></center>'
 			'The weather is horrible and a long walk is out of the question. You only walk him around the neighborhood until he has finished his business.'
-		else	
+		else
 			'<center><img <<$set_imgh>> src="images/characters/shared/rex/walk_day_'+rand(0,4)+'.jpg"></center>'
 			'He stops every few meters to sniff something interesting, happily greet another dog or mark his territory and you occasionally chat with another dog owner for a minute or two before you finally reach the park. You untie his leash when you reach the area marked for dogs and let him roam free for a while.'
-			
+
 			act 'Play with him (0:10)':
 				*clr & cla
 				minut += 10
@@ -147,14 +145,14 @@ if $ARGS[0] = 'exercise':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/rex/play_outside_'+rand(0,3)+'.jpg"></center>'
 				'You '+iif(wl_objects['toys'] = 1, 'pull out one of the rubber balls', 'pick up a branch')+' and he happily wags his tail, knowing what''s going to happen next. "Catch!" you say and throw the '+iif(wl_objects['toys'] = 1, 'ball', 'branch')+' as far as you can. He barks and runs after it before picking it up and proudly returning it to you. '+iif(wl_objects['toys'] = 1, 'He seems to enjoy playing fetch even more with his toy ball. ', '')+'You continue this for ten minutes before you finally...'
-			
+
 				act '... return home': gt $loc, $loc_arg
 			end
 		end
 	else
 		wl_rex['timer_walk'] = hour
 		wl_rex['relationship'] += 3
-		pcs_mood += 20	
+		pcs_mood += 20
 		sunWeather = 1
 		gs 'sweat', 'add', 20
 		gs 'exercise', 'tier1', 60, 'run_exp'
@@ -162,11 +160,11 @@ if $ARGS[0] = 'exercise':
 		'<center><img <<$set_imgh>> src="images/characters/shared/rex/run_'+iif(daystage = 1 or daystage = 3 or daystage = 4 or daystage = 6, 'sunset', rand(0,1))+'.jpg"></center>'
 		'<<$wl_rex[''name'']>> excitedly runs around you as you put on your running shoes. He loves going on runs with you. "Yes," you say with a smile. "We''re going for a run. Are you ready?" He wags his tail. "Alright, let''s go boy!"'
 		'You head out and start your run. <<$wl_rex[''name'']>> follows obediently, sometimes stopping to sniff or mark his territory, but he always returns to your side before you get too far away.'
-		'You return home an hour later, exhausted and sweaty.' 
-		
+		'You return home an hour later, exhausted and sweaty.'
+
 		act 'Continue': gt $loc, $loc_arg
 	end
-	
+
 	gs 'stat'
 end
 
@@ -178,7 +176,7 @@ if $ARGS[0] = 'play_inside':
 	wl_rex['play_inside'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/rex/play_inside_'+rand(0,3)+'.jpg"></center>'
-	'You cavort with <<$wl_rex[''name'']>> in '+iif($loc = 'mod_wlife_hotelroom', 'your hotel room', 'the apartment')+' and lavish him with all the attention he deserves. You get one of his toy balls and roll it around the apartment, playing a safe version of indoor catch. You cuddle up on the couch with him and spend the last few minutes stroking his soft fur.' 
+	'You cavort with <<$wl_rex[''name'']>> in '+iif($loc = 'mod_wlife_hotelroom', 'your hotel room', 'the apartment')+' and lavish him with all the attention he deserves. You get one of his toy balls and roll it around the apartment, playing a safe version of indoor catch. You cuddle up on the couch with him and spend the last few minutes stroking his soft fur.'
 
 	act 'Stop playing': gt $loc, $loc_arg
 end
@@ -212,7 +210,7 @@ if $ARGS[0] = 'name':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pet shop/pets/dog.jpg"></center>'
 	$wl_rex['name'] = input("What is the name of your dog? (Leave blank for Rex)")
 	if $wl_rex['name'] = '': $wl_rex['name'] = 'Rex'
-	
+
 	act 'Continue': $wl_status['dog'] = 'active' & gt $loc, $loc_arg
 	act 'Remove the dog (can be restored later in the cheat menu)': $wl_status['dog'] = 'blocked' & gt $loc, $loc_arg
 end