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

Improved level generation algorithm, fixed invisible hulls, turret projectile fix, fabricators work in mp

Browse Source
This commit is contained in:
Regalis
2016-02-11 21:37:37 +02:00
parent 5a38c4b1ef
commit 4f54e04c8c
32 changed files with 435 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Subsurface/Source/Items/Components/Holdable/Holdable.cs
View File

@@ -30,7 +30,7 @@ namespace Barotrauma.Items.Components
[HasDefaultValue(false, true)]
public bool Attached
{
get { return attached; }
get { return attached && item.Inventory == null; }
set { attached = value; }
}
@@ -101,7 +101,7 @@ namespace Barotrauma.Items.Components
Msg = "";
}
if (attachedByDefault || (Screen.Selected == GameMain.EditMapScreen && Submarine.Loaded!=null)) Use(1.0f);
if (attachedByDefault || (Screen.Selected == GameMain.EditMapScreen && Submarine.Loaded!=null)) Use(1.0f);
//holdAngle = ToolBox.GetAttributeFloat(element, "holdangle", 0.0f);
@@ -259,12 +259,22 @@ namespace Barotrauma.Items.Components
{
//prevRequiredItems = new List<RelatedItem>(requiredItems);
if (attached)
if (Attached)
{
Use(1.0f);
}
else
{
{
if (item.Inventory!=null)
{
if (body != null)
{
item.body = body;
body.Enabled = false;
}
attached = false;
}
requiredItems.Clear();
Msg = "";
}

2
Subsurface/Source/Items/Components/ItemContainer.cs
View File

@@ -9,6 +9,8 @@ namespace Barotrauma.Items.Components
{
class ItemContainer : ItemComponent
{
public const int MaxInventoryCount = 4;
List<RelatedItem> containableItems;
public ItemInventory Inventory;

9
Subsurface/Source/Items/Components/Machines/Fabricator.cs
View File

@@ -301,6 +301,10 @@ namespace Barotrauma.Items.Components
int itemIndex = fabricatedItem == null ? -1 : fabricableItems.IndexOf(fabricatedItem);
message.WriteRangedInteger(-1, fabricableItems.Count-1, itemIndex);
var containers = item.GetComponents<ItemContainer>();
containers[0].Inventory.FillNetworkData(type, message, null);
containers[1].Inventory.FillNetworkData(type, message, null);
return true;
}
@@ -311,6 +315,10 @@ namespace Barotrauma.Items.Components
int itemIndex = message.ReadRangedInteger(-1, fabricableItems.Count-1);
var containers = item.GetComponents<ItemContainer>();
containers[0].Inventory.ReadNetworkData(type, message, sendingTime);
containers[1].Inventory.ReadNetworkData(type, message, sendingTime);
if (itemIndex == -1)
{
CancelFabricating();
@@ -324,7 +332,6 @@ namespace Barotrauma.Items.Components
SelectItem(null, fabricableItems[itemIndex]);
StartFabricating(fabricableItems[itemIndex]);
timeUntilReady -= sendingTime - (float)Lidgren.Network.NetTime.Now;
}
lastNetworkUpdate = sendingTime;

2
Subsurface/Source/Items/Components/Projectile.cs
View File

@@ -177,6 +177,8 @@ namespace Barotrauma.Items.Components
}
}
ApplyStatusEffects(ActionType.OnUse, 1.0f, null);
item.body.FarseerBody.OnCollision -= OnProjectileCollision;
item.body.FarseerBody.IsBullet = false;

2
Subsurface/Source/Items/Components/Turret.cs
View File

@@ -172,6 +172,8 @@ namespace Barotrauma.Items.Components
projectile.body.ResetDynamics();
projectile.body.Enabled = true;
projectile.SetTransform(ConvertUnits.ToSimUnits(new Vector2(item.WorldRect.X + barrelPos.X, item.WorldRect.Y - barrelPos.Y)), -rotation);
projectile.FindHull();
projectile.Submarine = projectile.body.Submarine;
projectiles[0].Use(deltaTime);
projectiles[0].User = character;

28
Subsurface/Source/Items/Item.cs
View File

@@ -1370,9 +1370,16 @@ namespace Barotrauma
message.Write(requirementIndex);
break;
case NetworkEventType.InventoryUpdate:
var itemContainer = GetComponent<ItemContainer>();
if (itemContainer == null || itemContainer.Inventory == null) return false;
return itemContainer.Inventory.FillNetworkData(NetworkEventType.InventoryUpdate, message, data);
var itemContainers = GetComponents<ItemContainer>();
if (itemContainers == null || !itemContainers.Any()) return false;
message.WriteRangedInteger(1, ItemContainer.MaxInventoryCount, itemContainers.Count);
foreach (ItemContainer container in itemContainers)
{
container.Inventory.FillNetworkData(NetworkEventType.InventoryUpdate, message, data);
}
return true;
case NetworkEventType.ComponentUpdate:
case NetworkEventType.ImportantComponentUpdate:
@@ -1434,7 +1441,7 @@ namespace Barotrauma
{
case NetworkEventType.DropItem:
Vector2 newSimPos = Vector2.Zero;
newSimPos = new Vector2(message.ReadFloat(), message.ReadFloat());
newSimPos = new Vector2(message.ReadFloat(), message.ReadFloat());
SetTransform(newSimPos, body.Rotation);
Drop(null, false);
break;
@@ -1443,15 +1450,20 @@ namespace Barotrauma
byte requirementIndex = message.ReadByte();
data = requirementIndex;
if (requirementIndex>=FixRequirements.Count) return;
if (requirementIndex >= FixRequirements.Count) return;
FixRequirements[requirementIndex].Fixed = true;
break;
case NetworkEventType.InventoryUpdate:
var itemContainers = GetComponents<ItemContainer>();
if (itemContainers == null || !itemContainers.Any()) return;
int containerCount = message.ReadRangedInteger(1, ItemContainer.MaxInventoryCount);
for (int i = 0; i < containerCount;i++ )
{
itemContainers[i].Inventory.ReadNetworkData(type, message, sendingTime);
}
var itemContainer = GetComponent<ItemContainer>();
if (itemContainer == null || itemContainer.Inventory == null) return;
itemContainer.Inventory.ReadNetworkData(NetworkEventType.DropItem, message, sendingTime);
break;
case NetworkEventType.ComponentUpdate:
case NetworkEventType.ImportantComponentUpdate: