1
0
Selaa lähdekoodia

[Bug Fixes] Fixed image paths and disabled second letter until code is plumbed in for exam results.

Myles Croft (Hooded Silence) 1 kuukausi sitten
vanhempi
sitoutus
6e16c94221

+ 2 - 2
locations/npc_274_init.qsrc

@@ -195,13 +195,13 @@ if $ARGS[0] = 'summer_school':
 		*clr & cla
 		if mayaqw['grave'] = 4:
 			mood += 10
-			'<center><img <<$set_imgh>> src="images/characters/pushkin/maya/274-1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="<<$npc_img_path[''A274'']>>/274-1.jpg"></center>'
 			'<<$npc_firstname[''A274'']>> is bubbling with enthuasism when she finds you running behind schedule, "Come on <<$pcs_nickname>> you''re going to be late!"'
 			'Her mood is infectious and soon you quickly grab your dance bag and head to school with <<$npc_firstname[''A274'']>>.'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_npc/295.jpg"></center>'
+			'<center><img <<$set_imgh>> src="<$npc_img_path[''A286'']/286.jpg"></center>'
 			'Bronya finds you running late in your morning preperations, "Come on <<$pcs_nickname>>, you''re going to be late!"'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'

+ 1 - 1
locations/pushkin_ballet_init.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'start':
 		end
 		if locat['Mother'] = 4 and mod_ballet['letter'] < 1 and daystart >= 198:
 			! Trigger second act
-			act '<b>Read the letter</b>': gt 'pushkin_ballet_evt', 'letter'
+			!!act '<b>Read the letter</b>': gt 'pushkin_ballet_evt', 'letter'
 		end
 	end
 end

+ 1 - 1
locations/pushkin_ballet_res.qsrc

@@ -126,7 +126,7 @@ if $ARGS[0] = 'hallway':
 	if $apparel['status'] ! 'nude' and ($apparel['status'] = 'sport' or $apparel['status'] = 'dance'):
 		if hour = 7 and minut <= 30 and $apparel['status'] = 'sport':
 			act '<b>Attend Ballet Classes</b>': gt 'pushkin_ballet_class', 'start'
-		elseif (hour = 7 and (minut > 30 and minut <= 59)) or hour >=8 :
+		elseif ballet_day ! 7 and ((hour = 7 and (minut > 30 and minut <= 59)) or (hour >=8 or hour <= 16)):
 			$balletEv['trigger'] = 'late'
 			gs 'npc_274_init', 'summer_school'
 		else