diff options
Diffstat (limited to 'ShiftOS.WinForms/Applications')
| -rw-r--r-- | ShiftOS.WinForms/Applications/About.Designer.cs | 102 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/About.cs | 94 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/About.resx | 120 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ColorPicker.Designer.cs | 46 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ColorPicker.cs | 10 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ShiftLetters.cs | 58 |
6 files changed, 405 insertions, 25 deletions
diff --git a/ShiftOS.WinForms/Applications/About.Designer.cs b/ShiftOS.WinForms/Applications/About.Designer.cs new file mode 100644 index 0000000..e44b29e --- /dev/null +++ b/ShiftOS.WinForms/Applications/About.Designer.cs @@ -0,0 +1,102 @@ +namespace ShiftOS.WinForms.Applications +{ + partial class About + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + this.lbshiftit = new System.Windows.Forms.Label(); + this.lbaboutdesc = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.justthes; + this.pictureBox1.Location = new System.Drawing.Point(14, 18); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(105, 105); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(137, 40); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(43, 13); + this.label1.TabIndex = 1; + this.label1.Tag = "header1"; + this.label1.Text = "ShiftOS"; + // + // lbshiftit + // + this.lbshiftit.AutoSize = true; + this.lbshiftit.Location = new System.Drawing.Point(140, 73); + this.lbshiftit.Name = "lbshiftit"; + this.lbshiftit.Size = new System.Drawing.Size(84, 13); + this.lbshiftit.TabIndex = 2; + this.lbshiftit.Tag = "header2"; + this.lbshiftit.Text = "Shift it your way."; + // + // lbaboutdesc + // + this.lbaboutdesc.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.lbaboutdesc.Location = new System.Drawing.Point(14, 126); + this.lbaboutdesc.Name = "lbaboutdesc"; + this.lbaboutdesc.Size = new System.Drawing.Size(498, 328); + this.lbaboutdesc.TabIndex = 3; + this.lbaboutdesc.Text = "label2"; + // + // About + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbaboutdesc); + this.Controls.Add(this.lbshiftit); + this.Controls.Add(this.label1); + this.Controls.Add(this.pictureBox1); + this.Name = "About"; + this.Size = new System.Drawing.Size(532, 474); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label lbshiftit; + private System.Windows.Forms.Label lbaboutdesc; + } +} diff --git a/ShiftOS.WinForms/Applications/About.cs b/ShiftOS.WinForms/Applications/About.cs new file mode 100644 index 0000000..cd95296 --- /dev/null +++ b/ShiftOS.WinForms/Applications/About.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using ShiftOS.Engine; +using System.Reflection; + +namespace ShiftOS.WinForms.Applications +{ + [WinOpen("about")] + [Launcher("About", false, null, "Accessories")] + [DefaultTitle("About ShiftOS")] + public partial class About : UserControl, IShiftOSWindow + { + public About() + { + InitializeComponent(); + } + + public void SetupUI() + { + lbshiftit.Top = label1.Top + label1.Height; + + lbaboutdesc.Text = $@"ShiftOS +Copyright (c) 2015-{DateTime.Now.Year} Michael VanOverbeek and ShiftOS devs + +Engine version: Milestone 3, 1.0 Beta Series (Developer mode ON) +Frontend version: 1.0 Beta 1.2 +Multi-user domain version: 1.0 Rolling-Release + +Music courtesy of Selulance. Listen to the Fractal Forest album here: +https://www.youtube.com/watch?v=LB5jAYDL3VU&t=913s + +Special thanks to Philip Adams, the original creator of ShiftOS for helping us grow our community of amazing Shifters by featuring us on the YouTube Millionaire series and advertising us throughout various other series ran by him. + +Also, thanks to Rylan Arbour, Victor Tran and the other community moderators and administrators for helping us keep the community peaceful. + +Lastly, a huge special thanks to the community themselves - for testing, debugging, fixing, reporting bugs for, and enjoying our game even through its many failures, successes, revamps, etc. You guys are the reason we develop the game!"; + } + + public string GetEngineVersion() + { + foreach(var attr in typeof(IShiftOSWindow).Assembly.GetCustomAttributes(true)) + { + if(attr is AssemblyVersionAttribute) + { + var ver = attr as AssemblyVersionAttribute; + return ver.Version; + } + } + return "Unknown"; + } + + public string GetFrontendVersion() + { + foreach (var attr in this.GetType().Assembly.GetCustomAttributes(true)) + { + if (attr is AssemblyVersionAttribute) + { + var ver = attr as AssemblyVersionAttribute; + return ver.Version; + } + } + return "Unknown"; + } + + + + public void OnLoad() + { + SetupUI(); + } + + public void OnSkinLoad() + { + SetupUI(); + } + + public bool OnUnload() + { + return false; + } + + public void OnUpgrade() + { + + } + } +} diff --git a/ShiftOS.WinForms/Applications/About.resx b/ShiftOS.WinForms/Applications/About.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.WinForms/Applications/About.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs b/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs index 0cd92d6..c89321f 100644 --- a/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs +++ b/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs @@ -354,7 +354,7 @@ namespace ShiftOS.WinForms.Applications this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill; this.pgcontents.Location = new System.Drawing.Point(0, 0); this.pgcontents.Name = "pgcontents"; - this.pgcontents.Size = new System.Drawing.Size(552, 657); + this.pgcontents.Size = new System.Drawing.Size(481, 608); this.pgcontents.TabIndex = 20; // // pnlpinkcolours @@ -382,7 +382,7 @@ namespace ShiftOS.WinForms.Applications this.pnlpinkcolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlpinkcolours.Location = new System.Drawing.Point(0, 521); this.pnlpinkcolours.Name = "pnlpinkcolours"; - this.pnlpinkcolours.Size = new System.Drawing.Size(552, 46); + this.pnlpinkcolours.Size = new System.Drawing.Size(481, 46); this.pnlpinkcolours.TabIndex = 11; this.pnlpinkcolours.Visible = false; // @@ -657,7 +657,7 @@ namespace ShiftOS.WinForms.Applications this.pnlredcolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlredcolours.Location = new System.Drawing.Point(0, 475); this.pnlredcolours.Name = "pnlredcolours"; - this.pnlredcolours.Size = new System.Drawing.Size(552, 46); + this.pnlredcolours.Size = new System.Drawing.Size(481, 46); this.pnlredcolours.TabIndex = 10; this.pnlredcolours.Visible = false; // @@ -929,7 +929,7 @@ namespace ShiftOS.WinForms.Applications this.pnlbrowncolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlbrowncolours.Location = new System.Drawing.Point(0, 429); this.pnlbrowncolours.Name = "pnlbrowncolours"; - this.pnlbrowncolours.Size = new System.Drawing.Size(552, 46); + this.pnlbrowncolours.Size = new System.Drawing.Size(481, 46); this.pnlbrowncolours.TabIndex = 8; this.pnlbrowncolours.Visible = false; // @@ -1201,7 +1201,7 @@ namespace ShiftOS.WinForms.Applications this.pnlorangecolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlorangecolours.Location = new System.Drawing.Point(0, 383); this.pnlorangecolours.Name = "pnlorangecolours"; - this.pnlorangecolours.Size = new System.Drawing.Size(552, 46); + this.pnlorangecolours.Size = new System.Drawing.Size(481, 46); this.pnlorangecolours.TabIndex = 7; this.pnlorangecolours.Visible = false; // @@ -1473,7 +1473,7 @@ namespace ShiftOS.WinForms.Applications this.pnlyellowcolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlyellowcolours.Location = new System.Drawing.Point(0, 337); this.pnlyellowcolours.Name = "pnlyellowcolours"; - this.pnlyellowcolours.Size = new System.Drawing.Size(552, 46); + this.pnlyellowcolours.Size = new System.Drawing.Size(481, 46); this.pnlyellowcolours.TabIndex = 6; this.pnlyellowcolours.Visible = false; // @@ -1745,7 +1745,7 @@ namespace ShiftOS.WinForms.Applications this.pnlgreencolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlgreencolours.Location = new System.Drawing.Point(0, 291); this.pnlgreencolours.Name = "pnlgreencolours"; - this.pnlgreencolours.Size = new System.Drawing.Size(552, 46); + this.pnlgreencolours.Size = new System.Drawing.Size(481, 46); this.pnlgreencolours.TabIndex = 5; this.pnlgreencolours.Visible = false; // @@ -2017,7 +2017,7 @@ namespace ShiftOS.WinForms.Applications this.pnlbluecolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlbluecolours.Location = new System.Drawing.Point(0, 245); this.pnlbluecolours.Name = "pnlbluecolours"; - this.pnlbluecolours.Size = new System.Drawing.Size(552, 46); + this.pnlbluecolours.Size = new System.Drawing.Size(481, 46); this.pnlbluecolours.TabIndex = 4; this.pnlbluecolours.Visible = false; // @@ -2289,7 +2289,7 @@ namespace ShiftOS.WinForms.Applications this.pnlpurplecolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlpurplecolours.Location = new System.Drawing.Point(0, 199); this.pnlpurplecolours.Name = "pnlpurplecolours"; - this.pnlpurplecolours.Size = new System.Drawing.Size(552, 46); + this.pnlpurplecolours.Size = new System.Drawing.Size(481, 46); this.pnlpurplecolours.TabIndex = 3; this.pnlpurplecolours.Visible = false; // @@ -2562,7 +2562,7 @@ namespace ShiftOS.WinForms.Applications this.pnlgraycolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlgraycolours.Location = new System.Drawing.Point(0, 153); this.pnlgraycolours.Name = "pnlgraycolours"; - this.pnlgraycolours.Size = new System.Drawing.Size(552, 46); + this.pnlgraycolours.Size = new System.Drawing.Size(481, 46); this.pnlgraycolours.TabIndex = 2; this.pnlgraycolours.Visible = false; // @@ -2779,7 +2779,7 @@ namespace ShiftOS.WinForms.Applications this.pnlanycolours.Dock = System.Windows.Forms.DockStyle.Top; this.pnlanycolours.Location = new System.Drawing.Point(0, 107); this.pnlanycolours.Name = "pnlanycolours"; - this.pnlanycolours.Size = new System.Drawing.Size(552, 46); + this.pnlanycolours.Size = new System.Drawing.Size(481, 46); this.pnlanycolours.TabIndex = 1; this.pnlanycolours.Visible = false; // @@ -2813,7 +2813,7 @@ namespace ShiftOS.WinForms.Applications this.txtanysgreen.BackColor = System.Drawing.Color.White; this.txtanysgreen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtanysgreen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtanysgreen.Location = new System.Drawing.Point(100, 22); + this.txtanysgreen.Location = new System.Drawing.Point(100, 23); this.txtanysgreen.Multiline = true; this.txtanysgreen.Name = "txtanysgreen"; this.txtanysgreen.Size = new System.Drawing.Size(28, 15); @@ -3046,7 +3046,7 @@ namespace ShiftOS.WinForms.Applications this.Panel1.Dock = System.Windows.Forms.DockStyle.Top; this.Panel1.Location = new System.Drawing.Point(0, 0); this.Panel1.Name = "Panel1"; - this.Panel1.Size = new System.Drawing.Size(552, 107); + this.Panel1.Size = new System.Drawing.Size(481, 107); this.Panel1.TabIndex = 0; // // lblnewcolourrgb @@ -3074,17 +3074,18 @@ namespace ShiftOS.WinForms.Applications this.Label26.Name = "Label26"; this.Label26.Size = new System.Drawing.Size(145, 18); this.Label26.TabIndex = 8; - this.Label26.Text = "New Colour"; + this.Label26.Text = "New Color"; // // Label17 // this.Label17.AutoSize = true; - this.Label17.Location = new System.Drawing.Point(7, 87); + this.Label17.Location = new System.Drawing.Point(29, 87); this.Label17.Name = "Label17"; - this.Label17.Size = new System.Drawing.Size(426, 13); + this.Label17.Size = new System.Drawing.Size(414, 13); this.Label17.TabIndex = 7; - this.Label17.Text = "Click the new colour above to confirm your colour choice or click the old colour " + - "to cancel"; + this.Label17.Text = "Click the new color above to confirm your colour choice or click the old color to" + + " cancel"; + this.Label17.Click += new System.EventHandler(this.Label17_Click); // // lbloldcolourrgb // @@ -3113,8 +3114,9 @@ namespace ShiftOS.WinForms.Applications this.Label14.Name = "Label14"; this.Label14.Size = new System.Drawing.Size(151, 18); this.Label14.TabIndex = 4; - this.Label14.Text = "Old Colour"; + this.Label14.Text = "Old Color"; this.Label14.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.Label14.Click += new System.EventHandler(this.Label14_Click); // // pnlnewcolour // @@ -3133,11 +3135,11 @@ namespace ShiftOS.WinForms.Applications // lblobjecttocolour // this.lblobjecttocolour.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblobjecttocolour.Location = new System.Drawing.Point(10, 5); + this.lblobjecttocolour.Location = new System.Drawing.Point(20, 6); this.lblobjecttocolour.Name = "lblobjecttocolour"; this.lblobjecttocolour.Size = new System.Drawing.Size(423, 23); this.lblobjecttocolour.TabIndex = 1; - this.lblobjecttocolour.Text = "Close Button Colour"; + this.lblobjecttocolour.Text = "Close Button Color"; this.lblobjecttocolour.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // ColorPicker @@ -3146,7 +3148,7 @@ namespace ShiftOS.WinForms.Applications this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pgcontents); this.Name = "ColorPicker"; - this.Size = new System.Drawing.Size(552, 657); + this.Size = new System.Drawing.Size(481, 608); this.Load += new System.EventHandler(this.Color_Picker_Load); this.pgcontents.ResumeLayout(false); this.pnlpinkcolours.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/ColorPicker.cs b/ShiftOS.WinForms/Applications/ColorPicker.cs index 04ff23e..a8c0b3f 100644 --- a/ShiftOS.WinForms/Applications/ColorPicker.cs +++ b/ShiftOS.WinForms/Applications/ColorPicker.cs @@ -2349,5 +2349,15 @@ namespace ShiftOS.WinForms.Applications public void OnUpgrade() { } + + private void Label14_Click(object sender, EventArgs e) + { + + } + + private void Label17_Click(object sender, EventArgs e) + { + + } } } diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 4514157..aa3bf18 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -66,9 +66,59 @@ namespace ShiftOS.WinForms.Applications lbllives.Visible = true; lblword.Visible = true; btnrestart.Visible = false; - if ((String)comboBox1.SelectedItem == "ShiftOS") word = shiftWordlist[rng.Next(shiftWordlist.Count)]; - else if ((String)comboBox1.SelectedItem == "Contributors") word = contributorsWordlist[rng.Next(contributorsWordlist.Count)]; - else throw new NullWordlistException(":P"); + + var wordlist = new List<string> + { + "shiftos", + "devx", + "artpad", + "shifter", + "pong", + "shiftorium", + "codepoints", + "shiftletters", + "shops", + "mud", + "notification", + "namechanger", + "skinning", + "skinloader", + "calculator", + "fileskimmer", + "lua", + "shiftnet", + "terminal", + "textpad" + }; + foreach(var w in shiftWordlist) + { + if (!wordlist.Contains(w.ToLower()) + { + wordlist.Add(w.ToLower()); + } + } + foreach(var w in contributorsWordlist) + { + if (!wordlist.Contains(w.ToLower()) + { + wordlist.Add(w.ToLower()); + } + } + //This can diversify the amount of ShiftOS-related words in the game. + foreach(var upg in Shiftorium.GetDefaults()) + { + foreach(var w in upg.Name.Split(' ')) + { + if (!wordlist.Contains(w.ToLower())) + wordlist.Add(w.ToLower()); + } + } + word = wordlist[rng.Next(wordlist.Count)]; + while(word == lastword) + { + word = wordlist[rng.Next(wordlist.Count)]; + } + lastword = word; //to make the game not choose the same word twice or more in a row lbllives.Text = "You have 7 lives left!"; lblword.Text = ""; for (int i=0; i<word.Length; i++) @@ -100,6 +150,8 @@ namespace ShiftOS.WinForms.Applications } + string lastword = ""; + private void tbguess_TextChanged(object sender, EventArgs e) { if (this.tbguess.Text.Length == 1) |