Browse Source

rearranged the actions and removed two bathroom dynamics from the bedroom like in the pavlovsk apartment

julzor 6 years ago
parent
commit
cf38b868bc
3 changed files with 11 additions and 13 deletions
  1. 9 8
      locations/balkon
  2. 0 3
      locations/bedr
  3. 2 2
      locations/sitr

+ 9 - 8
locations/balkon

@@ -39,14 +39,6 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if siga >= 1:act 'Light a cigarette':gt 'balkon2', 'kurit'
-
-	!!!Probably CV edition
-	if pcs_horny >= 50 and pcs_exhibition > 20:
-		act 'Masturbate':gt 'balkon2', 'masopt'
-	end
-
-	act 'Approach the railing':gt 'balkon2', 'niz'
 	act 'Return to the living room':
 		if $loc = 'sitr': 
 			gt 'sitr'
@@ -54,6 +46,15 @@ if $ARGS[0] = 'start':
 			gt 'sitr2x'
 		end
 	end
+	
+	act 'Approach the railing':gt 'balkon2', 'niz'
+	
+	if siga >= 1:act 'Light a cigarette':gt 'balkon2', 'kurit'
+	
+	!!!Probably CV edition
+	if pcs_horny >= 50 and pcs_exhibition > 20:
+		act 'Masturbate':gt 'balkon2', 'masopt'
+	end	
 end
 
 --- balkon ---------------------------------

+ 0 - 3
locations/bedr

@@ -192,9 +192,6 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 	end
 end
 
-dynamic $wearpan
-dynamic $removepan
-
 if sick >= 1:
 	act 'Go to sleep (You''re sick)':
 		cla

+ 2 - 2
locations/sitr

@@ -94,9 +94,9 @@ if student > 0 and kursovik < 100:
 	end
 end
 
-gs 'events', 'read'
+act 'Go out on the balcony': gt 'balkon','start'
 
-act 'Go out to the balcony': gt 'balkon','start'
+gs 'events', 'read'
 
 if zoo >= 6 and sobaka ! 0:
 	if husband > 0 and husbandrink ! 10: