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

Fixed spectators joining messing up the game, textboxes are deselected when switching the screen, nerfed engineer construction level, tickboxes or textboxes cannot be selected through other ui elements

Browse Source
This commit is contained in:
Regalis
2016-02-16 20:52:39 +02:00
parent 9004205c80
commit f3112e29b4
19 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/AI/EnemyAIController.cs
+2 -2
View File
@@ -109,9 +109,9 @@ namespace Barotrauma
if (Character.AnimController is HumanoidAnimController)
{
if (Math.Abs(Character.AnimController.TargetMovement.X) > 0.1f && !Character.AnimController.InWater)
if (Math.Abs(Character.AnimController.movement.X) > 0.1f && !Character.AnimController.InWater)
{
Character.AnimController.TargetDir = Character.AnimController.TargetMovement.X > 0.0f ? Direction.Right : Direction.Left;
Character.AnimController.TargetDir = Character.AnimController.movement.X > 0.0f ? Direction.Right : Direction.Left;
}
}
Subsurface/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Barotrauma
return;
}
if (container.Item.Inventory == character.Inventory)
if (container.Item.ParentInventory == character.Inventory)
{
var containedItems = container.Inventory.Items;
//if there's already something in the mask (empty oxygen tank?), drop it
Subsurface/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs
+1 -1
View File
@@ -106,7 +106,7 @@ namespace Barotrauma
if (!Item.ItemList[currSearchIndex].HasTag(itemName) && Item.ItemList[currSearchIndex].Name != itemName) continue;
if (IgnoreContainedItems && Item.ItemList[currSearchIndex].Container != null) continue;
if (Item.ItemList[currSearchIndex].Inventory is CharacterInventory) continue;
if (Item.ItemList[currSearchIndex].ParentInventory is CharacterInventory) continue;
targetItem = Item.ItemList[currSearchIndex];