sigonasr2/rabiribi-display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ignore irisu P1

Browse Source
This commit is contained in:
Copy Liu 2017-02-11 00:14:01 +08:00
parent 9f9df14f55
commit 37ee73d0bf
No known key found for this signature in database
GPG Key ID: 63A453DBF23409AF
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rabiribi_splitter/Form1.Designer.cs generated
View File

@ -51,6 +51,7 @@
this.cbASG = new System.Windows.Forms.CheckBox(); this.cbASG = new System.Windows.Forms.CheckBox();
this.cbTM = new System.Windows.Forms.CheckBox(); this.cbTM = new System.Windows.Forms.CheckBox();
this.cbIGT = new System.Windows.Forms.CheckBox(); this.cbIGT = new System.Windows.Forms.CheckBox();
this.cbIrisu = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.portNum)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.portNum)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -134,7 +135,7 @@
// //
this.musicLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.musicLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.musicLabel.AutoSize = true; this.musicLabel.AutoSize = true;
this.musicLabel.Location = new System.Drawing.Point(13, 237); this.musicLabel.Location = new System.Drawing.Point(13, 256);
this.musicLabel.Name = "musicLabel"; this.musicLabel.Name = "musicLabel";
this.musicLabel.Size = new System.Drawing.Size(41, 12); this.musicLabel.Size = new System.Drawing.Size(41, 12);
this.musicLabel.TabIndex = 14; this.musicLabel.TabIndex = 14;
@ -145,7 +146,7 @@
this.cbBoss.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.cbBoss.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.cbBoss.AutoSize = true; this.cbBoss.AutoSize = true;
this.cbBoss.Enabled = false; this.cbBoss.Enabled = false;
this.cbBoss.Location = new System.Drawing.Point(15, 252); this.cbBoss.Location = new System.Drawing.Point(15, 271);
this.cbBoss.Name = "cbBoss"; this.cbBoss.Name = "cbBoss";
this.cbBoss.Size = new System.Drawing.Size(84, 16); this.cbBoss.Size = new System.Drawing.Size(84, 16);
this.cbBoss.TabIndex = 15; this.cbBoss.TabIndex = 15;
@ -190,7 +191,7 @@
// //
this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.linkLabel1.AutoSize = true; this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(279, 256); this.linkLabel1.Location = new System.Drawing.Point(279, 275);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(41, 12); this.linkLabel1.Size = new System.Drawing.Size(41, 12);
this.linkLabel1.TabIndex = 20; this.linkLabel1.TabIndex = 20;
@ -219,11 +220,11 @@
// //
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(232, 256); this.label4.Location = new System.Drawing.Point(232, 275);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(41, 12); this.label4.Size = new System.Drawing.Size(41, 12);
this.label4.TabIndex = 24; this.label4.TabIndex = 24;
this.label4.Text = "v0.2.0"; this.label4.Text = "v0.2.1";
// //
// cbSideCh // cbSideCh
// //
@ -246,7 +247,7 @@
this.debugLog.MinimumSize = new System.Drawing.Size(10, 10); this.debugLog.MinimumSize = new System.Drawing.Size(10, 10);
this.debugLog.Multiline = true; this.debugLog.Multiline = true;
this.debugLog.Name = "debugLog"; this.debugLog.Name = "debugLog";
this.debugLog.Size = new System.Drawing.Size(10, 86); this.debugLog.Size = new System.Drawing.Size(10, 105);
this.debugLog.TabIndex = 26; this.debugLog.TabIndex = 26;
// //
// debugArea // debugArea
@ -286,18 +287,31 @@
// cbIGT // cbIGT
// //
this.cbIGT.AutoSize = true; this.cbIGT.AutoSize = true;
this.cbIGT.Location = new System.Drawing.Point(15, 207); this.cbIGT.Location = new System.Drawing.Point(15, 229);
this.cbIGT.Name = "cbIGT"; this.cbIGT.Name = "cbIGT";
this.cbIGT.Size = new System.Drawing.Size(132, 16); this.cbIGT.Size = new System.Drawing.Size(132, 16);
this.cbIGT.TabIndex = 30; this.cbIGT.TabIndex = 30;
this.cbIGT.Text = "Track In-Game Time"; this.cbIGT.Text = "Track In-Game Time";
this.cbIGT.UseVisualStyleBackColor = true; this.cbIGT.UseVisualStyleBackColor = true;
// //
// cbIrisu
//
this.cbIrisu.AutoSize = true;
this.cbIrisu.Checked = true;
this.cbIrisu.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbIrisu.Location = new System.Drawing.Point(15, 207);
this.cbIrisu.Name = "cbIrisu";
this.cbIrisu.Size = new System.Drawing.Size(144, 16);
this.cbIrisu.TabIndex = 31;
this.cbIrisu.Text = "Ignore Irisu Phase 1";
this.cbIrisu.UseVisualStyleBackColor = true;
//
// Form1 // Form1
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(332, 280); this.ClientSize = new System.Drawing.Size(332, 299);
this.Controls.Add(this.cbIrisu);
this.Controls.Add(this.cbIGT); this.Controls.Add(this.cbIGT);
this.Controls.Add(this.cbTM); this.Controls.Add(this.cbTM);
this.Controls.Add(this.cbASG); this.Controls.Add(this.cbASG);
@ -352,6 +366,7 @@
private System.Windows.Forms.CheckBox cbASG; private System.Windows.Forms.CheckBox cbASG;
private System.Windows.Forms.CheckBox cbTM; private System.Windows.Forms.CheckBox cbTM;
private System.Windows.Forms.CheckBox cbIGT; private System.Windows.Forms.CheckBox cbIGT;
private System.Windows.Forms.CheckBox cbIrisu;
} }
} }

8
rabiribi_splitter/Form1.cs
View File

@ -193,12 +193,18 @@ namespace rabiribi_splitter
if (!bossbattle) if (!bossbattle)
{ {
if (cbASG.Checked && musicid == 54) if (musicid == 54 && cbASG.Checked )
{ {
bossbattle = false; bossbattle = false;
DebugLog("Alius music, ignore once"); DebugLog("Alius music, ignore once");
this.Invoke(new Action(() => cbASG.Checked = false)); this.Invoke(new Action(() => cbASG.Checked = false));
} }
if (musicid == 42 && mapid == 1 && cbIrisu.Checked)
{
bossbattle = false;
DebugLog("Irisu P1, ignore");
this.Invoke(new Action(() => cbASG.Checked = false));
}
else else
{ {
if (bossmusicflag) if (bossmusicflag)