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

Fuel rods can't be turned back to uranium/incendium if they've already been used, fixed level generation breaking with smaller subs

Browse Source
This commit is contained in:
Regalis
2016-02-13 13:09:27 +02:00
parent 1506738ff7
commit 08f1d05507
9 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Machines/Deconstructor.cs
+4 -2
View File
@@ -58,9 +58,11 @@ namespace Barotrauma.Items.Components
return;
}
foreach (string deconstructProduct in targetItem.Prefab.DeconstructItems)
foreach (DeconstructItem deconstructProduct in targetItem.Prefab.DeconstructItems)
{
var itemPrefab = ItemPrefab.list.FirstOrDefault(ip => ip.Name.ToLower() == deconstructProduct.ToLower()) as ItemPrefab;
if (deconstructProduct.RequireFullCondition && targetItem.Condition < 100.0f) continue;
var itemPrefab = ItemPrefab.list.FirstOrDefault(ip => ip.Name.ToLower() == deconstructProduct.ItemPrefabName.ToLower()) as ItemPrefab;
if (itemPrefab==null)
{
DebugConsole.ThrowError("Tried to deconstruct item ''"+targetItem.Name+"'' but couldn't find item prefab ''"+deconstructProduct+"''!");
Subsurface/Source/Items/ItemPrefab.cs
+20 -3
View File
@@ -9,6 +9,18 @@ using Microsoft.Xna.Framework.Input;
namespace Barotrauma
{
struct DeconstructItem
{
public readonly string ItemPrefabName;
public readonly bool RequireFullCondition;
public DeconstructItem(string itemPrefabName, bool requireFullCondition)
{
ItemPrefabName = itemPrefabName;
RequireFullCondition = requireFullCondition;
}
}
class ItemPrefab : MapEntityPrefab
{
//static string contentFolder = "Content/Items/";
@@ -38,7 +50,7 @@ namespace Barotrauma
get { return configFile; }
}
public List<string> DeconstructItems
public List<DeconstructItem> DeconstructItems
{
get;
private set;
@@ -216,7 +228,7 @@ namespace Barotrauma
Triggers = new List<Rectangle>();
DeconstructItems = new List<string>();
DeconstructItems = new List<DeconstructItem>();
DeconstructTime = 1.0f;
foreach (XElement subElement in element.Elements())
@@ -238,7 +250,12 @@ namespace Barotrauma
foreach (XElement deconstructItem in subElement.Elements())
{
DeconstructItems.Add(ToolBox.GetAttributeString(deconstructItem, "name", "not found"));
string deconstructItemName = ToolBox.GetAttributeString(deconstructItem, "name", "not found");
bool requireFullCondition = ToolBox.GetAttributeBool(deconstructItem, "requirefullcondition", false);
DeconstructItems.Add(new DeconstructItem(deconstructItemName, requireFullCondition));
}
break;