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

Unstable 1.2.4.0

Browse Source
This commit is contained in:
Markus Isberg
2023-11-30 13:53:00 +02:00
parent 8a2e2ea0ae
commit fb5ea537bf
210 changed files with 4201 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/IdCard.cs
-3
View File
@@ -80,9 +80,6 @@ namespace Barotrauma.Items.Components
[Serialize("0,0", IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
public Vector2 OwnerSheetIndex { get; set; }
[Serialize(false, IsPropertySaveable.Yes, alwaysUseInstanceValues: true)]
public bool SpawnPointTagsGiven { get; set; }
public IdCard(Item item, ContentXElement element) : base(item, element) { }
public void Initialize(WayPoint spawnPoint, Character character)
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs
+3 -2
View File
@@ -439,9 +439,10 @@ namespace Barotrauma.Items.Components
if (targetItem.Removed) { return; }
var attackResult = Attack.DoDamage(user, targetItem, item.WorldPosition, 1.0f);
#if CLIENT
if (attackResult.Damage > 0.0f && targetItem.Prefab.ShowHealthBar)
if (attackResult.Damage > 0.0f && targetItem.Prefab.ShowHealthBar && Character.Controlled != null &&
(user == Character.Controlled || Character.Controlled.CanSeeTarget(item)))
{
Character.Controlled?.UpdateHUDProgressBar(targetItem,
Character.Controlled.UpdateHUDProgressBar(targetItem,
targetItem.WorldPosition,
targetItem.Condition / targetItem.MaxCondition,
emptyColor: GUIStyle.HealthBarColorLow,
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs
+1 -1
View File
@@ -200,7 +200,7 @@ namespace Barotrauma.Items.Components
}
#if CLIENT
if (requiredTime < float.MaxValue)
if (requiredTime < float.MaxValue && picker == Character.Controlled)
{
Character.Controlled?.UpdateHUDProgressBar(
this,
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs
+10 -2
View File
@@ -572,8 +572,15 @@ namespace Barotrauma.Items.Components
structureFixAmount *= 1 + item.GetQualityModifier(Quality.StatType.RepairToolStructureDamageMultiplier);
}
var didLeak = targetStructure.SectionIsLeakingFromOutside(sectionIndex);
targetStructure.AddDamage(sectionIndex, -structureFixAmount * degreeOfSuccess, user);
if (didLeak && !targetStructure.SectionIsLeakingFromOutside(sectionIndex))
{
user.CheckTalents(AbilityEffectType.OnRepairedOutsideLeak);
}
//if the next section is small enough, apply the effect to it as well
//(to make it easier to fix a small "left-over" section)
for (int i = -1; i < 2; i += 2)
@@ -660,9 +667,10 @@ namespace Barotrauma.Items.Components
float addedDetachTime = deltaTime * (1f + user.GetStatValue(StatTypes.RepairToolDeattachTimeMultiplier)) * (1f + item.GetQualityModifier(Quality.StatType.RepairToolDeattachTimeMultiplier));
levelResource.DeattachTimer += addedDetachTime;
#if CLIENT
if (targetItem.Prefab.ShowHealthBar)
if (targetItem.Prefab.ShowHealthBar && Character.Controlled != null &&
(user == Character.Controlled || Character.Controlled.CanSeeTarget(item)))
{
Character.Controlled?.UpdateHUDProgressBar(
Character.Controlled.UpdateHUDProgressBar(
this,
targetItem.WorldPosition,
levelResource.DeattachTimer / levelResource.DeattachDuration,