浏览代码

[text edit] removed the maroon color in korrpar and a small text edit in one action
[fixes] missing Mother links and name in the CSB Start
[fixes] grandmother won't pay sveta in the first month of the cursed schoolgirl start and you could go to school in the cursed schoolgirl june start even during the holiday break

julzor 5 年之前
父节点
当前提交
f494d104b7
共有 3 个文件被更改,包括 14 次插入6 次删除
  1. 5 5
      locations/korrPar.qsrc
  2. 5 0
      locations/preCSB.qsrc
  3. 4 1
      locations/preSYS.qsrc

+ 5 - 5
locations/korrPar.qsrc

@@ -29,7 +29,7 @@ end
 
 
 if hour ! 18 and blockBedrPar = 1:blockBedrPar = 0
 if hour ! 18 and blockBedrPar = 1:blockBedrPar = 0
 
 
-act '<font color = maroon><b>Leave and go to the stairwell</b></font>':
+act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':
 	if $clothingworntype ! 'nude':
 		gt'pod_ezd','etaj_2'
 		gt'pod_ezd','etaj_2'
 	else
 	else
@@ -38,7 +38,7 @@ act '<font color = maroon><b>Leave and go to the stairwell</b></font>':
 	end
 	end
 end
 end
 
 
-act '<font color = maroon><b>Leave and go to the street</b></font>':
+act '<b>Leave and go to the street</b>':
 	if $clothingworntype ! 'nude':
 	if $clothingworntype ! 'nude':
 		if hour < 4 and motherWorry = 0 and age < 18:
 		if hour < 4 and motherWorry = 0 and age < 18:
 			'<font color=red>Are you sure? Your mother will worry.</b></font>'
 			'<font color=red>Are you sure? Your mother will worry.</b></font>'
@@ -57,11 +57,11 @@ end
 
 
 if blockBedrPar = 0:
 if blockBedrPar = 0:
 	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
 	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
-		act 'Go to your room bedroom':gt 'sisterQW', 'sisboytrioQW_bedroom', 'start'
+		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom', 'start'
 	elseif sisboyday + 1 = daystart and hour = 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] = 9):
 	elseif sisboyday + 1 = daystart and hour = 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] = 9):
-		act 'Go to your room bedroom':gt 'sisterQW', 'sisboyQW_bedroom'
+		act 'Go to your room':gt 'sisterQW', 'sisboyQW_bedroom'
 	else
 	else
-		act 'Go to your room bedroom':gt 'bedrPar'
+		act 'Go to your room':gt 'bedrPar'
 	end
 	end
 end
 end
 act 'Go to your parents'' room':gt 'bedrPar2'
 act 'Go to your parents'' room':gt 'bedrPar2'

+ 5 - 0
locations/preCSB.qsrc

@@ -149,8 +149,13 @@ if $ARGS[0] = 'intro_4':
 	'You do the best you can to repress any resentment towards <<$pcs_nickname>> about how little she appreciates what she has.'
 	'You do the best you can to repress any resentment towards <<$pcs_nickname>> about how little she appreciates what she has.'
 
 
 	act 'When she talks about her mother, she calls her ...':
 	act 'When she talks about her mother, she calls her ...':
+		
+		$npc_nickname['A29'] = 'Mother'
+		$temp_nickname = $npc_nickname['A29']
+		
 		$npc_nickname['A29'] = input('<center>What name does she use to address her mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
 		$npc_nickname['A29'] = input('<center>What name does she use to address her mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
 		if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
 		if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+		killvar '$temp_nickname'
 		
 		
 		gt 'preCSB', 'intro_5'
 		gt 'preCSB', 'intro_5'
 	end
 	end

+ 4 - 1
locations/preSYS.qsrc

@@ -322,14 +322,16 @@ if $ARGS[0] = 'SGStart2':
 		
 		
 		$holyday = '<b>Summer holidays</b>'
 		$holyday = '<b>Summer holidays</b>'
 		
 		
+		kanikuli = 5
+		
 		!!This is the default start
 		!!This is the default start
 		act 'Start at the end of August':
 		act 'Start at the end of August':
 			month = 8
 			month = 8
 			$month = 'August'
 			$month = 'August'
+			monthbabkapay = month
 			day = 26
 			day = 26
 			week = 5
 			week = 5
 			hour = 9
 			hour = 9
-			kanikuli = 5
 			kanicont = 6
 			kanicont = 6
 			gt 'preSYS', 'SGStart3'
 			gt 'preSYS', 'SGStart3'
 		end
 		end
@@ -337,6 +339,7 @@ if $ARGS[0] = 'SGStart2':
 		act 'Start at the beginning of June':
 		act 'Start at the beginning of June':
 			month = 6
 			month = 6
 			$month = 'June'
 			$month = 'June'
+			monthbabkapay = month
 			day = 1
 			day = 1
 			week = 3
 			week = 3
 			kanicont = 92
 			kanicont = 92