Release 0.14.9.0

This commit is contained in:
Markus Isberg
2021-08-26 00:57:37 +09:00
parent 27dd9e6022
commit 4a9727e58f
14 changed files with 48 additions and 54 deletions
@@ -282,7 +282,7 @@ namespace Barotrauma
{
Item matchingItem = character.Inventory.FindItemByIdentifier(treatmentSuitability.Key, true);
if (matchingItem == null) { continue; }
character.SelectCharacter(targetCharacter);
if (targetCharacter != character) { character.SelectCharacter(targetCharacter); }
ApplyTreatment(affliction, matchingItem);
//wait a bit longer after applying a treatment to wait for potential side-effects to manifest
treatmentTimer = TreatmentDelay * 4;
@@ -638,6 +638,8 @@ namespace Barotrauma
public CharacterHealth CharacterHealth { get; private set; }
public bool DisableHealthWindow;
public float Vitality
{
get { return CharacterHealth.Vitality; }
@@ -2320,14 +2322,13 @@ namespace Barotrauma
public void SelectCharacter(Character character)
{
if (character == null) return;
if (character == null || character == this) { return; }
SelectedCharacter = character;
}
public void DeselectCharacter()
{
if (SelectedCharacter == null) return;
if (SelectedCharacter == null) { return; }
SelectedCharacter.AnimController?.ResetPullJoints();
SelectedCharacter = null;
}
@@ -2387,6 +2388,7 @@ namespace Barotrauma
}
else
{
FocusedCharacter = null;
focusedItem = null;
}
findFocusedTimer -= deltaTime;
@@ -2714,6 +2716,10 @@ namespace Barotrauma
{
IsRagdolled = IsForceRagdolled;
}
else if (this != Controlled)
{
IsRagdolled = IsKeyDown(InputType.Ragdoll);
}
//Keep us ragdolled if we were forced or we're too speedy to unragdoll
else if (allowRagdoll && (!IsRagdolled || !tooFastToUnragdoll))
{
@@ -142,7 +142,7 @@ namespace Barotrauma
npcOrItem = item;
item.CampaignInteractionType = CampaignMode.InteractionType.Examine;
if (player.SelectedConstruction == item ||
player.Inventory.Contains(item) ||
player.Inventory != null && player.Inventory.Contains(item) ||
(player.FocusedItem == item && player.IsKeyHit(InputType.Use)))
{
Trigger(e1, e2);
@@ -732,10 +732,10 @@ namespace Barotrauma
public void AssignNPCMenuInteraction(Character character, InteractionType interactionType)
{
character.CampaignInteractionType = interactionType;
character.CharacterHealth.UseHealthWindow =
interactionType == InteractionType.None ||
interactionType == InteractionType.Examine ||
interactionType == InteractionType.Talk;
character.DisableHealthWindow =
interactionType != InteractionType.None &&
interactionType != InteractionType.Examine &&
interactionType != InteractionType.Talk;
if (interactionType == InteractionType.None)
{