Преглед на файлове

Removed din2 gosubs from loadg and begin, fixed option clearing and return code, plus set $loc in pavResidential

KevinSmarts преди 8 години
родител
ревизия
c406e89576
променени са 4 файла, в които са добавени 41 реда и са изтрити 23 реда
  1. 0 1
      locations/begin
  2. 39 21
      locations/events
  3. 0 1
      locations/loadg
  4. 2 0
      locations/pavResidential

+ 0 - 1
locations/begin

@@ -2,7 +2,6 @@
 gs 'din_pav'
 gs 'dinSex2'
 gs 'dina'
-gs 'din2'
 gs 'din_van'
 gs 'din_bad'
 gs 'obj_din'

+ 39 - 21
locations/events

@@ -103,11 +103,11 @@ if $ARGS[0] = 'read':
 					'For an hour you read the book.'
 				end
 
-				act 'Close the book':$loc, $Metka
+				act 'Close the book':gt $loc, $Metka
 			end
 		end
 
-		act ' Close the book':$loc, $Metka
+		act ' Close the book':gt $loc, $Metka
 	end
 	
 	if cookmag = 0 and fashmag = 0 and compmag = 0 and biomag = 0 and knitmag = 0 and fitmag = 0:
@@ -120,66 +120,72 @@ if $ARGS[0] = 'read':
 
 			if cookmag = 1:
 				act 'Read your cooking magazine':
+					cla
 					cookmag = 0
 					manna += 5
 					minut += 30
 					'You relax for half an hour reading your cooking magazine.'
-					act 'Return':$loc, $Metka
+					act 'Return':gt $loc, $Metka
 				end
 			end
 
 			if fashmag = 1:
 				act 'Read your fashion magazine':
+					cla
 					fashmag = 0
 					manna += 5
 					minut += 30
 					'You relax for half an hour reading your fashion magazine.'
-					act 'Return':$loc, $Metka
+					act 'Return':gt $loc, $Metka
 				end
 			end
 
 			if compmag = 1:
 				act 'Read your computing magazine':
+					cla
 					compmag = 0
 					manna += 5
 					minut += 30
 					'You relax for half an hour reading your computing magazine.'
-					act 'Return':$loc, $Metka
+					act 'Return':gt $loc, $Metka
 				end
 			end
 
 			if biomag = 1:
 				act 'Read your biographical magazine':
+					cla
 					biomag = 0
 					manna += 5
 					minut += 30
 					'You relax for half an hour reading your biographical magazine.'
-					act 'Return':$loc, $Metka
+					act 'Return':gt $loc, $Metka
 				end
 			end
 
 			if knitmag = 1:
 				act 'Read your knitting magazine':
+					cla
 					knitmag = 0
 					manna += 5
 					minut += 30
 					if poSkill <= 100: poSkill += rand(1,3)
 					'You relax for half an hour reading your knitting magazine.'
-					act 'Return':$loc, $Metka
+					act 'Return':gt $loc, $Metka
 				end
 			end
 
 			if fitmag = 1:
 				act 'Read your fitness magazine':
+					cla
 					fitmag = 0
 					manna += 5
 					minut += 30
 					'You relax for half an hour reading your fitness magazine.'
-					act 'Return':$loc, $Metka
+					act 'Return':gt $loc, $Metka
 				end
 			end
 
-			act 'Return':$loc, $Metka
+			act 'Return':gt $loc, $Metka
 		end
 	end
 end
@@ -188,28 +194,34 @@ if $ARGS[0] = 'snkayf':
 	snkz = RAND(1,6)
 	if tanga = 1:tanga = 0
 	if snkz = 1:
-		gt'gdk' & hour += 2
+		hour += 2
+		gt'gdk'
 	end
 
 	if snkz = 2:
-		gt'gskver' & hour += 2
+		hour += 2
+		gt'gskver'
 	end
 
 	if snkz = 3:
-		gt'bedrPar' & hour += 2
+		hour += 2
+		gt'bedrPar'
 	end
 
 	if snkz = 4:
-		gt'gopskver' & hour += 2
+		hour += 2
+		gt'gopskver'
 	end
 
 	if snkz = 5:
-		gt 'vokmantoiev', 'female' & hour += 2
+		hour += 2
+		gt 'vokmantoiev', 'female'
 	end
 
 	if snkz = 6:
 		$clothingworntype = 'nude'
-		gt'Glake' & hour += 2
+		hour += 2
+		gt'Glake'
 	end
 end
 
@@ -251,27 +263,33 @@ if $ARGS[0] = 'snkayf1':
 	snkz = RAND(1,6)
 	if tanga = 1:tanga = 0
 	if snkz = 1:
-		gt'park','start' & hour += 2
+		hour += 2
+		gt'park','start'
 	end
 
 	if snkz = 2:
-		gt'down' & hour += 2
+		hour += 2
+		gt'down'
 	end
 
 	if snkz = 3:
-		gt'nord' & hour += 2
+		hour += 2
+		gt'nord'
 	end
 
 	if snkz = 4:
-		gt'street' & hour += 2
+		hour += 2
+		gt'street'
 	end
 
 	if snkz = 5:
-		gt'dachi' & hour += 2
+		hour += 2
+		gt'dachi'
 	end
 
 	if snkz = 6:
-		gt'lake','start' & hour += 2
+		hour += 2
+		gt'lake','start'
 	end
 end
 

+ 0 - 1
locations/loadg

@@ -8,7 +8,6 @@ end
 gs 'din_pav'
 gs 'dinSex2'
 gs 'dina'
-gs 'din2'
 gs 'din_van'
 gs 'din_bad'
 gs 'obj_din'

+ 2 - 0
locations/pavResidential

@@ -2,6 +2,8 @@
 
 $metka = $ARGS[0]
 $loc = $CURLOC
+$metkaM = $ARGS[0]
+$locM = $CURLOC
 $metkaStreet = $ARGS[0]
 $locStreet = $CURLOC
 CLOSE ALL