(f0d812055) v0.9.9.0
This commit is contained in:
+25
-1
@@ -192,6 +192,8 @@ namespace Barotrauma.Items.Components
|
||||
public bool CheckCharacterSuccess(Character character)
|
||||
{
|
||||
if (character == null) { return false; }
|
||||
//no electrocution in sub editor
|
||||
if (Screen.Selected == GameMain.SubEditorScreen) { return true; }
|
||||
|
||||
var powered = item.GetComponent<Powered>();
|
||||
if (powered != null)
|
||||
@@ -203,7 +205,7 @@ namespace Barotrauma.Items.Components
|
||||
float degreeOfSuccess = DegreeOfSuccess(character);
|
||||
if (Rand.Range(0.0f, 0.5f) < degreeOfSuccess) { return true; }
|
||||
|
||||
item.ApplyStatusEffects(ActionType.OnFailure, 1.0f, character);
|
||||
ApplyStatusEffects(ActionType.OnFailure, 1.0f, character);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -262,7 +264,18 @@ namespace Barotrauma.Items.Components
|
||||
{
|
||||
if (wire.OtherConnection(null) == null) //wire not connected to anything else
|
||||
{
|
||||
#if CLIENT
|
||||
if (SubEditorScreen.IsSubEditor())
|
||||
{
|
||||
wire.Item.Remove();
|
||||
}
|
||||
else
|
||||
{
|
||||
wire.Item.Drop(null);
|
||||
}
|
||||
#else
|
||||
wire.Item.Drop(null);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -275,7 +288,18 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
if (wire.OtherConnection(c) == null) //wire not connected to anything else
|
||||
{
|
||||
#if CLIENT
|
||||
if (SubEditorScreen.IsSubEditor())
|
||||
{
|
||||
wire.Item.Remove();
|
||||
}
|
||||
else
|
||||
{
|
||||
wire.Item.Drop(null);
|
||||
}
|
||||
#else
|
||||
wire.Item.Drop(null);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user