Browse Source

[fixes] bely now really returns the character to where he found her

julzor 5 years ago
parent
commit
3ba95cdaca
4 changed files with 26 additions and 22 deletions
  1. 5 1
      locations/BelSex.qsrc
  2. 17 17
      locations/belgang.qsrc
  3. 2 2
      locations/pavCommercial.qsrc
  4. 2 2
      locations/pavResidential.qsrc

+ 5 - 1
locations/BelSex.qsrc

@@ -421,7 +421,11 @@ if $ARGS[0] = 'shower':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Leave': gt 'pavResidential'
+			if return_residential = 0: 
+				act 'Leave': gt 'pavCommercial'
+			else
+				act 'Leave': gt 'pavResidential'
+			end	
 		end
 	end
 end

+ 17 - 17
locations/belgang.qsrc

@@ -34,9 +34,9 @@ if $ARGS[0] = 'workofdebt':
 			end
 			'He signals his crew to get back in the jeep. You barely manage to dodge the spray of pebbles and dirt the spinning tires spew your way, as they drive off as fast as they can, probably on their way to another ''business appointment''.'
 			
-			if $ARGS[1] = 'commercial': 
+			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			elseif $ARGS[1] = 'residential':
+			else
 				act 'Move on': gt 'pavResidential'
 			end
 		end
@@ -57,11 +57,11 @@ if $ARGS[0] = 'workofdebt':
 			'You owe him: <<belgangPay>> <b>₽</b>'
 			'This week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 			
-			if $ARGS[1] = 'commercial': 
+			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			elseif $ARGS[1] = 'residential':
+			else
 				act 'Move on': gt 'pavResidential'
-			end				
+			end			
 		end
 	end
 	
@@ -123,9 +123,9 @@ elseif $ARGS[0] = 'payday':
 			end
 			'He signals his crew to get back in the jeep. You barely manage to dodge the spray of pebbles and dirt the spinning tires spew your way, as they drive off as fast as they can, probably on their way to another ''business appointment''.'
 			
-			if $ARGS[1] = 'commercial': 
+			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			elseif $ARGS[1] = 'residential':
+			else
 				act 'Move on': gt 'pavResidential'
 			end
 		end
@@ -154,9 +154,9 @@ elseif $ARGS[0] = 'payday':
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 				
-				if $ARGS[1] = 'commercial': 
+				if return_residential = 0: 
 					act 'Move on': gt 'pavCommercial'
-				elseif $ARGS[1] = 'residential':
+				else
 					act 'Move on': gt 'pavResidential'
 				end	
 			end
@@ -184,9 +184,9 @@ elseif $ARGS[0] = 'payday':
 			'You owe him: <<belgangPay>> <b>₽</b>'
 			'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 			
-			if $ARGS[1] = 'commercial': 
+			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			elseif $ARGS[1] = 'residential':
+			else
 				act 'Move on': gt 'pavResidential'
 			end	
 		end
@@ -216,11 +216,11 @@ elseif $ARGS[0] = 'payday':
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 				
-				if $ARGS[1] = 'commercial': 
+				if return_residential = 0: 
 					act 'Thank him and leave': gt 'pavCommercial'
-				elseif $ARGS[1] = 'residential':
+				else
 					act 'Thank him and leave': gt 'pavResidential'
-				end	
+				end
 			elseif belgangPayextension = 1:	
 				belgangPayextension += 1
 				belgangPay += 5000
@@ -237,11 +237,11 @@ elseif $ARGS[0] = 'payday':
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 								
-				if $ARGS[1] = 'commercial': 
+				if return_residential = 0: 
 					act 'Thank him and leave': gt 'pavCommercial'
-				elseif $ARGS[1] = 'residential':
+				else
 					act 'Thank him and leave': gt 'pavResidential'
-				end	
+				end
 			else 
 				'He frowns, abruptly cutting you off. You can see the disapproval in his eyes when you glance up. "That is very unfortunate <<$pcs_nickname>>. I had such high hopes for you," he says. "I guess we will have to find an alternative way for you to pay off your debts."'
 				'He then directs his attention to two of his henchmen: "She''s coming with us."'

+ 2 - 2
locations/pavCommercial.qsrc

@@ -136,7 +136,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
 
-	act 'Go to the jeep': gt 'belgang', 'payday', 'commercial'
+	act 'Go to the jeep': return_residential = 0 & gt 'belgang', 'payday'
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	cla & *clr
 	daybelisex = daystart
@@ -145,7 +145,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang. Your heart skips a beat as you notice one of them pointing at you, and soon they pull over.'
 
-	act 'Go to the jeep': gt 'belgang', 'workofdebt', 'commercial'
+	act 'Go to the jeep': return_residential = 0 & gt 'belgang', 'workofdebt'
 end
 
 --- pavCommercial ---------------------------------

+ 2 - 2
locations/pavResidential.qsrc

@@ -290,7 +290,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
 
-	act 'Go to the jeep': gt 'belgang', 'payday', 'residential' 	
+	act 'Go to the jeep': return_residential = 1 & gt 'belgang', 'payday' 	
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	cla & *clr
 	daybelisex = daystart
@@ -299,7 +299,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang. Your heart skips a beat as you notice one of them pointing at you, and soon they pull over.'
 		
-	act 'Go to the jeep': gt 'belgang', 'workofdebt', 'residential' 	
+	act 'Go to the jeep': return_residential = 1 & gt 'belgang', 'workofdebt' 	
 end
 
 --- pavResidential ---------------------------------