Browse Source

Set $loc in mod_bestmod_petdog, use $loc and not $curloc in entry file for petdog lines, renamed another var to follow bm_ prefix convention

oldentree 5 years ago
parent
commit
f9816f5f37
2 changed files with 28 additions and 24 deletions
  1. 2 2
      locations/mod_bestmod.qsrc
  2. 26 22
      locations/mod_bestmod_petdog.qsrc

+ 2 - 2
locations/mod_bestmod.qsrc

@@ -7,9 +7,9 @@ if $loc = 'Miroslava' and npc_QW['A60'] >= 30 and hour < 19 and month >= 5 and m
 
 if $loc = 'zoomagazine' and $metka = 'start' and menu_off = 0: gs 'mod_bestmod_petshop', 'buy_dog'
 
-if $curloc = 'korr' 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'', $loc"><<$namesob>></a>, is lying on the floor near the entrance.'
 
-if $curloc = 'korr2x' 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'', $loc"><<$namesob>></a>'
 
 if ($loc = 'sitr' or $loc = 'sitr2x') and menu_off = 0: gs 'mod_bestmod_sitr'
 

+ 26 - 22
locations/mod_bestmod_petdog.qsrc

@@ -1,12 +1,16 @@
 # 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
-	$mod_bestmod_oldloc = $ARGS[1]
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/dog2.jpg"></center>'
 
@@ -23,26 +27,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 $mod_bestmod_oldloc
+		act 'Go back home': gt $bm_oldloc
 
 		if pcs_horny >= 70 and zoo > 0 and streetdogday ! daystart:act 'Coitus':gt 'mod_bestmod_petdog', 'polactdog'
 	end
 
-	act 'Leave':gt $mod_bestmod_oldloc
+	act 'Leave':gt $bm_oldloc
 
 	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 $mod_bestmod_oldloc
+		act 'Aww... I can''t do it': gt $bm_oldloc
 
 		act 'Do it':
 			sobaka = 0
 			zoo = 0
 			minut += 60
 			'You take your dog to the vet, who puts him down.'
-			gt $mod_bestmod_oldloc
+			gt $bm_oldloc
 		end
 	end
 end
@@ -84,7 +88,7 @@ if $ARGS[0] = 'polactdog':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			if QWdogReiq > 0:act 'Leave':gt $mod_bestmod_oldloc
+			if QWdogReiq > 0:act 'Leave':gt $bm_oldloc
 			if QWdogReiq = 0:act 'Leave':gt 'mod_bestmod_petdog', 'dogreiqdi'
 		end
 	end
@@ -111,7 +115,7 @@ if $ARGS[0] = 'polactdog':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			if QWdogReiq > 0:act 'Leave':gt $mod_bestmod_oldloc
+			if QWdogReiq > 0:act 'Leave':gt $bm_oldloc
 			if QWdogReiq = 0:act 'Leave':gt 'mod_bestmod_petdog', 'dogreiqdi'
 		end
 	end
@@ -126,7 +130,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 $mod_bestmod_oldloc
+	act 'Leave':gt $bm_oldloc
 end
 
 if $ARGS[0] = 'gamedog':
@@ -139,7 +143,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 $mod_bestmod_oldloc
+	act 'Leave':pcs_dom += 5 & gt $bm_oldloc
 
 	act 'Get licked':
 		cla
@@ -213,7 +217,7 @@ if $ARGS[0] = 'gamedog':
 
 				if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-				act 'Release <<$namesob>> and go': gt $mod_bestmod_oldloc
+				act 'Release <<$namesob>> and go': gt $bm_oldloc
 			end
 		end
 	end
@@ -337,7 +341,7 @@ if $ARGS[0] = 'hardcoredog':
 											gs 'arousal', 'end'
 											gs 'stat'
 
-											act 'Get out of bed': gt $mod_bestmod_oldloc
+											act 'Get out of bed': gt $bm_oldloc
 
 											if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 										end
@@ -407,7 +411,7 @@ if $ARGS[0] = 'hardcoredog':
 			end
 		end
 
-		act 'Leave': gt $mod_bestmod_oldloc
+		act 'Leave': gt $bm_oldloc
 	end
 
 	act 'Walk <<$namesob>>':
@@ -417,7 +421,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': $mod_bestmod_oldloc
+		act 'Go home': gt $bm_oldloc
 
 		act 'Find somewhere private':
 			cla
@@ -471,7 +475,7 @@ if $ARGS[0] = 'cumshot2':
 
 	if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Leave': gt $mod_bestmod_oldloc
+	act 'Leave': gt $bm_oldloc
 end
 
 if $ARGS[0] = 'cumshot1':
@@ -493,7 +497,7 @@ if $ARGS[0] = 'cumshot1':
 
 	if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Leave': gt $mod_bestmod_oldloc
+	act 'Leave': gt $bm_oldloc
 end
 
 if $ARGS[0] = 'zoof14':
@@ -512,7 +516,7 @@ if $ARGS[0] = 'zoof14':
 
 	if REXQW = 0:act 'Look around':gt 'mod_bestmod_petdog', 'zoof16'
 
-	act 'Go home': gt $mod_bestmod_oldloc
+	act 'Go home': gt $bm_oldloc
 end
 
 if $ARGS[0] = 'zoof15':
@@ -532,7 +536,7 @@ if $ARGS[0] = 'zoof15':
 
 	if REXQW =0:act 'Look around':gt 'mod_bestmod_petdog', 'zoof16'
 
-	act 'Go home': gt $mod_bestmod_oldloc
+	act 'Go home': gt $bm_oldloc
 end
 
 if $ARGS[0] = 'zoof16':
@@ -553,7 +557,7 @@ if $ARGS[0] = 'zoof16':
 		'"YES!" You call back.'
 		'"Come see me, I would like to talk about your wonderful hobby." She says, throwing you a business card as she leaves.'
 
-		act 'Go home': gt $mod_bestmod_oldloc
+		act 'Go home': gt $bm_oldloc
 	end
 end
 
@@ -581,7 +585,7 @@ if $ARGS[0] = 'zoof27':
 
 		if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-		act 'Get up and get dressed': gt $mod_bestmod_oldloc
+		act 'Get up and get dressed': gt $bm_oldloc
 	end
 
 	act 'Undress and play lady dog':
@@ -599,7 +603,7 @@ if $ARGS[0] = 'zoof27':
 
 		if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-		act 'Get up and get dressed': gt $mod_bestmod_oldloc
+		act 'Get up and get dressed': gt $bm_oldloc
 	end
 end
 
@@ -684,7 +688,7 @@ if $ARGS[0] = 'dogcancerstyle':
 
 	if REXQW = 1:act 'Call Sonia':gt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Get up and get dressed': gt $mod_bestmod_oldloc
+	act 'Get up and get dressed': gt $bm_oldloc
 end
 
 
@@ -703,7 +707,7 @@ if $ARGS[0] = 'dogmissionarystyle':
 
 	if REXQW = 1:act 'Call Sonia':xgt 'mod_bestmod_petdog', 'dzoof1'
 
-	act 'Get up and get dressed': gt $mod_bestmod_oldloc
+	act 'Get up and get dressed': gt $bm_oldloc
 end
 
 if $ARGS[0] = 'dzoof1':