aboutsummaryrefslogtreecommitdiff
path: root/Project Ports
diff options
context:
space:
mode:
authorTrey <32907415+TheEdgeNK@users.noreply.github.com>2018-09-02 11:56:23 -0400
committerTrey <32907415+TheEdgeNK@users.noreply.github.com>2018-09-02 11:56:23 -0400
commitcf72b65769809ac77331414aee299112b9bf4b37 (patch)
tree9fb9fdfe01967db9c95b87cb96b7294b43ff455d /Project Ports
parent52376ce623346e257c2b7845d0d2414e7653a6dd (diff)
downloadProject-Silicon-cf72b65769809ac77331414aee299112b9bf4b37.tar.gz
Project-Silicon-cf72b65769809ac77331414aee299112b9bf4b37.tar.bz2
Project-Silicon-cf72b65769809ac77331414aee299112b9bf4b37.zip
WE FIXED THE STORYLINE!!!
Diffstat (limited to 'Project Ports')
-rw-r--r--Project Ports/Programs/ChatApp.Designer.cs1
-rw-r--r--Project Ports/Programs/ChatApp.cs24
-rw-r--r--Project Ports/hijackScreen.Designer.cs19
3 files changed, 21 insertions, 23 deletions
diff --git a/Project Ports/Programs/ChatApp.Designer.cs b/Project Ports/Programs/ChatApp.Designer.cs
index c8a6502..c1a3b38 100644
--- a/Project Ports/Programs/ChatApp.Designer.cs
+++ b/Project Ports/Programs/ChatApp.Designer.cs
@@ -48,6 +48,7 @@
this.txtSentMessages.ReadOnly = true;
this.txtSentMessages.Size = new System.Drawing.Size(439, 187);
this.txtSentMessages.TabIndex = 0;
+ this.txtSentMessages.TextChanged += new System.EventHandler(this.txtSentMessages_TextChanged);
//
// txtMsgContents
//
diff --git a/Project Ports/Programs/ChatApp.cs b/Project Ports/Programs/ChatApp.cs
index 3af3f64..2fd2070 100644
--- a/Project Ports/Programs/ChatApp.cs
+++ b/Project Ports/Programs/ChatApp.cs
@@ -41,21 +41,31 @@ namespace Project_Ports
private void btnSendMSG_Click(object sender, EventArgs e)
{
- //ChatAPI.SendMessage(txtMsgContents, txtSentMessages);
+ ChatAPI.SendMessage(txtMsgContents, txtSentMessages);
}
private void txtMsgContents_KeyDown(object sender, KeyEventArgs e)
{
- //if (e.KeyCode == Keys.Enter)
- //{
- //ChatAPI.SendMessage(txtMsgContents, txtSentMessages);
- //e.SuppressKeyPress = true;
- //}
+ if (e.KeyCode == Keys.Enter)
+ {
+ ChatAPI.SendMessage(txtMsgContents, txtSentMessages);
+ e.SuppressKeyPress = true;
+ }
}
private void ChatApp_Load(object sender, EventArgs e)
{
- StorylineAPI.StartChatterEvent1(txtMsgContents);
+ txtSentMessages.AppendText(GeneralAPI.PlayerName + " has entered the channel!");
+
+ }
+
+ private async void txtSentMessages_TextChanged(object sender, EventArgs e)
+ {
+ if (txtSentMessages.Text == GeneralAPI.PlayerName + " has entered the channel!" + Environment.NewLine)
+ {
+ await Task.Delay(1000);
+ StorylineAPI.StartChatterEvent1(txtSentMessages);
+ }
}
}
}
diff --git a/Project Ports/hijackScreen.Designer.cs b/Project Ports/hijackScreen.Designer.cs
index 1f3394a..c605dfb 100644
--- a/Project Ports/hijackScreen.Designer.cs
+++ b/Project Ports/hijackScreen.Designer.cs
@@ -29,7 +29,6 @@
private void InitializeComponent()
{
this.hijackPanel = new System.Windows.Forms.Panel();
- this.button1 = new System.Windows.Forms.Button();
this.txtHijack = new System.Windows.Forms.TextBox();
this.hijackPanel.SuspendLayout();
this.SuspendLayout();
@@ -40,38 +39,27 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.hijackPanel.BackColor = System.Drawing.Color.Black;
- this.hijackPanel.Controls.Add(this.button1);
this.hijackPanel.Controls.Add(this.txtHijack);
this.hijackPanel.Location = new System.Drawing.Point(0, 0);
this.hijackPanel.Name = "hijackPanel";
this.hijackPanel.Size = new System.Drawing.Size(986, 571);
this.hijackPanel.TabIndex = 3;
//
- // button1
- //
- this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.button1.Dock = System.Windows.Forms.DockStyle.Right;
- this.button1.Location = new System.Drawing.Point(911, 0);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 571);
- this.button1.TabIndex = 4;
- this.button1.Text = "skip";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
// txtHijack
//
this.txtHijack.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtHijack.BackColor = System.Drawing.Color.Black;
+ this.txtHijack.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.txtHijack.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtHijack.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txtHijack.ForeColor = System.Drawing.Color.White;
this.txtHijack.Location = new System.Drawing.Point(15, 12);
this.txtHijack.Multiline = true;
this.txtHijack.Name = "txtHijack";
this.txtHijack.ReadOnly = true;
- this.txtHijack.Size = new System.Drawing.Size(878, 547);
+ this.txtHijack.Size = new System.Drawing.Size(957, 547);
this.txtHijack.TabIndex = 3;
//
// hijackScreen
@@ -95,6 +83,5 @@
private System.Windows.Forms.Panel hijackPanel;
private System.Windows.Forms.TextBox txtHijack;
- private System.Windows.Forms.Button button1;
}
} \ No newline at end of file