Browse Source

Merge remote-tracking branch 'upstream/master' into ML-DEV

Netuttki 4 years ago
parent
commit
8482ac2491
1 changed files with 8 additions and 4 deletions
  1. 8 4
      locations/kit_din.qsrc

+ 8 - 4
locations/kit_din.qsrc

@@ -104,7 +104,7 @@ $santehnikend = {
 	if money >= 1500:
 		act 'Pay':
 			money -= 1500
-			gt'kuhr'
+			gt $curloc
 		end
 	elseif money < 1500:
 		'You do not have enough cash on you.'
@@ -113,7 +113,7 @@ $santehnikend = {
 			act 'Pay':
 				money = money+stolmoney & stolmoney = 0
 				money -= 1500
-				gt'kuhr'
+				gt $curloc
 			end
 		elseif money+stolmoney + karta >= 1500:
 			'You know that even with your stash in the apartment you are short, but you could get the extra from the ATM.'
@@ -122,7 +122,7 @@ $santehnikend = {
 				money = money + stolmoney & stolmoney = 0
 				karta -= (1500 - money)
 				money = 0
-				gt'kuhr'
+				gt $curloc
 			end
 		elseif money+stolmoney < 1500:
 			act 'I did not have enough money':
@@ -145,6 +145,9 @@ $santehnikend = {
 				gs 'stat'
 				
 				act 'Continue':
+! here I need work around the direct return address and get from kuhr korr and from kuhr2x korr2x
+					$sexloc = 'korr' + $mid($curloc,5,2)
+
 					if pcs_apprnc < 60:
 						*clr & cla
 						guy += 1
@@ -154,8 +157,9 @@ $santehnikend = {
 						gs 'arousal', 'bj', 5, 'sub', 'deepthroat', 'rough'
 						gs 'arousal', 'end'
 						gs 'stat'
+
 				
-						act 'Leave':gt 'korr'
+						act 'Leave':gt $sexloc
 					elseif pcs_apprnc >= 60:
 						picrand = 90
 						gt 'sex', 'minet'