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

(818a83da1) Alternate door versions with integrated buttons

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-10 13:22:39 +03:00
parent 842b6a2e34
commit bd0c8a9d34
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedContent.projitems
+3
View File
@@ -357,6 +357,9 @@
<Content Include="$(MSBuildThisFileDirectory)Content\Effects\waterbump.png"> <Content Include="$(MSBuildThisFileDirectory)Content\Effects\waterbump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="$(MSBuildThisFileDirectory)Content\Items\Door\door2.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\1_CommandReactor\BaroTutorial_CommandReactor.mp4"> <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\1_CommandReactor\BaroTutorial_CommandReactor.mp4">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
Barotrauma/BarotraumaShared/Source/Items/Item.cs
+3 -3
View File
@@ -1608,7 +1608,6 @@ namespace Barotrauma
if (remove) { Spawner?.AddToRemoveQueue(this); } if (remove) { Spawner?.AddToRemoveQueue(this); }
} }
List<ColoredText> texts = new List<ColoredText>();
public List<ColoredText> GetHUDTexts(Character character) public List<ColoredText> GetHUDTexts(Character character)
{ {
texts.Clear(); texts.Clear();
@@ -1618,12 +1617,13 @@ namespace Barotrauma
if (!ic.CanBePicked && !ic.CanBeSelected) continue; if (!ic.CanBePicked && !ic.CanBeSelected) continue;
if (ic is Holdable holdable && !holdable.CanBeDeattached()) continue; if (ic is Holdable holdable && !holdable.CanBeDeattached()) continue;
Color color = Color.Gray; Color color = Color.Red;
bool hasRequiredSkillsAndItems = ic.HasRequiredSkills(character) && ic.HasRequiredItems(character, false); bool hasRequiredSkillsAndItems = ic.HasRequiredSkills(character) && ic.HasRequiredItems(character, false);
if (hasRequiredSkillsAndItems) if (hasRequiredSkillsAndItems)
{ {
color = Color.Cyan; color = Color.Orange;
} }
// TODO: Blue color if the item is selected
texts.Add(new ColoredText(ic.DisplayMsg, color, false)); texts.Add(new ColoredText(ic.DisplayMsg, color, false));
} }