[Bug and layout fixes] More fixes and refactoring to the beta journal. Removed duplicated file.

locations/beta_journal.qsrc

@@ -51,21 +51,21 @@ if $ARGS[0] = 'default':
 	$hot_link = $ARGS[0]
     !! Initial menu page containing alerts and tips
 	gs $loc_id, 'nav_construct'
+	'<center>'
     gs $loc_id, 'game_events'
     gs $loc_id, 'gametips'
+	'</center>'
 end
 
 !! Core functions for tabs and menu creation
 
-
 !! Navigation bar constructor:
 if $ARGS[0] = 'nav_construct':
 	if $nav_banner = '': $nav_banner = "<<$pcs_firstname>>''s Quests and Relationships"
 	!! Set up the navigation body
-	$tablebody = '<tr>'
 	!! Create the navigation - remember to deduct -1 as magic option is removed
 	i = 0
-
+	!! Reset the table creation vars.
 	killvar '$tablebody'
 	killvar 'i'
 	killvar 'nav_i'
@@ -86,12 +86,10 @@ if $ARGS[0] = 'nav_construct':
 		i += 1
 	end
 	if i < nav_i: jump 'jmp_navigation_gen'
-	$tablebody += '</tr>'
-
 	!display the table here.
 	*clr & cla
-	'<center><h1><<$nav_banner>></h1></center>'
-	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
+	'<center><h1><<$nav_banner>></h1>'
+	'<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
 	gs 'journal', 'leaveactions'
 end
 
@@ -107,8 +105,9 @@ if $ARGS[0] = 'gametips':
     gs $loc_id, 'tips_init'
 
     rnd_tip = rand(0, arrsize('$tip_body')-1)
-    '<center><h3>Girl Life Random Tips</h3></center>'
+    '<center><h3>Girl Life Random Tips</h3>'
     $tip_body[rnd_tip]
+	'</center>'
     killvar 'rnd_tip'
     killvar '$tip_body'
 end

locations/beta_journal_home.qsrc

@@ -19,9 +19,9 @@ if $ARGS[0] = 'init':
 	end
 	if accessible_property['city_apartment'] = 3: 'You own a two bedroom apartment in the city residential area. It''s currently occupied by your tenants.'
 	if accessible_property['parents_home'] = 4:
-		'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-		'<th width=''100''><img height=''100'' src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></th>'
-		'<th>You currently live with your parents Natasha and Vladomir and your siblings Anya and Kolka in a two bedroom apartment as part of the 58 Estate in Pavlovsk.</th>'
+		'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
+		'<th><img height=''100px'' src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></th>'
+		'<th width="70%" align="left">You currently live with your parents Natasha and Vladomir and your siblings Anya and Kolka in a two bedroom apartment as part of the 58 Estate in Pavlovsk.</th>'
 		'</tr></table></center>'
 	end
 	if accessible_property['village_cottage']= 2 : 'You own a small holiday cottage with an adjacent allotment in the communal village.'

locations/beta_journal_relationships.qsrc

@@ -5,125 +5,196 @@
 !! Purpose: Contains the navigation elements for all Pertinent data for NPC relations in game
 
 if $ARGS[0] = 'init':
+	*clr & cla
     !! Do we need to load a vcard or just index the NPCs?
 	$loc_id = 'beta_journal_relationships'
 	$hot_link = $loc_id
 	gs 'beta_journal', 'nav_construct'
-	'<a href="exec:family_show = 1 & gs ''<<$loc_id>>'', ''rel_family''">Show Family</a>'
-	'<a href="exec:pavlovsk_show = 1 & gs ''<<$loc_id>>'', ''rel_pavlovsk''">Show Pavlovsk NPCs</a>'
-	!!'Show family contacts'
-	!!'Show Gadukino contacts'
-	!1'Show school contacts'
-	!!'Show St Petersburg Contacts'
-	!!'Show Pushkin contacts'
-	if family_show = 1:
+	'<center>'
+	!! panel_show - trigger for which relationship panel that is open
+	!! 1 Family, 2 Pavlovsk, 3 Gadukino, 4 city, 5 Pushkin, 6 School
+	if panel_show ! 1 or panel_show = 0:
+		'<a href="exec:panel_show = 1 & gs ''<<$loc_id>>'', ''init''">Show Family</a>'
+	elseif panel_show = 1:
+		'<i>Show Family</i>'
 		gs $loc_id, 'rel_family'
-	elseif pavlovsk_show = 1:
+	end
+	if panel_show ! 2:
+		'<a href="exec:panel_show = 2 & gs ''<<$loc_id>>'', ''init''">Show Pavlovsk NPCs</a>'
+	elseif panel_show = 2:
+		'<i>Show Pavlovsk NPCs</i>'
 		gs $loc_id, 'rel_pavlovsk'
 	end
+	if panel_show ! 3:
+		'<a href="exec:panel_show = 3 & gs ''<<$loc_id>>'', ''init''">Show Gadukino NPCs</a>'
+	elseif panel_show = 3:
+		'<i>Show Gadukino NPCs</i>'
+		gs $loc_id, 'rel_gudukino'
+	end
+	if panel_show ! 4:
+		'<a href="exec:panel_show = 4 & gs ''<<$loc_id>>'', ''init''">Show St Petersburg NPCs</a>'
+	elseif panel_show = 4:
+		'<i>Show St Petersburg NPCs</i>'
+		gs $loc_id, 'rel_city'
+	end
+	if panel_show ! 5:
+		'<a href="exec:panel_show = 5 & gs ''<<$loc_id>>'', ''init''">Show Pushkin NPCs</a>'
+	elseif panel_show = 5:
+		'<i>Show Pushkin NPCs</i>'
+		gs $loc_id, 'rel_pushkin'
+	end
+	if panel_show ! 6:
+		'<a href="exec:panel_show = 6 & gs ''<<$loc_id>>'', ''init''">Show School NPCs</a>'
+	elseif panel_show = 6:
+		'<i>Show Gadukino NPCs</i>'
+		gs $loc_id, 'rel_school'
+	end
+	'</center>'
 end
 
 !! Friends and Relations
 
 if $ARGS[0] = 'rel_family':
+	'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top">'
+	if kid > 0 or arrsize('$lover') > 0: gs $loc_id, 'rel_spouse_kids'
+	rel_id = 29
+	gs $loc_id, 'npc_preview'
+	rel_id = 28
+	gs $loc_id, 'npc_preview'
+	rel_id = 33
+	gs $loc_id, 'npc_preview'
+	rel_id = 34
+	gs $loc_id, 'npc_preview'
+	'</table></center>'
+end
 
-	if kid > 0 or arrsize('$lover') > 0:
-		'<center><h2>Lovers & Children</h2></center>'
-		if kid > 0:
-			i = 0
-			if kid = 1:
-				'You have a child, a <<$polreb[0]>> named <<$kidname[0]>>. Born <<daykid[0]>>-<<monthkid[0]>>-<<yearkid[0]>>. Aged <<kidage[0]>>.'
-
-			else
-				'You have children:'
-				:LoopKidCounter
-				if i < kid:
-					'<br> a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>.'
-					i += 1
-					jump 'LoopKidCounter'
-				end
+if $ARGS[0] = 'rel_spouse_kids':
+	'<center><h2>Lovers & Children</h2></center>'
+	if kid > 0:
+		i = 0
+		if kid = 1:
+			'<th>You have a child, a <<$polreb[0]>> named <<$kidname[0]>>. Born <<daykid[0]>>-<<monthkid[0]>>-<<yearkid[0]>>. Aged <<kidage[0]>>.</th>'
+
+		else
+			'You have children:'
+			:LoopKidCounter
+			if i < kid:
+				'<th> a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>.</th>'
+				i += 1
+				jump 'LoopKidCounter'
 			end
-			*nl
-			*nl
+		end
+		*nl
+		*nl
+	end
+
+	jnl_i = 0
+	jnl_max_i = arrsize('$lover')
+	:loverjournalloop
+	if jnl_i < jnl_max_i:
+		gs 'npcStat', $lover[jnl_i], 'i'
+
+		if mid($npc_rel_type[$npcID9], 1, 2) = 'ex':
+			jnl_i += 1
+			jump 'loverjournalloop'
 		end
 
-		jnl_i = 0
-		jnl_max_i = arrsize('$lover')
-		:loverjournalloop
-		if jnl_i < jnl_max_i:
-			gs 'npcStat', $lover[jnl_i], 'i'
+		if $npc_rel_type[$npcID9] = 'husband':
+			'You have been married for <<daystart - spouseVars[''marry_day'']>> days. Your husband <<$npcdesc9>> is <<$npcheight9>> and <<$npcbuild9>> with <<$npchair9>> hair. <<$npcdesc9>> is usually wearing <<$npcClo9>>. Member <<$dick_desc9>> cock and <<$dick_girth9>>. Relationship <<npc_rel[$npcID9]>>.'
+		else
+			'Your <<$npcrelat9>> <<$npcdesc9>> is <<$npcheight9>> and <<$npcbuild9>> with <<$npchair9>> hair. <<$npcdesc9>> is usually wearing <<$npcClo9>>. Your relationship is <<npc_rel[$npcID9]>> after <<npc_dates[$npcID9]>> dates and <<daystart - npc_daygenerated[$npcID9]>> days dating.'
+		end
 
-			if mid($npc_rel_type[$npcID9], 1, 2) = 'ex':
-				jnl_i += 1
-				jump 'loverjournalloop'
-			end
+		gs 'indik', '1', npc_rel[$npcID9], npc_rel[$npcID9], 100
+		'<<$ind>>'
 
-			if $npc_rel_type[$npcID9] = 'husband':
-				'You have been married for <<daystart - spouseVars[''marry_day'']>> days. Your husband <<$npcdesc9>> is <<$npcheight9>> and <<$npcbuild9>> with <<$npchair9>> hair. <<$npcdesc9>> is usually wearing <<$npcClo9>>. Member <<$dick_desc9>> cock and <<$dick_girth9>>. Relationship <<npc_rel[$npcID9]>>.'
+		if npc_rel[$npcID9] > 1:
+			if npc_gentle[$npcID9] = 1:
+				'<<$Xec9>> is timid and lacks confidence.'
+			elseif npc_rough[$npcID9] = 0:
+				'<<$Xec9>> has a cheerful and sociable personality.'
 			else
-				'Your <<$npcrelat9>> <<$npcdesc9>> is <<$npcheight9>> and <<$npcbuild9>> with <<$npchair9>> hair. <<$npcdesc9>> is usually wearing <<$npcClo9>>. Your relationship is <<npc_rel[$npcID9]>> after <<npc_dates[$npcID9]>> dates and <<daystart - npc_daygenerated[$npcID9]>> days dating.'
-			end
-
-			gs 'indik', '1', npc_rel[$npcID9], npc_rel[$npcID9], 100
-			'<<$ind>>'
-
-			if npc_rel[$npcID9] > 1:
-				if npc_gentle[$npcID9] = 1:
-					'<<$Xec9>> is timid and lacks confidence.'
-				elseif npc_rough[$npcID9] = 0:
-					'<<$Xec9>> has a cheerful and sociable personality.'
-				else
-					'<<$Xec9>> is short-tempered and strict.'
-				end
+				'<<$Xec9>> is short-tempered and strict.'
 			end
+		end
 
-			*nl
+		*nl
 
-			jnl_i += 1
-			jump 'loverjournalloop'
-		end
-		killvar 'jnl_i'
-		killvar 'jnl_max_i'
+		jnl_i += 1
+		jump 'loverjournalloop'
 	end
-	'<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-	rel_id = 29
-	'<center><h3>Family</h3></center>'
-	'<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'
-	rel_id = 29
-	gs $loc_id, 'npc_preview'
-	rel_id = 28
-	gs $loc_id, 'npc_preview'
-	rel_id = 33
-	gs $loc_id, 'npc_preview'
-	rel_id = 34
-	gs $loc_id, 'npc_preview'
-	'</table>'
-	'<a href="exec:family_show = 0 & gs ''<<$loc_id>>'', ''init''">Hide Family</a>'
+	killvar 'jnl_i'
+	killvar 'jnl_max_i'
 end
 if $ARGS[0] = 'rel_pavlovsk':
-	gs $loc_id, 'pavlovsk_array'
-	'<center><h2>Pavlovsk Relations</h2></center>'
-	if npc_rel['A54']  > 0: 'Friendship with Uncle Misha:'    & gs 'journal', 'relindex', 'A54'
-	if npc_rel['A57']  > 0: 'Friendship with Rex:'            & gs 'journal', 'relindex', 'A57'
-	if npc_rel['A217'] > 0: 'Friendship with Pavlin:'         & gs 'journal', 'relindex', 'A217'
-	if npc_rel['A112'] > 0: 'Friendship with Sergey Shulgin:' & gs 'journal', 'relindex', 'A112'
-	if npc_rel['A119'] > 0: 'Friendship with Borislav:'       & gs 'journal', 'relindex', 'A119'
-	'<a href="exec:pavlovsk_show = 0 & gs ''<<$loc_id>>'', ''init''">Hide Pavlovsk NPCs</a>'
-
+	'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top">'
+	if npc_rel['A54']  > 0:
+		rel_id = 54
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A57']  > 0:
+		rel_id = 57
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A217']  > 0:
+		rel_id = 217
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A112']  > 0:
+		rel_id = 112
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A119']  > 0:
+		rel_id = 119
+		gs $loc_id, 'npc_preview'
+	end
+	'</table></center>'
 end
 if $ARGS[0] = 'rel_school':
 end
 if $ARGS[0] = 'rel_city':
-	if npc_QW['A192']  > 0: 'Friendship with Nastya:'  & gs 'journal', 'relindex', 'A192'
-	if npc_rel['A218'] > 0: 'Friendship with Tanya:'   & gs 'journal', 'relindex', 'A218'
-	if npc_rel['A219'] > 0: 'Friendship with Kat:'     & gs 'journal', 'relindex', 'A219'
-	if npc_rel['A220'] > 0: 'Friendship with Vika:'    & gs 'journal', 'relindex', 'A220'
-	if npc_rel['A93']  > 0: 'Friendship with Ira:'     & gs 'journal', 'relindex', 'A93'
-	if npc_rel['A43']  > 0: 'Friendship with Tamara:'  & gs 'journal', 'relindex', 'A43'
-	if npc_rel['A35']  > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35'
-	if npc_rel['A169'] > 0: 'Friendship with Dima:'    & gs 'journal', 'relindex', 'A169'
-	if npc_rel['A89']  > 0: 'Friendship with Eugene:'  & gs 'journal', 'relindex', 'A89'
-	if npc_rel['A216'] > 0: 'Friendship with Martin:'  & gs 'journal', 'relindex', 'A216'
+	'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top">'
+	if npc_rel['A192']  > 0:
+		rel_id = 192
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A218']  > 0:
+		rel_id = 218
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A219']  > 0:
+		rel_id = 219
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A220']  > 0:
+		rel_id = 220
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A93']  > 0:
+		rel_id = 93
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A43']  > 0:
+		rel_id = 43
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A35']  > 0:
+		rel_id = 35
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A169']  > 0:
+		rel_id = 169
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A89']  > 0:
+		rel_id = 89
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A216']  > 0:
+		rel_id = 216
+		gs $loc_id, 'npc_preview'
+	end
+	'</table></center>'
 
 	! '<center><h2>Other Relations</h2></center>'
 	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
@@ -132,7 +203,7 @@ if $ARGS[0] = 'rel_city':
 	! if npc_rel['A41'] > 0: 'Friendship with Givi K. <<npc_rel[''A41'']>>'
 	! if npc_rel['A42'] > 0: 'Friendship with Ashot <<npc_rel[''A42'']>>'
 end
-if $ARGS[0] = 'rel_gad':
+if $ARGS[0] = 'rel_gadukino':
 	'<center><h3>Gadukino</h3></center>'
 	if npc_rel['A31'] > 0 or npc_rel['A32'] > 0:
 		'<center><h3>Great Grandparents</h3></center>'
@@ -156,15 +227,13 @@ if $ARGS[0] = 'rel_gad':
 	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172'
 	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):'   & gs 'journal', 'relindex', 'A173'
 	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174'
+	'<a href="exec:pavlovsk_show = 0 & gs ''<<$loc_id>>'', ''init''">Hide Gadukino NPCs</a>'
 end
 if $ARGS[0] = 'rel_pushkin':
 	!! Ballet Maya
 end
 
-!!-------------------------!!
-!!      Relationships      !!
-!!-------------------------!!
-
+!! relationship functions
 
 if $ARGS[0] = 'relationstab':
 
@@ -304,7 +373,7 @@ end
 if $ARGS[0] = 'npc_preview':
 	!! creates the npc table.
 	'<tr><th width="10%"><img height=''50'' src="images/characters/shared/headshots_main/<<rel_id>>.jpg"></th>'
-	'<th width="40%"><<$npc_firstname[''A<<rel_id>>'']>> <<$npc_lastname[''A<<rel_id>>'']>> (<<$npc_nickname[''A<<rel_id>>'']>>):'
+	'<th width="30%"><<$npc_firstname[''A<<rel_id>>'']>> <<$npc_lastname[''A<<rel_id>>'']>> (<<$npc_nickname[''A<<rel_id>>'']>>):'
 	gs 'journal', 'relindex', 'A<<rel_id>>'
 	'</th><th align left>Events</th></tr>'
 end

locations/city_canal.qsrc

@@ -1,49 +0,0 @@
-# city_canal
-!! Date Created: 14th May, 2024
-!! Modified date: 
-!! Version: .01 - initial release
-!! Author: Hooded Silence
-!!
-!! St Petersburg Canals
-!!
-!! Sub-location in St Petersburg for dates, boat rides and other events
-
-if $args[0] = 'init':
-    img_sel = rand(1,2)
-    if daystage = 2 or daystage = 3:
-        $setloc['StageImage'] =  'city_canals_day_<<img_sel>>'
-    else
-        $setloc['StageImage'] =  'city_canals_night_<<img_sel>>'
-    end
-    killvar img_sel
-end
-
-if $args[0] = 'content':
-    !! Main location content.
-
-    *clr & cla
-	$setloc['StageTitle'] = 'St Petersburg Canals'
-    gs 'city_canal', 'init'
-	$location_type = 'public_outdoors'
-	gs 'shortgs', 'setloc', 'city_canals', $ARGS[0]
-	gs 'stat'
-	gs 'core_library', 'stage_title'
-
-
-    'You stand gazing at the famous Canals of the North, the hustle and bustle of people on the streets against a backdrop of elegant Russian buildings. You see boatmen plying their trade on the waters below and working on their tour boats.'
-
-    !! Navigation
-
-    act 'Head to the Arts district': msg 'not implented' & gt 'city_canal', 'content'
-    act 'Take a boat trip (100)': msg 'not implented' & gt 'city_canal', 'content'
-    act 'Take the boats to Vasily Island (50)': msg 'not implented' & gt 'city_canal', 'content'
-
-end
-
-if $args[0] = 'dates':
-    !! For all date related activities.
-
-end
-
-
---- city_canal ---------------------------------

locations/city_canals.qsrc

@@ -1,6 +1,49 @@
 # city_canals
-
+!! Date Created: 14th May, 2024
+!! Modified date:
+!! Version: .01 - initial release
 !! Author: Hooded Silence
-!! Date and meeting spot at the St Petersburg Canals
+!!
+!! St Petersburg Canals
+!!
+!! Sub-location in St Petersburg for dates, boat rides and other events
+
+if $args[0] = 'init':
+    img_sel = rand(1,2)
+    if daystage = 2 or daystage = 3:
+        $setloc['StageImage'] =  'city_canals_day_<<img_sel>>'
+    else
+        $setloc['StageImage'] =  'city_canals_night_<<img_sel>>'
+    end
+    killvar img_sel
+end
+
+if $args[0] = 'content':
+    !! Main location content.
+
+    *clr & cla
+	$setloc['StageTitle'] = 'St Petersburg Canals'
+    gs 'city_canal', 'init'
+	$location_type = 'public_outdoors'
+	gs 'shortgs', 'setloc', 'city_canals', $ARGS[0]
+	gs 'stat'
+	gs 'core_library', 'stage_title'
+
+
+    'You stand gazing at the famous Canals of the North, the hustle and bustle of people on the streets against a backdrop of elegant Russian buildings. You see boatmen plying their trade on the waters below and working on their tour boats.'
+
+    !! Navigation
+
+    act 'Head to the Arts district': msg 'not implented' & gt 'city_canal', 'content'
+    act 'Take a boat trip (100)': msg 'not implented' & gt 'city_canal', 'content'
+    act 'Take the boats to Vasily Island (50)': msg 'not implented' & gt 'city_canal', 'content'
+
+end
+
+if $args[0] = 'dates':
+    !! For all date related activities.
+
+end
+
 
---- city_canals ---------------------------------
+--- city_canals ---------------------------------

locations/city_commcenter.qsrc

@@ -60,8 +60,8 @@ if $ARGS[0] = 'lessons':
 	'<center><b>The Vladimir Lenin community center</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk1.jpg"></center>'
 	*nl
-	'Vladimir Lenin is open from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' through to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on weekdays, and closed on weekends.
-	 It''s available to teach essential life skills such as driving, life coaching or finding new job skills this is the place to learn. '
+	'Vladimir Lenin is open from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' through to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on weekdays, and closed on weekends.'
+	'It''s available to teach essential life skills such as driving, life coaching or finding new job skills this is the place to learn. '
 	*nl
 	'<B><center>Currently available courses:</center></B>'
 	'<center>'
@@ -385,4 +385,3 @@ if $ARGS[0] = 'singingtutor':
 end
 
 --- city_commcenter ---------------------------------
-