From ca15b7e61696a0a73c80364f924fd80dedd68a5d Mon Sep 17 00:00:00 2001
From: Copy Liu <copyliu@gmail.com>
Date: Sat, 19 Nov 2016 00:07:40 +0800
Subject: [PATCH] fix ignore town bug

---
 rabiribi_splitter/Form1.cs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/rabiribi_splitter/Form1.cs b/rabiribi_splitter/Form1.cs
index 86ab562..6d3f0af 100644
--- a/rabiribi_splitter/Form1.cs
+++ b/rabiribi_splitter/Form1.cs
@@ -185,13 +185,8 @@ namespace rabiribi_splitter
                         }
                         if (!bossbattle)
                         {
-                            if (mapid == 5 && cbSideCh.Checked)
-                            {
-                                bossbattle = false;
-                                DebugLog("boss music in town, ignore");
 
-                            }
-                            else if (cbASG.Checked  && musicid==54)
+                            if (cbASG.Checked && musicid == 54)
                             {
                                 bossbattle = false;
                                 DebugLog("Alius music, ignore once");
@@ -201,13 +196,22 @@ namespace rabiribi_splitter
                             {
                                 if (bossmusicflag)
                                 {
-                                    bossbattle = true;
-                                    lastbosslist = new List<int>();
-                                    lastnoah3hp = -1;
-                                    if (cbBossStart.Checked)
+                                    if (mapid == 5 && musicid == 44 && cbSideCh.Checked )
                                     {
-                                        sendsplit();
-                                        DebugLog("music start, split");
+                                        bossbattle = false;
+                                        DebugLog("sidechapter, ignore");
+
+                                    }
+                                    else
+                                    {
+                                        bossbattle = true;
+                                        lastbosslist = new List<int>();
+                                        lastnoah3hp = -1;
+                                        if (cbBossStart.Checked)
+                                        {
+                                            sendsplit();
+                                            DebugLog("music start, split");
+                                        }
                                     }
                                 }
                             }
@@ -292,7 +296,7 @@ namespace rabiribi_splitter
                                     bossbattle = false;
                                 }
                             }
-                            if (cbTM.Checked)
+                            if (cbTM.Checked && musicid==8)
                             {
                                 bool f = true;
                                 foreach (var boss in lastbosslist)