Browse Source

[fixed] dead end in pornstudio and kit_din, endless music in military and pavsharedapt, blocked access to dangeon in obekt2
[added] water bottle to pavsharedapt

julzor 5 years ago
parent
commit
ec50333c98

+ 1 - 0
locations/Military.qsrc

@@ -1,6 +1,7 @@
 # Military
 
 if $ARGS[0] = 'start':
+	CLOSE ALL
 	$metka = $ARGS[0]
 	$loc = $CURLOC
 	$sexloc = $CURLOC

+ 1 - 1
locations/kit_din.qsrc

@@ -484,7 +484,7 @@ $edaD = {
 			end
 			gs 'stat'
 
-			act 'Get up from the table':gt $curloc
+			act 'Get up from the table':gt $loc, $metka
 		end
 	end
 }

+ 8 - 7
locations/obekt2.qsrc

@@ -21,13 +21,14 @@ act 'Leave the construction site':
 	gt 'obekt'
 end
 
-act 'Try to sneak in':
-	cla & *clr
-	menu_off = 1
-	minut += 10
-	gs 'stat'
-	gt 'dangeon'
-end
+!!Access blocked until it is needed again
+!!act 'Try to sneak in':
+!!	cla & *clr
+!!	menu_off = 1
+!!	minut += 10
+!!	gs 'stat'
+!!	gt 'dangeon'
+!!end
 
 --- obekt2 ---------------------------------
 

+ 4 - 4
locations/pavSharedApt.qsrc

@@ -174,6 +174,7 @@ end
 
 ! door No 3 - shared
 if $ARGS[0] = 'doorNo30':
+	CLOSE ALL
 	$menu_loc = 'pavSharedApt'
 	$menu_arg = 'doorNo30'
 	menu_off = 1
@@ -620,13 +621,12 @@ if $ARGS[0] = 'kitchen':
 	if edahot > 0:'<a href="exec: dynamic $edahotd ">On the table is ready meal (0:30).</a>'
 	if edaD = 0 and eda = 0:'<b><font color="red">You have nothing to eat, the refrigerator is empty!</font></b>'
 
-	if eda >= 3:
-		'<a href="exec: gt ''pavSharedApt'', ''cookForGuys''">Cook meal (1:30) for the guys</a>'
-	end
-
+	if eda >= 3: '<a href="exec: gt ''pavSharedApt'', ''cookForGuys''">Cook meal (1:30) for the guys</a>'
+	
 	dynamic $edasnack
 	dynamic $driwater
 	dynamic $dritea
+	dynamic $fill_bottle
 	dynamic $pranik
 	dynamic $edaD
 	dynamic $fatdel

+ 1 - 0
locations/pornstudio.qsrc

@@ -789,6 +789,7 @@ if $ARGS[0] = 'yes':
 			'"Nearly..." You plead.'
 			'"Right. Then here''s my card, be sure to come back when you are old enough.'
 			fakepassport = 2
+			act 'Leave': gt 'pornstudio', 'start'
 			exit
 		end