Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

4 files changed, 154 insertions, 9 deletions

diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index 0ef4da3..6198cad 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -285,6 +285,16 @@ namespace ShiftOS.WinForms.Applications
                 {
                     secondsleft = 60;
                     level = level + 1;
+                    if (SaveSystem.CurrentSave.UniteAuthToken != null)
+                    {
+                        try
+                        {
+                            var unite = new ShiftOS.Unite.UniteClient("http://getshiftos.ml", SaveSystem.CurrentSave.UniteAuthToken);
+                            if (unite.GetPongLevel() < level)
+                                unite.SetPongLevel(level);
+                        }
+                        catch { }
+                    }
                     generatenextlevel();
                     pnlgamestats.Show();
                     pnlgamestats.BringToFront();
@@ -544,6 +554,14 @@ namespace ShiftOS.WinForms.Applications
             lblfinalcomputerreward.Text = beatairewardtotal.ToString();
             lblfinalcodepoints.Text = totalreward + Localization.Parse(" {CODEPOINTS_SHORT}");
             SaveSystem.TransferCodepointsFrom("pong", totalreward);
+            if (!string.IsNullOrWhiteSpace(SaveSystem.CurrentSave.UniteAuthToken))
+            {
+                var unite = new ShiftOS.Unite.UniteClient("http://getshiftos.ml", SaveSystem.CurrentSave.UniteAuthToken);
+                if (unite.GetPongCP() < totalreward)
+                {
+                    unite.SetPongCP(totalreward);
+                }
+            }
         }
 
         private void newgame()
diff --git a/ShiftOS.WinForms/Applications/TriWrite.Designer.cs b/ShiftOS.WinForms/Applications/TriWrite.Designer.cs
index 61d48c3..e420fd5 100644
--- a/ShiftOS.WinForms/Applications/TriWrite.Designer.cs
+++ b/ShiftOS.WinForms/Applications/TriWrite.Designer.cs
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddressBook));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TriWrite));
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.addContactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -36,8 +36,15 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.txtbody = new System.Windows.Forms.Label();
             this.lbtitle = new System.Windows.Forms.Label();
+            this.txtcontents = new System.Windows.Forms.TextBox();
+            this.menuStrip2 = new System.Windows.Forms.MenuStrip();
+            this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuStrip3 = new System.Windows.Forms.MenuStrip();
             this.menuStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.menuStrip2.SuspendLayout();
             this.SuspendLayout();
             // 
             // menuStrip1
@@ -51,6 +58,16 @@
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
+            // addContactToolStripMenuItem
+            // 
+            this.addContactToolStripMenuItem.Name = "addContactToolStripMenuItem";
+            this.addContactToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
+            // 
+            // removeToolStripMenuItem
+            // 
+            this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
+            this.removeToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
+            // 
             // tvcontacts
             // 
             this.tvcontacts.Dock = System.Windows.Forms.DockStyle.Left;
@@ -71,8 +88,8 @@
             // 
             // txtbody
             // 
-            this.txtbody.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+            this.txtbody.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.txtbody.Location = new System.Drawing.Point(7, 54);
             this.txtbody.Name = "txtbody";
@@ -85,10 +102,74 @@
             this.lbtitle.AutoSize = true;
             this.lbtitle.Location = new System.Drawing.Point(7, 4);
             this.lbtitle.Name = "lbtitle";
-            this.lbtitle.Size = new System.Drawing.Size(73, 13);
+            this.lbtitle.Size = new System.Drawing.Size(44, 13);
             this.lbtitle.TabIndex = 0;
             this.lbtitle.Tag = "header1";
             this.lbtitle.Text = "TriWrite";
+            // 
+            // txtcontents
+            // 
+            this.txtcontents.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtcontents.Location = new System.Drawing.Point(0, 53);
+            this.txtcontents.Multiline = true;
+            this.txtcontents.Name = "txtcontents";
+            this.txtcontents.Size = new System.Drawing.Size(527, 460);
+            this.txtcontents.TabIndex = 1;
+            this.txtcontents.TabStop = false;
+            // 
+            // menuStrip2
+            // 
+            this.menuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.newToolStripMenuItem,
+            this.openToolStripMenuItem,
+            this.saveToolStripMenuItem});
+            this.menuStrip2.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip2.Name = "menuStrip2";
+            this.menuStrip2.Size = new System.Drawing.Size(527, 24);
+            this.menuStrip2.TabIndex = 2;
+            this.menuStrip2.Text = "menuStrip2";
+            // 
+            // newToolStripMenuItem
+            // 
+            this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+            this.newToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+            this.newToolStripMenuItem.Text = "New";
+            // 
+            // openToolStripMenuItem
+            // 
+            this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+            this.openToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.openToolStripMenuItem.Text = "Open";
+            // 
+            // saveToolStripMenuItem
+            // 
+            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            this.saveToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+            this.saveToolStripMenuItem.Text = "Save";
+            // 
+            // menuStrip3
+            // 
+            this.menuStrip3.Location = new System.Drawing.Point(0, 30);
+            this.menuStrip3.Name = "menuStrip3";
+            this.menuStrip3.Size = new System.Drawing.Size(527, 24);
+            this.menuStrip3.TabIndex = 3;
+            this.menuStrip3.Text = "menuStrip3";
+            // 
+            // TriWrite
+            // 
+            this.Controls.Add(this.txtcontents);
+            this.Controls.Add(this.menuStrip3);
+            this.Controls.Add(this.menuStrip2);
+            this.Name = "TriWrite";
+            this.Size = new System.Drawing.Size(527, 513);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.menuStrip2.ResumeLayout(false);
+            this.menuStrip2.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -101,5 +182,11 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label txtbody;
         private System.Windows.Forms.Label lbtitle;
+        private System.Windows.Forms.TextBox txtcontents;
+        private System.Windows.Forms.MenuStrip menuStrip2;
+        private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+        private System.Windows.Forms.MenuStrip menuStrip3;
     }
 }
diff --git a/ShiftOS.WinForms/Applications/TriWrite.cs b/ShiftOS.WinForms/Applications/TriWrite.cs
index 90add8d..6fb814f 100644
--- a/ShiftOS.WinForms/Applications/TriWrite.cs
+++ b/ShiftOS.WinForms/Applications/TriWrite.cs
@@ -1,15 +1,14 @@
-using System;
+using ShiftOS.Objects.ShiftFS;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Data;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ShiftOS.Engine;
-using static ShiftOS.Objects.ShiftFS.Utils;
-using Newtonsoft.Json;
 
 namespace ShiftOS.WinForms.Applications
 {
@@ -20,9 +19,44 @@ namespace ShiftOS.WinForms.Applications
     public partial class TriWrite : UserControl, IShiftOSWindow
     {
 
-        public void OnLoad()
+        public TriWrite()
+        {
+            InitializeComponent();
+        }
+
+        private void newToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            txtcontents.Text = "";
+        }
+
+        private void openToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var txt = new List<string>();
+            txt.Add(".txt");
 
+            AppearanceManager.SetupDialog(new FileDialog(txt.ToArray(), FileOpenerStyle.Open, new Action<string>((file) => this.LoadFile(file))));
+        }
+
+        public void LoadFile(string file)
+        {
+            txtcontents.Text = Utils.ReadAllText(file);
+        }
+
+        public void SaveFile(string file)
+        {
+            Utils.WriteAllText(file, txtcontents.Text);
+        }
+
+        private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var txt = new List<string>();
+            txt.Add(".txt");
+
+            AppearanceManager.SetupDialog(new FileDialog(txt.ToArray(), FileOpenerStyle.Save, new Action<string>((file) => this.SaveFile(file))));
+        }
+
+        public void OnLoad()
+        {
         }
 
         public void OnSkinLoad()
diff --git a/ShiftOS.WinForms/Applications/TriWrite.resx b/ShiftOS.WinForms/Applications/TriWrite.resx
index e150f33..525a23c 100644
--- a/ShiftOS.WinForms/Applications/TriWrite.resx
+++ b/ShiftOS.WinForms/Applications/TriWrite.resx
@@ -127,4 +127,10 @@ On the left, we have made a list of all your contacts. You can click on one to v
 
 To add a contact, simply click "Add Contact", and to remove one, click "Remove". Some contacts may not be removed as they are integral to the progression of your adventures within the digital society.</value>
   </data>
+  <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="menuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>247, 17</value>
+  </metadata>
 </root>
\ No newline at end of file