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

5d2c9f2...bdbcef4

Browse Source 
commit bdbcef41bfbc42beeb2d942e7db431b8ab627f1c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 13:31:02 2019 +0200

    Simplify the sprite related commands.

commit 49c8e1cd01953ae31cff99bf35432ab887b45d62
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 13:05:20 2019 +0200

    Rename "Reload Texture" button as "Reload Sprite", because it actually reloads both the xml and the texture. Add the button text into the localization file.

commit 84f58d9e0bb46f29412f936d569348e46227c9d5
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 12:50:51 2019 +0200

    Add the option to reload xml/texture/both for items when they are hovered over with the mouse. dry.

commit 732084c044e6a2c220cee8d5c1d9b5e4ce05587d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 12:48:49 2019 +0200

    Fix the sprite name of the right hand in the assistant job gear.

commit 30344369d7e87a17312cc839f195c36c77c4a3b2
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 12:26:20 2019 +0200

    Fix ReloadXML failing when multiple source elements are found.

commit ddb6fb48b6e0789b18a1ea889dcdf408fcbb5b12
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 11:47:13 2019 +0200

    Fix damagemodifier multiplier not applied on particles if no sound is played.

commit 41206013be41d240b12dad48f4ddaba9b072742b
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 7 11:46:22 2019 +0200

    Fix engigear lower arm sprite name.

commit 8ce938305206ca65aeb00515639e799d9f2fd526
Merge: e6166d2ef 61703e8af
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 6 18:53:36 2019 +0200

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

commit e6166d2ef24489bac6f217211849884013dbf4e6
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 6 18:53:30 2019 +0200

    Implement husk sprite overlays as wearables. Add new husk injector (wip).

commit 367c4f5b3784c65c3c26807dd6c10e837960c6bb
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Wed Mar 6 18:52:15 2019 +0200

    Add console commands for changing the gender and race of the character.

commit 61703e8af274c8f5d9e05575ebaf13c9bde8855f
Author: Iiro Enges <iiro@fakefish.fi>
Date:   Wed Mar 6 17:47:09 2019 +0200

    Refined environment item scales and colors
This commit is contained in:
Joonas Rikkonen
2019-03-18 22:31:14 +02:00
parent e28ec38c40
commit 110d803b78
18 changed files with 563 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+6 -5
View File
@@ -795,15 +795,12 @@ namespace Barotrauma
}
partial void InitProjSpecific(XDocument doc);
public void ReloadHead(int? headId = null, int? hairIndex = null, int? beardIndex = null, int? moustacheIndex = null, int? faceAttachmentIndex = null)
public void ReloadHead(int? headId = null, int hairIndex = -1, int beardIndex = -1, int moustacheIndex = -1, int faceAttachmentIndex = -1)
{
if (Info == null) { return; }
var head = AnimController.GetLimb(LimbType.Head);
if (head == null) { return; }
if (headId.HasValue)
{
Info.RecreateHead(headId.Value, Info.Race, Info.Gender, hairIndex ?? -1, beardIndex ?? -1, moustacheIndex ?? -1, faceAttachmentIndex ?? -1);
}
Info.RecreateHead(headId ?? Info.HeadSpriteId, Info.Race, Info.Gender, hairIndex, beardIndex, moustacheIndex, faceAttachmentIndex);
#if CLIENT
head.RecreateSprite();
#endif
@@ -828,6 +825,10 @@ namespace Barotrauma
Info.MoustacheElement?.Elements("sprite").ForEach(s => head.OtherWearables.Add(new WearableSprite(s, WearableType.Moustache)));
if (info.HairElement == null) { info.HairIndex = 0; }
Info.HairElement?.Elements("sprite").ForEach(s => head.OtherWearables.Add(new WearableSprite(s, WearableType.Hair)));
#if CLIENT
head.LoadHuskSprite();
#endif
}
private static string humanConfigFile;
Barotrauma/BarotraumaShared/Source/Characters/CharacterInfo.cs
+13 -13
View File
@@ -462,7 +462,7 @@ namespace Barotrauma
private List<XElement> faceAttachments;
private IEnumerable<XElement> wearables;
private IEnumerable<XElement> Wearables
public IEnumerable<XElement> Wearables
{
get
{
@@ -478,7 +478,18 @@ namespace Barotrauma
}
}
private IEnumerable<XElement> FilterElementsByGenderAndRace(IEnumerable<XElement> elements)
public IEnumerable<XElement> FilterByTypeAndHeadID(IEnumerable<XElement> elements, WearableType targetType)
{
return elements.Where(e =>
{
if (Enum.TryParse(e.GetAttributeString("type", ""), true, out WearableType type) && type != targetType) { return false; }
int headId = e.GetAttributeInt("headid", -1);
// if the head id is less than 1, the id is not valid and the condition is ignored.
return headId < 1 || headId == Head.HeadSpriteId;
});
}
public IEnumerable<XElement> FilterElementsByGenderAndRace(IEnumerable<XElement> elements)
{
if (elements == null) { return elements; }
return elements.Where(w =>
@@ -669,17 +680,6 @@ namespace Barotrauma
return element == null || element.Name == "Empty" ? null : element;
}
IEnumerable<XElement> FilterByTypeAndHeadID(IEnumerable<XElement> elements, WearableType targetType)
{
return elements.Where(e =>
{
if (Enum.TryParse(e.GetAttributeString("type", ""), true, out WearableType type) && type != targetType) { return false; }
int headId = e.GetAttributeInt("headid", -1);
// if the head id is less than 1, the id is not valid and the condition is ignored.
return headId < 1 || headId == Head.HeadSpriteId;
});
}
bool IsWearableAllowed(XElement element)
{
string spriteName = element.Element("sprite").GetAttributeString("name", string.Empty);
Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
+5
View File
@@ -257,6 +257,11 @@ namespace Barotrauma
return null;
}
public T GetAffliction<T>(string afflictionType, bool allowLimbAfflictions = true) where T : Affliction
{
return GetAffliction(afflictionType, allowLimbAfflictions) as T;
}
public Affliction GetAffliction(string afflictionType, Limb limb)
{
foreach (Affliction affliction in limbHealths[limb.HealthIndex].Afflictions)