Merge remote-tracking branch 'Anjuna/master'

locations/bed_events.qsrc

@@ -100,6 +100,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -109,6 +110,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

locations/bed_get_out.qsrc

@@ -4,6 +4,7 @@
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	InSleep = 0
+	sleepVars['stat_display'] = 0
 	sleepVars['slept_in'] = 0
 	strip_here = 0
 	SleepHorny = 0
@@ -17,7 +18,7 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!! Check for: if $ARGS[0] = 'bed_get_out' and $ARGS[1] = 'mod_sleeptriggers'
 	!!
 	!! This is NOT for events!!
-	
+
 	gs 'LOCA', 'bed_get_out', 'mod_sleeptriggers'
 	xgt 'bed_get_out_events', 'start'
 end

locations/bed_get_out_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 
@@ -97,6 +98,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -106,6 +108,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

locations/dream_events.qsrc

@@ -121,6 +121,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -130,6 +131,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

locations/natbel_friend.qsrc

@@ -2001,6 +2001,9 @@ if $ARGS[0] = 'city_date2_after_rel_talk':
 	'You reply. "Yes I fully agree especially around here. Hopefully if we stay together and move to St Petersburg folks there may be a little more open minded, however, that''s for the future."'
 	'Bella continues. "Just one more thing, I wanted to thank you for having walked my girl home from the disco and let you know that you are welcome to stay over if you both get back late while the two of you are together. After all even inside this block it''s not always safe at night."'
 
+	$loc = 'natbel_friend'
+	$loc_arg = 'city_date2_cleanup'
+
 !If Sveta lives at home
 	if func('homes_properties', 'is_current_home', 'parents_home'):
 		act 'Thank Bella and say you may need to when you tell your parents':

locations/piercing_management.qsrc

@@ -129,7 +129,7 @@ if $ARGS[0] = 'main':
 	'<center><font color="maroon">Piercing Management</font></center>'
 
 	$temp_table = '<center><table border=0 cellspacing=<<ward_img_hgt / 25>> cellpadding=5>'
-	$temp_table +=	'<tr>'
+	$temp_table +=	'<tr align="center">'
 	$temp_table +=		'<th>'
 	$temp_table +=			'Ear piercings'
 	$temp_table +=		'</th>'
@@ -144,49 +144,49 @@ if $ARGS[0] = 'main':
 	$temp_table +=		'</th>'
 	$temp_table +=	'</tr>'
 
-	$temp_table +=	'<tr>'
+	$temp_table +=	'<tr align="center">'
 	$temp_table +=		'<td>'
 	if pcs_piercings['ears'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/ears.jpg">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/ears.jpg">'
 	elseif pcs_piercings['ears'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''ears''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/ears.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''ears''"><img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/ears.jpg"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''ears''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/c<<pcs_piercings[''ears'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''ears''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''ears_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 
 	$temp_table +=		'<td>'
 	if pcs_piercings['nose'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/nose.jpg">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/nose.jpg">'
 	elseif pcs_piercings['nose'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nose''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/nose.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nose''"><img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/nose.jpg"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nose''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/d<<pcs_piercings[''nose'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nose''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''nose_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 
 	$temp_table +=		'<td>'
 	if pcs_piercings['brow'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/brow.jpg">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/brow.jpg">'
 	elseif pcs_piercings['brow'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''brow''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/brow.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''brow''"><img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/brow.jpg"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''brow''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/a<<pcs_piercings[''brow'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''brow''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''brow_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 
 	$temp_table +=		'<td>'
 	if pcs_piercings['lip'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/lip.jpg">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/lip.jpg">'
 	elseif pcs_piercings['lip'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''lip''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/lip.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''lip''"><img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/lip.jpg"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''lip''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/b<<pcs_piercings[''lip'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''lip''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''lip_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
 
-	$temp_table +=	'<tr>'
+	$temp_table +=	'<tr align="center">'
 	$temp_table +=		'<td>'
 	if pcs_piercings['ears'] = 0:
 		$temp_table +=		'Not pierced'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'main':
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
 
-	$temp_table +=	'<tr>'
+	$temp_table +=	'<tr align="center">'
 	$temp_table +=		'<th>'
 	$temp_table +=			'Tongue piercing'
 	$temp_table +=		'</th>'
@@ -243,49 +243,49 @@ if $ARGS[0] = 'main':
 	$temp_table +=		'</th>'
 	$temp_table +=	'</tr>'
 
-	$temp_table +=	'<tr>'
+	$temp_table +=	'<tr align="center">'
 	$temp_table +=		'<td>'
 	if pcs_piercings['tongue'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/tongue.jpg">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/tongue.jpg">'
 	elseif pcs_piercings['tongue'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''tongue''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/tongue.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''tongue''"><img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/tongue.jpg"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''tongue''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/a<<pcs_piercings[''tongue'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''tongue''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''tongue_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 
 	$temp_table +=		'<td>'
 	if pcs_piercings['navel'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/navel.jpg">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/navel.jpg">'
 	elseif pcs_piercings['navel'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''navel''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/unpierced/navel.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''navel''"><img height=<<ward_img_hgt>> src="images/pc/body/piercings/unpierced/navel.jpg"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''navel''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/n<<pcs_piercings[''navel'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''navel''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''navel_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 
 	$temp_table +=		'<td>'
 	if pcs_piercings['nipples'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="<<func(''$body_image'', ''tits'')>>">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="<<func(''$body_image'', ''tits'')>>">'
 	elseif pcs_piercings['nipples'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nipples''"><img Height = <<ward_img_hgt>> src="<<func(''$body_image'', ''tits'')>>"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nipples''"><img height=<<ward_img_hgt>> src="<<func(''$body_image'', ''tits'')>>"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nipples''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/f<<pcs_piercings[''nipples'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''nipples''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''nipples_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 
 	$temp_table +=		'<td>'
 	if pcs_piercings['pussy'] = 0:
-		$temp_table +=		'<img Height = <<ward_img_hgt>> src="<<$pcs_vag_image>>">'
+		$temp_table +=		'<img height=<<ward_img_hgt>> src="<<$pcs_vag_image>>">'
 	elseif pcs_piercings['pussy'] < 0:
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''pussy''"><img Height = <<ward_img_hgt>> src="<<$pcs_vag_image>>"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''pussy''"><img height=<<ward_img_hgt>> src="<<$pcs_vag_image>>"></a>'
 	else
-		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''pussy''"><img Height = <<ward_img_hgt>> src="images/pc/body/piercings/g<<pcs_piercings[''pussy'']>>.jpg"></a>'
+		$temp_table +=		'<a href="exec:gt ''piercing_management'', ''pussy''"><img height=<<ward_img_hgt>> src="<<func(''piercing_management'', ''pussy_image'')>>"></a>'
 	end
 	$temp_table +=		'</td>'
 	$temp_table +=	'</tr>'
 
-	$temp_table +=	'<tr>'
+	$temp_table +=	'<tr align="center">'
 	$temp_table +=		'<td>'
 	if pcs_piercings['tongue'] = 0:
 		$temp_table +=		'Not pierced'

locations/pre_sleep.qsrc

@@ -14,6 +14,7 @@ end
 
 if $ARGS[0] = 'pre_sleep2':
 	menu_off = 1
+	sleepVars['stat_display'] = 0
 	if clo_flag['bed'] = 0:
 		clo_flag['bed'] = 1
 		$lastwornclothingtype['bed'] = $clothingworntype

locations/pre_sleep_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 
@@ -116,6 +117,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -125,6 +127,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

locations/sleep.qsrc

@@ -35,7 +35,7 @@ end
 if $ARGS[0] = '':
 	msg 'gt ''sleep'', is depricated! If you did not load an old save, please report this bug. You can continue playing without worry.'
 	gt 'pre_sleep', 'start'
-	
+
 end
 
 
@@ -111,6 +111,7 @@ end
 
 if $ARGS[0] = 'sleep_loop':
 	menu_off = 1
+	sleepVars['stat_display'] = 0
 	:sleep_loop_loop
 		minut += 1
 		sleepVars['stime'] += 1
@@ -163,7 +164,7 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!! Check for: if $ARGS[0] = 'pre_sleep' and $ARGS[1] = 'mod_sleeptriggers'
 	!!
 	!! This is NOT for events!!
-	
+
 	gs 'LOCA', 'sleep', 'mod_sleeptriggers'
 end
 

locations/sleep_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 
@@ -113,6 +114,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -122,6 +124,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

locations/stat.qsrc

@@ -899,7 +899,7 @@ gs 'stat_sklattrib_lvlset'
 !!Sleep variable cap
 if pcs_sleep > 100: pcs_sleep = 100
 
-if insleep = 0:
+if insleep = 0 or sleepVars['stat_display'] = 1:
 	gs 'outdoors', 'main'
 	gs 'stat_display'
 end

locations/stat_display.qsrc

@@ -1888,8 +1888,12 @@ else
 			$stat_display_temp_table_desc = 'fuck buddy'
 		elseif $npc_rel_type[$stat_display_temp_npcid] = 'sugar_daddy':
 			$stat_display_temp_table_desc = 'sugar daddy'
+		else
+			$stat_display_temp_table_desc = ''
 		end
-		gs 'show_table', '<<$stat_display_temp_table_desc>> <<$npc_usedname[$stat_display_temp_npcid]>>: <<npc_rel[$stat_display_temp_npcid]>>', '2'
+
+		if $stat_display_temp_table_desc ! '': gs 'show_table', '<<$stat_display_temp_table_desc>> <<$npc_usedname[$stat_display_temp_npcid]>>: <<npc_rel[$stat_display_temp_npcid]>>', '2'
+
 		stat_display_i += 1
 		jump 'lover_display_loop'
 	end

locations/wakeup.qsrc

@@ -8,6 +8,7 @@
 if $ARGS[0] = 'start' or $ARGS[0] = 'wake' or $ARGS[0] = '':
 	menu_off = 1
 	InSleep = 1
+	sleepVars['stat_display'] = 1
 	gs 'stat'
 
 	SleepVars['no_sleep_loss'] = 1