Browse Source

[fixed] SG_TG start wasn't initialised so lots of things were broken, the sg specific option in customisation were not set to display in menu correctly and the $loc_args was being overwritten in relationship customisation

Kevin_Smarts 2 years ago
parent
commit
a717ef9a7e

+ 1 - 3
locations/intro_customization.qsrc

@@ -7,12 +7,10 @@ if $ARGS[0] = 'start':
 	!act 'Set attributes': gt 'intro_customization','modatt'
 	!act 'Set skills': gt 'intro_customization','modskl'
 	act 'Set appearance':gt 'intro_customization','modapp'
-	act 'Set relationships': gt 'intro_customization','modrel'
 	act 'Set purse': gt 'intro_customization','modpur'
 	act 'Set items': gt 'intro_customization','modite'
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'intro_customization','start'
-	if custom_csb ! 1: act 'Return to preset character menu': gt 'intro_sg_select', 'charselect'
-	if start < 10:
+	if mid($start_type,1,2) = 'sg':
 		gs 'intro_sg_select_custom', 'start'
 	else
 		act 'Confirm these options':

+ 8 - 8
locations/intro_sg_select_custom.qsrc

@@ -274,11 +274,11 @@ end
 if $ARGS[0] = 'modrel_setup':
 	if npc_rel['<<$ARGS[1]>>'] < 0: npc_rel['<<$ARGS[1]>>'] = 0
 	if npc_rel['<<$ARGS[1]>>'] > 100: npc_rel['<<$ARGS[1]>>'] = 100
-	'<TR bgcolor=#ffffff><TD><<$npc_firstname[''<<$ARGS[1]>>'']>> <<$npc_lastname[''<<$ARGS[1]>>'']>>: <<npc_rel[''<<$ARGS[1]>>'']>></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 0 & gt ''intro_sg_select_custom'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 10 & gt ''intro_sg_select_custom'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 5 & gt ''intro_sg_select_custom'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 5 & gt ''intro_sg_select_custom'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 10 & gt ''intro_sg_select_custom'', $loc_arg">plus 10</a></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 100 & gt ''intro_sg_select_custom'', $loc_arg">100</a></TD>'
+	'<TR bgcolor=#ffffff><TD><<$npc_firstname[''<<$ARGS[1]>>'']>> <<$npc_lastname[''<<$ARGS[1]>>'']>>: <<npc_rel[''<<$ARGS[1]>>'']>></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 0 & gt ''intro_sg_select_custom'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 10 & gt ''intro_sg_select_custom'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 5 & gt ''intro_sg_select_custom'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 5 & gt ''intro_sg_select_custom'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 10 & gt ''intro_sg_select_custom'', $locM_arg">plus 10</a></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 100 & gt ''intro_sg_select_custom'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_pop':
-	$loc_arg = 'modrel_pop'
+	$locM_arg = 'modrel_pop'
 	'<center><b>Popular kids relationship levels</b></center>'
 	*nl
 	*nl
@@ -302,7 +302,7 @@ if $ARGS[0] = 'modrel_pop':
 end
 
 if $ARGS[0] = 'modrel_ath':
-	$loc_arg = 'modrel_ath'
+	$locM_arg = 'modrel_ath'
 	'<center><b>Jocks relationship levels</b></center>'
 	*nl
 	*nl
@@ -324,7 +324,7 @@ if $ARGS[0] = 'modrel_ath':
 end
 
 if $ARGS[0] = 'modrel_ner':
-	$loc_arg = 'modrel_ner'
+	$locM_arg = 'modrel_ner'
 	'<center><b>Nerds relationship levels</b></center>'
 	*nl
 	*nl
@@ -344,7 +344,7 @@ if $ARGS[0] = 'modrel_ner':
 end
 
 if $ARGS[0] = 'modrel_gop':
-	$loc_arg = 'modrel_gop'
+	$locM_arg = 'modrel_gop'
 	'<center><b>Gopnik kids relationship levels</b></center>'
 	*nl
 	*nl
@@ -371,7 +371,7 @@ end
 
 
 if $ARGS[0] = 'modrel_out':
-	$loc_arg = 'modrel_out'
+	$locM_arg = 'modrel_out'
 	'<center><b>Outcast kids relationship levels</b></center>'
 	*nl
 	*nl
@@ -385,7 +385,7 @@ if $ARGS[0] = 'modrel_out':
 end
 
 if $ARGS[0] = 'modrel_tea':
-	$loc_arg = 'modrel_tea'
+	$locM_arg = 'modrel_tea'
 	'<center><b>Teacher relationship levels</b></center>'
 	*nl
 	*nl
@@ -409,7 +409,7 @@ if $ARGS[0] = 'modrel_tea':
 end
 
 if $ARGS[0] = 'modrel_oth':
-	$loc_arg = 'modrel_oth'
+	$locM_arg = 'modrel_oth'
 	'<center><b>Others relationship levels</b></center>'
 	*nl
 	*nl

+ 50 - 12
locations/intro_sg_tg.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_ivan.jpg"></center>'
 	'You are Mikhail Ivanov.'
 	'<<$startdob>>'
-	'Your parents died shortly after you were born. Your only remaining relative, your great uncle Ivan, took you in. Your uncle has always made it clear that he took you in as a courtesy to your parents, not to become one himself. You two never became close, causing a lonely childhood.'
+	'Your parents died shortly after you were born. Your only remaining relative, your great uncle Ivan (pictured), took you in. Your uncle has always made it clear that he took you in as a courtesy to your parents, not to become one himself. You two never became close, causing a lonely childhood.'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/1.jpg"></center>'
@@ -125,11 +125,9 @@ end
 
 if $ARGS[0] = 'intro_5':
 	*clr & cla
-	if $month = 'August': $cbpre_text1 = ' the end of'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/6.jpg"></center>'
-	'A couple months pass. You and <<$pcs_nickname>> continue to talk, and you learn even more about her life. As<<$cbpre_text1>> summer break approaches, you bring up the idea of meeting up. <<$pcs_nickname>> is excited at the prospect and you agree to meet at the café where her mother works.'
+	'A couple months pass. You and <<$pcs_nickname>> continue to talk, and you learn even more about her life. During your summer holidays you bring up the idea of meeting up. <<$pcs_nickname>> is excited at the prospect and you agree to meet at the café where her mother works.'
 
-	killvar '$cbpre_text1'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/7.jpg"></center>'
@@ -153,6 +151,8 @@ if $ARGS[0] = 'intro_5':
 end
 
 if $ARGS[0] = 'settings':
+	$locM = 'intro_sg_tg'
+	$locM_arg = 'intro_6_looks'
 	*clr & cla
 
 	ml_update_1 = 1
@@ -278,12 +278,22 @@ if $ARGS[0] = 'settings':
 	end
 
 	*nl
+
+	'<a href="exec:gt ''intro_customization'', ''birthday''"><<$startdob>></a>.'
+
 	gt 'intro_sg_tg', 'intro_6_looks'
 end
 
 if $ARGS[0] = 'intro_6_looks':
 	$loc = 'intro_sg_tg'
-	$loc_arg = 'intro_7'
+	$loc_arg = 'intro_6_looks'
+	killvar '$startdob'
+	!killvar 'date_toggle'
+
+	$holyday = '<b>Summer holidays</b>'
+
+	kanikuli = 5
+
 	*clr & cla
 	if player_avatar = 1:
 		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
@@ -299,7 +309,7 @@ if $ARGS[0] = 'intro_6_looks':
 
 	
 	act 'Meet her': gt 'intro_sg_tg', 'intro_7'
-	act 'Customise Sveta': gt 'intro_customization', 'start'
+	act 'Customise Sveta': $loc_arg = 'intro_7' & gt 'intro_customization', 'start'
 end
 
 
@@ -454,6 +464,11 @@ end
 
 if $ARGS[0] = 'intro_9':
 	*clr & cla
+	!!background: black
+	bcolor = rgb(0, 0, 0)
+	lcolor = rgb(106, 90, 205)
+	fcolor = rgb(255, 255, 255)
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/11.jpg"></center>'
 	'...'
 	wait 1500
@@ -584,12 +599,31 @@ if $ARGS[0] = 'intro_9':
 																	*clr & cla
 																	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/start_csb.jpg"></center>'
 																	'Welcome to the Cursed Schoolboy version! You may have lost your masculinity and your old life, but you''ve gained new possibilities in return! Will you try to live your new life as a mere schoolgirl, or do you have grander aspirations with your newfound knowledge of magic? The choice is yours!'
-																	!!'Now, would you like to dive right into the action? Or would you rather take some time to get used to your new body and life?'
 
-																	act 'Start main game!': gt 'intro_sg_tg', 'intro_end'
 
-																	!! [Will lead into the prologue, which is currently WIP]
-																	!! act 'Let''s keep this intro going!':
+																	!!This is the default start
+																	act 'Start at the end of August':
+																		month = 8
+																		$month = 'August'
+																		grandmaQW['last_month_paid'] = month
+																		day = 26
+																		week = 5
+																		hour = 9
+																		kanicont = 6
+																		gt 'intro_sg_tg', 'intro_end'
+																	end
+
+																	act 'Start at the beginning of June':
+																		month = 6
+																		$month = 'June'
+																		grandmaQW['last_month_paid'] = month
+																		day = 1
+																		week = 3
+																		kanicont = 92
+																		Gspassed = 1
+																		dostupindorf = 1
+																		gt 'intro_sg_tg', 'intro_end'
+																	end
 																end
 															end
 														end
@@ -625,7 +659,7 @@ if $ARGS[0] = 'pav_start':
 	'<center><h2>Pavlovsk</h2></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_pavlovsk.jpg"></center>'
 	*nl
-	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants.</center>'
+	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants. This is where you live with your parents, it is ideal if you are due back to school but it might be a bit boring to spend all summer here.</center>'
 
 	act 'Continue': $starting_location = 'pavlovsk' & gt 'intro_sg_tg', 'game_start'
 	act 'Change location': gt 'intro_sg_tg', 'gad_start'
@@ -636,7 +670,7 @@ if $ARGS[0] = 'gad_start':
 	'<center><h2>Gadukino</h2></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_pavlovsk.jpg"></center>'
 	*nl
-	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times.</center>'
+	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times. It might be a good place to spend your summer holidays but it is not convenient if you are due to return to school.</center>'
 
 	act 'Continue': $starting_location = 'gadukino' & gt 'intro_sg_tg', 'game_start'
 	act 'Change location': gt 'intro_sg_tg', 'pav_start'
@@ -664,8 +698,11 @@ if $ARGS[0] = 'game_start':
 
 			act 'Continue':
 				cla
+				gs 'intro_sg_select', 'sg_settings'
+				gs 'intro_initialization'
 				showstat 1
 				showobjs 1
+				gs 'obj_din', 'old'
 
 				!!Stuff from the backpack, phone
 				prezik = 3
@@ -680,6 +717,7 @@ if $ARGS[0] = 'game_start':
 				gs 'stat'
 
 				act 'Start your new life':
+					music_loop = 0
 					if $starting_location = 'pavlovsk': gt 'bedrPar'
 					if $starting_location = 'gadukino': gt 'gadhouse', 'start'
 				end