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

(2bbea6767) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-15 13:43:07 +03:00
parent ffa6192377
commit 8f310256b5
5 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
+6 -1
View File
@@ -393,7 +393,7 @@ namespace Barotrauma
} }
} }
partial void SeverLimbJointProjSpecific(LimbJoint limbJoint) partial void SeverLimbJointProjSpecific(LimbJoint limbJoint, bool playSound = true)
{ {
foreach (Limb limb in new Limb[] { limbJoint.LimbA, limbJoint.LimbB }) foreach (Limb limb in new Limb[] { limbJoint.LimbA, limbJoint.LimbB })
{ {
@@ -411,6 +411,11 @@ namespace Barotrauma
character.CurrentHull?.AddDecal(character.BloodDecalName, limb.WorldPosition, MathHelper.Clamp(limb.Mass, 0.5f, 2.0f)); character.CurrentHull?.AddDecal(character.BloodDecalName, limb.WorldPosition, MathHelper.Clamp(limb.Mass, 0.5f, 2.0f));
} }
} }
if (playSound)
{
SoundPlayer.PlayDamageSound("Gore", 1.0f, limbJoint.LimbA.body);
}
} }
public virtual void Draw(SpriteBatch spriteBatch, Camera cam) public virtual void Draw(SpriteBatch spriteBatch, Camera cam)
Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
+1
View File
@@ -296,6 +296,7 @@ namespace Barotrauma
break; break;
} }
} }
SoundPlayer.PlayDamageSound(damageSoundType, Math.Max(damage, bleedingDamage), WorldPosition);
} }
// Always spawn damage particles // Always spawn damage particles
Barotrauma/BarotraumaShared/SharedContent.projitems
+21
View File
@@ -2004,6 +2004,27 @@
<None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\ElectricalDischarger.ogg"> <None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\ElectricalDischarger.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore2.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore3.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore4.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore5.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore6.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Damage\Gore7.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Sounds\Impact\MetalImpactHeavy1.ogg"> <None Include="$(MSBuildThisFileDirectory)Content\Sounds\Impact\MetalImpactHeavy1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
+2 -2
View File
@@ -692,7 +692,7 @@ namespace Barotrauma
ImpactProjSpecific(impact, f1.Body); ImpactProjSpecific(impact, f1.Body);
} }
public void SeverLimbJoint(LimbJoint limbJoint) public void SeverLimbJoint(LimbJoint limbJoint, bool playSound = true)
{ {
if (!limbJoint.CanBeSevered || limbJoint.IsSevered) if (!limbJoint.CanBeSevered || limbJoint.IsSevered)
{ {
@@ -721,7 +721,7 @@ namespace Barotrauma
} }
} }
partial void SeverLimbJointProjSpecific(LimbJoint limbJoint); partial void SeverLimbJointProjSpecific(LimbJoint limbJoint, bool playSound = true);
private void GetConnectedLimbs(List<Limb> connectedLimbs, List<LimbJoint> checkedJoints, Limb limb) private void GetConnectedLimbs(List<Limb> connectedLimbs, List<LimbJoint> checkedJoints, Limb limb)
{ {
Barotrauma/BarotraumaShared/Source/Map/Hull.cs
+19
View File
@@ -489,6 +489,25 @@ namespace Barotrauma
} }
} }
public string DisplayName
{
get;
private set;
}
private string roomName;
[Editable, Serialize("", true, translationTextTag: "RoomName.")]
public string RoomName
{
get { return roomName; }
set
{
if (roomName == value) { return; }
roomName = value;
DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
}
}
public override Rectangle Rect public override Rectangle Rect
{ {
get get