shiftos-archive/ShiftOS-C-
1
0
Fork 0
mirror of https://github.com/seriocomedy/ShiftOS-C-.git synced 2025-02-02 04:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More client-side fixes.

Browse source 
Still got some moldy bread in there... if ya know what I mean.

I meant bugs.
This commit is contained in:
MichaelTheShifter 2016-06-28 18:30:15 -04:00
parent a067684f08
commit dec9dfac5e
3 changed files with 141 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/WindowsFormsApplication1/Controls/ProgressBarEX.cs
View file

@ -61,7 +61,7 @@ namespace ShiftOS
this.Invalidate(); this.Invalidate();
} }
else { else {
throw new ArgumentOutOfRangeException("The value must be between the minimum and maximum values.");
} }
} }
} }

38
source/WindowsFormsApplication1/Gameplay/HackUI.cs
View file

@ -235,6 +235,8 @@ namespace ShiftOS
TotalPlayerHP += newModule.HP; TotalPlayerHP += newModule.HP;
AllPlayerComputers.Add(newModule); AllPlayerComputers.Add(newModule);
newModule.Show(); newModule.Show();
if (!InOnlineBattle)
{
newModule.StolenModule += (o, a) => newModule.StolenModule += (o, a) =>
{ {
var t = new Thread(new ThreadStart(() => var t = new Thread(new ThreadStart(() =>
@ -267,10 +269,10 @@ namespace ShiftOS
}; };
newModule.EnslavedModule += (o, e) => newModule.EnslavedModule += (o, e) =>
{ {
if(!newModule.Enslaved) if (!newModule.Enslaved)
{ {
var pc = AllEnemyComputers[rand.Next(0, AllEnemyComputers.Count)]; var pc = AllEnemyComputers[rand.Next(0, AllEnemyComputers.Count)];
if(!pc.Enslaved) if (!pc.Enslaved)
{ {
WriteLine($"[{newModule.Hostname}] Successfully enslaved {pc.Hostname}"); WriteLine($"[{newModule.Hostname}] Successfully enslaved {pc.Hostname}");
pc.Enslaved = true; pc.Enslaved = true;
@ -278,6 +280,7 @@ namespace ShiftOS
} }
}; };
}
newModule.OnDestruction += (object s, EventArgs a) => newModule.OnDestruction += (object s, EventArgs a) =>
{ {
if (this.SelectedPlayerComputer == newModule) if (this.SelectedPlayerComputer == newModule)
@ -515,7 +518,7 @@ namespace ShiftOS
lbcompromised.Location = new Point(location, y); lbcompromised.Location = new Point(location, y);
lbcompromised.Show(); lbcompromised.Show();
c.Flash(lbcompromised); c.Flash(lbcompromised);
transmitter?.send_message(Online.Hacking.NetTransmitter.Messages.SetHealth, $"{c.Hostname} {c.HP}");
} }
@ -529,6 +532,8 @@ namespace ShiftOS
lbcompromised.Location = new Point(location, y); lbcompromised.Location = new Point(location, y);
lbcompromised.Show(); lbcompromised.Show();
c.Flash(lbcompromised); c.Flash(lbcompromised);
transmitter?.send_message(Online.Hacking.NetTransmitter.Messages.SetHealth, $"{c.Hostname} {c.HP}");
} }
private void btnaddmodule_Click(object sender, EventArgs e) private void btnaddmodule_Click(object sender, EventArgs e)
@ -1094,7 +1099,6 @@ namespace ShiftOS
Audio.Play("hackerbattle_ambient"); Audio.Play("hackerbattle_ambient");
Hacking.RepairTimer.Stop(); //Don't want the player to be able to repair dead modules during a battle! Hacking.RepairTimer.Stop(); //Don't want the player to be able to repair dead modules during a battle!
this.TopMost = true;
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
LoadPlayerScreen(); LoadPlayerScreen();
if (InOnlineBattle) if (InOnlineBattle)
@ -1114,7 +1118,7 @@ namespace ShiftOS
AllEnemyComputers = new List<Computer>(); AllEnemyComputers = new List<Computer>();
VisualizeEnemyNetwork(); VisualizeEnemyNetwork();
tmrenemyhealthdetect.Start(); tmrenemyhealthdetect.Start();
ThisEnemyPC.Enemy = true; ThisEnemyPC.Enemy = !InOnlineBattle;
} }
private void VisualizeEnemyNetwork() private void VisualizeEnemyNetwork()
@ -1136,12 +1140,15 @@ namespace ShiftOS
} }
public void Enemy_System_Attacking(object s, EventArgs a) public void Enemy_System_Attacking(object s, EventArgs a)
{
if (!InOnlineBattle)
{ {
int i = new Random().Next(AllPlayerComputers.Count); int i = new Random().Next(AllPlayerComputers.Count);
var pc = AllPlayerComputers[i]; var pc = AllPlayerComputers[i];
var se = (Computer)s; var se = (Computer)s;
pc.LaunchAttack(se.GetProperType()); pc.LaunchAttack(se.GetProperType());
} }
}
public Computer SelectedEnemyComputer = null; public Computer SelectedEnemyComputer = null;
@ -1292,6 +1299,7 @@ namespace ShiftOS
WormToPlayer(); WormToPlayer();
}; };
} }
newModule.Enemy = !InOnlineBattle;
} }
public void Enemy_Firewall_Deflect(Computer fwall) public void Enemy_Firewall_Deflect(Computer fwall)
@ -1563,6 +1571,16 @@ namespace ShiftOS
receiver.ModulePlaced += Receiver_ModulePlaced; receiver.ModulePlaced += Receiver_ModulePlaced;
receiver.ModuleUpgraded += Receiver_ModuleUpgraded; receiver.ModuleUpgraded += Receiver_ModuleUpgraded;
receiver.ModuleRemoved += Receiver_ModuleRemoved; receiver.ModuleRemoved += Receiver_ModuleRemoved;
receiver.ModuleDisabled += (o, e) =>
{
foreach(var c in AllEnemyComputers)
{
if(c.Hostname == e.hostName)
{
c.Disable();
}
}
};
} }
private void Receiver_ModuleRemoved(object sender, Online.Hacking.Events.ModuleRemoved e) private void Receiver_ModuleRemoved(object sender, Online.Hacking.Events.ModuleRemoved e)
@ -1605,15 +1623,7 @@ namespace ShiftOS
if (m.Hostname == e.host_name) if (m.Hostname == e.host_name)
mod = m; mod = m;
} }
int health_amount = mod.HP - e.health; mod.HP = e.health;
if(health_amount > 0)
{
mod.Repair(health_amount);
}
else if(health_amount < 0)
{
mod.LaunchAttack(AttackType.Virus, -health_amount);
}
} }
#endregion #endregion

29
source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
View file

@ -29,9 +29,11 @@ namespace ShiftOS.Online.Hacking
foreach(var c in Package_Grabber.clients) foreach(var c in Package_Grabber.clients)
{ {
c.Value.OnReceived += (o, e) => c.Value.OnReceived += (o, e) =>
{
try
{ {
var om = (e.Data.Object as ObjectModel); var om = (e.Data.Object as ObjectModel);
if(om.Command == "server_info") if (om.Command == "server_info")
{ {
var si = JsonConvert.DeserializeObject<ServerInfo>(om.OptionalObject as string); var si = JsonConvert.DeserializeObject<ServerInfo>(om.OptionalObject as string);
si.IPAddress = c.Value.RemoteHost; si.IPAddress = c.Value.RemoteHost;
@ -41,6 +43,11 @@ namespace ShiftOS.Online.Hacking
Initiated?.Invoke(null, new EventArgs()); Initiated?.Invoke(null, new EventArgs());
}); });
} }
}
catch
{
}
}; };
Package_Grabber.SendMessage(c.Value.RemoteHost, "get_info"); Package_Grabber.SendMessage(c.Value.RemoteHost, "get_info");
} }
@ -53,6 +60,8 @@ namespace ShiftOS.Online.Hacking
Players = new List<Network>(); Players = new List<Network>();
var server = Package_Grabber.clients[si.IPAddress]; var server = Package_Grabber.clients[si.IPAddress];
server.OnReceived += (o, e) => server.OnReceived += (o, e) =>
{
try
{ {
var om = e.Data.Object as ObjectModel; var om = e.Data.Object as ObjectModel;
if (om.Command == "matchmaking") if (om.Command == "matchmaking")
@ -63,6 +72,11 @@ namespace ShiftOS.Online.Hacking
MorePlayersFound?.Invoke(null, new EventArgs()); MorePlayersFound?.Invoke(null, new EventArgs());
}); });
} }
}
catch
{
}
}; };
Package_Grabber.SendMessage(si.IPAddress, "get_matchmaking"); Package_Grabber.SendMessage(si.IPAddress, "get_matchmaking");
int index = 0; int index = 0;
@ -74,7 +88,7 @@ namespace ShiftOS.Online.Hacking
{ {
SelectedNetwork = Players[index]; SelectedNetwork = Players[index];
MakerTimer.Stop(); MakerTimer.Stop();
SelectedNetworkListener = new NetListener(si, SelectedNetwork); SelectedNetworkListener = new NetListener(si, API.CurrentSave.MyOnlineNetwork);
SelectedNetworkTransmitter = new NetTransmitter(si, SelectedNetwork); SelectedNetworkTransmitter = new NetTransmitter(si, SelectedNetwork);
Package_Grabber.SendMessage(SelectedServer.IPAddress, $"leave_lobby {JsonConvert.SerializeObject(API.CurrentSave.MyOnlineNetwork)}"); Package_Grabber.SendMessage(SelectedServer.IPAddress, $"leave_lobby {JsonConvert.SerializeObject(API.CurrentSave.MyOnlineNetwork)}");
} }
@ -118,11 +132,15 @@ namespace ShiftOS.Online.Hacking
var server = Package_Grabber.clients[si.IPAddress]; var server = Package_Grabber.clients[si.IPAddress];
server.OnReceived += (o, e) => server.OnReceived += (o, e) =>
{ {
if(e.Data.Object is string) if (e.Data.Object is ObjectModel)
{
var data = (e.Data.Object as ObjectModel);
if (data.Command != null)
{ {
var data = JsonConvert.DeserializeObject<ObjectModel>(e.Data.Object as string);
string[] args = data.Command.Split(' '); string[] args = data.Command.Split(' ');
if ((data.OptionalObject as Network) == net) { if ((data.OptionalObject as Network)?.Name == net.Name)
{
switch (args[0].ToLower()) switch (args[0].ToLower())
{ {
case "set_health": case "set_health":
@ -173,6 +191,7 @@ namespace ShiftOS.Online.Hacking
} }
} }
} }
}
}; };
} }