vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Voting for round to end, level generation improvements

Browse Source
This commit is contained in:
Regalis
2016-02-12 19:39:24 +02:00
parent 3ffc19485b
commit c6f52cc68f
20 changed files with 294 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Subsurface/Content/Characters/Husk/husk.xml
View File

@@ -11,6 +11,7 @@
<!-- head -->
<limb id = "0" radius="13" mass = "6" type="Head" attackpriority="2" impacttolerance="5.0">
<sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="93,1,34,31" depth="0.04" origin="0.5,0.5"/>
<attack type="PinchCCW" range="100" duration="0.5" damage="10" stun="0.1" bleedingdamage="3" structuredamage="30" damagetype="slash"/>
</limb>
<!-- body -->
<limb id = "1" radius="14" height="21" mass = "20" type="Torso" attackpriority="3" impacttolerance="10.0">

2
Subsurface/Content/Items/Weapons/railgun.xml
View File

@@ -110,7 +110,7 @@
<Holdable slots="RightHand+LeftHand" holdpos="0,-50" handle1="-10,0" handle2="10,0" aimable="false"/>
<Projectile launchimpulse="80.0">
<Attack damage="100" bleedingdamage="10" structuredamage="200" damagetype="Blunt"/>
<Attack damage="1000" bleedingdamage="10" structuredamage="200" damagetype="Blunt"/>
<StatusEffect type="OnUse" Condition="-100.0" stun="10.0" disabledeltatime="true" sound="Content/Items/Reactor/explosion.ogg">
<Explosion range="1000.0" structuredamage="1000" damage="1000" stun="10" force="50.0"/>
</StatusEffect>

4
Subsurface/Source/Characters/Character.cs
View File

@@ -915,7 +915,7 @@ namespace Barotrauma
if (isDead) return;
if (!(AnimController is FishAnimController))
if (needsAir)
{
bool protectedFromPressure = PressureProtection > 0.0f;
@@ -1445,7 +1445,7 @@ namespace Barotrauma
else
{
Character character = FindEntityByID(characterId) as Character;
if (character != null) SelectCharacter(character, false);
if (character != null && character.IsHumanoid) SelectCharacter(character, false);
}
return;
case NetworkEventType.KillCharacter:

10
Subsurface/Source/DebugConsole.cs
View File

@@ -382,16 +382,8 @@ namespace Barotrauma
return;
}
if (Submarine.SaveCurrent(fileName +".sub")) NewMessage("map saved", Color.Green);
Submarine.Loaded.CheckForErrors();
if (WayPoint.WayPointList.Find(wp => !wp.MoveWithLevel && wp.SpawnType == SpawnType.Path)==null)
{
DebugConsole.ThrowError("No waypoints found in the submarine. AI controlled crew members won't be able to navigate without waypoints.");
}
if (WayPoint.WayPointList.Find(wp => wp.SpawnType == SpawnType.Cargo) == null)
{
DebugConsole.ThrowError("The submarine doesn't have a waypoint marked as ''Cargo'', which are used for determining where to place bought items.");
}
break;
case "loadmap":
case "loadsub":

2
Subsurface/Source/Events/Quests/MonsterQuest.cs
View File

@@ -27,7 +27,7 @@ namespace Barotrauma
public override void Start(Level level)
{
Vector2 position = level.GetRandomInterestingPosition(monster.Mass > 500.0f, true);
Vector2 position = level.GetRandomInterestingPosition(true, true);
monster = Character.Create(monsterFile, position);
monster.Enabled = false;

4
Subsurface/Source/GUI/GUIScrollBar.cs
View File

@@ -17,7 +17,7 @@ namespace Barotrauma
private bool enabled;
public delegate bool OnMovedHandler(float barScroll);
public delegate bool OnMovedHandler(GUIScrollBar scrollBar, float barScroll);
public OnMovedHandler OnMoved;
public bool IsHorizontal
@@ -174,7 +174,7 @@ namespace Barotrauma
barScroll = (float)newY / ((float)frame.Rect.Height - (float)bar.Rect.Height);
}
if (moveAmount != 0 && OnMoved != null) OnMoved(barScroll);
if (moveAmount != 0 && OnMoved != null) OnMoved(this, barScroll);
bar.Rect = new Rectangle(newX + frame.Rect.X, newY + frame.Rect.Y, bar.Rect.Width, bar.Rect.Height);

6
Subsurface/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
View File

@@ -17,7 +17,7 @@ namespace Barotrauma.Tutorials
public override IEnumerable<object> UpdateState()
{
Submarine.Loaded.SetPosition(new Vector2(Submarine.Loaded.Position.X, 38500.0f));
//Submarine.Loaded.SetPosition(new Vector2(Submarine.Loaded.Position.X, 38500.0f));
//spawn some fish next to the player
GameMain.GameScreen.BackgroundCreatureManager.SpawnSprites(2,
@@ -91,7 +91,7 @@ namespace Barotrauma.Tutorials
{
yield return CoroutineStatus.Running;
}
infoBox = CreateInfoFrame("The reactor is now fueled up. Try turning it on by increasing the fission rate.");
while (reactor.FissionRate <= 0.0f)
@@ -275,7 +275,7 @@ namespace Barotrauma.Tutorials
infoBox = CreateInfoFrame("Steer the submarine downwards, heading further into the cavern.");
while (Submarine.Loaded.WorldPosition.Y > 31000.0f)
while (Submarine.Loaded.WorldPosition.Y > 39000.0f)
{
yield return CoroutineStatus.Running;
}

2
Subsurface/Source/GameSession/GameModes/Tutorials/TutorialType.cs
View File

@@ -42,7 +42,7 @@ namespace Barotrauma.Tutorials
GameMain.GameSession = new GameSession(Submarine.Loaded, "", GameModePreset.list.Find(gm => gm.Name.ToLower() == "tutorial"));
(GameMain.GameSession.gameMode as TutorialMode).tutorialType = this;
GameMain.GameSession.StartShift("tuto");
GameMain.GameSession.StartShift("tutorial");
GameMain.GameSession.TaskManager.Tasks.Clear();

4
Subsurface/Source/GameSettings.cs
View File

@@ -248,7 +248,7 @@ namespace Barotrauma
doc.Save(filePath);
}
private bool ChangeSoundVolume(float barScroll)
private bool ChangeSoundVolume(GUIScrollBar scrollBar, float barScroll)
{
UnsavedSettings = true;
SoundVolume = MathHelper.Clamp(barScroll, 0.0f, 1.0f);
@@ -256,7 +256,7 @@ namespace Barotrauma
return true;
}
private bool ChangeMusicVolume(float barScroll)
private bool ChangeMusicVolume(GUIScrollBar scrollBar, float barScroll)
{
UnsavedSettings = true;
MusicVolume = MathHelper.Clamp(barScroll, 0.0f, 1.0f);

88
Subsurface/Source/Map/Levels/Level.cs
View File

@@ -150,18 +150,21 @@ namespace Barotrauma
float minWidth = Submarine.Loaded == null ? 3000.0f : Math.Max(Submarine.Borders.Width, Submarine.Borders.Height);
startPosition = new Vector2(minWidth * 2, borders.Height);
endPosition = new Vector2(borders.Width - minWidth * 2, borders.Height);
startPosition = new Vector2((int)minWidth * 2, Rand.Range((int)minWidth * 2, borders.Height - (int)minWidth * 2, false));
endPosition = new Vector2(borders.Width - (int)minWidth * 2, Rand.Range((int)minWidth * 2, borders.Height - (int)minWidth * 2, false));
List<Vector2> pathNodes = new List<Vector2>();
Rectangle pathBorders = borders;// new Rectangle((int)minWidth, (int)minWidth, borders.Width - (int)minWidth * 2, borders.Height - (int)minWidth);
pathBorders.Inflate(-minWidth*2, -minWidth*2);
pathNodes.Add(startPosition);
//pathNodes.Add(new Vector2(minWidth * 3, Rand.Range(minWidth * 2, borders.Height - minWidth * 2, false)));
for (float x = startPosition.X; x < endPosition.X; x += Rand.Range(2000.0f, 10000.0f, false))
pathNodes.Add(new Vector2(startPosition.X, borders.Height));
pathNodes.Add(startPosition);
for (float x = startPosition.X; x < endPosition.X; x += Rand.Range(5000.0f, 10000.0f, false))
{
pathNodes.Add(new Vector2(x, Rand.Range(pathBorders.Y, pathBorders.Bottom, false)));
@@ -171,8 +174,8 @@ namespace Barotrauma
//}
}
//pathNodes.Add(new Vector2(borders.Width - minWidth * 3, borders.Height / 2));
pathNodes.Add(endPosition);
pathNodes.Add(new Vector2(endPosition.X, borders.Height));
int smallTunnelCount = 5;
@@ -283,7 +286,8 @@ namespace Barotrauma
// pathNodes.Reverse();
//}
List<VoronoiCell> pathCells = GeneratePath(pathNodes, cells, pathBorders, minWidth, 0.3f, mirror, true);
List<VoronoiCell> pathCells = GeneratePath(pathNodes, cells,
new Rectangle(pathBorders.X, pathBorders.Y, pathBorders.Width, borders.Height), minWidth, 0.3f, mirror, true);
foreach (InterestingPosition positionOfInterest in positionsOfInterest)
{
@@ -291,8 +295,8 @@ namespace Barotrauma
wayPoint.MoveWithLevel = true;
}
startPosition = pathCells[0].Center;
endPosition = pathCells[pathCells.Count - 1].Center;
//startPosition = pathCells[0].Center;
//endPosition = pathCells[pathCells.Count - 1].Center;
foreach (List<Vector2> tunnel in smallTunnels)
{
@@ -475,9 +479,7 @@ namespace Barotrauma
pathCells.Add(currentCell);
int currentTargetIndex = 1;
wanderAmount = 0.0f;
do
{
int edgeIndex = 0;
@@ -617,30 +619,41 @@ namespace Barotrauma
minDistance *= 0.5f;
do
{
var closeCells = GetCells(position, 2);
var closeCells = GetCells(position, 1);
foreach (VoronoiCell cell in closeCells)
{
if (!cell.edges.Any(e => Vector2.Distance(position, e.point1) < minDistance || Vector2.Distance(position, e.point2) < minDistance)) continue;
bool tooClose = false;
foreach (GraphEdge edge in cell.edges)
{
if (Math.Abs(position.X - edge.point1.X) < minDistance ||
Math.Abs(position.Y - edge.point1.Y) < minDistance ||
Math.Abs(position.X - edge.point2.X) < minDistance ||
Math.Abs(position.Y - edge.point2.Y) < minDistance)
{
tooClose = true;
break;
}
}
if (!tooCloseCells.Contains(cell)) tooCloseCells.Add(cell);
if (tooClose && !tooCloseCells.Contains(cell)) tooCloseCells.Add(cell);
}
//for (int x = -1; x <= 1; x++)
//{
// for (int y = -1; y <= 1; y++)
// {
// if (x == 0 && y == 0) continue;
// Vector2 cornerPos = position + new Vector2(x * minDistance, y * minDistance);
for (int x = -1; x <= 1; x++)
{
for (int y = -1; y <= 1; y++)
{
if (x == 0 && y == 0) continue;
Vector2 cornerPos = position + new Vector2(x * minDistance, y * minDistance);
// int cellIndex = FindCellIndex(cornerPos);
// if (cellIndex == -1) continue;
// if (!tooCloseCells.Contains(cells[cellIndex]))
// {
// tooCloseCells.Add(cells[cellIndex]);
// }
// }
//}
int cellIndex = FindCellIndex(cornerPos);
if (cellIndex == -1) continue;
if (!tooCloseCells.Contains(cells[cellIndex]))
{
tooCloseCells.Add(cells[cellIndex]);
}
}
}
position += Vector2.Normalize(emptyCells[targetCellIndex].Center - position) * step;
@@ -664,7 +677,7 @@ namespace Barotrauma
foreach (GraphEdge edge in cell.edges)
{
VoronoiCell adjacent = edge.AdjacentCell(cell);
if (!newCells.Contains(adjacent)) newCells.Add(adjacent);
if (adjacent!=null && !newCells.Contains(adjacent)) newCells.Add(adjacent);
}
}
@@ -964,7 +977,7 @@ namespace Barotrauma
int tries = 0;
do
{
Vector2 startPos = ConvertUnits.ToSimUnits(positionsOfInterest[Rand.Int(positionsOfInterest.Count, false)].Position);
Vector2 startPos = ConvertUnits.ToSimUnits(Level.Loaded.GetRandomInterestingPosition(true, false));
Vector2 endPos = startPos - ConvertUnits.ToSimUnits(Vector2.UnitY * Size.Y);
@@ -989,20 +1002,21 @@ namespace Barotrauma
return position;
}
public Vector2 GetRandomInterestingPosition(bool requireSpace, bool useSyncedRand)
public Vector2 GetRandomInterestingPosition(bool useSyncedRand, bool? preferLarge)
{
if (!positionsOfInterest.Any()) return Size * 0.5f;
if (requireSpace)
if (preferLarge==null)
{
var positionsWithSpace = positionsOfInterest.FindAll(p => p.IsLarge);
if (!positionsWithSpace.Any()) return Size * 0.5f;
return positionsOfInterest[Rand.Int(positionsOfInterest.Count, !useSyncedRand)].Position;
return positionsWithSpace[Rand.Int(positionsOfInterest.Count, !useSyncedRand)].Position;
}
else
{
return positionsOfInterest[Rand.Int(positionsOfInterest.Count, !useSyncedRand)].Position;
var positionsWithSpace = positionsOfInterest.FindAll(p => (bool)preferLarge == p.IsLarge);
if (!positionsWithSpace.Any()) return Size * 0.5f;
return positionsWithSpace[Rand.Int(positionsOfInterest.Count, !useSyncedRand)].Position;
}
}

29
Subsurface/Source/Map/Submarine.cs
View File

@@ -524,6 +524,34 @@ namespace Barotrauma
return loaded.SaveAs(SavePath+System.IO.Path.DirectorySeparatorChar+fileName);
}
public void CheckForErrors()
{
if (!Hull.hullList.Any())
{
DebugConsole.ThrowError("No hulls found in the submarine. Hulls determine the ''borders'' of an individual room and are required for water and air distribution to work correctly.");
}
foreach (Item item in Item.ItemList)
{
if (item.GetComponent<Barotrauma.Items.Components.Vent>() == null) continue;
if (!item.linkedTo.Any())
{
DebugConsole.ThrowError("The submarine contains vents which haven't been linked to an oxygen generator. Select a vent and click an oxygen generator while holding space to link them.");
}
}
if (WayPoint.WayPointList.Find(wp => !wp.MoveWithLevel && wp.SpawnType == SpawnType.Path) == null)
{
DebugConsole.ThrowError("No waypoints found in the submarine. AI controlled crew members won't be able to navigate without waypoints.");
}
if (WayPoint.WayPointList.Find(wp => wp.SpawnType == SpawnType.Cargo) == null)
{
DebugConsole.ThrowError("The submarine doesn't have a waypoint marked as ''Cargo'', which are used for determining where to place bought items.");
}
}
public static void Preload()
{
@@ -669,7 +697,6 @@ namespace Barotrauma
{
DebugConsole.ThrowError("Could not find the method ''Load'' in " + t + ".", e);
}
}
subBody = new SubmarineBody(this);

98
Subsurface/Source/Map/SubmarineBody.cs
View File

@@ -87,57 +87,67 @@ namespace Barotrauma
{
this.submarine = sub;
List<Vector2> convexHull = GenerateConvexHull();
HullVertices = convexHull;
for (int i = 0; i < convexHull.Count; i++)
if (!Hull.hullList.Any())
{
convexHull[i] = ConvertUnits.ToSimUnits(convexHull[i]);
body = BodyFactory.CreateRectangle(GameMain.World, 1.0f, 1.0f, 1.0f);
DebugConsole.ThrowError("WARNING: no hulls found, generating a physics body for the submarine failed.");
}
convexHull.Reverse();
//get farseer 'vertices' from vectors
Vertices shapevertices = new Vertices(convexHull);
AABB hullAABB = shapevertices.GetAABB();
Borders = new Rectangle(
(int)ConvertUnits.ToDisplayUnits(hullAABB.LowerBound.X),
(int)ConvertUnits.ToDisplayUnits(hullAABB.UpperBound.Y),
(int)ConvertUnits.ToDisplayUnits(hullAABB.Extents.X * 2.0f),
(int)ConvertUnits.ToDisplayUnits(hullAABB.Extents.Y * 2.0f));
//var triangulatedVertices = Triangulate.ConvexPartition(shapevertices, TriangulationAlgorithm.Bayazit);
body = BodyFactory.CreateBody(GameMain.World, this);
foreach (Hull hull in Hull.hullList)
else
{
Rectangle rect = hull.Rect;
foreach (Structure wall in Structure.WallList)
List<Vector2> convexHull = GenerateConvexHull();
HullVertices = convexHull;
for (int i = 0; i < convexHull.Count; i++)
{
if (!Submarine.RectsOverlap(wall.Rect, hull.Rect)) continue;
Rectangle wallRect = wall.IsHorizontal ?
new Rectangle(hull.Rect.X, wall.Rect.Y, hull.Rect.Width, wall.Rect.Height) :
new Rectangle(wall.Rect.X, hull.Rect.Y, wall.Rect.Width, hull.Rect.Height);
rect = Rectangle.Union(
new Rectangle(wallRect.X, wallRect.Y-wallRect.Height, wallRect.Width, wallRect.Height),
new Rectangle(rect.X, rect.Y - rect.Height, rect.Width, rect.Height));
rect.Y = rect.Y + rect.Height;
convexHull[i] = ConvertUnits.ToSimUnits(convexHull[i]);
}
FixtureFactory.AttachRectangle(
ConvertUnits.ToSimUnits(rect.Width),
ConvertUnits.ToSimUnits(rect.Height),
5.0f,
ConvertUnits.ToSimUnits(new Vector2(rect.X + rect.Width/2, rect.Y - rect.Height/2)),
body, this);
convexHull.Reverse();
//get farseer 'vertices' from vectors
Vertices shapevertices = new Vertices(convexHull);
AABB hullAABB = shapevertices.GetAABB();
Borders = new Rectangle(
(int)ConvertUnits.ToDisplayUnits(hullAABB.LowerBound.X),
(int)ConvertUnits.ToDisplayUnits(hullAABB.UpperBound.Y),
(int)ConvertUnits.ToDisplayUnits(hullAABB.Extents.X * 2.0f),
(int)ConvertUnits.ToDisplayUnits(hullAABB.Extents.Y * 2.0f));
//var triangulatedVertices = Triangulate.ConvexPartition(shapevertices, TriangulationAlgorithm.Bayazit);
body = BodyFactory.CreateBody(GameMain.World, this);
foreach (Hull hull in Hull.hullList)
{
Rectangle rect = hull.Rect;
foreach (Structure wall in Structure.WallList)
{
if (!Submarine.RectsOverlap(wall.Rect, hull.Rect)) continue;
Rectangle wallRect = wall.IsHorizontal ?
new Rectangle(hull.Rect.X, wall.Rect.Y, hull.Rect.Width, wall.Rect.Height) :
new Rectangle(wall.Rect.X, hull.Rect.Y, wall.Rect.Width, hull.Rect.Height);
rect = Rectangle.Union(
new Rectangle(wallRect.X, wallRect.Y - wallRect.Height, wallRect.Width, wallRect.Height),
new Rectangle(rect.X, rect.Y - rect.Height, rect.Width, rect.Height));
rect.Y = rect.Y + rect.Height;
}
FixtureFactory.AttachRectangle(
ConvertUnits.ToSimUnits(rect.Width),
ConvertUnits.ToSimUnits(rect.Height),
5.0f,
ConvertUnits.ToSimUnits(new Vector2(rect.X + rect.Width / 2, rect.Y - rect.Height / 2)),
body, this);
}
}
body.BodyType = BodyType.Dynamic;
body.CollisionCategories = Physics.CollisionMisc | Physics.CollisionWall;
body.CollidesWith = Physics.CollisionLevel | Physics.CollisionCharacter;
@@ -275,7 +285,7 @@ namespace Barotrauma
volume += hull.FullVolume;
}
float waterPercentage = waterVolume / volume;
float waterPercentage = volume==0.0f ? 0.0f : waterVolume / volume;
float neutralPercentage = 0.07f;

43
Subsurface/Source/Networking/GameClient.cs
View File

@@ -15,6 +15,8 @@ namespace Barotrauma.Networking
private ReliableChannel reliableChannel;
private GUIButton endRoundButton;
private bool connected;
private int myID;
@@ -28,8 +30,17 @@ namespace Barotrauma.Networking
get { return myID; }
}
public List<Client> OtherClients
{
get { return otherClients; }
}
public GameClient(string newName)
{
endRoundButton = new GUIButton(new Rectangle(GameMain.GraphicsWidth - 170, 20, 150, 25), "End round", Alignment.TopLeft, GUI.Style, inGameHUD);
endRoundButton.OnClicked = EndRoundClicked;
endRoundButton.Visible = false;
GameMain.DebugDraw = false;
Hull.EditFire = false;
Hull.EditWater = false;
@@ -230,7 +241,6 @@ namespace Barotrauma.Networking
new GUIMessageBox("Connection timed out", "You were disconnected for too long and your Character was deleted. Please wait for another round to start.");
}
GameMain.NetLobbyScreen.ClearPlayers();
//add the names of other connected clients to the lobby screen
@@ -590,6 +600,8 @@ namespace Barotrauma.Networking
gameStarted = true;
endRoundButton.Visible = Voting.AllowEndVoting;
GameMain.GameScreen.Select();
AddChatMessage("Press TAB to chat", ChatMessageType.Server);
@@ -659,7 +671,7 @@ namespace Barotrauma.Networking
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)
{
base.Draw(spriteBatch);
if (!GameMain.DebugDraw) return;
int width = 200, height = 300;
@@ -696,13 +708,16 @@ namespace Barotrauma.Networking
{
case VoteType.Sub:
msg.Write(((Submarine)userData).Name);
client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);
break;
case VoteType.Mode:
msg.Write(((GameModePreset)userData).Name);
client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);
break;
case VoteType.EndRound:
msg.Write((bool)userData);
break;
}
client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);
}
public bool SpectateClicked(GUIButton button, object userData)
@@ -717,6 +732,23 @@ namespace Barotrauma.Networking
return false;
}
public bool EndRoundClicked(GUIButton button, object userData)
{
if (!gameStarted) return false;
if (!Voting.AllowEndVoting)
{
button.Visible = false;
return false;
}
Vote(VoteType.EndRound, true);
return false;
}
public void SendCharacterData()
{
if (characterInfo == null) return;
@@ -794,7 +826,8 @@ namespace Barotrauma.Networking
if (client.ServerConnection == null) return;
type = (gameStarted && myCharacter != null && myCharacter.IsDead) ? ChatMessageType.Dead : ChatMessageType.Default;
type = (Screen.Selected == GameMain.GameScreen &&
(myCharacter == null || myCharacter.IsDead)) ? ChatMessageType.Dead : ChatMessageType.Default;
ReliableMessage msg = reliableChannel.CreateMessage();
msg.InnerMessage.Write((byte)PacketTypes.Chatmessage);

24
Subsurface/Source/Networking/GameServer.cs
View File

@@ -473,6 +473,12 @@ namespace Barotrauma.Networking
break;
case (byte)PacketTypes.Vote:
Voting.RegisterVote(inc, ConnectedClients);
if (Voting.AllowEndVoting &&
((float)EndVoteCount / (float)EndVoteMax) >= EndVoteRequiredRatio)
{
EndButtonHit(null,null);
}
break;
case (byte)PacketTypes.RequestNetLobbyUpdate:
UpdateNetLobby(null, null);
@@ -860,9 +866,11 @@ namespace Barotrauma.Networking
private bool EndButtonHit(GUIButton button, object obj)
{
if (!gameStarted) return false;
string endMessage = "The round has ended." + '\n';
if (TraitorManager!=null)
if (TraitorManager != null)
{
endMessage += TraitorManager.GetEndMessage();
}
@@ -1092,7 +1100,7 @@ namespace Barotrauma.Networking
base.Draw(spriteBatch);
if (settingsFrame != null) settingsFrame.Draw(spriteBatch);
if (!ShowNetStats) return;
int width = 200, height = 300;
@@ -1465,14 +1473,22 @@ namespace Barotrauma.Networking
jobPreferences = new List<JobPrefab>(JobPrefab.List.GetRange(0,3));
}
public object GetVote(VoteType voteType)
public T GetVote<T>(VoteType voteType)
{
return votes[(int)voteType];
return (votes[(int)voteType] is T) ? (T)votes[(int)voteType] : default(T);
}
public void SetVote(VoteType voteType, object value)
{
votes[(int)voteType] = value;
}
public void ResetVotes()
{
for (int i = 0; i<votes.Length; i++)
{
votes[i] = null;
}
}
}
}

43
Subsurface/Source/Networking/GameServerSettings.cs
View File

@@ -36,7 +36,7 @@ namespace Barotrauma.Networking
private GUIFrame settingsFrame;
public float AutoRestartTimer;
private bool autoRestart;
private bool allowSpectating = true;
@@ -85,6 +85,8 @@ namespace Barotrauma.Networking
get { return allowSpectating; }
}
public float EndVoteRequiredRatio;
private void CreateSettingsFrame()
{
settingsFrame = new GUIFrame(new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), Color.Black * 0.5f);
@@ -93,16 +95,39 @@ namespace Barotrauma.Networking
new GUITextBlock(new Rectangle(0, -15, 0, 20), "Server settings", GUI.Style, innerFrame, GUI.LargeFont);
var randomizeLevelBox = new GUITickBox(new Rectangle(0, 30, 20, 20), "Randomize level seed", Alignment.Left, innerFrame);
var randomizeLevelBox = new GUITickBox(new Rectangle(0, 30, 20, 20), "Randomize level seed between rounds", Alignment.Left, innerFrame);
randomizeLevelBox.Selected = randomizeSeed;
randomizeLevelBox.OnSelected = ToggleRandomizeSeed;
var endBox = new GUITickBox(new Rectangle(0, 60, 20, 20), "End round when destination reached", Alignment.Left, innerFrame);
endBox.Selected = endRoundAtLevelEnd;
endBox.OnSelected = (GUITickBox) => { endRoundAtLevelEnd = GUITickBox.Selected; return true; };
var endVoteBox = new GUITickBox(new Rectangle(0, 90, 20, 20), "End round by voting", Alignment.Left, innerFrame);
endVoteBox.Selected = Voting.AllowEndVoting;
endVoteBox.OnSelected = (GUITickBox) =>
{
Voting.AllowEndVoting = !Voting.AllowEndVoting;
GameMain.Server.UpdateVoteStatus();
return true;
};
var votesRequiredText = new GUITextBlock(new Rectangle(20, 110, 20, 20), "Votes required: 50 %", GUI.Style, innerFrame, GUI.SmallFont);
var votesRequiredSlider = new GUIScrollBar(new Rectangle(150,115, 100, 10), GUI.Style, 0.1f, innerFrame);
votesRequiredSlider.UserData = votesRequiredText;
votesRequiredSlider.OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
{
GUITextBlock voteText = scrollBar.UserData as GUITextBlock;
scrollBar.BarScroll = MathUtils.Round(barScroll, 0.2f);
EndVoteRequiredRatio = barScroll/2.0f + 0.5f;
voteText.Text = "Votes required: " + (int)MathUtils.Round(EndVoteRequiredRatio * 100.0f, 10.0f) + " %";
return true;
};
new GUITextBlock(new Rectangle(0, 95, 100, 20), "Submarine selection:", GUI.Style, innerFrame);
var selectionFrame = new GUIFrame(new Rectangle(0, 120, 300, 20), null, innerFrame);
new GUITextBlock(new Rectangle(0, 95+50, 100, 20), "Submarine selection:", GUI.Style, innerFrame);
var selectionFrame = new GUIFrame(new Rectangle(0, 120 + 50, 300, 20), null, innerFrame);
for (int i = 0; i<3; i++)
{
var selectionTick = new GUITickBox(new Rectangle(i * 100, 0, 20, 20), ((SelectionMode)i).ToString(), Alignment.Left, selectionFrame);
@@ -110,9 +135,9 @@ namespace Barotrauma.Networking
selectionTick.OnSelected = SwitchSubSelection;
selectionTick.UserData = (SelectionMode)i;
}
new GUITextBlock(new Rectangle(0, 145, 100, 20), "Mode selection:", GUI.Style, innerFrame);
selectionFrame = new GUIFrame(new Rectangle(0, 170, 300, 20), null, innerFrame);
new GUITextBlock(new Rectangle(0, 145 + 50, 100, 20), "Mode selection:", GUI.Style, innerFrame);
selectionFrame = new GUIFrame(new Rectangle(0, 170 + 50, 300, 20), null, innerFrame);
for (int i = 0; i<3; i++)
{
var selectionTick = new GUITickBox(new Rectangle(i*100, 0, 20, 20), ((SelectionMode)i).ToString(), Alignment.Left, selectionFrame);
@@ -120,8 +145,8 @@ namespace Barotrauma.Networking
selectionTick.OnSelected = SwitchModeSelection;
selectionTick.UserData = (SelectionMode)i;
}
var allowSpecBox = new GUITickBox(new Rectangle(0, 210, 20, 20), "Allow spectating", Alignment.Left, innerFrame);
var allowSpecBox = new GUITickBox(new Rectangle(0, 210 + 50, 20, 20), "Allow spectating", Alignment.Left, innerFrame);
allowSpecBox.Selected = true;
allowSpecBox.OnSelected = ToggleAllowSpectating;

13
Subsurface/Source/Networking/NetworkMember.cs
View File

@@ -47,7 +47,7 @@ namespace Barotrauma.Networking
class NetworkMember
{
protected static Color[] messageColor = { Color.White, Color.Red, Color.LightBlue, Color.LightGreen };
protected static Color[] messageColor = { Color.White, Color.Red, new Color(63,72,204), Color.LightGreen };
protected NetPeer netPeer;
@@ -60,6 +60,10 @@ namespace Barotrauma.Networking
protected GUIListBox chatBox;
protected GUITextBox chatMsgBox;
public int EndVoteCount, EndVoteMax;
//private GUITextBlock endVoteText;
public int Port;
protected bool gameStarted;
@@ -122,7 +126,6 @@ namespace Barotrauma.Networking
chatMsgBox.Padding = Vector4.Zero;
chatMsgBox.OnEnterPressed = EnterChatMessage;
Voting = new Voting();
}
@@ -247,6 +250,12 @@ namespace Barotrauma.Networking
GameMain.GameSession.CrewManager.Draw(spriteBatch);
inGameHUD.Draw(spriteBatch);
if (EndVoteCount > 0)
{
GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 150.0f, 40), "Votes: " + EndVoteCount + "/" + EndVoteMax, Color.White);
}
}
public virtual bool SelectCrewCharacter(GUIComponent component, object obj)

1
Subsurface/Source/Screens/EditMapScreen.cs
View File

@@ -292,6 +292,7 @@ namespace Barotrauma
}
Submarine.SaveCurrent(nameBox.Text + ".sub");
Submarine.Loaded.CheckForErrors();
GUI.AddMessage("Submarine saved to " + Submarine.Loaded.FilePath, Color.Green, 3.0f);

4
Subsurface/Source/Screens/NetLobbyScreen.cs
View File

@@ -355,6 +355,8 @@ namespace Barotrauma
playYourself.UserData = "playyourself";
}
GameMain.Server.Voting.ResetVotes(GameMain.Server.ConnectedClients);
if (GameMain.Server.RandomizeSeed) LevelSeed = ToolBox.RandomSeed(8);
if (GameMain.Server.SubSelectionMode == SelectionMode.Random) subList.Select(Rand.Range(0,subList.CountChildren));
if (GameMain.Server.ModeSelectionMode == SelectionMode.Random) modeList.Select(Rand.Range(0, modeList.CountChildren));
@@ -368,6 +370,8 @@ namespace Barotrauma
spectateButton.UserData = "spectateButton";
}
GameMain.Client.Voting.ResetVotes(GameMain.Client.OtherClients);
UpdatePlayerFrame(GameMain.Client.CharacterInfo);
}

45
Subsurface/Source/Screens/NetLobbyVoting.cs
View File

@@ -12,6 +12,8 @@ namespace Barotrauma
{
private bool allowSubVoting, allowModeVoting;
public bool AllowEndVoting = true;
public bool AllowSubVoting
{
get { return allowSubVoting; }
@@ -83,7 +85,12 @@ namespace Barotrauma
UpdateVoteTexts(connectedClients, voteType);
break;
case VoteType.EndRound:
if (sender.Character == null) return;
sender.SetVote(voteType, inc.ReadBoolean());
GameMain.NetworkMember.EndVoteCount = connectedClients.Count(c => c.Character != null && c.GetVote<bool>(VoteType.EndRound));
GameMain.NetworkMember.EndVoteMax = connectedClients.Count(c => c.Character != null);
break;
}
@@ -107,7 +114,7 @@ namespace Barotrauma
SetVoteText(listBox, votable.First, votable.Second);
}
}
private void SetVoteText(GUIListBox listBox, object userData, int votes)
{
if (userData == null) return;
@@ -124,14 +131,14 @@ namespace Barotrauma
voteText.Text = votes.ToString();
}
}
private List<Pair<object, int>> GetVoteList(VoteType voteType, List<Client> voters)
{
List<Pair<object, int>> voteList = new List<Pair<object, int>>();
foreach (Client voter in voters)
{
object vote = voter.GetVote(voteType);
object vote = voter.GetVote<object>(voteType);
if (vote == null) continue;
var existingVotable = voteList.Find(v => v.First == vote);
@@ -167,6 +174,20 @@ namespace Barotrauma
return selected;
}
public void ResetVotes(List<Client> connectedClients)
{
foreach (Client client in connectedClients)
{
client.ResetVotes();
}
GameMain.NetworkMember.EndVoteCount = 0;
GameMain.NetworkMember.EndVoteMax = 0;
UpdateVoteTexts(connectedClients, VoteType.Mode);
UpdateVoteTexts(connectedClients, VoteType.Sub);
}
public void WriteData(NetOutgoingMessage msg, List<Client> voters)
{
@@ -198,17 +219,22 @@ namespace Barotrauma
}
}
msg.Write(AllowEndVoting);
if (AllowEndVoting)
{
msg.Write((byte)voters.Count);
msg.Write((byte)voters.Count(v => v.GetVote<bool>(VoteType.EndRound)));
}
}
public void ReadData(NetIncomingMessage msg)
{
AllowSubVoting = msg.ReadBoolean();
AllowSubVoting = msg.ReadBoolean();
if (allowSubVoting)
{
int votableCount = msg.ReadByte();
for (int i = 0; i<votableCount; i++)
for (int i = 0; i < votableCount; i++)
{
int votes = msg.ReadByte();
string subName = msg.ReadString();
@@ -229,6 +255,13 @@ namespace Barotrauma
SetVoteText(GameMain.NetLobbyScreen.SubList, mode, votes);
}
}
AllowEndVoting = msg.ReadBoolean();
if (AllowEndVoting)
{
GameMain.NetworkMember.EndVoteCount = msg.ReadByte();
GameMain.NetworkMember.EndVoteMax = msg.ReadByte();
}
}
}
}

BIN
Subsurface_Solution.v12.suo
View File

Binary file not shown.