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

Merge branch 'master' of https://github.com/Faerdan/Barotrauma into Faerdan-master

Browse Source 
Conflicts:
	Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
	Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
	Barotrauma/BarotraumaShared/Source/Characters/Character.cs
	Barotrauma/BarotraumaShared/Source/Items/Item.cs
This commit is contained in:
Joonas Rikkonen
2017-07-05 19:32:34 +03:00
parent 64ad5e5003 a09367c78f
commit bf5a0746ad
47 changed files with 473 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs
+3 -3
View File
@@ -141,7 +141,7 @@ namespace Barotrauma
{
if (character.SelectedConstruction != currentPath.CurrentNode.Ladders.Item && currentPath.CurrentNode.Ladders.Item.IsInsideTrigger(character.WorldPosition))
{
currentPath.CurrentNode.Ladders.Item.Pick(character, false, true);
currentPath.CurrentNode.Ladders.Item.TryInteract(character, false, true);
}
}
@@ -239,7 +239,7 @@ namespace Barotrauma
foreach (Controller controller in buttons)
{
float dist = Vector2.Distance(controller.Item.WorldPosition, character.WorldPosition);
if (dist > controller.Item.PickDistance * 2.0f) continue;
if (dist > controller.Item.InteractDistance * 2.0f) continue;
if (dist < closestDist || closestButton == null)
{
@@ -256,7 +256,7 @@ namespace Barotrauma
return;
}
closestButton.Item.Pick(character, false, true);
closestButton.Item.TryInteract(character, false, true);
break;
}
}
Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs
+1 -1
View File
@@ -61,7 +61,7 @@ namespace Barotrauma
}
else
{
if (Vector2.Distance(character.Position, container.Item.Position) > container.Item.PickDistance
if (Vector2.Distance(character.Position, container.Item.Position) > container.Item.InteractDistance
&& !container.Item.IsInsideTrigger(character.Position))
{
AddSubObjective(new AIObjectiveGoTo(container.Item, character));
Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs
+2 -2
View File
@@ -55,7 +55,7 @@ namespace Barotrauma
FindTargetItem();
if (targetItem == null || moveToTarget == null) return;
if (Vector2.Distance(character.Position, moveToTarget.Position) < targetItem.PickDistance*2.0f)
if (Vector2.Distance(character.Position, moveToTarget.Position) < targetItem.InteractDistance*2.0f)
{
int targetSlot = -1;
if (equip)
@@ -91,7 +91,7 @@ namespace Barotrauma
}
}
targetItem.Pick(character, false, true);
targetItem.TryInteract(character, false, true);
if (targetSlot > -1 && character.Inventory.IsInLimbSlot(targetItem, InvSlotType.Any))
{
Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs
+1 -1
View File
@@ -126,7 +126,7 @@ namespace Barotrauma
if (item != null)
{
allowedDistance = Math.Max(ConvertUnits.ToSimUnits(item.PickDistance), allowedDistance);
allowedDistance = Math.Max(ConvertUnits.ToSimUnits(item.InteractDistance), allowedDistance);
if (item.IsInsideTrigger(character.WorldPosition)) completed = true;
}
Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs
+2 -2
View File
@@ -50,12 +50,12 @@ namespace Barotrauma
if (target.CanBeSelected)
{
if (Vector2.Distance(character.Position, target.Item.Position) < target.Item.PickDistance
if (Vector2.Distance(character.Position, target.Item.Position) < target.Item.InteractDistance
|| target.Item.IsInsideTrigger(character.WorldPosition))
{
if (character.SelectedConstruction != target.Item && target.CanBeSelected)
{
target.Item.Pick(character, false, true);
target.Item.TryInteract(character, false, true);
}
if (component.AIOperate(deltaTime, character, this)) isCompleted = true;