Browse Source

[fixed] Couldn't do sg_m start as I hadn't added split and was overwriting the start type

Kevin_Smarts 2 years ago
parent
commit
3321c39519
2 changed files with 24 additions and 30 deletions
  1. 11 5
      locations/intro_sg.qsrc
  2. 13 25
      locations/intro_sg_m.qsrc

+ 11 - 5
locations/intro_sg.qsrc

@@ -1,9 +1,11 @@
 # intro_sg
 
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type = 'sg'
-$start_type[1] = 'nomagic'
+if $start_type ! 'sg_m':
+	killvar '$start_type'
+	$start_type = 'sg'
+	$start_type[1] = 'nomagic'
+end
 
 if $ARGS[0] = 'start':
 	menu_off = 1
@@ -11,7 +13,7 @@ if $ARGS[0] = 'start':
 	'You were born in the small town of Pavlovsk near the city of St Petersburg. You have an older sister, Anya, who is two years older than you.'
 	'Your mother is Natasha. You don''t know much about your biological father; your mother never wants to talk about him, or why he left you and Anya with her.'
 	'Your mother met another man not too long after her and your biological father got divorced, Vladimir. Together they had your little brother Kolka. Even though he''s not your real father, Vladimir has always treated you and Anya as if you were his own children.'
-	act 'Continue': gt 'intro_sg', 'Two'
+	act '<center><b>Continue</b></center>': gt 'intro_sg', 'Two'
 end
 
 if $ARGS[0] = 'Two':
@@ -42,7 +44,11 @@ if $ARGS[0] = 'four':
 	'<center>Customize your:</center>'
 	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
 
-	act '<center><b>Done</b></center>': gt 'intro_sg', 'five'
+	if $start_type = 'sg_m':
+		act '<center><b>Done</b></center>': gt 'intro_sg_m', 'four'
+	else
+		act '<center><b>Done</b></center>': gt 'intro_sg', 'five'
+	end
 end
 
 if $ARGS[0] = 'five':

+ 13 - 25
locations/intro_sg_m.qsrc

@@ -109,8 +109,6 @@ if $ARGS[0] = 'five':
 							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 							'"Lay low for now. Get on with your life. We''ll contact you if anything comes up. Gustav here will drop you off at your '+iif($month = 'June','grandparent''s','parent''s')+' place."'
 							act 'Follow Gustav':
-								gs 'intro_sg_select', 'sg_settings'
-								gs 'intro_initialization'
 								money = 5000
 
 								*clr & cla
@@ -133,29 +131,19 @@ end
 
 if $ARGS[0] = 'six':
 	*clr & cla				
-	hour = 18
-	$loc = 'intro_sg_m'
-	$loc_arg = 'six'
-	'<center><b><font color = maroon>Character Face</font></b></center>'
-	'<center><b>Allows you to alter hair and eyes, use to match fixed profile picture if in use.</b></center>'
-	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_2.jpg"></center>'
-	*nl
-	'<center>Customize your:</center>'
-	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
-
-	act 'Continue':
-		showstat 1
-		showobjs 1
-		gs 'obj_din', 'old'
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_csg.jpg"></center>'
-		'Welcome to the Cursed Schoolgirl version! 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!'
-		act 'Begin!':
-			if start_location = 2:
-				gt 'gadhouse', 'intro'
-			elseif start_location = 1:
-				gt 'bedrPar', 'intro'
-			end
+	gs 'intro_sg_select', 'sg_settings'
+	gs 'intro_initialization'
+	showstat 1
+	showobjs 1
+	gs 'obj_din', 'old'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_csg.jpg"></center>'
+	'Welcome to the Cursed Schoolgirl version! 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!'
+	act '<center><b>Begin!</b></center>':
+		if start_location = 2:
+			gt 'gadhouse', 'intro'
+		elseif start_location = 1:
+			gt 'bedrPar', 'intro'
 		end
 	end
 end