shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-23 02:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
lempamo 2017-02-26 10:50:03 -05:00
commit 8756989633
9 changed files with 109 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShiftOS.WinForms/Applications/ColorPicker.cs
View file

@ -1049,7 +1049,6 @@ namespace ShiftOS.WinForms.Applications
case 1:
pnlpink1.BackColor = Color.HotPink;
pnlpink1.Show();
break;
pnlpink1.BackColor = Color.DeepPink;
pnlpink1.Show();
pnlpink2.BackColor = Color.HotPink;

3
ShiftOS.WinForms/Applications/MUDControlCentre.cs
View file

@ -243,8 +243,7 @@ namespace ShiftOS.WinForms.Applications
}
private Shop editingShop = null;
private string editingShopOldName = "";
public void ShowCreateShop()
{
this.Invoke(new Action(() =>

2
ShiftOS.WinForms/Applications/ShiftLetters.Designer.cs generated
View file

@ -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
//

147
ShiftOS.WinForms/Applications/ShiftLetters.cs
View file

@ -52,6 +52,47 @@ namespace ShiftOS.WinForms.Applications
List<String> contributorsWordlist = new List<string> { "philipadams", "carverh", "computelinux", "lempamo",
"wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"};
List<string> osWordlist = new List<string>
{
"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<string>
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<string>();
if (isOSes)
{
"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(' '))
foreach (var w in osWordlist)
{
if (!wordlist.Contains(w.ToLower()))
{
wordlist.Add(w.ToLower());
}
}
}
if (isShiftOS)
{
foreach (var w in shiftWordlist)
{
if (!wordlist.Contains(w.ToLower()))
{
wordlist.Add(w.ToLower());
}
}
}
else if (isContributors)
{
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,7 +175,9 @@ 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;
lblword.Left = (this.Width - lblword.Width) / 2;
}
public void OnUpgrade()
@ -147,7 +192,7 @@ namespace ShiftOS.WinForms.Applications
public void OnSkinLoad()
{
lblword.Left = (this.Width - lblword.Width) / 2;
}
string lastword = "";
@ -170,15 +215,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();
}
}
}
@ -186,7 +225,12 @@ namespace ShiftOS.WinForms.Applications
{
guessedCharacters = guessedCharacters + charGuessed;
lives--;
lbllives.Text = "You have: " + lives + " lives left!";
if (lives == 1)
{
lbllives.Text = "You have 1 life left! Be careful...";
} else {
lbllives.Text = "You have " + lives + " lives left!";
}
if (lives == 0)
{
tbguess.Visible = false;
@ -211,5 +255,10 @@ namespace ShiftOS.WinForms.Applications
}
}
private void lblword_TextChanged(object sender, EventArgs e)
{
lblword.Left = (this.Width - lblword.Width) / 2;
}
}
}

1
ShiftOS.WinForms/Applications/Terminal.cs
View file

@ -187,7 +187,6 @@ namespace ShiftOS.WinForms.Applications
public static event TextSentEventHandler TextSent;
public event EventHandler OnComplete;
public void ResetAllKeywords()
{

8
ShiftOS.WinForms/Oobe.cs
View file

@ -54,15 +54,10 @@ namespace ShiftOS.WinForms
string rtext;
string gtexttotype;
int charcount;
int currentletter;
int slashcount;
int conversationcount = 0;
Label textgeninput;
bool needtoclose = false;
public bool upgraded = false;
int hackeffect;
int percentcount;
private bool typing = false;
public void TextType(string texttotype)
@ -74,7 +69,6 @@ namespace ShiftOS.WinForms
charcount = texttotype.Length;
gtexttotype = texttotype;
currentletter = 0;
slashcount = 1;
foreach (var c in gtexttotype)
{

6
ShiftOS.WinForms/Resources/Shiftorium.txt
View file

@ -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,

5
ShiftOS.WinForms/Tools/ControlManager.cs
View file

@ -194,10 +194,7 @@ namespace ShiftOS.WinForms.Tools
}
}
Image dithered = null;
ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
ctrl.Font = SkinEngine.LoadedSkin.MainFont;

5
ShiftOS.WinForms/WinformsDesktop.cs
View file

@ -48,11 +48,6 @@ namespace ShiftOS.WinForms
/// </summary>
public partial class WinformsDesktop : Form, IDesktop
{
/// <summary>
/// Occurs when window added.
/// </summary>
private static event Action<WindowBorder> windowAdded;
/// <summary>
/// Initializes a new instance of the <see cref="ShiftOS.WinForms.WinformsDesktop"/> class.
/// </summary>