Browse Source

[fixes] moved the leave option to the top in ivanEv

julzor 5 years ago
parent
commit
b6e11c2e8d
1 changed files with 15 additions and 16 deletions
  1. 15 16
      locations/IvanEv.qsrc

+ 15 - 16
locations/IvanEv.qsrc

@@ -3,7 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = '':
-	cls
+	*clr & cla
 	numnpc = 3
 	ivansportday = daystart
 	gs 'stat'
@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 			'Ivan pauses for a second, and then suggests. "Hey! I''m sparring with Vitek Kotov today. It''s part of my preparation for the big match. You can come watch if you''d like?"'
 
 			act '"Sure, that sounds like fun!"':
-				cls
+				*clr & cla
 				kotovVSprohorov = 1
 				gs 'stat'
 				'That could be interesting! You follow Ivan into the hall where the local boxing club has their training sessions. It''s impossible to miss the smell of stale sweat and leather, but in a way it seems oddly fitting for a venue like this.'
@@ -32,7 +32,7 @@ if $ARGS[0] = '':
 				'Ivan smirks at him and quickly puts on his headgear and gloves, before getting in the ring to face Vitek. Most of the other guys leave their training and come over to watch them spar.'
 
 				act 'Watch them':
-					cls
+					*clr & cla
 					minut += 3
 					pcs_dom += 1
 					gs 'stat'
@@ -44,7 +44,7 @@ if $ARGS[0] = '':
 					'Ivan just has a sip of water while he waits for round 2. He still looks fresh, while Vitek is sweating profusely already.'
 
 					act 'Round 2':
-						cls
+						*clr & cla
 						minut += 3
 						pcs_dom += 1
 						gs 'stat'
@@ -53,7 +53,7 @@ if $ARGS[0] = '':
 						'This time it''s Ivan who gets the majority of the instructions. The coach scolds him, while wiping the blood off his face: "Ivan, you need to keep your distance. Don''t let him get close!"'
 
 						act 'Round 3':
-							cls
+							*clr & cla
 							minut += 3
 							pcs_dom += 1
 							gs 'stat'
@@ -64,7 +64,7 @@ if $ARGS[0] = '':
 							'After that hit, Vitek is noticeably more quiet and tries to dodge and evade Ivan''s blows more often, while Ivan tries to push his advantage and puts a lot of energy into trying to find an opening. When the third round ends, both of the guys are sweating and panting heavily. While you find yourself appreciating their sweat covered bodies, finding yourself mildly turned on.'
 
 							act 'Round 4':
-								cls
+								*clr & cla
 								minut += 3
 								pcs_dom += 1
 								gs 'stat'
@@ -76,7 +76,7 @@ if $ARGS[0] = '':
 								'The trainer just shrugs. "Whatever, Vitek. You know what you''re doing."'
 
 								act 'Ask the coach who won':
-									cls
+									*clr & cla
 									minut += 3
 									gs 'stat'
 									'You approach the elderly coach and ask. "Sir, if you don''t mind me asking who won?"'
@@ -86,7 +86,7 @@ if $ARGS[0] = '':
 									'Vitek angrily takes off his gloves and throws them away, before heading to the corner where the weights are. The coach sighs while he watches him walk away, and adds. "That boy is all muscle, and no brains. Such a shame, he could''ve been a good boxer with a better mindset."'
 
 									act '"Can I try boxing too?"':
-										cls
+										*clr & cla
 										minut += 3
 										gs 'stat'
 										'This looks interesting! You ask the old trainer. "This looks like fun can I come and train with you too?"'
@@ -108,8 +108,7 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'School Chat':
-	*clr
-	cla
+	*clr & cla
 	numnpc = 3
 	minut += 5
 	gs'stat'
@@ -123,6 +122,12 @@ if $ARGS[0] = 'School Chat':
 	if npc_rel['A3'] >= 60 and npc_rel['A3'] < 80:'You and Ivan have a good relationship.'
 	if npc_rel['A3'] >= 80:'You and Ivan have a great relationship.'
 
+	if $loc ! 'gdkin':
+		act 'Leave': gt 'gschool_lessons', 'short_break'
+	else
+		act 'Move away': gt $loc, $metka
+	end
+	
 	act 'Chat':
 		cla
 		if $loc ! 'gdkin':
@@ -187,12 +192,6 @@ if $ARGS[0] = 'School Chat':
 			act 'Move away':gt $loc, $metka
 		end
 	end
-
-	if $loc ! 'gdkin':
-		act 'Leave': gt 'gschool_lessons', 'short_break'
-	else
-		act 'Move away': gt $loc, $metka
-	end
 end
 
 --- IvanEv ---------------------------------