Merge pull request #42 from duncathan/core

fixes #25, fixes #8 - core water issues

pre-edited-cs/data/Stage/Drain.tsc

@@ -1 +1 @@
-_\uｂ汲_\次<>梼<EFBFBD>怩鰍ｌｂ窮歯洫ｂｊ侍筒ｂｂ寺ｦ怩ｄレｂ級似<E7B49A>棒\uｂ泣_\次<>梼福ｧｂｊ侍筒ｂｃ寺ｦ怩ｄレｂ級似<E7B49A>棒\uｂ灸_\次<>梼福ｧｂｊ侍筒ｂｄ寺ｦ怩ｄレｂ級似<E7B49A>棒\uｂ球_\次<>梼福ｧｂｊ侍筒ｂｅ寺ｦ怩ｄレｂ級似<E7B49A>棒\uｂ究_\次<>梼福ｧｂｊ侍筒ｂｆ寺ｦ怩ｄレｂ級似<E7B49A>棒\uｂ窮_\歯洫ｂу侍筒ｂｂ寺ｦ怩ｄレｂ級似<E7B49A>棒\uｂ級_\次<>｢ｆモ撃ｂъｂｅ撃ｂｎ蕩｢ｆモ撃ｂｌｂｂ似<EFBD82>棒\uｃｂ_\持劉磁｡ｧｂャ雌<E383A3>｢ｃｂ撃ｂｌｂｄ侍藤ｂｂ示､唐ｆ㈹ｂ汲撃ｊレｂ㊤_\uｃｃ_\持劉次･剱ﾆrﾉﾁﾀyﾆrﾁﾂｷﾀ€滋｡鮪裏棒\uｃモ_\持劉磁｡ｧｂャ雌<E383A3>｢ｃモ撃ｂｌｂｄ侍藤ｂｄ示､唐ｆ煙ｂ灸撃ｂ<E69283>ｂラ_\uｃр_\寺ｦ怩ｄレｃс_\持劉次･勠ﾁﾇrｺｷｳﾄrﾆｺｷrﾅﾁﾇﾀｶrﾁｸrﾄﾇﾅｺｻﾀｹ_\ﾉｳﾆｷﾄrｸﾄﾁｿrﾉｻﾆｺｻﾀ€滋｡棒\嵌rﾉﾁﾇｾｶﾀyﾆrｴｷrｳrｹﾁﾁｶrｻｶｷｳrﾆﾁrｺｷｳｶ_\ｻﾀrﾉｻﾆｺﾁﾇﾆrｳﾀrｳｻﾄrﾆｳﾀｽ€滋｡鮪裏棒\uｃс_\持劉侍藤ｂｅ示R唐ｆ褐ｂ球撃ョ㈹ｂｃ_\_\uｃ№_\持劉次<E58A89>梼福ｧｂｊ自筒ｂｇ歯<EFBD87>｢ｅｂ撃ャ煙ｂｄ侍筒ｂｄ_\自筒ｂモ_\雌<>｢ｅｂ撃ｂ<E69283>ｂｄ自筒ｂヨ_\雌<>｢ｅｂ撃ｂレｂｄ_\磁逃次･剋<EFBDA5>浮ｄ∮ﾄｷrﾉｷrﾅﾆｻｾｾrｻﾀrﾆｺｷ_\楜ｴﾋﾄｻﾀﾆｺ綜<EFBDBA>｡鮪<EFBDA1>浮ｂｎ服｡_\雌<>｢ｅｂ撃ｂ<E69283>ｂｄ自筒ｂ<E7AD92>_\雌<>｢ｅｂ撃ｄｌｂｄ自筒ｂ№_\雌<>｢ｅｂ撃ｂレｂｂ_\次･剋<EFBDA5>浮ｄ<E6B5AE>ｷrｵｳﾀyﾆrｹｷﾆrﾆｺﾄﾁﾇｹｺ_\ｺｷﾄｷ€滋｡棒\ｩｷyｾｾrｺｳﾈｷrﾆﾁrｽｷｷﾂ_\ｿﾁﾈｻﾀｹrｳｺｷｳｶ€滋｡鮪服｡_\雌<>｢ｅｂ撃ｂ<E69283>ｂｄ自筒ｃ<E7AD92>_\雌<>｢ｅｂ撃ｄｌｂｄ自筒ｂモ_\磁｡ｧｂャ雌<E383A3>｢ｃモ撃ｂｌｂｄ自筒ｂр_\事<>｢ｅｂ自筒ｂр_\磁｡ｧｂャ雌<E383A3>｢ｃモ撃ｂｌｂｂ侍栲ｊр似<D180>棒\uｅｂ_\uｅ<75>_\爾､寰衍勠ﾁﾇrﾅｷｷrｳrｴﾇﾆﾆﾁﾀ€滋｡鮪･｡ｧｂ<EFBDA7>歯椄次･劼ﾄｷﾅﾅｷｶrｻﾆ€滋｡鮪服｡_\自筒ｂ№_\磁｡ｧｂ宴_\歯泙ｂｉ撃ｅ㈹ｂｂ_\歯泙ｂｊ撃ｅ㈹ｂｂ_\歯泙ｂц撃ｅレｃャ_\自筒ｂ№似<E28496>棒\
+0-FSS\S0-_pqd_iomS[SS]SS\X_fpxSSS[_idlSSSS_lwmSSUT]SS\Z_hqg0-FSS\T0-_pqd_fpxSSS[_idlSSST_lwmSSUT]SS\Z_hqg0-FSS\U0-_pqd_fpxSSS[_idlSSSU_lwmSSUT]SS\Z_hqg0-FSS\V0-_pqd_fpxSSS[_idlSSSV_lwmSSUT]SS\Z_hqg0-FSS\W0-_pqd_fpxSSS[_idlSSSW_lwmSSUT]SS\Z_hqg0-FSS\X0-_fpxSSUV_lwmSSUT]SS\Y_idlSSSS_hqg0-FSS\Y0-_iomS[VU]SS\Z_idlSSSS_hqg0-FSS\Z0-_pqsSWTS]SSSU]SSSV]SSSS_dqsSWTS]SSSS]SSSS_idlSSSS_hqg0-FSTSS0-_nh|_vrxSSTT_dqsSTSS]SSSS]SSSU_idrSSSS_wudSSWX]SS\S]SS[T]SSXV0-FSTST0-_nh|_pvjl佑囃遷佑駐<E4BD91>Q_qrg_hqg0-FSTTS0-_nh|_vrxSSTT_dqsSTTS]SSSS]SSSU_idrSSSU_wudSSWZ]SS\U]SSSW]SSTZ0-FSTUS0-_lwmSSUT]STUT0-_nh|_pvj|著C笈<43>C雷<43>亦<EFBFBD>④忠C葺幕倦<E5B995>0-噪来匹鴛註C嚮雷倦Q_qrg0-l佑囃<E4BD91>≡J佑<4A>CГ樺仲C欠<43>C嵐C笈х0-倦C嚮雷著佑яCъ匹淀綜Q_qrg_hqg0-#STUT0-_nh|_idrSSSV_wudSSW[]SS\V]STXX]SSST0-0-FSTXS0-_nh|_pqd_fpxSSS[_zdlSSSX_fqsSVSS]STTZ]SSSU_idlSSSU0-_zdlSSTS0-_dqsSVSS]SSSV]SSSU_zdlSSTY0-_dqsSVSS]SSST]SSSU0-_vdw_pvj_idfSSUXd譜C嚠C沫件修倦C雷<43>0-oу恤倦雷b_qrg_idfSSSS_for0-_dqsSVSS]SSSV]SSSU_zdlSSYW0-_dqsSVSS]SSUS]SSSU_zdlSSXS0-_dqsSVSS]SSST]SSSS0-_pvj_idfSSUXz<58><7A>遷佑活佑雷葡<E99BB7><E891A1>0-笈譜Q_qrg0-z<>緒C灸刪C嵐C肢<43>0-崇剏相Cщ<43>⑱_qrg_for0-_dqsSVSS]SSSV]SSSU_zdlSTWT0-_dqsSVSS]SSUS]SSSU_zdlSSTS0-_vrxSSTT_dqsSTTS]SSSS]SSSU_zdlSSUS0-_gqsSVSS_zdlSSUS0-_vrxSSTT_dqsSTTS]SSSS]SSSS_ioNS[US_hqg0-FSVSS0-FSVVS0-_sul_pvj|著C毎<43>Г<EFBFBD>覧酎Q_qrg_vrxSSWV_fou_pvjs譜末<E8AD9C>C圏Q_qrg_for0-_zdlSSXS0-_vrxSSZT0-_fpsSSSZ]SSVX]SSSS0-_fpsSSS[]SSVX]SSSS0-_fpsSSUY]SSVT]STTT0-_zdlSSXS_hqg0-

pre-edited-cs/data/Stage/ScriptSource/Almond.txt

@@ -4,16 +4,20 @@
 #0091
 <MNA<CMU0023<FAI0001<END
 #0092
-<MNA<CMU0023<FAI0002<FLJ0829:0098<FLJ0822:0097<END
+<MNA<CMU0023<FLJ0829:0098<FLJ0822:0097<FAI0002<END
 #0093
 <MNA<CMU0023<FAI0003<END
 #0094
 <MNA<CMU0023<FAI0004<END
 
 #0097
-<ANP0253:0020:0000<END
+<ANP0253:0020:0000<FAI0002<END
 #0098
-<CNP0306:0117:0000<ANP0306:0032:0002<END
+<CNP0306:0117:0000<ANP0306:0032:0002<ITJ0021:0099<FAI0002<END
+#0099
+<MNP0410:0001:0002:0000
+<ANP0410:0000:0000
+<FAI0002<END
 
 #0100
 <KEY<FLJ0839:0101
@@ -137,7 +141,7 @@ like she's still alive.<NOD<CLR
 
 #0340
 <KEY<DNP0340<WAI0010<SOU0022<WAI0010
-<MSGYou hear something give.<NOD<CLO<WAI0050<ANP0253:0010:0001
+<MSG<TURYou hear something give.<NOD<CLO<WAI0050<ANP0253:0010:0001
 <WAI0048<DNP0253
 <ANP0301:0003:0002<WAI0128
 <ANP0301:0001:0002
@@ -246,10 +250,13 @@ grows dark...<NOD<CLO
 <ITJ0021:1101<EVE1102
 
 #1101
+<MNP0410:0001:0002:0000
+<ANP0410:0000:0000
 <EQ+0016<EVE1110
 
 #1102
-<ANP0410:0021:0000<EVE1110
+<MNP0410:0001:0022:0000
+<ANP0410:0000:0000<EVE1110
 
 #1110
 <CNP0306:0117:0002
@@ -257,10 +264,10 @@ grows dark...<NOD<CLO
 <ANP0258:0010:0001<WAI0096<ANP0258:0001:0000
 <WAI0050
 <MOV0055:0018
-<DNA0183<MSG<TUR......?<NOD<CLR<FAI0004<WAI0050<ANP0410:0010:0000<EVE1111
+<DNA0183<MSG<TUR......?<NOD<CLR<FAI0004<WAI0050<EVE1111
 
 #1111
-<EVE0071
+<END<EVE0071
 
 
 #1200

pre-edited-cs/data/Stage/ScriptSource/Drain.txt

@@ -11,10 +11,11 @@
 <MNA<CMU0008<FAI0004<ITJ0021:0097<END
 
 #0095
-<CMU0023<FAI0000<ITJ0021:0097<END
-
+<CMU0023<ITJ0021:0096<FAI0000<END
+#0096
+<FLJ0832:0097<FAI0000<END
 #0097
-<MNP0410:0002:0003:0000<ANP0410:0000:0000<END
+<MNP0410:0002:0003:0000<ANP0410:0000:0000<FAI0000<END
 
 #0100
 <KEY<SOU0011<ANP0100:0000:0002<FAO0000<TRA0045:0090:0081:0053