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

Fabricator, deconstructor, itemspawner & itemremover syncing, fixed placing hulls in editor, misc cleanup

Browse Source
This commit is contained in:
Regalis
2016-01-10 17:10:22 +02:00
parent 81547c2c9c
commit 17f3ec7301
22 changed files with 343 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Subsurface/Source/Items/Components/Machines/Deconstructor.cs
View File

@@ -17,13 +17,15 @@ namespace Barotrauma.Items.Components
ItemContainer container;
private float lastNetworkUpdate;
public Deconstructor(Item item, XElement element)
: base(item, element)
{
progressBar = new GUIProgressBar(new Rectangle(0,0,200,20), Color.Green, 0.0f, Alignment.BottomCenter, GuiFrame);
activateButton = new GUIButton(new Rectangle(0, 0, 200, 20), "Deconstruct", Alignment.TopCenter, GUI.Style, GuiFrame);
activateButton.OnClicked = Activate;
activateButton.OnClicked = ToggleActive;
}
public override void Update(float deltaTime, Camera cam)
@@ -73,19 +75,31 @@ namespace Barotrauma.Items.Components
public override void DrawHUD(SpriteBatch spriteBatch, Character character)
{
GuiFrame.Update((float)Physics.step);
GuiFrame.Draw(spriteBatch);
}
private bool Activate(GUIButton button, object obj)
private bool ToggleActive(GUIButton button, object obj)
{
SetActive(!IsActive);
item.NewComponentEvent(this, true, true);
return true;
}
private void SetActive(bool active)
{
container = item.GetComponent<ItemContainer>();
if (container==null)
if (container == null)
{
DebugConsole.ThrowError("Error in Deconstructor.Activate: Deconstructors must have two ItemContainer components");
return false;
return;
}
if (IsActive)
IsActive = active;
if (!IsActive)
{
progressBar.BarSize = 0.0f;
progressTimer = 0.0f;
@@ -94,16 +108,38 @@ namespace Barotrauma.Items.Components
}
else
{
if (!container.Inventory.Items.Any(i => i != null)) return false;
if (!container.Inventory.Items.Any(i => i != null)) return;
activateButton.Text = "Cancel";
}
IsActive = !IsActive;
container.Inventory.Locked = IsActive;
}
public override bool FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
var containers = item.GetComponents<ItemContainer>();
containers[0].Inventory.FillNetworkData(type, message, null);
containers[1].Inventory.FillNetworkData(type, message, null);
message.Write(IsActive);
return true;
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message, float sendingTime)
{
if (sendingTime < lastNetworkUpdate) return;
var containers = item.GetComponents<ItemContainer>();
containers[0].Inventory.ReadNetworkData(type, message, sendingTime);
containers[1].Inventory.ReadNetworkData(type, message, sendingTime);
SetActive(message.ReadBoolean());
lastNetworkUpdate = sendingTime;
}
}
}

8
Subsurface/Source/Items/Components/Machines/Engine.cs
View File

@@ -12,13 +12,11 @@ namespace Barotrauma.Items.Components
class Engine : Powered
{
float force;
private float force;
float targetForce;
private float targetForce;
float maxForce;
float powerPerForce;
private float maxForce;
//[Editable, HasDefaultValue(1.0f, true)]
//public float PowerPerForce

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

@@ -15,7 +15,7 @@ namespace Barotrauma.Items.Components
public readonly List<ItemPrefab> RequiredItems;
public readonly float RequiredTime;
//ListOrSomething requiredLevels
public FabricableItem(XElement element)
@@ -45,14 +45,19 @@ namespace Barotrauma.Items.Components
class Fabricator : ItemComponent
{
List<FabricableItem> fabricableItems;
private List<FabricableItem> fabricableItems;
GUIListBox itemList;
private GUIListBox itemList;
GUIFrame selectedItemFrame;
private GUIFrame selectedItemFrame;
FabricableItem fabricatedItem;
float timeUntilReady;
GUIProgressBar progressBar;
GUIButton activateButton;
private FabricableItem fabricatedItem;
private float timeUntilReady;
private float lastNetworkUpdate;
public Fabricator(Item item, XElement element)
: base(item, element)
@@ -96,10 +101,13 @@ namespace Barotrauma.Items.Components
if (selectedItemFrame != null) GuiFrame.RemoveChild(selectedItemFrame);
//int width = 200, height = 150;
selectedItemFrame = new GUIFrame(new Rectangle(0,0,(int)(GuiFrame.Rect.Width*0.4f),200), Color.Black*0.8f, Alignment.CenterY | Alignment.Right, null, GuiFrame);
selectedItemFrame = new GUIFrame(new Rectangle(0,0,(int)(GuiFrame.Rect.Width*0.4f),250), Color.Black*0.8f, Alignment.CenterY | Alignment.Right, null, GuiFrame);
selectedItemFrame.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
progressBar = new GUIProgressBar(new Rectangle(0, 0, 0, 20), Color.Green, GUI.Style, 0.0f, Alignment.BottomCenter, selectedItemFrame);
progressBar.IsHorizontal = true;
if (targetItem.TargetItem.sprite != null)
{
GUIImage img = new GUIImage(new Rectangle(10, 0, 40, 40), targetItem.TargetItem.sprite, Alignment.TopLeft, selectedItemFrame);
@@ -119,7 +127,7 @@ namespace Barotrauma.Items.Components
{
text += " - " + ip.Name + "\n";
}
text += "Required time: "+targetItem.RequiredTime+" s";
text += "Required time: " + targetItem.RequiredTime + " s";
GUITextBlock textBlock = new GUITextBlock(
new Rectangle(0, 50, 0, 25),
@@ -129,11 +137,10 @@ namespace Barotrauma.Items.Components
Alignment.TopLeft, null,
selectedItemFrame);
GUIButton button = new GUIButton(new Rectangle(0,0,100,20), "Create", Color.White, Alignment.CenterX | Alignment.Bottom, GUI.Style, selectedItemFrame);
button.OnClicked = StartFabricating;
button.UserData = targetItem;
activateButton = new GUIButton(new Rectangle(0, -30, 100, 20), "Create", Color.White, Alignment.CenterX | Alignment.Bottom, GUI.Style, selectedItemFrame);
activateButton.OnClicked = StartButtonClicked;
activateButton.UserData = targetItem;
activateButton.Enabled = false;
}
return true;
@@ -144,25 +151,80 @@ namespace Barotrauma.Items.Components
return (picker != null);
}
private bool StartFabricating(GUIButton button, object obj)
private bool StartButtonClicked(GUIButton button, object obj)
{
GUIComponent listElement = itemList.GetChild(obj);
if (fabricatedItem == null)
{
StartFabricating(obj as FabricableItem);
item.NewComponentEvent(this, true, true);
}
else
{
CancelFabricating();
item.NewComponentEvent(this, true, true);
}
listElement.Color = Color.Green;
//listElement.Color = Color.Green;
//itemList.Enabled = false;
//activateButton.Text = "Cancel";
//fabricatedItem = obj as FabricableItem;
//IsActive = true;
//timeUntilReady = fabricatedItem.RequiredTime;
return true;
}
private void StartFabricating(FabricableItem selectedItem)
{
if (selectedItem == null) return;
itemList.Enabled = false;
fabricatedItem = obj as FabricableItem;
activateButton.Text = "Cancel";
fabricatedItem = selectedItem;
IsActive = true;
timeUntilReady = fabricatedItem.RequiredTime;
return true;
var containers = item.GetComponents<ItemContainer>();
containers[0].Inventory.Locked = true;
containers[1].Inventory.Locked = true;
}
private void CancelFabricating()
{
itemList.Enabled = true;
IsActive = false;
fabricatedItem = null;
if (activateButton != null)
{
activateButton.Text = "Create";
}
if (progressBar != null) progressBar.BarSize = 0.0f;
timeUntilReady = 0.0f;
var containers = item.GetComponents<ItemContainer>();
containers[0].Inventory.Locked = false;
containers[1].Inventory.Locked = false;
}
public override void Update(float deltaTime, Camera cam)
{
timeUntilReady -= deltaTime;
if (progressBar!=null)
{
progressBar.BarSize = fabricatedItem == null ? 0.0f : (fabricatedItem.RequiredTime - timeUntilReady) / fabricatedItem.RequiredTime;
}
if (timeUntilReady > 0.0f) return;
var containers = item.GetComponents<ItemContainer>();
@@ -180,9 +242,7 @@ namespace Barotrauma.Items.Components
Item.Spawner.QueueItem(fabricatedItem.TargetItem, containers[1].Inventory);
itemList.Enabled = true;
IsActive = false;
fabricatedItem = null;
CancelFabricating();
}
public override void DrawHUD(SpriteBatch spriteBatch, Character character)
@@ -190,13 +250,13 @@ namespace Barotrauma.Items.Components
FabricableItem targetItem = itemList.SelectedData as FabricableItem;
if (targetItem != null)
{
selectedItemFrame.GetChild<GUIButton>().Enabled = true;
activateButton.Enabled = true;
ItemContainer container = item.GetComponent<ItemContainer>();
foreach (ItemPrefab ip in targetItem.RequiredItems)
{
if (Array.Find(container.Inventory.Items, it => it != null && it.Prefab == ip) != null) continue;
selectedItemFrame.GetChild<GUIButton>().Enabled = false;
activateButton.Enabled = false;
break;
}
}
@@ -213,5 +273,39 @@ namespace Barotrauma.Items.Components
// selectedItemFrame.Draw(spriteBatch);
//}
}
public override bool FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
int itemIndex = fabricatedItem == null ? -1 : fabricableItems.IndexOf(fabricatedItem);
message.WriteRangedInteger(-1, fabricableItems.Count-1, itemIndex);
return true;
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message, float sendingTime)
{
if (sendingTime < lastNetworkUpdate) return;
int itemIndex = message.ReadRangedInteger(-1, fabricableItems.Count-1);
if (itemIndex == -1)
{
CancelFabricating();
}
else
{
//if already fabricating the selected item, return
if (fabricatedItem != null && fabricableItems.IndexOf(fabricatedItem) != itemIndex) return;
if (itemIndex < 0 || itemIndex >= fabricableItems.Count) return;
SelectItem(null, fabricableItems[itemIndex]);
StartFabricating(fabricableItems[itemIndex]);
timeUntilReady -= sendingTime - (float)Lidgren.Network.NetTime.Now;
}
lastNetworkUpdate = sendingTime;
}
}
}

14
Subsurface/Source/Items/Components/Machines/Pump.cs
View File

@@ -16,7 +16,7 @@ namespace Barotrauma.Items.Components
float lastUpdate;
Hull hull1, hull2;
Hull hull1;
[HasDefaultValue(0.0f, true)]
public float FlowPercentage
@@ -82,7 +82,7 @@ namespace Barotrauma.Items.Components
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
if (hull2 == null && hull1 == null) return;
if (hull1 == null) return;
float powerFactor = (currPowerConsumption==0.0f) ? 1.0f : voltage;
//flowPercentage = maxFlow * powerFactor;
@@ -92,11 +92,11 @@ namespace Barotrauma.Items.Components
hull1.Volume += currFlow;
if (hull1.Volume > hull1.FullVolume) hull1.Pressure += 0.5f;
if (hull2 != null)
{
hull2.Volume -= currFlow;
if (hull2.Volume > hull1.FullVolume) hull2.Pressure += 0.5f;
}
//if (hull2 != null)
//{
// hull2.Volume -= currFlow;
// if (hull2.Volume > hull1.FullVolume) hull2.Pressure += 0.5f;
//}
voltage = 0.0f;
}