1
0
Просмотр исходного кода

[fixed] missing text in voltrener, missing $menu_arg in nichutil

julzor 4 лет назад
Родитель
Сommit
06253330f1
2 измененных файлов с 11 добавлено и 24 удалено
  1. 7 9
      locations/Voltrener.qsrc
  2. 4 15
      locations/nichUtil.qsrc

+ 7 - 9
locations/Voltrener.qsrc

@@ -153,11 +153,11 @@ if $ARGS[0] = 'talk':
 				*clr & cla
 				gs 'stat'
 				if pav_slut <= 25:
-					if pcs_vball < 50:
-						'You ask the coach about joining the team, but he shakes his head. "<<$pcs_lastname>> it''s not personal, you have good amateur skills. Just not enough to make the team."'
-					elseif trenerSex = 1:
+					if trenerSex = 1:
 						volleysostav = 1
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
+					elseif pcs_vball < 65:
+						'You ask the coach about joining the team, but he shakes his head. "<<$pcs_lastname>> it''s not personal, you have good amateur skills. Just not enough to make the team."'
 					elseif pcs_vball >= 65:
 						'You ask the coach about joining the team, the coach thinks for a minute. "You have good skills for an amateur but you''re still not good enough to start on the team. However, I have a spot for a substitute and we can put you there. How does that sound?"'
 
@@ -174,9 +174,11 @@ if $ARGS[0] = 'talk':
 					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
 					act 'It''s all lies':
 						*clr & cla
-						gs 'willpower', 'misc', 'self', 'hard'
 						gs 'stat'
+						
 						act 'Leave': gt 'gdksport', 'start'
+						
+						gs 'willpower', 'misc', 'self', 'hard'
 						if will_cost <= pcs_willpwr:
 							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
 								*clr & cla
@@ -196,11 +198,7 @@ if $ARGS[0] = 'talk':
 							act 'Persuade him to let you join the team (<font color="red"><will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
 					end
-					act 'Okay, it''s true, I am a <<$gnikname>>':
-						*clr & cla
-						gs 'stat'
-						gt'Voltrener', 'gorslut'
-					end
+					act 'Okay, it''s true, I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
 				else
 					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
 					gs 'willpower', 'misc', 'self'

+ 4 - 15
locations/nichUtil.qsrc

@@ -151,13 +151,9 @@ elseif $ARGS[0] = 'debug':
 	'The last time you fucked Tanya was '+(daystart-nichTanyaFuckLast)+' days ago'
 	'Tanya has a dominance of <<nichTanyaDominance>> (range: -100 - 100)'
 	
-	act 'DEBUG: New Workday':
-		gs 'nichUtil', 'startWorkday'
-	end
+	act 'DEBUG: New Workday': gs 'nichUtil', 'startWorkday'
 	
-	act 'Back':
-		gt $menu_loc
-	end
+	act 'Back': gt $menu_loc, $menu_arg
 	
 elseif $ARGS[0] = 'startWorkday':
 	!! Sveta has free Wednesdays.
@@ -166,9 +162,7 @@ elseif $ARGS[0] = 'startWorkday':
 	end
 	
 	nichMissedWorkdays = daystart - nichLastWorkDay - 1
-	
-	
-	
+		
 	if nickHired + 1 = daystart:
 		!! this is the first workday ever
 		nichMissedWorkdays = 0
@@ -215,8 +209,6 @@ elseif $ARGS[0] = 'startWorkday':
 		end
 	end
 	
-	
-	
 	nichLastWorkDay = daystart
 	
 	if nichWorkState > 0:
@@ -259,7 +251,6 @@ elseif $ARGS[0] = 'startWorkday':
 		nichSalaryNext = nichSalaryBase
 	end
 	
-	
 	!! NPC behaviour
 	!! Gala will give up talking smack about Sveta after 5 days
 	if nichGalaOpponent >= 10 and nichGalaOpponent < 20 and daystart > nichGalaOpponentDay + 5:
@@ -327,8 +318,7 @@ elseif $ARGS[0] = 'clearVars':
 	!!Do not kill Tanyas fuck vars since Sveta might meet her after leaving her job
 	killvar 'nichTanyaSpyLast'
 	killvar 'nichTanyaSpyCounter'
-	
-	
+		
 elseif $ARGS[0] = 'fired':
 	'It takes you a few moments to process what just happened:'
 	'You have just been fired. And kind of lost your home, too.'
@@ -343,7 +333,6 @@ elseif $ARGS[0] = 'fired':
 	act 'Take your belongings and leave the apartment':gt 'down'
 end
 
-
 !! initializes variables when hired, might mess everything up if called at any other time
 if $ARGS[0] = 'hired':
 	home_owned[7] = 1