From a1cc892f6900aa770c2cbffc5fbcbeccd0b914ce Mon Sep 17 00:00:00 2001 From: Dazed Date: Sat, 30 Dec 2023 22:34:52 -0600 Subject: [PATCH] Fix Skip Crashes --- data/scenario/s_003a.ks | 2 +- data/scenario/s_003b.ks | 4 ++-- data/scenario/s_004.ks | 4 ++-- data/scenario/s_005b.ks | 10 +++++----- data/scenario/s_005b_bad.ks | 4 ++-- data/scenario/s_006a.ks | 2 +- data/scenario/s_006b.ks | 4 ++-- data/scenario/s_006c_bad.ks | 2 +- data/scenario/s_008_2b.ks | 12 ++++++------ data/scenario/s_008_2c.ks | 2 +- data/scenario/s_009_1a.ks | 4 ++-- data/scenario/s_009_1b.ks | 2 +- data/scenario/s_010a.ks | 2 +- data/scenario/s_010a2.ks | 4 ++-- data/scenario/s_010a3.ks | 6 +++--- data/scenario/s_010b2.ks | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/data/scenario/s_003a.ks b/data/scenario/s_003a.ks index fc4f255..ad19e3a 100644 --- a/data/scenario/s_003a.ks +++ b/data/scenario/s_003a.ks @@ -2114,7 +2114,7 @@ *kaisou_08 [tb_replay_start ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [delay speed="10" ] [playbgm volume="100" time="1000" loop="true" storage="taste_xxx02.ogg" ] [wait time="1500" ] diff --git a/data/scenario/s_003b.ks b/data/scenario/s_003b.ks index af7102c..9044b16 100644 --- a/data/scenario/s_003b.ks +++ b/data/scenario/s_003b.ks @@ -475,7 +475,7 @@ *kaisou_04 [tb_replay_start ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [stopbgm time="1500" fadeout="true" ] [delay speed="10" ] [bg time="0" method="crossfade" storage="cg11/cg11_01.png" ] @@ -2204,7 +2204,7 @@ [bg time="2000" method="crossfade" storage="cg11/cg13_04.png" ] [wait time="1000" ] [playse volume="100" time="1000" buf="5" storage="se02/dressing1.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="250" effect="fadeOut" ] [wait time="1000" ] [tb_show_message_window ] diff --git a/data/scenario/s_004.ks b/data/scenario/s_004.ks index 9ef3b07..be7ee44 100644 --- a/data/scenario/s_004.ks +++ b/data/scenario/s_004.ks @@ -2175,7 +2175,7 @@ [resetfont ] [tb_hide_message_window ] [playse volume="100" time="1000" buf="5" storage="se02/swing1.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="1000" effect="fadeOut" ] [tb_show_message_window ] [tb_start_text mode=1 ] @@ -2296,7 +2296,7 @@ [resetfont ] [tb_hide_message_window ] [wait time="250" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [playse volume="100" time="1000" buf="0" storage="basa03.ogg" ] [chara_show name="hitomi_1" time="0" wait="true" storage="chara/3/hitomi_1_16_03.png" width="406" height="600" left="" top="" reflect="false" ] [chara_show name="maikai" time="0" wait="true" storage="chara/7/maikai_2_03.png" width="313" height="600" left="456" top="0" reflect="false" ] diff --git a/data/scenario/s_005b.ks b/data/scenario/s_005b.ks index 10b6425..cd02131 100644 --- a/data/scenario/s_005b.ks +++ b/data/scenario/s_005b.ks @@ -966,7 +966,7 @@ [tb_hide_message_window ] [wait time="750" ] [playse volume="100" time="1000" buf="0" storage="basa03.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_hide name="saeko" time="0" wait="true" pos_mode="false" ] [wait time="10" ] [mask_off time="50" effect="fadeOut" ] @@ -999,7 +999,7 @@ [tb_hide_message_window ] [wait time="500" ] [playse volume="100" time="1000" buf="0" storage="ugoki04.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_mod name="kotora_1" time="50" cross="false" storage="chara/4/kotora_1_15.png" ] [wait time="10" ] [mask_off time="50" effect="fadeOut" ] @@ -1013,7 +1013,7 @@ [resetfont ] [tb_hide_message_window ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [playse volume="100" time="1000" buf="0" storage="basa05.ogg" ] [chara_hide_all time="0" wait="true" ] [chara_show name="hitomi_1" time="0" wait="true" storage="chara/3/hitomi_1_16_05.png" width="406" height="600" reflect="false" left="190" top="0" ] @@ -1030,7 +1030,7 @@ [tb_hide_message_window ] [chara_hide_all time="250" wait="true" ] [playse volume="100" time="1000" buf="0" storage="ugoki04.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_show name="saeko" time="0" wait="true" storage="chara/11/saeko_1_02.png" width="438" height="600" left="104" top="-2" reflect="false" ] [chara_show name="kotora_1" time="0" wait="true" storage="chara/4/kotora_1_19.png" width="363" height="600" reflect="true" left="187" top="66" ] [wait time="10" ] @@ -1080,7 +1080,7 @@ [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="basa05.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_hide name="kotora_1" time="0" wait="true" pos_mode="false" ] [chara_hide name="saeko" time="0" wait="true" pos_mode="false" ] [chara_hide name="hitomi_1" time="0" wait="true" pos_mode="false" ] diff --git a/data/scenario/s_005b_bad.ks b/data/scenario/s_005b_bad.ks index 26b83d2..58df3c4 100644 --- a/data/scenario/s_005b_bad.ks +++ b/data/scenario/s_005b_bad.ks @@ -1011,12 +1011,12 @@ [tb_hide_message_window ] [wait time="1000" ] [playse volume="100" time="1000" buf="0" storage="se02/gyuu3.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_hide_all time="0" wait="true" ] [wait time="10" ] [mask_off time="150" effect="fadeOut" ] [playse volume="100" time="1000" buf="1" storage="se02/gyuu2.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="500" effect="fadeOut" ] [bg time="1000" method="crossfade" storage="haikei/room06_3.jpg" ] [playse volume="90" time="1000" buf="0" storage="se02/dosyu1.ogg" ] diff --git a/data/scenario/s_006a.ks b/data/scenario/s_006a.ks index 0db5c11..569cc19 100644 --- a/data/scenario/s_006a.ks +++ b/data/scenario/s_006a.ks @@ -422,7 +422,7 @@ [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="panchi01.ogg" ] [stopbgm time="1500" fadeout="true" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [delay speed="10" ] [chara_hide_all time="0" wait="true" ] [wait time="2500" ] diff --git a/data/scenario/s_006b.ks b/data/scenario/s_006b.ks index ecf3306..99c2631 100644 --- a/data/scenario/s_006b.ks +++ b/data/scenario/s_006b.ks @@ -421,7 +421,7 @@ [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="panchi01.ogg" ] [stopbgm time="1500" fadeout="true" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [delay speed="10" ] [chara_hide_all time="0" wait="true" ] [wait time="2500" ] @@ -2188,7 +2188,7 @@ [resetfont ] [tb_hide_message_window ] [stopbgm time="1000" fadeout="true" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [bg time="0" method="crossfade" storage="haikei/roziura13.png" ] [chara_show name="ai_1" time="0" wait="true" storage="chara/12/ai02_05_2.png" width="375" height="600" left="114" top="0" reflect="false" ] [chara_show name="rin_1" time="0" wait="true" storage="chara/13/rin2_08.png" width="375" height="600" left="316" top="0" reflect="false" ] diff --git a/data/scenario/s_006c_bad.ks b/data/scenario/s_006c_bad.ks index 5f9721a..5e31733 100644 --- a/data/scenario/s_006c_bad.ks +++ b/data/scenario/s_006c_bad.ks @@ -1596,7 +1596,7 @@ [tb_replay_start ] [stopbgm time="1500" fadeout="true" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [delay speed="10" ] [chara_hide_all time="0" wait="true" ] [wait time="500" ] diff --git a/data/scenario/s_008_2b.ks b/data/scenario/s_008_2b.ks index fc9d4f3..0eec523 100644 --- a/data/scenario/s_008_2b.ks +++ b/data/scenario/s_008_2b.ks @@ -195,7 +195,7 @@ [resetfont ] [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="basa03.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [bg time="0" method="crossfade" storage="haikei/roka03_4.jpg" ] [wait time="10" ] [mask_off time="250" effect="fadeOut" ] @@ -641,7 +641,7 @@ [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="ugoki04.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_show name="saeko" time="0" wait="true" storage="chara/11/saeko_2_01.png" width="438" height="600" left="-138" top="0" reflect="false" ] [wait time="10" ] [mask_off time="250" effect="fadeOut" ] @@ -673,7 +673,7 @@ [resetfont ] [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="se02/swing3.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_hide name="hitomi_1" time="0" wait="true" pos_mode="false" ] [chara_hide name="saeko" time="0" wait="true" pos_mode="false" ] [wait time="250" ] @@ -715,7 +715,7 @@ [tb_hide_message_window ] [wait time="250" ] [playse volume="100" time="1000" buf="0" storage="basa05.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_hide_all time="0" wait="true" ] [wait time="10" ] [mask_off time="250" effect="fadeOut" ] @@ -2484,10 +2484,10 @@ [resetfont ] [tb_hide_message_window ] [wait time="1000" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="250" effect="fadeOut" ] [wait time="1000" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="750" effect="fadeOut" ] [wait time="1000" ] [playse volume="100" time="1000" buf="3" storage="se02/dressing1.ogg" ] diff --git a/data/scenario/s_008_2c.ks b/data/scenario/s_008_2c.ks index 579d927..5d0a90a 100644 --- a/data/scenario/s_008_2c.ks +++ b/data/scenario/s_008_2c.ks @@ -1454,7 +1454,7 @@ [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="se02/charge2.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="350" effect="fadeOut" ] [mask time="350" effect="fadeIn" color="0x000000" ] [mask_off time="350" effect="fadeOut" ] diff --git a/data/scenario/s_009_1a.ks b/data/scenario/s_009_1a.ks index 49d639f..0735d9d 100644 --- a/data/scenario/s_009_1a.ks +++ b/data/scenario/s_009_1a.ks @@ -2724,7 +2724,7 @@ [bg time="0" method="crossfade" storage="haikei/school12.jpg" ] [mask_off time="500" effect="slideOutLeft" ] [playse volume="100" time="1000" buf="0" storage="se02/dogo1.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="250" effect="fadeOut" ] [chara_show name="sabato" time="50" wait="true" storage="chara/18/sabato_08.png" width="800" height="600" left="210" top="0" reflect="false" ] [tb_chara_shake name="sabato" direction="x" count="2" swing="20" time="100" ] @@ -2769,7 +2769,7 @@ [tb_hide_message_window ] [resetfont ] [playse volume="100" time="750" buf="0" storage="se02/swing4.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_mod name="kotora_1" time="0" cross="false" storage="chara/4/kotora_2_07.png" ] [mask_off time="250" effect="fadeOut" ] [wait time="250" ] diff --git a/data/scenario/s_009_1b.ks b/data/scenario/s_009_1b.ks index f839eac..4334664 100644 --- a/data/scenario/s_009_1b.ks +++ b/data/scenario/s_009_1b.ks @@ -1938,7 +1938,7 @@ [tb_hide_message_window ] [playse volume="100" time="1000" buf="0" storage="basa03.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="250" effect="fadeOut" ] [chara_mod name="saeko" time="50" cross="false" storage="chara/11/saeko_5_07.png" ] [tb_show_message_window ] diff --git a/data/scenario/s_010a.ks b/data/scenario/s_010a.ks index 1ae31fb..62e29fa 100644 --- a/data/scenario/s_010a.ks +++ b/data/scenario/s_010a.ks @@ -828,7 +828,7 @@ [chara_mod name="sabato" time="250" cross="false" storage="chara/18/sabato_08_2.png" ] [wait time="1150" ] [playse volume="80" time="1000" buf="0" storage="bom06.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_mod name="sabato" time="0" cross="false" storage="chara/18/sabato_10.png" ] [mask_off time="250" effect="fadeOut" ] [stopse time="1000" buf="0" fadeout="true" ] diff --git a/data/scenario/s_010a2.ks b/data/scenario/s_010a2.ks index 081d9db..3d6437f 100644 --- a/data/scenario/s_010a2.ks +++ b/data/scenario/s_010a2.ks @@ -1704,7 +1704,7 @@ [chara_hide_all time="500" wait="true" ] [playse volume="100" time="1000" buf="0" storage="se02/heartbeats.ogg" ] [wait time="1000" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [bg time="0" method="crossfade" storage="haikei/school12.jpg" ] [wait time="50" ] [mask_off time="750" effect="fadeOut" ] @@ -2739,7 +2739,7 @@ [_tb_end_text] [tb_hide_message_window ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [bg time="0" method="crossfade" storage="cg11/cg26_01.png" ] [wait time="50" ] [mask_off time="1000" effect="fadeOut" ] diff --git a/data/scenario/s_010a3.ks b/data/scenario/s_010a3.ks index 2deba1a..687ffe8 100644 --- a/data/scenario/s_010a3.ks +++ b/data/scenario/s_010a3.ks @@ -3086,7 +3086,7 @@ [mask time="0" effect="fadeIn" color="0xff0000" ] [mask_off time="250" effect="fadeOut" ] [playse volume="100" time="1000" buf="0" storage="se02/slash01.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [bg time="0" method="crossfade" storage="haikei/school14_08.png" ] [wait time="50" ] [mask_off time="250" effect="fadeOut" ] @@ -3443,7 +3443,7 @@ [chara_mod name="kotora_1" time="250" cross="false" storage="chara/4/kotora_1_19.png" ] [wait time="750" ] [playse volume="100" time="1000" buf="0" storage="basa05.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [chara_hide_all time="0" wait="true" ] [chara_show name="sabato" time="0" wait="true" storage="chara/18/sabato_01.png" width="800" height="600" left="242" top="0" reflect="false" ] [chara_show name="kotora_1" time="0" wait="true" storage="chara/4/kotora_1_02_2.png" width="363" height="600" left="587" top="121" reflect="false" ] @@ -3543,7 +3543,7 @@ [mask_off time="250" effect="slideOutRight" ] [wait time="500" ] [playse volume="100" time="1000" buf="0" storage="se02/charge2.ogg" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [mask_off time="250" effect="fadeOut" ] [tb_show_message_window ] [font size="50" color="0xffffff" ] diff --git a/data/scenario/s_010b2.ks b/data/scenario/s_010b2.ks index fce0253..c1bfc24 100644 --- a/data/scenario/s_010b2.ks +++ b/data/scenario/s_010b2.ks @@ -1329,7 +1329,7 @@ [playse volume="100" time="2000" buf="0" storage="se02/heartbeats.ogg" fadein="true" loop="true" ] [playse volume="100" time="3500" buf="1" storage="se02/eating1.ogg" fadein="true" loop="true" ] [playse volume="100" time="3500" buf="2" storage="se02/eating2.ogg" fadein="true" loop="true" ] -[mask time="0" effect="fadeIn" color="0x000000" ] + [bg time="0" method="crossfade" storage="cg11/cg39_01.png" ] [wait time="10" ] [mask_off time="3500" effect="fadeOut" ]