1
0
Prechádzať zdrojové kódy

[fixed] wrong variable in bed2 and wrong label in pod_ezd

julzor 5 rokov pred
rodič
commit
9f8c3ec754
2 zmenil súbory, kde vykonal 20 pridanie a 13 odobranie
  1. 1 1
      locations/bed2.qsrc
  2. 19 12
      locations/pod_ezd.qsrc

+ 1 - 1
locations/bed2.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = 'sleep':
 			'You decide to leave your butt plug and vibrator in.'
 		end
 	elseif analplug = 1 or vibrator = 1:
-		if analplug = 1:
+		if analplugin = 1:
 			if bedAnal = 1:
 				*nl
 				'You remove your butt plug.'

+ 19 - 12
locations/pod_ezd.qsrc

@@ -466,10 +466,8 @@ if $ARGS[0] = 'floor2_events':
 	killvar 'floor2'
 end
 
-if $ARGS[0] = 'floor3_events':
-	floor3 = rand(1,22)
-	if (floor3 <= 3 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump1
+if $ARGS[0] = 'gopnik_events':
+	if ARGS[1] = 1:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -478,8 +476,7 @@ if $ARGS[0] = 'floor3_events':
 		'You see Vasily standing in the stairwell having a smoke.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Ask him for a smoke': gt 'pod_ezd', 'vasily_smoke'
-	elseif (floor3 <= 6 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump2
+	elseif ARGS[1] = 2:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -488,8 +485,7 @@ if $ARGS[0] = 'floor3_events':
 		'Vasily and Dan are standing outside uncle Sergey''s apartment, smoking a cigarette.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Ask them for a smoke': gt 'pod_ezd', 'smoke_danvas'
-	elseif (floor3 <= 9 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump3
+	elseif ARGS[1] = 3:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -498,8 +494,7 @@ if $ARGS[0] = 'floor3_events':
 		'Vasily, Vitek and Dan are standing outside uncle Sergey''s apartment, smoking a cigarette.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Ask them for a smoke': gt 'pod_ezd', 'smoke_vitdanvas'
-	elseif (floor3 <= 11 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
-		:gopnik_jump4
+	elseif ARGS[1] = 4:
 		*clr & cla
 		menu_off = 1
 		minut += 2
@@ -508,6 +503,19 @@ if $ARGS[0] = 'floor3_events':
 		'Lena is sitting outside uncle Sergey''s apartment, drinking.'
 		act 'Continue': gt 'pod_ezd', 'etaj_3'
 		act 'Talk to Lena': gt 'pod_ezd', 'lena_chat'
+	end
+end
+
+if $ARGS[0] = 'floor3_events':
+	floor3 = rand(1,22)
+	if (floor3 <= 3 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 1
+	elseif (floor3 <= 6 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 2
+	elseif (floor3 <= 9 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 3
+	elseif (floor3 <= 11 and hour >= 14 and hour < 17) or (floor3 <= 5 and week = 7 and hour >= 20 and hour <= 23) or (floor3 <= 5 and week >= 6 and hour >= 11 and hour < 14):
+		gt 'pod_ezd', 'gopnik_events', 4
 	elseif floor3 > 11 and floor3 <= 14 and hour >= 15 and hour <= 23:
 		*clr & cla
 		menu_off = 1
@@ -682,8 +690,7 @@ if $ARGS[0] = 'floor5_events':
 		act 'Leave': gt 'pod_ezd', 'etaj_5'
 		act 'Join them':
 			if rand(0,2) = 2:
-				gopnik_rand = rand(1,4)
-				jump 'gopnik_jump<<gopnik_rand>>'
+				gt 'pod_ezd', 'gopnik_events', rand(1,4)
 			else
 				gt 'pod_ezd', 'gopnik_group_chat'
 			end