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

List of previously used mapentities in editor, waypoint sprites, properly generating waypoints for hatches, waypoint paths are saved in editor instead of generating them on loading, gap particle bugfix, separate waypoint and spawnpoint prefabs, turret rotation limits visible in editor, hatch convexhull fix, new railgunloader sprite

Browse Source
This commit is contained in:
Regalis
2016-01-17 15:45:16 +02:00
parent 8e491ae855
commit 5f1cb194ab
20 changed files with 316 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Barotrauma.csproj
+3 -3
View File
@@ -632,6 +632,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Content> </Content>
<Content Include="Content\Map\waypointIcons.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Particles\fire.png"> <Content Include="Content\Particles\fire.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@@ -721,9 +724,6 @@
<Content Include="Content\Items\MiniMap\item.xml"> <Content Include="Content\Items\MiniMap\item.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Items\MiniMap\reactor.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Items\OxygenGenerator\oxygengenerator.xml"> <Content Include="Content\Items\OxygenGenerator\oxygengenerator.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType> <SubType>Designer</SubType>
Subsurface/Content/Items/MiniMap/reactor.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

Subsurface/Content/Items/Weapons/railgun.xml
+1 -1
View File
@@ -56,7 +56,7 @@
<Sprite texture ="railgunloader.png" depth =" 0.8"/> <Sprite texture ="railgunloader.png" depth =" 0.8"/>
<ItemContainer hideitems="false" drawinventory="true" capacity="5" itempos="54,-61" iteminterval="40,0" itemrotation="90" canbeselected = "true"> <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="24,-75" iteminterval="26,0" itemrotation="90" canbeselected = "true">
<Containable name="Railgun Shell"/> <Containable name="Railgun Shell"/>
</ItemContainer> </ItemContainer>
Subsurface/Content/Items/Weapons/railgunloader.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Subsurface/Content/Map/StructurePrefabs.xml
+2 -2
View File
@@ -76,8 +76,8 @@
<largeplatform sprite="Content/Map/testroom.png" sourcerect="896,0,128,64" depth="0.9" <largeplatform sprite="Content/Map/testroom.png" sourcerect="896,0,128,64" depth="0.9"
width = "64" height ="64" resizehorizontal="true" body="true" platform="true"/> width = "64" height ="64" resizehorizontal="true" body="true" platform="true"/>
<platform sprite="Content/Map/testroom.png" sourcerect="896,64,128,32" depth ="0.9" <platform sprite="Content/Map/testroom.png" sourcerect="896,53,128,32" depth ="0.9"
width = "64" height ="32" resizehorizontal="true" body="true" platform="true"/> width = "64" height ="26" resizehorizontal="true" body="true" platform="true"/>
<roughbgwall sprite="Content/Map/testroom.png" sourcerect="200,104,240,240" depth = "1.0" <roughbgwall sprite="Content/Map/testroom.png" sourcerect="200,104,240,240" depth = "1.0"
width="64" height="64" resizehorizontal="true" resizevertical="true"/> width="64" height="64" resizehorizontal="true" resizevertical="true"/>
Subsurface/Content/Map/waypointIcons.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+1 -1
View File
@@ -651,7 +651,7 @@ namespace Barotrauma
MoveLimb(head, new Vector2(ladderSimPos.X - 0.27f * Dir, head.SimPosition.Y + 0.05f), 10.5f); MoveLimb(head, new Vector2(ladderSimPos.X - 0.27f * Dir, head.SimPosition.Y + 0.05f), 10.5f);
MoveLimb(torso, new Vector2(ladderSimPos.X - 0.27f * Dir, torso.SimPosition.Y), 10.5f); MoveLimb(torso, new Vector2(ladderSimPos.X - 0.27f * Dir, torso.SimPosition.Y), 10.5f);
MoveLimb(waist, new Vector2(ladderSimPos.X - 0.35f * Dir, waist.SimPosition.Y), 10.5f); MoveLimb(waist, new Vector2(ladderSimPos.X - 0.35f * Dir, waist.SimPosition.Y), 10.5f);
float stepHeight = ConvertUnits.ToSimUnits(30.0f); float stepHeight = ConvertUnits.ToSimUnits(30.0f);
handPos = new Vector2( handPos = new Vector2(
Subsurface/Source/DebugConsole.cs
+11 -1
View File
@@ -363,6 +363,16 @@ namespace Barotrauma
return; return;
} }
if (Submarine.SaveCurrent(fileName +".sub")) NewMessage("map saved", Color.Green); if (Submarine.SaveCurrent(fileName +".sub")) NewMessage("map saved", Color.Green);
if (WayPoint.WayPointList.Find(wp => !wp.MoveWithLevel && wp.SpawnType == SpawnType.Path)==null)
{
DebugConsole.ThrowError("No waypoints found in the submarine. Did you forget to generate the 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; break;
case "loadmap": case "loadmap":
case "loadsub": case "loadsub":
@@ -454,7 +464,7 @@ namespace Barotrauma
//messages.Add(new ColoredText(msg, color)); //messages.Add(new ColoredText(msg, color));
if (textBox != null && textBox.Text == "") selectedIndex = listBox.children.Count; selectedIndex = listBox.children.Count;
} }
public static void ThrowError(string error, Exception e = null) public static void ThrowError(string error, Exception e = null)
Subsurface/Source/Items/CharacterInventory.cs
+13 -13
View File
@@ -25,7 +25,7 @@ namespace Barotrauma
LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any,
LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any}; LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any, LimbSlot.Any};
private Vector2[] slotPositions; public Vector2[] SlotPositions;
public CharacterInventory(int capacity, Character character) public CharacterInventory(int capacity, Character character)
: base(character, capacity) : base(character, capacity)
@@ -34,11 +34,11 @@ namespace Barotrauma
if (icons == null) icons = TextureLoader.FromFile("Content/UI/inventoryIcons.png"); if (icons == null) icons = TextureLoader.FromFile("Content/UI/inventoryIcons.png");
slotPositions = new Vector2[limbSlots.Length]; SlotPositions = new Vector2[limbSlots.Length];
int rectWidth = 40, rectHeight = 40; int rectWidth = 40, rectHeight = 40;
int spacing = 10; int spacing = 10;
for (int i = 0; i < slotPositions.Length; i++) for (int i = 0; i < SlotPositions.Length; i++)
{ {
switch (i) switch (i)
{ {
@@ -46,19 +46,19 @@ namespace Barotrauma
case 0: case 0:
case 1: case 1:
case 2: case 2:
slotPositions[i] = new Vector2( SlotPositions[i] = new Vector2(
spacing, spacing,
GameMain.GraphicsHeight - (spacing + rectHeight) * (3 - i)); GameMain.GraphicsHeight - (spacing + rectHeight) * (3 - i));
break; break;
//lefthand, righthand //lefthand, righthand
case 3: case 3:
case 4: case 4:
slotPositions[i] = new Vector2( SlotPositions[i] = new Vector2(
spacing * 2 + rectWidth + (spacing + rectWidth) * (i - 3), spacing * 2 + rectWidth + (spacing + rectWidth) * (i - 3),
GameMain.GraphicsHeight - (spacing + rectHeight)*3); GameMain.GraphicsHeight - (spacing + rectHeight)*3);
break; break;
default: default:
slotPositions[i] = new Vector2( SlotPositions[i] = new Vector2(
spacing * 2 + rectWidth + (spacing + rectWidth) * ((i - 3)%5), spacing * 2 + rectWidth + (spacing + rectWidth) * ((i - 3)%5),
GameMain.GraphicsHeight - (spacing + rectHeight) * ((i>9) ? 2 : 1)); GameMain.GraphicsHeight - (spacing + rectHeight) * ((i>9) ? 2 : 1));
break; break;
@@ -225,8 +225,8 @@ namespace Barotrauma
for (int i = 0; i < capacity; i++) for (int i = 0; i < capacity; i++)
{ {
slotRect.X = (int)slotPositions[i].X; slotRect.X = (int)SlotPositions[i].X;
slotRect.Y = (int)slotPositions[i].Y; slotRect.Y = (int)SlotPositions[i].Y;
if (i==1) //head if (i==1) //head
{ {
@@ -246,8 +246,8 @@ namespace Barotrauma
for (int i = 0; i < capacity; i++) for (int i = 0; i < capacity; i++)
{ {
slotRect.X = (int)slotPositions[i].X; slotRect.X = (int)SlotPositions[i].X;
slotRect.Y = (int)slotPositions[i].Y; slotRect.Y = (int)SlotPositions[i].Y;
bool multiSlot = false; bool multiSlot = false;
//skip if the item is in multiple slots //skip if the item is in multiple slots
@@ -285,8 +285,8 @@ namespace Barotrauma
//check if the item is in multiple slots //check if the item is in multiple slots
if (Items[i] != null) if (Items[i] != null)
{ {
slotRect.X = (int)slotPositions[i].X; slotRect.X = (int)SlotPositions[i].X;
slotRect.Y = (int)slotPositions[i].Y; slotRect.Y = (int)SlotPositions[i].Y;
slotRect.Width = 40; slotRect.Width = 40;
slotRect.Height = 40; slotRect.Height = 40;
@@ -300,7 +300,7 @@ namespace Barotrauma
{ {
multiSlot = true; multiSlot = true;
slotRect = Rectangle.Union( slotRect = Rectangle.Union(
new Rectangle((int)slotPositions[n].X, (int)slotPositions[n].Y, rectWidth, rectHeight), slotRect); new Rectangle((int)SlotPositions[n].X, (int)SlotPositions[n].Y, rectWidth, rectHeight), slotRect);
} }
} }
} }
Subsurface/Source/Items/Components/Door.cs
+14 -15
View File
@@ -13,12 +13,12 @@ namespace Barotrauma.Items.Components
{ {
class Door : ItemComponent class Door : ItemComponent
{ {
Gap linkedGap; private Gap linkedGap;
Rectangle window; private Rectangle window;
ConvexHull convexHull; private ConvexHull convexHull;
ConvexHull convexHull2; private ConvexHull convexHull2;
private bool isOpen; private bool isOpen;
@@ -45,7 +45,7 @@ namespace Barotrauma.Items.Components
} }
} }
Gap LinkedGap public Gap LinkedGap
{ {
get get
{ {
@@ -139,7 +139,7 @@ namespace Barotrauma.Items.Components
doorRect = new Rectangle( doorRect = new Rectangle(
item.Rect.Center.X - (int)(doorSprite.size.X / 2), item.Rect.Center.X - (int)(doorSprite.size.X / 2),
item.Rect.Y, item.Rect.Y - item.Rect.Height/2 + (int)(doorSprite.size.Y / 2.0f),
(int)doorSprite.size.X, (int)doorSprite.size.X,
(int)doorSprite.size.Y); (int)doorSprite.size.Y);
@@ -165,24 +165,23 @@ namespace Barotrauma.Items.Components
private void UpdateConvexHulls() private void UpdateConvexHulls()
{ {
Rectangle rect = doorRect; Rectangle rect = doorRect;
if (isHorizontal)
rect.Height = (int)(rect.Height * (1.0f - openState));
if (window.Height == 0 || window.Width == 0)
{ {
rect.Width = (int)(rect.Width * (1.0f - openState));
} }
else else
{ {
//Rectangle rect = item.Rect; rect.Height = (int)(rect.Height * (1.0f - openState));
//rect.Height = (int)(rect.Height * (1.0f - openState)); }
if (window.Height > 0 && window.Width > 0)
{
rect.Height = -window.Y; rect.Height = -window.Y;
rect.Y += (int)(doorRect.Height * openState); rect.Y += (int)(doorRect.Height * openState);
rect.Height = Math.Max(rect.Height - (rect.Y - doorRect.Y), 0); rect.Height = Math.Max(rect.Height - (rect.Y - doorRect.Y), 0);
rect.Y = Math.Min(doorRect.Y, rect.Y); rect.Y = Math.Min(doorRect.Y, rect.Y);
if (convexHull2 != null) if (convexHull2 != null)
{ {
Rectangle rect2 = doorRect; Rectangle rect2 = doorRect;
@@ -395,8 +394,8 @@ namespace Barotrauma.Items.Components
if (isHorizontal) if (isHorizontal)
{ {
l.body.SetTransform(new Vector2(l.SimPosition.X, item.SimPosition.Y + dir * simSize.Y * 1.2f), l.body.Rotation); l.body.SetTransform(new Vector2(l.SimPosition.X, item.SimPosition.Y + dir * simSize.Y * 2.0f), l.body.Rotation);
l.body.ApplyLinearImpulse(new Vector2(isOpen ? 0.0f : 1.0f, dir * 0.5f)); l.body.ApplyLinearImpulse(new Vector2(isOpen ? 0.0f : 1.0f, dir * 2.0f));
} }
else else
{ {
Subsurface/Source/Items/Components/Turret.cs
+18
View File
@@ -89,6 +89,24 @@ namespace Barotrauma.Items.Components
drawPos + barrelPos, Color.White, drawPos + barrelPos, Color.White,
rotation + MathHelper.PiOver2, 1.0f, rotation + MathHelper.PiOver2, 1.0f,
SpriteEffects.None, item.Sprite.Depth+0.01f); SpriteEffects.None, item.Sprite.Depth+0.01f);
if (!editing) return;
GUI.DrawLine(spriteBatch,
drawPos + barrelPos,
drawPos + barrelPos + new Vector2((float)Math.Cos(minRotation), (float)Math.Sin(minRotation))*60.0f,
Color.Green);
GUI.DrawLine(spriteBatch,
drawPos + barrelPos,
drawPos + barrelPos + new Vector2((float)Math.Cos(maxRotation), (float)Math.Sin(maxRotation)) * 60.0f,
Color.Green);
GUI.DrawLine(spriteBatch,
drawPos + barrelPos,
drawPos + barrelPos + new Vector2((float)Math.Cos((maxRotation + minRotation) / 2), (float)Math.Sin((maxRotation + minRotation) / 2)) * 60.0f,
Color.LightGreen);
} }
public override void Update(float deltaTime, Camera cam) public override void Update(float deltaTime, Camera cam)
Subsurface/Source/Items/Item.cs
+10 -3
View File
@@ -908,8 +908,8 @@ namespace Barotrauma
transformedTrigger.X + transformedTrigger.Width / 2.0f, transformedTrigger.X + transformedTrigger.Width / 2.0f,
transformedTrigger.Y - transformedTrigger.Height / 2.0f); transformedTrigger.Y - transformedTrigger.Height / 2.0f);
dist = MathHelper.Min(Math.Abs(triggerCenter.X - displayPos.X), Math.Abs(triggerCenter.Y-displayPos.Y)); //dist = MathHelper.Min(Math.Abs(triggerCenter.X - displayPos.X), Math.Abs(triggerCenter.Y-displayPos.Y));
if (dist > closestDist && closest!=null) continue; //if (dist > closestDist && closest!=null) continue;
dist = MathHelper.Min(Math.Abs(triggerCenter.X - displayPickPos.X), Math.Abs(triggerCenter.Y - displayPickPos.Y)); dist = MathHelper.Min(Math.Abs(triggerCenter.X - displayPickPos.X), Math.Abs(triggerCenter.Y - displayPickPos.Y));
if (closest == null || dist < closestDist) if (closest == null || dist < closestDist)
@@ -951,6 +951,13 @@ namespace Barotrauma
return false; return false;
} }
public bool IsInPickRange(Vector2 worldPosition)
{
if (IsInsideTrigger(worldPosition)) return true;
return Vector2.Distance(WorldPosition, worldPosition) < PickDistance;
}
public bool Pick(Character picker, bool ignoreRequiredItems=false, bool forceSelectKey=false, bool forceActionKey=false) public bool Pick(Character picker, bool ignoreRequiredItems=false, bool forceSelectKey=false, bool forceActionKey=false)
{ {
@@ -1019,7 +1026,7 @@ namespace Barotrauma
picker.SelectedConstruction = this; picker.SelectedConstruction = this;
} }
if (!hasRequiredSkills && Character.Controlled==picker) if (!hasRequiredSkills && Character.Controlled==picker && Screen.Selected != GameMain.EditMapScreen)
{ {
GUI.AddMessage("Your skills may be insufficient to use the item!", Color.Red, 5.0f); GUI.AddMessage("Your skills may be insufficient to use the item!", Color.Red, 5.0f);
if (requiredSkill != null) if (requiredSkill != null)
Subsurface/Source/Map/Gap.cs
+20 -9
View File
@@ -67,7 +67,7 @@ namespace Barotrauma
} }
} }
public Gap(Rectangle rectangle) public Gap(MapEntityPrefab prefab, Rectangle rectangle)
: this (rectangle, Submarine.Loaded) : this (rectangle, Submarine.Loaded)
{ } { }
@@ -225,7 +225,6 @@ namespace Barotrauma
soundIndex = SoundPlayer.flowSounds[index].Loop(soundIndex, soundVolume, WorldPosition, 2000.0f); soundIndex = SoundPlayer.flowSounds[index].Loop(soundIndex, soundVolume, WorldPosition, 2000.0f);
flowForce = Vector2.Zero; flowForce = Vector2.Zero;
lerpedFlowForce = Vector2.Lerp(lerpedFlowForce, flowForce, 0.05f);
if (open == 0.0f) return; if (open == 0.0f) return;
@@ -242,7 +241,9 @@ namespace Barotrauma
UpdateRoomToRoom(deltaTime); UpdateRoomToRoom(deltaTime);
} }
if (LerpedFlowForce.Length() > 150.0f && flowTargetHull != null && flowTargetHull.Volume < flowTargetHull.FullVolume) lerpedFlowForce = Vector2.Lerp(lerpedFlowForce, flowForce, deltaTime*2.0f);
if (LerpedFlowForce.Length() > 100.0f && flowTargetHull != null && flowTargetHull.Volume < flowTargetHull.FullVolume)
{ {
//UpdateFlowForce(); //UpdateFlowForce();
@@ -256,8 +257,10 @@ namespace Barotrauma
MathHelper.Clamp(flowForce.X, -5000.0f, 5000.0f) * Rand.Range(0.5f, 0.7f), MathHelper.Clamp(flowForce.X, -5000.0f, 5000.0f) * Rand.Range(0.5f, 0.7f),
flowForce.Y * Rand.Range(0.5f, 0.7f)); flowForce.Y * Rand.Range(0.5f, 0.7f));
var particle = GameMain.ParticleManager.CreateParticle("watersplash", var particle = GameMain.ParticleManager.CreateParticle(
new Vector2(pos.X, pos.Y - Rand.Range(0.0f, 10.0f)), velocity); "watersplash",
(Submarine.Loaded==null ? pos : pos + Submarine.Loaded.Position) - Vector2.UnitY * Rand.Range(0.0f, 10.0f),
velocity);
if (particle != null) if (particle != null)
{ {
@@ -266,7 +269,10 @@ namespace Barotrauma
pos.Y = Rand.Range(lowerSurface, rect.Y - rect.Height); pos.Y = Rand.Range(lowerSurface, rect.Y - rect.Height);
GameMain.ParticleManager.CreateParticle("bubbles", pos, flowForce / 200.0f); GameMain.ParticleManager.CreateParticle(
"bubbles",
Submarine.Loaded==null ? pos : pos + Submarine.Loaded.Position,
flowForce / 200.0f);
} }
else else
{ {
@@ -278,13 +284,18 @@ namespace Barotrauma
Vector2 velocity = new Vector2( Vector2 velocity = new Vector2(
flowForce.X * Rand.Range(0.5f, 0.7f), flowForce.X * Rand.Range(0.5f, 0.7f),
Math.Max(flowForce.Y,-100.0f) * Rand.Range(0.5f, 0.7f)); Math.Max(flowForce.Y,-100.0f) * Rand.Range(0.5f, 0.7f));
var splash = GameMain.ParticleManager.CreateParticle("watersplash", pos, var splash = GameMain.ParticleManager.CreateParticle(
"watersplash",
Submarine.Loaded == null ? pos : pos + Submarine.Loaded.Position,
velocity); velocity);
if (splash != null) splash.Size = splash.Size * MathHelper.Clamp(rect.Width / 50.0f, 0.8f, 4.0f); if (splash != null) splash.Size = splash.Size * MathHelper.Clamp(rect.Width / 50.0f, 0.8f, 4.0f);
GameMain.ParticleManager.CreateParticle("bubbles", pos, flowForce / 2.0f); GameMain.ParticleManager.CreateParticle(
"bubbles",
Submarine.Loaded == null ? pos : pos + Submarine.Loaded.Position,
flowForce / 2.0f);
} }
} }
Subsurface/Source/Map/Hull.cs
+1 -1
View File
@@ -136,7 +136,7 @@ namespace Barotrauma
get { return fireSources; } get { return fireSources; }
} }
public Hull(Rectangle rectangle) public Hull(MapEntityPrefab prefab, Rectangle rectangle)
: this (rectangle, Submarine.Loaded) : this (rectangle, Submarine.Loaded)
{ {
Subsurface/Source/Map/MapEntityPrefab.cs
+14 -8
View File
@@ -89,25 +89,31 @@ namespace Barotrauma
public static void Init() public static void Init()
{ {
MapEntityPrefab ep = new MapEntityPrefab(); MapEntityPrefab ep = new MapEntityPrefab();
ep.name = "hull"; ep.name = "Hull";
ep.Description = "Hulls determine which parts are considered to be ''inside the sub''. Generally every room should be enclosed by a hull."; ep.Description = "Hulls determine which parts are considered to be ''inside the sub''. Generally every room should be enclosed by a hull.";
ep.constructor = typeof(Hull).GetConstructor(new Type[] { typeof(Rectangle) }); ep.constructor = typeof(Hull).GetConstructor(new Type[] { typeof(MapEntityPrefab), typeof(Rectangle) });
ep.resizeHorizontal = true; ep.resizeHorizontal = true;
ep.resizeVertical = true; ep.resizeVertical = true;
list.Add(ep); list.Add(ep);
ep = new MapEntityPrefab(); ep = new MapEntityPrefab();
ep.name = "gap"; ep.name = "Gap";
ep.Description = "Gaps allow water and air to flow between two hulls. "; ep.Description = "Gaps allow water and air to flow between two hulls. ";
ep.constructor = typeof(Gap).GetConstructor(new Type[] { typeof(Rectangle) }); ep.constructor = typeof(Gap).GetConstructor(new Type[] { typeof(MapEntityPrefab), typeof(Rectangle) });
ep.resizeHorizontal = true; ep.resizeHorizontal = true;
ep.resizeVertical = true; ep.resizeVertical = true;
list.Add(ep); list.Add(ep);
ep = new MapEntityPrefab(); ep = new MapEntityPrefab();
ep.name = "waypoint"; ep.name = "Waypoint";
ep.constructor = typeof(WayPoint).GetConstructor(new Type[] { typeof(Rectangle) }); ep.constructor = typeof(WayPoint).GetConstructor(new Type[] { typeof(MapEntityPrefab), typeof(Rectangle) });
list.Add(ep); list.Add(ep);
ep = new MapEntityPrefab();
ep.name = "Spawnpoint";
ep.constructor = typeof(WayPoint).GetConstructor(new Type[] { typeof(MapEntityPrefab), typeof(Rectangle) });
list.Add(ep);
} }
@@ -121,7 +127,7 @@ namespace Barotrauma
GUI.DrawLine(spriteBatch, new Vector2(position.X-GameMain.GraphicsWidth, -position.Y), new Vector2(position.X+GameMain.GraphicsWidth, -position.Y), Color.White); GUI.DrawLine(spriteBatch, new Vector2(position.X-GameMain.GraphicsWidth, -position.Y), new Vector2(position.X+GameMain.GraphicsWidth, -position.Y), Color.White);
GUI.DrawLine(spriteBatch, new Vector2(position.X, position.Y - GameMain.GraphicsHeight), new Vector2(position.X, position.Y+GameMain.GraphicsHeight), Color.White); GUI.DrawLine(spriteBatch, new Vector2(position.X, -(position.Y - GameMain.GraphicsHeight)), new Vector2(position.X, -(position.Y + GameMain.GraphicsHeight)), Color.White);
if (PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed) placePosition = position; if (PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed) placePosition = position;
} }
@@ -138,7 +144,7 @@ namespace Barotrauma
if (PlayerInput.GetMouseState.LeftButton == ButtonState.Released) if (PlayerInput.GetMouseState.LeftButton == ButtonState.Released)
{ {
object[] lobject = new object[] { newRect }; object[] lobject = new object[] { this, newRect };
constructor.Invoke(lobject); constructor.Invoke(lobject);
placePosition = Vector2.Zero; placePosition = Vector2.Zero;
selected = null; selected = null;
Subsurface/Source/Map/Submarine.cs
+1 -1
View File
@@ -673,7 +673,7 @@ namespace Barotrauma
MapEntity.MapLoaded(); MapEntity.MapLoaded();
WayPoint.GenerateSubWaypoints(); //WayPoint.GenerateSubWaypoints();
GameMain.LightManager.OnMapLoaded(); GameMain.LightManager.OnMapLoaded();
Subsurface/Source/Map/WayPoint.cs
+155 -43
View File
@@ -8,17 +8,22 @@ using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Barotrauma.Items.Components; using Barotrauma.Items.Components;
using FarseerPhysics.Dynamics;
namespace Barotrauma namespace Barotrauma
{ {
public enum SpawnType { None, Human, Enemy, Cargo, Path }; public enum SpawnType { Path, Human, Enemy, Cargo };
class WayPoint : MapEntity class WayPoint : MapEntity
{ {
public static List<WayPoint> WayPointList = new List<WayPoint>(); public static List<WayPoint> WayPointList = new List<WayPoint>();
public static bool ShowWayPoints = true, ShowSpawnPoints = true; public static bool ShowWayPoints = true, ShowSpawnPoints = true;
private SpawnType spawnType; private static Texture2D iconTexture;
private const int IconSize = 32;
private static int[] iconIndices = { 3, 0, 1, 2 };
protected SpawnType spawnType;
//characters spawning at the waypoint will be given an ID card with these tags //characters spawning at the waypoint will be given an ID card with these tags
private string[] idCardTags; private string[] idCardTags;
@@ -47,13 +52,13 @@ namespace Barotrauma
set { spawnType = value; } set { spawnType = value; }
} }
public override string Name //public override string Name
{ //{
get // get
{ // {
return "WayPoint"; // return spawnType == SpawnType.Path ? "WayPoint" : "SpawnPoint";
} // }
} //}
public string[] IdCardTags public string[] IdCardTags
{ {
@@ -75,9 +80,18 @@ namespace Barotrauma
ConnectedGap = gap; ConnectedGap = gap;
} }
public WayPoint(Rectangle rectangle) public WayPoint(MapEntityPrefab prefab, Rectangle rectangle)
: this (rectangle, Submarine.Loaded) : this (rectangle, Submarine.Loaded)
{ } {
if (prefab.Name.Contains("Spawn"))
{
spawnType = SpawnType.Human;
}
else
{
SpawnType = SpawnType.Path;
}
}
public WayPoint(Rectangle newRect, Submarine submarine) public WayPoint(Rectangle newRect, Submarine submarine)
: base (submarine) : base (submarine)
@@ -86,6 +100,11 @@ namespace Barotrauma
linkedTo = new ObservableCollection<MapEntity>(); linkedTo = new ObservableCollection<MapEntity>();
idCardTags = new string[0]; idCardTags = new string[0];
if (iconTexture==null)
{
iconTexture = Sprite.LoadTexture("Content/Map/waypointIcons.png");
}
InsertToList(); InsertToList();
WayPointList.Add(this); WayPointList.Add(this);
@@ -105,19 +124,31 @@ namespace Barotrauma
if (IsHidden()) return; if (IsHidden()) return;
Rectangle drawRect = //Rectangle drawRect =
Submarine == null ? rect : new Rectangle((int)(Submarine.DrawPosition.X + rect.X), (int)(Submarine.DrawPosition.Y + rect.Y), rect.Width, rect.Height); // Submarine == null ? rect : new Rectangle((int)(Submarine.DrawPosition.X + rect.X), (int)(Submarine.DrawPosition.Y + rect.Y), rect.Width, rect.Height);
Vector2 drawPos = Position;
if (Submarine!=null) drawPos += Submarine.DrawPosition;
drawPos.Y = -drawPos.Y;
Color clr = (isSelected) ? Color.Red : Color.LightGreen; Color clr = (isSelected) ? Color.Red : Color.White;
GUI.DrawRectangle(spriteBatch, new Rectangle(drawRect.X, -drawRect.Y, rect.Width, rect.Height), clr, true); if (isHighlighted) clr = Color.DarkRed;
int iconX = iconIndices[(int)spawnType]*IconSize % iconTexture.Width;
int iconY = (int)(Math.Floor(iconIndices[(int)spawnType]*IconSize / (float)iconTexture.Width))*IconSize;
spriteBatch.Draw(iconTexture,
new Rectangle((int)(drawPos.X - IconSize/2), (int)(drawPos.Y - IconSize/2), IconSize, IconSize),
new Rectangle(iconX, iconY, IconSize,IconSize), clr);
//GUI.DrawRectangle(spriteBatch, new Rectangle(drawRect.X, -drawRect.Y, rect.Width, rect.Height), clr, true);
//spriteBatch.DrawString(GUI.SmallFont, Position.ToString(), new Vector2(Position.X, -Position.Y), Color.White); //spriteBatch.DrawString(GUI.SmallFont, Position.ToString(), new Vector2(Position.X, -Position.Y), Color.White);
foreach (MapEntity e in linkedTo) foreach (MapEntity e in linkedTo)
{ {
GUI.DrawLine(spriteBatch, GUI.DrawLine(spriteBatch,
new Vector2(drawRect.X+rect.Width/2.0f, -drawRect.Y+rect.Height/2.0f), drawPos,
new Vector2(e.DrawPosition.X, -e.DrawPosition.Y), new Vector2(e.DrawPosition.X, -e.DrawPosition.Y),
Color.Green); Color.Green);
} }
@@ -167,8 +198,8 @@ namespace Barotrauma
spawnType += (int)button.UserData; spawnType += (int)button.UserData;
if (spawnType > SpawnType.Cargo) spawnType = SpawnType.None; if (spawnType > SpawnType.Path) spawnType = SpawnType.Human;
if (spawnType < SpawnType.None) spawnType = SpawnType.Enemy; if (spawnType < SpawnType.Human) spawnType = SpawnType.Path;
spawnTypeText.Text = spawnType.ToString(); spawnTypeText.Text = spawnType.ToString();
@@ -179,7 +210,7 @@ namespace Barotrauma
{ {
IdCardTags = text.Split(','); IdCardTags = text.Split(',');
textBox.Text = text; textBox.Text = text;
textBox.Color = Color.White; textBox.Color = Color.Green;
return true; return true;
} }
@@ -191,7 +222,7 @@ namespace Barotrauma
if (assignedJob !=null && trimmedName!="none") if (assignedJob !=null && trimmedName!="none")
{ {
textBox.Color = Color.White; textBox.Color = Color.Green;
textBox.Text = (assignedJob == null) ? "None" : assignedJob.Name; textBox.Text = (assignedJob == null) ? "None" : assignedJob.Name;
} }
@@ -378,16 +409,59 @@ namespace Barotrauma
ladderPoints[1] = new WayPoint(new Vector2(item.Rect.Center.X, item.Rect.Y-1.0f), SpawnType.Path, Submarine.Loaded); ladderPoints[1] = new WayPoint(new Vector2(item.Rect.Center.X, item.Rect.Y-1.0f), SpawnType.Path, Submarine.Loaded);
WayPoint prevPoint = ladderPoints[0];
for (float y = ladderPoints[0].Position.Y+100.0f; y < ladderPoints[1].Position.Y; y+=100.0f )
{
var midPoint = new WayPoint(new Vector2(item.Rect.Center.X, y), SpawnType.Path, Submarine.Loaded);
midPoint.Ladders = ladders;
midPoint.ConnectTo(prevPoint);
prevPoint = midPoint; WayPoint prevPoint = ladderPoints[0];
Vector2 prevPos = prevPoint.SimPosition;
List<Body> ignoredBodies = new List<Body>();
while (prevPoint != ladderPoints[1])
{
var pickedBody = Submarine.PickBody(prevPos, ladderPoints[1].SimPosition, ignoredBodies);
if (pickedBody == null) break;
ignoredBodies.Add(pickedBody);
if (pickedBody.UserData is Item)
{
var door = (pickedBody.UserData as Item).GetComponent<Door>();
if (door != null)
{
WayPoint newPoint = new WayPoint(door.Item.Position, SpawnType.Path, Submarine.Loaded);
newPoint.ConnectedGap = door.LinkedGap;
newPoint.ConnectTo(prevPoint);
prevPoint = newPoint;
prevPos = ConvertUnits.ToSimUnits(door.Item.Position - Vector2.UnitY * door.Item.Rect.Height);
}
else
{
prevPos = Submarine.LastPickedPosition;
}
}
else
{
prevPos = Submarine.LastPickedPosition;
}
} }
ladderPoints[1].ConnectTo(prevPoint);
prevPoint.ConnectTo(ladderPoints[1]);
//for (float y = ladderPoints[0].Position.Y+100.0f; y < ladderPoints[1].Position.Y; y+=100.0f )
//{
// var midPoint = new WayPoint(new Vector2(item.Rect.Center.X, y), SpawnType.Path, Submarine.Loaded);
// midPoint.Ladders = ladders;
// midPoint.ConnectTo(prevPoint);
// prevPoint = midPoint;
//}
//ladderPoints[1].ConnectTo(prevPoint);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
@@ -395,13 +469,13 @@ namespace Barotrauma
for (int dir = -1; dir <= 1; dir += 2) for (int dir = -1; dir <= 1; dir += 2)
{ {
WayPoint closest = ladderPoints[i].FindClosest(dir, true, new Vector2(-100.0f, 0f)); WayPoint closest = ladderPoints[i].FindClosest(dir, true, new Vector2(-150.0f, 10f));
if (closest == null) continue; if (closest == null) continue;
ladderPoints[i].ConnectTo(closest); ladderPoints[i].ConnectTo(closest);
} }
} }
ladderPoints[0].ConnectTo(ladderPoints[1]); //ladderPoints[0].ConnectTo(ladderPoints[1]);
} }
foreach (Gap gap in Gap.GapList) foreach (Gap gap in Gap.GapList)
@@ -423,6 +497,24 @@ namespace Barotrauma
} }
} }
foreach (Gap gap in Gap.GapList)
{
if (gap.isHorizontal || gap.IsRoomToRoom) continue;
//too small to walk through
if (gap.Rect.Width < 100.0f) continue;
var wayPoint = new WayPoint(
new Vector2(gap.Rect.Center.X, gap.Rect.Y - gap.Rect.Height/2), SpawnType.Path, Submarine.Loaded, gap);
for (int dir = -1; dir <= 1; dir += 2)
{
WayPoint closest = wayPoint.FindClosest(dir, false, new Vector2(-outSideWaypointInterval, outSideWaypointInterval) / 2.0f);
if (closest == null) continue;
wayPoint.ConnectTo(closest);
}
}
var orphans = WayPointList.FindAll(w => w.spawnType == SpawnType.Path && !w.linkedTo.Any()); var orphans = WayPointList.FindAll(w => w.spawnType == SpawnType.Path && !w.linkedTo.Any());
foreach (WayPoint wp in orphans) foreach (WayPoint wp in orphans)
@@ -438,27 +530,37 @@ namespace Barotrauma
float closestDist = 0.0f; float closestDist = 0.0f;
WayPoint closest = null; WayPoint closest = null;
if (horizontalSearch)
{
foreach (WayPoint wp in WayPointList) foreach (WayPoint wp in WayPointList)
{ {
if (wp.SpawnType != SpawnType.Path || wp == this) continue; if (wp.SpawnType != SpawnType.Path || wp == this) continue;
if ((wp.Position.Y - Position.Y) < tolerance.X || (wp.Position.Y - Position.Y) > tolerance.Y) continue; float diff = 0.0f;
if (horizontalSearch)
{
if ((wp.Position.Y - Position.Y) < tolerance.X || (wp.Position.Y - Position.Y) > tolerance.Y) continue;
diff = wp.Position.X - Position.X;
}
else
{
if ((wp.Position.X - Position.X) < tolerance.X || (wp.Position.X - Position.X) > tolerance.Y) continue;
diff = wp.Position.Y - Position.Y;
}
float diff = wp.Position.X - Position.X;
if (Math.Sign(diff) != dir) continue; if (Math.Sign(diff) != dir) continue;
diff = Math.Abs(diff); float dist = Vector2.Distance(wp.Position, Position);
if (closest == null || diff < closestDist) if (closest == null || dist < closestDist)
{ {
if (Submarine.CheckVisibility(SimPosition, wp.SimPosition) != null) continue; if (Submarine.CheckVisibility(SimPosition, wp.SimPosition) != null) continue;
closestDist = diff; closestDist = dist;
closest = wp; closest = wp;
} }
} }
}
return closest; return closest;
} }
@@ -469,13 +571,13 @@ namespace Barotrauma
if (!wayPoint2.linkedTo.Contains(this)) wayPoint2.linkedTo.Add(this); if (!wayPoint2.linkedTo.Contains(this)) wayPoint2.linkedTo.Add(this);
} }
public static WayPoint GetRandom(SpawnType spawnType = SpawnType.None, Job assignedJob = null) public static WayPoint GetRandom(SpawnType spawnType = SpawnType.Human, Job assignedJob = null)
{ {
List<WayPoint> wayPoints = new List<WayPoint>(); List<WayPoint> wayPoints = new List<WayPoint>();
foreach (WayPoint wp in WayPointList) foreach (WayPoint wp in WayPointList)
{ {
if (spawnType != SpawnType.None && wp.spawnType != spawnType) continue; if (wp.spawnType != spawnType) continue;
if (assignedJob != null && wp.assignedJob != assignedJob.Prefab) continue; if (assignedJob != null && wp.assignedJob != assignedJob.Prefab) continue;
wayPoints.Add(wp); wayPoints.Add(wp);
@@ -525,6 +627,16 @@ namespace Barotrauma
if (assignedWayPoints[i] != null) continue; if (assignedWayPoints[i] != null) continue;
//try to assign a spawnpoint that isn't meant for any specific job
var nonJobSpecificPoints = WayPointList.FindAll(wp => wp.spawnType == SpawnType.Human && wp.assignedJob == null);
if (nonJobSpecificPoints.Any())
{
assignedWayPoints[i] = nonJobSpecificPoints[Rand.Int(nonJobSpecificPoints.Count, false)];
}
if (assignedWayPoints[i] != null) continue;
//everything else failed -> just give a random spawnpoint //everything else failed -> just give a random spawnpoint
assignedWayPoints[i] = GetRandom(SpawnType.Human); assignedWayPoints[i] = GetRandom(SpawnType.Human);
} }
@@ -548,7 +660,7 @@ namespace Barotrauma
public override XElement Save(XDocument doc) public override XElement Save(XDocument doc)
{ {
if (MoveWithLevel || spawnType == SpawnType.Path) return null; if (MoveWithLevel) return null;
XElement element = new XElement("WayPoint"); XElement element = new XElement("WayPoint");
element.Add(new XAttribute("ID", ID), element.Add(new XAttribute("ID", ID),
@@ -591,8 +703,8 @@ namespace Barotrauma
WayPoint w = new WayPoint(rect, submarine); WayPoint w = new WayPoint(rect, submarine);
w.ID = (ushort)int.Parse(element.Attribute("ID").Value); w.ID = (ushort)int.Parse(element.Attribute("ID").Value);
w.spawnType = (SpawnType)Enum.Parse(typeof(SpawnType),
ToolBox.GetAttributeString(element, "spawn", "None")); Enum.TryParse<SpawnType>(ToolBox.GetAttributeString(element, "spawn", "Path"), out w.spawnType);
string idCardTagString = ToolBox.GetAttributeString(element, "idcardtags", ""); string idCardTagString = ToolBox.GetAttributeString(element, "idcardtags", "");
if (!string.IsNullOrWhiteSpace(idCardTagString)) if (!string.IsNullOrWhiteSpace(idCardTagString))
Subsurface/Source/Screens/EditMapScreen.cs
+51 -4
View File
@@ -2,6 +2,7 @@
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using System; using System;
using System.Linq;
namespace Barotrauma namespace Barotrauma
{ {
@@ -16,6 +17,9 @@ namespace Barotrauma
private GUITextBox nameBox; private GUITextBox nameBox;
const int PreviouslyUsedCount = 10;
private GUIListBox previouslyUsedList;
//a Character used for picking up and manipulating items //a Character used for picking up and manipulating items
private Character dummyCharacter; private Character dummyCharacter;
@@ -161,9 +165,7 @@ namespace Barotrauma
y+=50; y+=50;
new GUITextBlock(new Rectangle(0, y, 0, 20), "Show:", GUI.Style, GUIpanel); new GUITextBlock(new Rectangle(0, y, 0, 20), "Show:", GUI.Style, GUIpanel);
var tickBox = new GUITickBox(new Rectangle(0,y+20,20,20), "Waypoints", Alignment.TopLeft, GUIpanel); var tickBox = new GUITickBox(new Rectangle(0,y+20,20,20), "Waypoints", Alignment.TopLeft, GUIpanel);
tickBox.OnSelected = (GUITickBox obj) => { WayPoint.ShowWayPoints = !WayPoint.ShowWayPoints; return true; }; tickBox.OnSelected = (GUITickBox obj) => { WayPoint.ShowWayPoints = !WayPoint.ShowWayPoints; return true; };
tickBox.Selected = true; tickBox.Selected = true;
@@ -180,6 +182,16 @@ namespace Barotrauma
tickBox.OnSelected = (GUITickBox obj) => { Gap.ShowGaps = !Gap.ShowGaps; return true; }; tickBox.OnSelected = (GUITickBox obj) => { Gap.ShowGaps = !Gap.ShowGaps; return true; };
tickBox.Selected = true; tickBox.Selected = true;
y+=150;
if (y < GameMain.GraphicsHeight - 100)
{
new GUITextBlock(new Rectangle(0, y, 0, 15), "Previously used:", GUI.Style, GUIpanel);
previouslyUsedList = new GUIListBox(new Rectangle(0, y + 15, 0, Math.Min(GameMain.GraphicsHeight - y - 40, 150)), GUI.Style, GUIpanel);
previouslyUsedList.OnSelected = SelectPrefab;
}
} }
public void StartTutorial() public void StartTutorial()
@@ -230,6 +242,12 @@ namespace Barotrauma
if (dummyCharacter != null) dummyCharacter.Remove(); if (dummyCharacter != null) dummyCharacter.Remove();
dummyCharacter = Character.Create(Character.HumanConfigFile, Vector2.Zero); dummyCharacter = Character.Create(Character.HumanConfigFile, Vector2.Zero);
for (int i = 0; i<dummyCharacter.Inventory.SlotPositions.Length; i++)
{
dummyCharacter.Inventory.SlotPositions[i].X += GUIpanel.Rect.Width+10;
}
Character.Controlled = dummyCharacter; Character.Controlled = dummyCharacter;
GameMain.World.ProcessChanges(); GameMain.World.ProcessChanges();
} }
@@ -313,10 +331,12 @@ namespace Barotrauma
private bool SelectPrefab(GUIComponent component, object obj) private bool SelectPrefab(GUIComponent component, object obj)
{ {
AddPreviouslyUsed(obj as MapEntityPrefab);
MapEntityPrefab.SelectPrefab(obj); MapEntityPrefab.SelectPrefab(obj);
selectedTab = -1; selectedTab = -1;
GUIComponent.MouseOn = null; GUIComponent.MouseOn = null;
return true; return false;
} }
private bool GenerateWaypoints(GUIButton button, object obj) private bool GenerateWaypoints(GUIButton button, object obj)
@@ -325,6 +345,33 @@ namespace Barotrauma
return true; return true;
} }
private void AddPreviouslyUsed(MapEntityPrefab mapEntityPrefab)
{
if (previouslyUsedList == null || mapEntityPrefab == null) return;
previouslyUsedList.Deselect();
if (previouslyUsedList.CountChildren == PreviouslyUsedCount)
{
previouslyUsedList.RemoveChild(previouslyUsedList.children.Last());
}
var existing = previouslyUsedList.FindChild(mapEntityPrefab);
if (existing != null) previouslyUsedList.RemoveChild(existing);
string name = mapEntityPrefab.Name;
if (name.Length>15)
{
name = name.Substring(0,12)+"...";
}
var textBlock = new GUITextBlock(new Rectangle(0,0,0,15), name, GUI.Style, previouslyUsedList);
textBlock.UserData = mapEntityPrefab;
previouslyUsedList.RemoveChild(textBlock);
previouslyUsedList.children.Insert(0, textBlock);
}
/// <summary> /// <summary>
/// Allows the game to run logic such as updating the world, /// Allows the game to run logic such as updating the world,
Subsurface/Source/Screens/GameScreen.cs
+1 -1
View File
@@ -191,7 +191,7 @@ namespace Barotrauma
{ {
Character.Controlled.SelectedConstruction.DrawHUD(spriteBatch, Character.Controlled); Character.Controlled.SelectedConstruction.DrawHUD(spriteBatch, Character.Controlled);
} }
else else if (!Character.Controlled.SelectedConstruction.IsInPickRange(Character.Controlled.WorldPosition))
{ {
Character.Controlled.SelectedConstruction = null; Character.Controlled.SelectedConstruction = null;
} }
Subsurface_Solution.v12.suo
BIN
View File
Binary file not shown.