Bladeren bron

[fixes] A couple of white screens in the volleyball trainer files from willpower additions and a failsafe for the failsafe in the supermarket from reports by griffor

KevinSmarts 4 jaren geleden
bovenliggende
commit
ab1b385e9a
3 gewijzigde bestanden met toevoegingen van 16 en 7 verwijderingen
  1. 5 1
      locations/Voltrener.qsrc
  2. 4 5
      locations/Voltrenersex.qsrc
  3. 7 1
      locations/shop.qsrc

+ 5 - 1
locations/Voltrener.qsrc

@@ -151,6 +151,7 @@ if $ARGS[0] = 'talk':
 			'Coach looked at you "Ah, <<$pcs_lastname>>. You have the makings of an athlete, though I''m not sure if you are up to a professional level yet."'
 			act 'Ask to join the team':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
 				if pav_slut <= 25:
 					if pcs_vball < 50:
@@ -174,9 +175,12 @@ 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
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+						'You tell him its not true and that some of the kids have been spreading false rumours about you.'
+						'He doesn''t appear to be convinced the only options are to go aggressive or leave it.'
 						gs 'willpower', 'misc', 'self', 'hard'
 						gs 'stat'
-						act 'Leave': gt 'gdksport', 'start'
+						act 'Leave it': gt 'gdksport', 'start'
 						if will_cost <= pcs_willpwr:
 							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
 								*clr & cla

+ 4 - 5
locations/Voltrenersex.qsrc

@@ -29,10 +29,8 @@ if $ARGS[0] = 'start':
 			end
 		else
 			act 'Don''t resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to stop resisting.</font>'
-		end
-	end
-	
-	gs 'willpower', 'misc', 'self'		
+		end	
+		gs 'willpower', 'misc', 'self'		
 	elseif trenerSex = 0:
 		if  will_cost <= pcs_willpwr:
 			act 'Look at the coach (<<will_cost>> Willpower)':
@@ -44,7 +42,8 @@ if $ARGS[0] = 'start':
 		else
 			act 'Look at the coach (<font color="red"><<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to look at the coach.</font>'
 		end
-	end	
+	end
+end
 	
 if $ARGS[0] = 'talk':
 	if Voltrenersee = 1:

+ 7 - 1
locations/shop.qsrc

@@ -22,7 +22,13 @@ if $shoplocation = 'main':
 	if hour < 8 or hour > 20:
 		'The supermarket is currently closed.'
 
-		if $loc = 'shop': $loc = $loc_bak
+		if $loc = 'shop':
+			if $loc_bak = 'shop':
+				$loc = torgpred
+			else
+				$loc = $loc_bak
+			end
+		end
 		act 'Leave the store':minut += 3 & gt $loc
 		exit
 	end