Merge remote-tracking branch 'origin/master'

locations/intro_city.qsrc

@@ -174,6 +174,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 
 	act 'Start the game': gt 'korr'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'city' & gt 'stat_explanations', 'start'
 end
 
 

locations/intro_city_m.qsrc

@@ -133,6 +133,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to the magical girl version of Girl Life! You are finally free of your parents and ready to face all the freedoms and challenges that entails. Guide <<$pcs_nickname>> through her school life, relationships and myriad of other issues that might pop up, all with the added spice of magic to keep things interesting!'
 	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 	act 'Start the game': gt 'korr'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'city' & gt 'stat_explanations', 'start'
 end
 
 --- intro_city_m ---------------------------------

locations/intro_city_tg.qsrc

@@ -403,6 +403,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to the Transformation start! Although you''ve lost your masculinity and your old life, new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world!'
 	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 	act 'Start the game': gt 'korr'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'city' & gt 'stat_explanations', 'start'
 end
 
 --- intro_city_tg ---------------------------------

locations/intro_sg.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = 'five':
 		act 'No': gt 'intro_sg', 'four'
 		act 'Yes': killall & gt 'start'
 	end
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'sg' & gt 'stat_explanations', 'start'
 end
 
 

locations/intro_sg_m.qsrc

@@ -143,6 +143,7 @@ if $ARGS[0] = 'six':
 			gt 'bedrPar', 'intro'
 		end
 	end
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'sg_m' & gt 'stat_explanations', 'start'
 end
 
 

locations/intro_sg_tg.qsrc

@@ -693,6 +693,7 @@ if $ARGS[0] = 'game_start':
 					if $starting_location = 'pavlovsk': gt 'bedrPar'
 					if $starting_location = 'gadukino': gt 'gad_gphouse', 'start'
 				end
+				act 'Introduction to character stats and the stat display': $stat_explanation = 'sg_tg' & gt 'stat_explanations', 'start'
 			end
 		end
 	end

locations/intro_uni.qsrc

@@ -309,6 +309,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to Girl Life. Guide <<$pcs_nickname>> through the many challenges of life at university. Manage coursework, a job and relationships with the people you meet on your journey.'
 
 	act 'Start the game': gt 'uni_grounds', 'main'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'uni' & gt 'stat_explanations', 'start'
 end
 
 

locations/intro_uni_m.qsrc

@@ -136,6 +136,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to the Cursed University Student version! Guide <<$pcs_nickname>> through the many challenges of life at university. Manage coursework, a job and relationships with the people you meet on your journey.'
 
 	act 'Start the game': gt 'uni_grounds', 'main'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'uni' & gt 'stat_explanations', 'start'
 end
 
 --- intro_uni_m ---------------------------------

locations/intro_uni_tg.qsrc

@@ -404,6 +404,7 @@ if $ARGS[0] = 'welcome_intro':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/uni_start.jpg"></center>'
 	'Welcome to the Transformation start! Although you''ve lost your masculinity and your old life, new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world! Guide <<$pcs_nickname>> through the many challenges of life at university. Manage coursework, a job and relationships with the people you meet on your journey.'
 	act 'Start the game': gt 'uni_grounds', 'main'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'uni' & gt 'stat_explanations', 'start'
 end
 
 --- intro_uni_tg ---------------------------------

locations/stat_explanations.qsrc

@@ -2,7 +2,11 @@
 !2024/05/09
 
 if $ARGS[0] = 'start':
-	gs 'obj_din', 'settingtabs'
+	if $stat_explanation = '':
+		gs 'obj_din', 'settingtabs'
+	else
+		gs 'stat_explanations', 'start_exit'
+	end
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Glossary</font></b></center>'
@@ -20,7 +24,9 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'icons':
-	gs 'obj_din', 'settingtabs'
+	if $stat_explanation = '':
+		gs 'obj_din', 'settingtabs'
+	end
 	menu_off = 1
 	gs 'stat'
 	cla
@@ -81,11 +87,17 @@ if $ARGS[0] = 'icons':
 	act 'Go back to the Glossary overview':  gt 'stat_explanations', 'start'
 	act 'Jump to the explanation of skills': gt 'stat_explanations', 'skill'
 	act 'Jump to the explanation of status effects': gt 'stat_explanations', 'status'
-	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	if $stat_explanation = '':
+		act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	else
+		gs 'stat_explanations', 'start_exit'
+	end
 end
 
 if $ARGS[0] = 'attributes':
-	gs 'obj_din', 'settingtabs'
+	if $stat_explanation = '':
+		gs 'obj_din', 'settingtabs'
+	end
 	menu_off = 1
 	gs 'stat'
 	cla
@@ -111,11 +123,17 @@ if $ARGS[0] = 'attributes':
 	act 'Go back to the Glossary overview':  gt 'stat_explanations', 'start'
 	act 'Jump back to the explanation of icons': gt 'stat_explanations', 'icons'
 	act 'Jump to the explanation of status effects': gt 'stat_explanations', 'status'
-	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	if $stat_explanation = '':
+		act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	else
+		gs 'stat_explanations', 'start_exit'
+	end
 end
 
 if $ARGS[0] = 'skill':
-	gs 'obj_din', 'settingtabs'
+	if $stat_explanation = '':
+		gs 'obj_din', 'settingtabs'
+	end
 	menu_off = 1
 	gs 'stat'
 	cla
@@ -169,11 +187,17 @@ if $ARGS[0] = 'skill':
 	act 'Go back to the Glossary overview':  gt 'stat_explanations', 'start'
 	act 'Jump back to the explanation of icons': gt 'stat_explanations', 'icons'
 	act 'Jump back to the explanation of attributes': gt 'stat_explanations', 'attributes'
-	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	if $stat_explanation = '':
+		act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	else
+		gs 'stat_explanations', 'start_exit'
+	end
 end
 
 if $ARGS[0] = 'status':
-	gs 'obj_din', 'settingtabs'
+	if $stat_explanation = '':
+		gs 'obj_din', 'settingtabs'
+	end
 	menu_off = 1
 	gs 'stat'
 	cla
@@ -198,8 +222,52 @@ if $ARGS[0] = 'status':
 	act 'Jump back to the explanation of icons': gt 'stat_explanations', 'icons'
 	act 'Jump back to the explanation of attributes': gt 'stat_explanations', 'attributes'
 	act 'Jump back to the explanation of skills': gt 'stat_explanations', 'skill'
-	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	if $stat_explanation = '':
+		act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
+	else
+		gs 'stat_explanations', 'start_exit'
+	end
 end
 
+if $ARGS[0] = 'start_exit':
+	if $stat_explanation = 'sg':
+		act 'Start playing':
+			close all
+			killvar '$stat_explanation'
+			if start_location = 2:
+				gt 'gad_gphouse', 'intro'
+			elseif start_location = 1:
+				gt 'bedrPar', 'intro'
+			end
+		end
+		act 'Restart the character selection':
+			*clr & cla
+			killvar '$stat_explanation'
+			'This will reset everything and take you back to the beginning. Are you sure you want to start again?'
+			act 'No': gt 'intro_sg', 'four'
+			act 'Yes': killall & gt 'start'
+		end
+	elseif $stat_explanation = 'sg_m':
+		act '<center><b>Begin!</b></center>':
+			killvar '$stat_explanation'
+			if start_location = 2:
+				gt 'gad_gphouse', 'intro'
+			elseif start_location = 1:
+				gt 'bedrPar', 'intro'
+			end
+		end
+	elseif $stat_explanation = 'sg_tg':
+		act 'Start your new life':
+			killvar '$stat_explanation'
+			music_loop = 0
+			if $starting_location = 'pavlovsk': gt 'bedrPar'
+			if $starting_location = 'gadukino': gt 'gad_gphouse', 'start'
+		end
+	elseif $stat_explanation = 'city':
+		act 'Start the game':  killvar '$stat_explanation' & gt 'korr'
+	elseif $stat_explanation = 'uni':
+		act 'Start the game': killvar '$stat_explanation' & gt 'uni_grounds', 'main'
+	end
+end
 --- stat_explanations ---------------------------------