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

Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Browse Source
This commit is contained in:
EvilFactory
2024-03-28 14:26:18 -03:00
parent b3ac01cb22 3791670c42
commit 7a74cd052f
271 changed files with 13174 additions and 3021 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs
+1 -1
View File
@@ -497,7 +497,7 @@ namespace Barotrauma.Items.Components
{
CurrentFixer.Info?.ApplySkillGain(skill.Identifier, SkillSettings.Current.SkillIncreasePerRepair);
}
SteamAchievementManager.OnItemRepaired(item, CurrentFixer);
AchievementManager.OnItemRepaired(item, CurrentFixer);
CurrentFixer.CheckTalents(AbilityEffectType.OnRepairComplete, new AbilityRepairable(item));
}
if (CurrentFixer?.SelectedItem == item) { CurrentFixer.SelectedItem = null; }
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/ColorComponent.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Barotrauma.Items.Components
if (UseHSV)
{
Color hsvColor = ToolBox.HSVToRGB(signalR, signalG, signalB);
Color hsvColor = ToolBoxCore.HSVToRGB(signalR, signalG, signalB);
signalR = hsvColor.R;
signalG = hsvColor.G;
signalB = hsvColor.B;
Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs
+4 -4
View File
@@ -150,7 +150,7 @@ namespace Barotrauma
{
ItemPrefabIdentifier = itemPrefab;
using MD5 md5 = MD5.Create();
UintIdentifier = ToolBox.IdentifierToUint32Hash(itemPrefab, md5);
UintIdentifier = ToolBoxCore.IdentifierToUint32Hash(itemPrefab, md5);
}
public override string ToString()
@@ -197,7 +197,7 @@ namespace Barotrauma
{
Tag = tag;
using MD5 md5 = MD5.Create();
UintIdentifier = ToolBox.IdentifierToUint32Hash(tag, md5);
UintIdentifier = ToolBoxCore.IdentifierToUint32Hash(tag, md5);
}
public override string ToString()
@@ -349,7 +349,7 @@ namespace Barotrauma
private uint GenerateHash()
{
using var md5 = MD5.Create();
uint outputId = ToolBox.IdentifierToUint32Hash(TargetItemPrefabIdentifier, md5);
uint outputId = ToolBoxCore.IdentifierToUint32Hash(TargetItemPrefabIdentifier, md5);
var requiredItems = string.Join(':', RequiredItems
.Select(static i => $"{i.UintIdentifier}:{i.Amount}")
@@ -358,7 +358,7 @@ namespace Barotrauma
var requiredSkills = string.Join(':', RequiredSkills.Select(s => $"{s.Identifier}:{s.Level}"));
uint retVal = ToolBox.StringToUInt32Hash($"{Amount}|{outputId}|{RequiredTime}|{RequiresRecipe}|{requiredItems}|{requiredSkills}", md5);
uint retVal = ToolBoxCore.StringToUInt32Hash($"{Amount}|{outputId}|{RequiredTime}|{RequiresRecipe}|{requiredItems}|{requiredSkills}", md5);
if (retVal == 0) { retVal = 1; }
return retVal;
}