[fixed] Final Journal revision ready for merging, fixes the magic casting bug. Tested on latest repo. Still an issue when closing by clicking on other menu icons but that's a minor annoyance.By Hooded Silence

locations/journal.qsrc

@@ -29,12 +29,12 @@ if $ARGS[0] = 'records':
 	*clr & cla
 	gs 'housing', 'rent'
     gs 'journal', 'journalmenu'
-    
 ! records
 end
 
 if $ARGS[0]='journalmenu':
 	*clr & cla
+	gs 'stat'
 	if $start_type[1] ! 'nomagic':
         $tablebody = '<tr><th><a href="exec:menutrack = 0 & gs ''journal'', ''magictab''">Magic</a></th><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th></tr>'
     
@@ -59,6 +59,7 @@ if $ARGS[0]='journalmenu':
 	end
 	gs 'journal', 'leaveactions'
 
+
 ! Journal Menu
 end
 
@@ -68,13 +69,15 @@ if $ARGS[0] = 'magictab':
 	
 	'<center><h2>Spells</h2></center><br>'
 	'<center><h2>Spells to Cast</h2></center><br>'
-	func('spellBook','cast','$nonComSpells') 
+	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1') 
 	'<br><center><h2>Spell Learning</h2></center><br>'
 	'<br><center><h3>Combat</h3></center><br>'
 	func('spellBook','learn','$combatSpells') 
 	'<br><center><h3>Non-Combat</h3></center><br>'
 	func('spellBook','learn','$nonComSpells') 
 	delact 'Never mind'
+	
+	
 ! magic
 end
 
@@ -83,6 +86,8 @@ if $ARGS[0] = 'housingtab':
 	gs 'journal', 'journalmenu'
 
 	'<center><h2>Housing</h2></center>'
+	
+	gs 'homes_properties', 'get_owned_homes'
 	*nl
 	if pavSharedAptEnabled = 1:'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services'
 	if home_owned[1] = 1:'You rent a two room apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<home_rent[1]>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL>></b> days'
@@ -94,6 +99,7 @@ if $ARGS[0] = 'housingtab':
 	if home_owned[5] = 1:'You own a vacant block in the city suburbs. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 2:'You own a plot of land in the city suburbs upon which you are building a house. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 3:'You own an impressive mansion in the city suburbs. Your utility bills are due on the 25th of each month.'
+	if home_owned[14] = 1:'You live with your grandparents in their cottage in Gadukino.' 
 	if home_owned[15] = 1:'You own a nice house on the edge of the city residential district. Your utility bills are due on the 25th of each month.'
 	if home_owned[16] = 1:'You live with Vicky, Katja and Tamara Meynold. You have your own room and get an allowance based on helping out around the house and/or studying with Tamara.'
 	*nl