Leahnaya/A1Emu
1
0
Fork 0
mirror of https://github.com/GittyMac/A1Emu.git synced 2026-08-27 03:24:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code revert and isolating game over code

Browse Source
This commit is contained in:
Lako
2023-06-09 22:10:25 -04:00
parent 84aad4fdf9
commit c4cb95e5b7
2 changed files with 40 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
A1Emu/A1.Objects/FKGamePlayer.cs Normal file
View File

@@ -0,0 +1,16 @@
namespace A1Emu.A1.Objects
{
public class FKGamePlayer
{
//Used in all/most games.
public int score = 0;
public int round = 0;
//Plugin 3
public int health = 200;
public int lives = 3;
//Plugin 5
public bool isKicker = false;
}
}

106
A1Emu/A1.Servers/A1_TCP.cs
View File

@@ -1473,6 +1473,25 @@ namespace A1Emu.A1.Servers
// -------------------------------------------------------------------------- \\
// Multiplayer (Generic) \\
// -------------------------------------------------------------------------- \\
void SendGameOver(XmlWriter writer)
{
writer.WriteStartElement("go");
//The result attribute seems to determine the coin distribution.
if (mpPlayer.score > mpRival.score)
{
writer.WriteAttributeString("r", "6");
}
else if (mpPlayer.score < mpRival.score)
{
writer.WriteAttributeString("r", "7");
}
else
{
writer.WriteAttributeString("r", "8");
}
writer.WriteEndElement();
}
async Task<String> JoinGame(string pr, string c, string plugin)
{
@@ -2037,23 +2056,7 @@ namespace A1Emu.A1.Servers
}
}
con.Close();
writer.WriteStartElement("go");
//The result attribute seems to determine the coin distribution.
if (mpPlayer.score > mpRival.score)
{
writer.WriteAttributeString("r", "6");
}
else if (mpPlayer.score < mpRival.score)
{
writer.WriteAttributeString("r", "7");
}
else
{
writer.WriteAttributeString("r", "8");
}
writer.WriteEndElement();
SendGameOver(writer);
}
}
@@ -2132,23 +2135,7 @@ namespace A1Emu.A1.Servers
}
}
con.Close();
writer.WriteStartElement("go");
//The result attribute seems to determine the coin distribution.
if (mpPlayer.score > mpRival.score)
{
writer.WriteAttributeString("r", "6");
}
else if (mpPlayer.score < mpRival.score)
{
writer.WriteAttributeString("r", "7");
}
else
{
writer.WriteAttributeString("r", "8");
}
writer.WriteEndElement();
SendGameOver(writer);
}
}
@@ -2448,22 +2435,7 @@ namespace A1Emu.A1.Servers
writer.WriteAttributeString("s", mpPlayer.score.ToString());
writer.WriteEndElement();
writer.WriteStartElement("go");
//The result attribute seems to determine the coin distribution.
if (mpPlayer.score < mpRival.score)
{
writer.WriteAttributeString("r", "6");
}
else if (mpPlayer.score > mpRival.score)
{
writer.WriteAttributeString("r", "7");
}
else
{
writer.WriteAttributeString("r", "8");
}
writer.WriteEndElement();
SendGameOver(writer);
}
}
@@ -2501,22 +2473,7 @@ namespace A1Emu.A1.Servers
writer.WriteAttributeString("s", mpRival.score.ToString());
writer.WriteEndElement();
writer.WriteStartElement("go");
//The result attribute seems to determine the coin distribution.
if (mpPlayer.score > mpRival.score)
{
writer.WriteAttributeString("r", "6");
}
else if (mpPlayer.score < mpRival.score)
{
writer.WriteAttributeString("r", "7");
}
else
{
writer.WriteAttributeString("r", "8");
}
writer.WriteEndElement();
SendGameOver(writer);
}
writer.WriteEndElement();
@@ -2736,22 +2693,7 @@ namespace A1Emu.A1.Servers
//SCRATCH - s="1", leads to game over, but it still adds points to the player...?
if (s.Equals("1"))
{
writer.WriteStartElement("go");
//The result attribute seems to determine the coin distribution.
if (mpPlayer.score < mpRival.score)
{
writer.WriteAttributeString("r", "6");
}
else if (mpPlayer.score > mpRival.score)
{
writer.WriteAttributeString("r", "7");
}
else
{
writer.WriteAttributeString("r", "8");
}
writer.WriteEndElement();
SendGameOver(writer);
}
writer.WriteStartElement("nt");