Merge branch 'master' of https://git.catrenelle.com/oldentree/gl_bestmod

locations/mod_bestmod.qsrc

@@ -3,15 +3,15 @@
 
 bm_rand = rand(0, 100)
 
-if $loc = 'Gadsarai' and $metka = '' and menu_off = 0: '<br>Sitting near the barn is your grandparents'' <a href="exec:gt ''mod_bestmod_bandit''">large dog, named Bandit</a>'
+if $loc = 'Gadsarai' and $metka = '' and menu_off = 0: '<br>Sitting near the barn is your grandparent''s <a href="exec:gt ''mod_bestmod_bandit''">large dog, named Bandit</a>'
 
 if $loc = 'Miroslava' and npc_QW['A60'] >= 30 and hour < 19 and month >= 5 and month <= 9 and MiraLoc ! 3: gs 'mod_bestmod_mira', 'third_wish'
 
 if $loc = 'zoomagazine' and $metka = 'start' and menu_off = 0: gs 'mod_bestmod_petshop', 'buy_dog'
 
-if $loc = 'korr' and $metka = '' and sobaka = 1 and menu_off = 0:'Your dog, <a href="exec:gt ''mod_bestmod_petdog'', ''start'', $loc"><<$namesob>></a>, is lying on the floor near the entrance.'
+if $loc = 'korr' and $metka = '' and sobaka = 1 and menu_off = 0:'Your dog, <a href="exec:gt ''mod_bestmod_petdog'', ''start''"><<$namesob>></a>, is lying on the floor near the entrance.'
 
-if $loc = 'korr2x' and $metka = '' and sobaka = 1 and menu_off = 0:'Near the entrance to the bedroom is your dog, <a href="exec:gt ''mod_bestmod_petdog'',''start'', $loc"><<$namesob>></a>'
+if $loc = 'korr2x' and $metka = '' and sobaka = 1 and menu_off = 0:'Near the entrance to the bedroom is your dog, <a href="exec:gt ''mod_bestmod_petdog'',''start''"><<$namesob>></a>'
 
 if ($loc = 'sitr' or $loc = 'sitr2x') and menu_off = 0: gs 'mod_bestmod_sitr'
 
@@ -23,11 +23,11 @@ if $loc = 'kafe' and metka = 'start' and menu_off = 0 and QWdogReiq = 3 and week
 !! beast exp and relationship with pet.
 if $curloc = 'bed' and ((bm_pet_dog_rel > 10 and pcs_horny > 60) or (pcs_horny > 80 and alko > 3) or bm_beast['exp'] > 6) and housrA = 1 and bm_dog_once_day ! daystart and rand(0, 100) < 4: gt 'mod_bestmod_bed', 'sog1'
 
-if $loc = 'glake' and $selact = 'Go sunbathing (1:00)' and $clothingworntype = 'nude' and bm_beast['exp'] > 0 and rand(1,10) = 5: gt 'mod_bestmod_lake_dog', 'start'
+if $loc = 'glake' and $selact = 'Go sunbathing (30 minutes)' and $clothingworntype = 'nude' and bm_beast['exp'] > 0 and rand(1,10) = 5: gt 'mod_bestmod_lake_dog', 'start'
 
-if $locclass = 'park' and $metka = 'start' and (hour >= 20 or hour < 6) and menu_off = 0:
-	''
-	'<b>You see a stray dog sniffing around some trash.</b>'
+if $loc = 'park' and $metka = 'start' and (hour >= 20 or hour < 6) and menu_off = 0:
+	*nl
+	'You see a stray dog sniffing around some trash.'
 	act 'Go up to the stray dog': gt 'mod_bestmod_park_dog', 'start', $loc
 end
 		

locations/mod_bestmod_bandit.qsrc

@@ -98,6 +98,7 @@ if $args[0] = 'horny':
 end
 
 if $args[0] = '1':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'Bandit jumps up, wraps his forelegs around your leg and starts humping against it. You blush when you feel his tip smearing a small amount of canine precum on your skin.'
 	act 'Push Bandit away':
@@ -128,6 +129,7 @@ if $args[0] = '1':
 end
 
 if $args[0] = '2':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'Bandit stands on his rear legs and plants his front paws on your shoulders from behind you. You feel very excited as Bandit stands on top of you with his dick pressing against your butt.'
 
@@ -173,6 +175,7 @@ if $args[0] = '2':
 end
 
 if $args[0] = '3':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'Bandit excitedly turns around you, sometimes jumping against you, hugging your legs and rubbing his red dick against you...'
 
@@ -232,6 +235,7 @@ if $args[0] = '3':
 end
 
 if $args[0] = '4':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'Bandit is happily barking and turning around you.'
 
@@ -294,6 +298,7 @@ if $args[0] = '4':
 end
 
 if $args[0] = '5':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'Bandit is happily barking and turning around you, randomly jumping against your legs or trying to sniff your crotch...'
 
@@ -309,11 +314,17 @@ if $args[0] = '5':
 		act 'Leave': gt 'Gadsarai'
 	end
 	act 'Give in':
-		if pcs_vag = 0: gt 'mod_bestmod_bandit', '5a' else gt 'mod_bestmod_bandit', '5b'
+		if pcs_vag = 0:
+			gt 'mod_bestmod_bandit', '5a'
+		else
+			gt 'mod_bestmod_bandit', '5b'
+		end
 	end
 end
 
 if $args[0] = '5a':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'You just can''t leave Bandit in this state. You decide you need to help the doggie get some relief.'
 	'You remind yourself that you are a virgin, so you consider your next move carefully...'
 	
@@ -678,6 +689,8 @@ if $args[0] = '5a':
 end
 
 if $args[0] = '5b':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	'You just can''t leave Bandit in this state. You decide you need to help the doggie get some relief. The question is how...'
 	act 'Suck Bandit':
 		*clr & cla
@@ -1360,6 +1373,7 @@ end
 
 
 if $args[0] = '6':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/pirat.jpg"></center>'
 	act 'Suck Bandit':
 		*clr & cla

locations/mod_bestmod_bed.qsrc

@@ -295,7 +295,6 @@ end
 
 if $ARGS[0] = 'fin':
 	cla
-	menu_off = 1
 	gt $loc, $metka
 	!!savegame 'avtosave.sav'
 

locations/mod_bestmod_kuhr.qsrc

@@ -52,7 +52,7 @@ if zoo >= 6 and sobaka ! 0:
 						act 'Let him put your dog to sleep':
 							sobaka = 0
 							zoo = 0
-							gt $loc
+							dynamic $brodilk
 						end
 
 
@@ -61,7 +61,7 @@ if zoo >= 6 and sobaka ! 0:
 							'"No dear, it''s not his fault, it''s his instincts, just let him do what he''s supposed to do, he''ll eventually stop", you say.'
 							'"Well, whatever you say."'
 
-							act 'Finish':gt $loc
+							act 'Finish':dynamic $brodilk
 						end
 					end
 				elseif harakHusb = 1:
@@ -75,14 +75,14 @@ if zoo >= 6 and sobaka ! 0:
 						act 'Let him put your dog to sleep':
 							sobaka = 0
 							zoo = 0
-							gt $loc
+							dynamic $brodilk
 						end
 
 						act 'It''s just his instincts':
 							cla
 							'"No dear, it''s not his fault, it''s his instincts, just let him do what he''s supposed to do, he''ll eventually stop", you say.'
 							'"Well, whatever you say."'
-							act 'Finish':gt $loc
+							act 'Finish':dynamic $brodilk
 						end
 					elseif izvratH = 1:
 						swallow += 1
@@ -108,7 +108,7 @@ if zoo >= 6 and sobaka ! 0:
 							act 'Put your dog to sleep':
 								sobaka = 0
 								zoo = 0
-								gt $loc
+								dynamic $brodilk
 							end
 
 							act 'It''s just his instincts!':
@@ -123,7 +123,7 @@ if zoo >= 6 and sobaka ! 0:
 									'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/z6.jpg"></center>'
 									'You take the dogs dick in your hand and begin to stroke it, after a few minutes your dog cums on your hands.'
 
-									act 'Finish':gt $loc
+									act 'Finish':dynamic $brodilk
 								end
 
 								act 'Suck dog':
@@ -140,10 +140,10 @@ if zoo >= 6 and sobaka ! 0:
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Finish':gt $loc
+									act 'Finish':dynamic $brodilk
 								end
 
-								act 'Finish':gt $loc
+								act 'Finish':dynamic $brodilk
 							end
 						end
 					end
@@ -161,7 +161,7 @@ if zoo >= 6 and sobaka ! 0:
 						act 'Finish':
 							sobaka = 0
 							zoo = 0
-							gt $loc
+							dynamic $brodilk
 						end
 					elseif izvratH = 1:
 						swallow += 1
@@ -208,7 +208,7 @@ if zoo >= 6 and sobaka ! 0:
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Finish':gt $loc
+									act 'Finish':dynamic $brodilk
 								end
 							end
 						end

locations/mod_bestmod_park_dog.qsrc

@@ -1,7 +1,4 @@
 # mod_bestmod_park_dog
-
-$loc = 'mod_bestmod_park_dog'
-$metka = $ARGS[0]
 menu_off = 1
 
 !! Set a default large volume of sperm for stray dog
@@ -11,21 +8,20 @@ sexvolume = rand(100, 200)
 
 
 if $ARGS[0] = 'start':
-	$bm_oldloc = $ARGS[1]
 	*clr & cla
 	pcs_willpwr -= 5
 	minut += 5
 
 	if bm_know_parkdog = 1:
 		'Under construction!'
-		act 'Go back to the park': gt $bm_oldloc, 'start'
+		act 'Go back to the park': gt 'park', 'start'
 	else
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/locations/gadukino/village/baddog.jpg"></center>'
 		'It''s a rather large dog and you''re not sure what breed it is. But you figure something that size must be hungry if it hasn''t had something to eat in a while.'
 		''
 		'"Poor thing," you think to yourself, and walk towards it. As you approach, the dog looks up. You must have scared it because it turns around as soon as it sees you, and trots off into the darkness among the trees.'
 		act 'Follow him': gt 'mod_bestmod_park_dog', 'first_follow'
-		act 'Leave him be': gt $bm_oldloc, 'start'
+		act 'Leave him be': gt 'park', 'start'
 	end
 end
 
@@ -42,7 +38,7 @@ if $ARGS[0] = 'first_follow':
 			'You wonder why you even followed this dog. He looks like he is comfortable where he is and you don''t even have any food to give him.'
 			'Even worse, you realize that you have no idea where you are in the park and should probably get out as soon as you can. You don''t want to be known as "that girl who got lost in the park".'
 			'You finally find your way out, but you''re not sure you could find your way back to the dog. If you ever want to go back to his den, you''ll have to run into him somewhere in the park again.'
-			act 'Go back to the park': gt $bm_oldloc, 'start'
+			act 'Go back to the park': gt 'park', 'start'
 		end
 	else
 		buterbrod = 0
@@ -50,7 +46,7 @@ if $ARGS[0] = 'first_follow':
 			*clr & cla
 			bm_know_parkdog = 1
 			bm_parkdog_QW += 1
-			$bm_firstmet_parkdog = $bm_oldloc
+			bm_firstmet_parkdog = 1
 			'You take the sandwich out from your bag and offer it to the dog. He sniffs at it for a bit, but seems hesitant to get very close to you.'
 			'You figure he might not trust you too much, so you put the sandwich down on the ground and step back. You guessed right, as the dog jumped forward after a moment''s pause and devoured the sandwich meat, leaving the bread behind.'
 			''
@@ -72,13 +68,13 @@ if $ARGS[0] = 'first_follow':
 				'You don''t have another place to stay, but you also weren''t looking to spend the night out somewhere in the middle of the park.'
 				'"Sorry, boy. I can''t stay here. But I hope I see you again. I''ll be sure to bring something better than a sandwich next time, too," you say, smiling at the dog. He happily wags his tail and keeps looking at you as you walk back through the trees.'
 			end
-			act 'Go back to the park': gt $bm_oldloc, 'start'
+			act 'Go back to the park': gt 'park', 'start'
 		end
 		act 'Leave':
 			*clr & cla
 			'You realize that you have no idea where you are in the park and should probably get out as soon as you can. You don''t want to be known as "that girl who got lost in the park".'
 			'You finally find your way out, but you''re not sure you could find your way back to the dog. If you ever want to go back to his den, you''ll have to run into him somewhere in the park again.'
-			act 'Go back to the park': gt $bm_oldloc, 'start'
+			act 'Go back to the park': gt 'park', 'start'
 		end
 	end
 end

locations/mod_bestmod_petdog.qsrc

@@ -1,14 +1,10 @@
 # mod_bestmod_petdog
-
-$loc = 'mod_bestmod_petdog'
-$metka = ''
 menu_off = 1
 
 !! Set a default large volume of sperm for pet dog
 sexvolume = rand(100, 200)
 
 if $ARGS[0] = 'start':
-	$bm_oldloc = $ARGS[1]
 	cls
 	minut += 5
 	gs 'stat'
@@ -27,26 +23,26 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/dog_walk.jpg"></center>'
 		'<center><b>You take <<$namesob>> for a walk.</b></center>'
 
-		act 'Go back home': gt $bm_oldloc
+		act 'Go back home':dynamic $brodila
 
 		if pcs_horny >= 70 and zoo > 0 and streetdogday ! daystart:act 'Coitus':gt 'mod_bestmod_petdog', 'polactdog'
 	end
 
-	act 'Leave':gt $bm_oldloc
+	act 'Leave':dynamic $brodila
 
 	act 'Have <<$namesob>> put down':
 		cls
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/dog2.jpg"></center>'
 		'<<$namesob>> puts on his saddest face and whimpers'
 
-		act 'Aww... I can''t do it': gt $bm_oldloc
+		act 'Aww... I can''t do it': dynamic $brodila
 
 		act 'Do it':
 			sobaka = 0
 			zoo = 0
 			minut += 60
 			'You take your dog to the vet, who puts him down.'
-			gt $bm_oldloc
+			dynamic $brodila
 		end
 	end
 end
@@ -88,7 +84,7 @@ if $ARGS[0] = 'polactdog':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			if QWdogReiq > 0:act 'Leave':gt $bm_oldloc
+			if QWdogReiq > 0:act 'Leave':dynamic $brodila
 			if QWdogReiq = 0:act 'Leave':gt 'mod_bestmod_petdog', 'dogreiqdi'
 		end
 	end
@@ -115,7 +111,7 @@ if $ARGS[0] = 'polactdog':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			if QWdogReiq > 0:act 'Leave':gt $bm_oldloc
+			if QWdogReiq > 0:act 'Leave':dynamic $brodila
 			if QWdogReiq = 0:act 'Leave':gt 'mod_bestmod_petdog', 'dogreiqdi'
 		end
 	end
@@ -130,7 +126,7 @@ if $ARGS[0] = 'dogreiqdi':
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/girl.jpg"></center>'
 	'Once you calm down and adjust yourself, you kiss <<$namesob>> and decide to head home. Recovering after intercourse, you struggle to your feet. While adjusting your clothes, you notice a girl. She watches with curiosity and excitement explicitly looking for all your shows. The girl opens her mouth and wants to say something, but stops and runs away. You watch in a mild surprise, but also the fact that you were watched getting filled. You call <<$namesob>> and go home.'
 
-	act 'Leave':gt $bm_oldloc
+	act 'Leave':dynamic $brodila
 end
 
 if $ARGS[0] = 'gamedog':
@@ -143,7 +139,7 @@ if $ARGS[0] = 'gamedog':
 	'Suddenly, your pussy starts to itch. You can''t understand why, but you strongly want sex. Then, seeing <<$namesob>> penis poking out of its sheeth, you have a crazy idea.'
 	'You could have some fun playing with his member.'
 
-	act 'Leave':pcs_dom += 5 & gt $bm_oldloc
+	act 'Leave':pcs_dom += 5 & dynamic $brodila
 
 	act 'Get licked':
 		cla
@@ -217,7 +213,7 @@ if $ARGS[0] = 'gamedog':
 
 				if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-				act 'Release <<$namesob>> and go': gt $bm_oldloc
+				act 'Release <<$namesob>> and go':dynamic $brodila
 			end
 		end
 	end
@@ -341,7 +337,7 @@ if $ARGS[0] = 'hardcoredog':
 											gs 'arousal', 'end'
 											gs 'stat'
 
-											act 'Get out of bed': gt $bm_oldloc
+											act 'Get out of bed':dynamic $brodila
 
 											if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 										end
@@ -411,7 +407,7 @@ if $ARGS[0] = 'hardcoredog':
 			end
 		end
 
-		act 'Leave': gt $bm_oldloc
+		act 'Leave':dynamic $brodila
 	end
 
 	act 'Walk <<$namesob>>':
@@ -421,7 +417,7 @@ if $ARGS[0] = 'hardcoredog':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/dog_walk.jpg"></center>'
 		'<center><b>You walk <<$namesob>> and see that he is very excited.</center></b>'
-		act 'Go home': gt $bm_oldloc
+		act 'Go home':dynamic $brodila
 
 		act 'Find somewhere private':
 			cla
@@ -475,7 +471,7 @@ if $ARGS[0] = 'cumshot2':
 
 	if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Leave': gt $bm_oldloc
+	act 'Leave':dynamic $brodila
 end
 
 if $ARGS[0] = 'cumshot1':
@@ -497,7 +493,7 @@ if $ARGS[0] = 'cumshot1':
 
 	if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Leave': gt $bm_oldloc
+	act 'Leave':dynamic $brodila
 end
 
 if $ARGS[0] = 'zoof14':
@@ -516,7 +512,7 @@ if $ARGS[0] = 'zoof14':
 
 	if REXQW = 0:act 'Look around':gt 'mod_bestmod_petdog', 'zoof16'
 
-	act 'Go home': gt $bm_oldloc
+	act 'Go home':dynamic $brodila
 end
 
 if $ARGS[0] = 'zoof15':
@@ -536,7 +532,7 @@ if $ARGS[0] = 'zoof15':
 
 	if REXQW =0:act 'Look around':gt 'mod_bestmod_petdog', 'zoof16'
 
-	act 'Go home': gt $bm_oldloc
+	act 'Go home':dynamic $brodila
 end
 
 if $ARGS[0] = 'zoof16':
@@ -585,7 +581,7 @@ if $ARGS[0] = 'zoof27':
 
 		if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-		act 'Get up and get dressed': gt $bm_oldloc
+		act 'Get up and get dressed':dynamic $brodila
 	end
 
 	act 'Undress and play lady dog':
@@ -603,7 +599,7 @@ if $ARGS[0] = 'zoof27':
 
 		if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-		act 'Get up and get dressed': gt $bm_oldloc
+		act 'Get up and get dressed':dynamic $brodila
 	end
 end
 
@@ -688,7 +684,7 @@ if $ARGS[0] = 'dogcancerstyle':
 
 	if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Get up and get dressed': gt $bm_oldloc
+	act 'Get up and get dressed':dynamic $brodila
 end
 
 
@@ -707,7 +703,7 @@ if $ARGS[0] = 'dogmissionarystyle':
 
 	if REXQW = 1:act 'Call Sonia':xgt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Get up and get dressed': gt $bm_oldloc
+	act 'Get up and get dressed':dynamic $brodila
 end
 
 if $ARGS[0] = 'dzoof1':