From b2bd8eb462f222db64efbc729c6ce2cfb5b65d61 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 25 Feb 2017 20:28:58 -0500 Subject: Added custom wordlist feature to shiftletters --- ShiftOS.WinForms/Resources/Shiftorium.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index bc79bdd..1945707 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -72,6 +72,8 @@ Dependencies: "app_launcher", Description: "Want to open the Notifications application from within the App Launcher? This upgrade is for you." }, + + // SHIFTLETTERS AND WORDLISTS { Name: "ShiftLetters", Cost: 150, @@ -84,6 +86,12 @@ Dependencies: "app_launcher;shiftletters", Description: "This upgrade allows you to find ShiftLetters in your App Launcher." }, + { + Name: "SL Contributors Wordlist", + Cost: 250, + Dependencies: "shiftletters", + Description: "This nice wordlist lets you find out the people who contributed to the development of ShiftOS!" + }, { Name: "Panel Notifications", Cost: 150, @@ -95,6 +103,9 @@ Cost: 80, Description: "Want to adjust the volume of ShiftOS's audio? This upgrade will let you." }, + + // COLOR DEPTH AND DITHERING + { Name: "Color Depth Dithering", Cost: 1000, @@ -435,13 +446,13 @@ Dependencies: "mud_fundamentals;window_manager;pong_upgrade" }, { - Name: "WAV Player", + Name: "Audio Player", Cost: 10000, Description: "Want to listen to the greatest tunes? Well get this app asap!", Dependencies: "desktop;wm_free_placement" }, { - Name: "WAV Player AL", + Name: "Audio Player AL", Cost: 300, Description: "Just another app launcher, making it easier to listen to your favorite songs!", Dependencies: "desktop;wm_free_placement;wav_player" -- cgit v1.2.3 From 8d72f2c4d4ac742f942262159b5195bb44875846 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 10:11:58 -0500 Subject: shiftletters improvements --- .../Applications/ShiftLetters.Designer.cs | 2 + ShiftOS.WinForms/Applications/ShiftLetters.cs | 121 ++++++++++++++------- ShiftOS.WinForms/Resources/Shiftorium.txt | 6 + 3 files changed, 90 insertions(+), 39 deletions(-) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs index 48e77bf..0692244 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs @@ -68,8 +68,10 @@ namespace ShiftOS.WinForms.Applications this.lblword.RightToLeft = System.Windows.Forms.RightToLeft.No; this.lblword.Size = new System.Drawing.Size(302, 22); this.lblword.TabIndex = 1; + this.lblword.Tag = "header3"; this.lblword.Text = "Choose a wordlist from the box below."; this.lblword.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblword.TextChanged += new System.EventHandler(this.lblword_TextChanged); // // tbguess // diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs index 7a3000a..e4adde2 100644 --- a/ShiftOS.WinForms/Applications/ShiftLetters.cs +++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs @@ -52,6 +52,47 @@ namespace ShiftOS.WinForms.Applications List contributorsWordlist = new List { "philipadams", "carverh", "computelinux", "lempamo", "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"}; + List osWordlist = new List + { + "windows", + "longhorn", + "memphis", + "neptune", + "vista", + "visopsys", + "ubuntu", + "linux", + "arch", + "debian", + "redhat", + "fedora", + "opensuse", + "kubuntu", + "lubuntu", + "xubuntu", + "mythbuntu", + "ubuntumate", + "zorin", + "lindows", + "msdos", + "freedos", + "freebsd", + "netbsd", + "pcbsd", + "android", + "ios", + "macos", + "mint", + "mikeos", + "raspbian", + "cosmos", + "chicago", + "vienna", + "whistler", + "windowsxp", + "windowsforworkgroups" + }; + public ShiftLetters() { InitializeComponent(); @@ -67,50 +108,52 @@ namespace ShiftOS.WinForms.Applications lblword.Visible = true; btnrestart.Visible = false; - var wordlist = new List - { - "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) + bool isShiftOS = comboBox1.SelectedItem.ToString().ToLower() == "shiftos"; + bool isContributors = comboBox1.SelectedItem.ToString().ToLower() == "contributors"; + bool isOSes = comboBox1.SelectedItem.ToString().ToLower() == "operating systems"; + + + var wordlist = new List(); + if (isOSes) { - if (!wordlist.Contains(w.ToLower())) + foreach (var w in osWordlist) { - wordlist.Add(w.ToLower()); + if (!wordlist.Contains(w.ToLower())) + { + wordlist.Add(w.ToLower()); + } } } - foreach(var w in contributorsWordlist) + if (isShiftOS) { - if (!wordlist.Contains(w.ToLower())) + foreach (var w in shiftWordlist) { - wordlist.Add(w.ToLower()); + 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()) + else if (isContributors) { - foreach(var w in upg.Name.Split(' ')) + foreach (var w in contributorsWordlist) { if (!wordlist.Contains(w.ToLower())) + { wordlist.Add(w.ToLower()); + } + } + } + if (isShiftOS) + { + //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)]; @@ -132,6 +175,7 @@ namespace ShiftOS.WinForms.Applications tbguess.Visible = false; comboBox1.Items.Add("ShiftOS"); if (ShiftoriumFrontend.UpgradeInstalled("sl_contributors_wordlist")) comboBox1.Items.Add("Contributors"); + if (Shiftorium.UpgradeInstalled("sl_operating_systems_wordlist")) comboBox1.Items.Add("Operating Systems"); btnrestart.Visible = true; } @@ -170,15 +214,9 @@ namespace ShiftOS.WinForms.Applications if (!lblword.Text.Contains("_")) { int oldlives = lives; - tbguess.Visible = false; - lives = 0; - lbllives.Visible = true; - btnrestart.Visible = true; - btnrestart.Text = "Restart"; - comboBox1.Visible = true; int cp = word.Length * oldlives; - lbllives.Text = "You earned: " + cp + " codepoints!"; SaveSystem.TransferCodepointsFrom("shiftletters", cp); + StartGame(); } } } @@ -211,5 +249,10 @@ namespace ShiftOS.WinForms.Applications } } + + private void lblword_TextChanged(object sender, EventArgs e) + { + lblword.Left = (this.Width - lblword.Width) / 2; + } } } diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 1945707..04cf6ac 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -6,6 +6,12 @@ Dependencies: "wm_free_placement;desktop", Description: "Crazy math problems getting you down? Well, this calculator will take care of that!" }, + { + Name: "SL Operating Systems Wordlist", + Cost: 500, + Dependencies: "shiftletters", + Description: "Know a lot about computer operating systems? This upgrade adds a wordlist to ShiftLetters, full of various Linux distros, Windows codenames and other OS names. All for the low price of 500 Codepoints! It's an incredible value but it's true! Upgrade today... except out of ShiftOS!" + }, { Name: "AL Calculator", Cost: 350, -- cgit v1.2.3