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

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TriggerAction.cs
+43 -4
View File
@@ -2,7 +2,6 @@ using Barotrauma.Networking;
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
namespace Barotrauma
{
@@ -50,6 +49,9 @@ namespace Barotrauma
[Serialize(false, IsPropertySaveable.Yes, description: "If true and using multiple targets, all targets must be inside/outside the radius.")]
public bool CheckAllTargets { get; set; }
[Serialize(false, IsPropertySaveable.Yes, description: "If true, interacting with the target will make the character select it.")]
public bool SelectOnTrigger { get; set; }
private float distance;
public TriggerAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) { }
@@ -186,7 +188,12 @@ namespace Barotrauma
{
if (npc != null)
{
if (npc.CampaignInteractionType != CampaignMode.InteractionType.Examine)
if (npc.CampaignInteractionType == CampaignMode.InteractionType.Talk)
{
//if the NPC has a conversation available, don't assign the trigger until the conversation is done
continue;
}
else if (npc.CampaignInteractionType != CampaignMode.InteractionType.Examine)
{
if (!npcsOrItems.Any(n => n.TryGet(out Character npc2) && npc2 == npc))
{
@@ -213,7 +220,8 @@ namespace Barotrauma
{
npcsOrItems.Add(item);
}
item.CampaignInteractionType = CampaignMode.InteractionType.Examine;
item.AssignCampaignInteractionType(CampaignMode.InteractionType.Examine,
GameMain.NetworkMember?.ConnectedClients.Where(c => c.Character != null && targets2.Contains(c.Character)));
if (player.SelectedItem == item ||
player.SelectedSecondaryItem == item ||
(player.Inventory != null && player.Inventory.Contains(item)) ||
@@ -276,7 +284,7 @@ namespace Barotrauma
}
else if (npcOrItem.TryGet(out Item item))
{
item.CampaignInteractionType = CampaignMode.InteractionType.None;
item.AssignCampaignInteractionType(CampaignMode.InteractionType.None);
}
}
}
@@ -352,6 +360,37 @@ namespace Barotrauma
ParentEvent.AddTarget(ApplyToTarget2, entity2);
}
Character player = null;
Entity target = null;
if (entity1 is Character { IsPlayer: true })
{
player = entity1 as Character;
target = entity2;
}
else if (entity2 is Character { IsPlayer: true })
{
player = entity2 as Character;
target = entity1;
}
if (player != null && SelectOnTrigger)
{
if (target is Character targetCharacter)
{
player.SelectCharacter(targetCharacter);
}
else if (target is Item targetItem)
{
if (targetItem.IsSecondaryItem)
{
player.SelectedSecondaryItem = targetItem;
}
else
{
player.SelectedItem = targetItem;
}
}
}
isRunning = false;
isFinished = true;
}