[fixed][added] Fixed the game crash error due to a missing colon, a switched elseif and if, and a missin end tag. Added support for gadukino residents

locations/journal.qsrc

@@ -435,6 +435,7 @@ if $ARGS[0] = 'generaltab':
 	'<br><center><a href="exec: gs ''journal'', ''locations''">Locations</a></center>'
 	'<br><center><a href="exec: gs ''journal'', ''family''">Family</a></center>'
 	'<br><center><a href="exec: gs ''journal'', ''pav_res''">Pavlovsk Residents</a></center>'
+	'<br><center><a href="exec: gs ''journal'', ''gad_res''">Gadukino Residents</a></center>'
 	'<br><center><a href="exec: gs ''journal'', ''city_res''">City Residents</a></center>'
 
 	if SchoolAtestat = 0 and mid($start_type, 1, 2) = 'sg' and SchoolBlock = 0: 
@@ -717,11 +718,13 @@ if $ARGS[0] = 'family':
 
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
-end
 
-if $ARGS[0] = 'pav_res':
+
+elseif $ARGS[0] = 'pav_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
+	
+	'<center><h2>Pavlovsk Residents</h2></center>'
 
 	!! Post Secondary school !!
 	if yearstart > 1:
@@ -783,12 +786,71 @@ if $ARGS[0] = 'pav_res':
 
 	act 'Go back': gt 'journal', 'generaltab'
 	gs 'journal', 'leaveactions'
-end
 
 
-if $ARGS[0] = 'city_res':
+elseif $ARGS[0] = 'gad_res':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
+	
+	'<center><h2>Gadukino Residents</h2></center>'
+	!!Grandpa
+	gs 'journal_NPC_information', 'A31'
+	*nl
+	!!Grandma
+	gs 'journal_NPC_information', 'A32'
+	*nl
+	!!Mira
+	if npc_known['A60'] = 1: 
+		gs 'journal_NPC_information', 'A60'
+		*nl
+	end
+	!!Mitka
+	gs 'journal_NPC_information', 'A63'
+	*nl
+	!!Kolyamba
+	if mitka_first_drink > 1:
+		gs 'journal_NPC_information', 'A61'
+		*nl
+	end
+	!!Vasyan
+	if mitka_first_drink > 1:
+		gs 'journal_NPC_information', 'A62'
+		*nl
+	end
+	!!Afanasiy (Mira''s father)
+	if npc_known['A60'] = 1: 
+		gs 'journal_NPC_information', 'A64'
+		*nl
+	end
+	!!Vtialiy (Mira''s brother)
+	if npc_known['A60'] = 1: 
+		gs 'journal_NPC_information', 'A64'
+		*nl
+	end
+	!!Grigory
+	if npc_qw['A221'] > 0:
+		gs 'journal_NPC_information', 'A221'
+		*nl
+	end 
+	!!Hunters
+	if hunters_were_met > 0:
+		gs 'journal_NPC_information', 'A172'
+		*nl
+		gs 'journal_NPC_information', 'A173'
+		*nl
+		gs 'journal_NPC_information', 'A174'
+		*nl
+	end
+	
+	act 'Go back': gt 'journal', 'generaltab'
+	gs 'journal', 'leaveactions'
+
+
+elseif $ARGS[0] = 'city_res':
+	$jumploc = 'generalsub'
+	gs 'journal', 'journalmenu'
+	
+	'<center><h2>City Residents</h2></center>'
 
 	!! Post Secondary school !!
 	if yearstart > 1:
@@ -809,17 +871,18 @@ end
 !! Helper functions
 
 if $ARGS[0] = 'relindex':
-
     gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
 	*nl
-end
 
-if $ARGS[0] = 'leaveactions':
+
+elseif $ARGS[0] = 'leaveactions':
 	act 'Put your notebook down': 		 
 		killvar 'jumploc'
 		jclose = 1
 		gt $loc, $loc_arg
 	end	
 end
+
+
 --- journal ---------------------------------
 

locations/journal_NPC_information.qsrc

@@ -259,6 +259,80 @@ end
 
 
 
+    !!-----------------------------------------------------------!!
+    !!                                                           !!
+    !!                  Gadukino Residents                       !!
+    !!                                                           !!
+    !!===========================================================!!
+    !!                                                           !!
+    !!                                                           !!
+    !!                        Mira                               !!
+    !!                                                           !!
+    !!-----------------------------------------------------------!!
+
+
+!!Mira  A60
+if $ARGS[0] = 'A60':
+	'<center><img src="images/characters/shared/headshots_main/60.jpg"></center>'
+	'<center>Miroslava Maximova</center>'
+
+
+!!Mitka A63
+elseif $ARGS[0] = 'A63':
+	'<center><img src="images/characters/shared/headshots_main/63.jpg"></center>'
+	'<center>Mitka Ruslanov</center>'
+
+
+!!Kolyamba A61
+elseif $ARGS[0] = 'A61':
+	'<center><img src="images/characters/shared/headshots_main/61.jpg"></center>'
+	'<center>Kolyamba Rostislav</center>'
+
+
+!!Vasyan
+elseif $ARGS[0] = 'A62':
+	'<center><img src="images/characters/shared/headshots_main/62.jpg"></center>'
+	'<center>Vasyan Makarovich</center>'
+
+
+!!Afanasiy (Mira''s father)
+elseif $ARGS[0] = 'A64':
+	'<center><img src="images/characters/shared/headshots_main/64.jpg"></center>'
+	'<center>Afanasiy Maximov</center>'
+
+
+!!Vtialiy
+elseif $ARGS[0] = 'A65':
+	'<center><img src="images/characters/shared/headshots_main/65.jpg"></center>'
+	'<center>Vtialiy Maximov</center>'
+
+
+!!Grigory
+elseif $ARGS[0] = 'A221':
+	'<center><img src="images/characters/shared/headshots_main/64.jpg"></center>'
+	'<center>Grigory Chekov</center>'
+
+
+!!Andrei (hunter)
+elseif $ARGS[0] = 'A172':
+	'<center><img src="images/characters/shared/headshots_main/172.jpg"></center>'
+	'<center>Andrei Saveliev</center>'
+
+!!Igor (hunter)
+elseif $ARGS[0] = 'A173':
+	'<center><img src="images/characters/shared/headshots_main/173.jpg"></center>'
+	'<center>Igor Danilovich</center>'
+
+!!Sergei (hunter)
+elseif $ARGS[0] = 'A174':
+	'<center><img src="images/characters/shared/headshots_main/174.jpg"></center>'
+	'<center>Sergei Kirillov</center>'
+
+
+end
+
+
+
 
 !!==============================================================================!!
 !!                                                                              !!
@@ -850,7 +924,7 @@ elseif $ARGS[0] = 'A141':
 elseif $ARGS[0] = 'A149':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/149.jpg"></center>'
 	'<center>Lazar Pajari</center>'
-	if $ARGS[1] = 'gschool'
+	if $ARGS[1] = 'gschool':
 		if grupTipe = 2:
 			'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the football team captain. He excels in several sports, but his passion is football, at least when he''s not chasing after girls or, more often than not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different ones. He has even been seen hanging out with Albina, who mostly ignores the boys in school. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
 		else
@@ -1082,7 +1156,7 @@ elseif $ARGS[0] = 'A151':
 		end
 
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A151'], 'm'
-	if $ARGS[1] = 'uni':
+	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with him. He has since moved away to go the the Moscow University.'
 		'Evgeny Kuznetsov was the Pavlovsk school chess champion and you could always find him at the chess club at the community center. He was shy and very intelligent, but didn''t show any interest in girls, or anyone else for that matter. No one would be surprised if he had mild autism.'
 		'He left to attend the university in Moscow.'
@@ -1627,7 +1701,7 @@ end
 
 
 !!Tryndin
-elseif $ARGS[0] = 'A77':
+if $ARGS[0] = 'A77':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/77.jpg"></center>'
 	'<center>Tryndin Maximovich</center>'
 	'Tryndin lives in apartment 37 in the residential area of the city and attends the city university.'
@@ -1636,7 +1710,7 @@ elseif $ARGS[0] = 'A77':
 
 
 !!Djibril
-if $ARGS[0] = 'A82':
+elseif $ARGS[0] = 'A82':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/82.jpg"></center>'
 	'<center>Djibril Maina</center>'
 	'Djibril is from Africa. He is the nephew of Oluuosegun, your aunt''s boyfriend, and lives in the student dorms. He is studying for a business degree.'