Husk sounds & event, removing logfiles with cleanbuild command,

This commit is contained in:
Regalis
2016-02-14 22:50:34 +02:00
parent ef78f2d0f6
commit 35e2d441fc
14 changed files with 43 additions and 8 deletions

View File

@@ -335,9 +335,6 @@
<Content Include="Content\Characters\Husk\DivingSuit.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Characters\Husk\head1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Characters\Husk\husk.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -926,6 +923,15 @@
<None Include="Content\Characters\Endworm\endwormidle.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Characters\Husk\Husk1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Characters\Husk\Husk2.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Characters\Husk\Husk3.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Characters\Moloch\attack1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<Character name="husk" humanoid="true" needsair="false" doesbleed="false">
<sound file="Content/Characters/Husk/Husk1.ogg" state="Attack" range="1000"/>
<sound file="Content/Characters/Husk/Husk2.ogg" state="Attack" range="1000"/>
<sound file="Content/Characters/Husk/Husk3.ogg" state="Attack" range="1000"/>
<ragdoll headposition="134" torsoposition="108"
stepsize="42.0, 12.0"

View File

@@ -109,7 +109,7 @@
<MeleeWeapon slots="Any,RightHand,LeftHand"
aimpos="50,0" handle1="-5,0" holdangle="10" reload="1.0">
<Attack damage="2" stun="0.2" damagetype="Blunt" sound="Content/Items/Weapons/smack.ogg"/>
<StatusEffect type="OnUse" target="Contained,Character" Condition="-25.0" stun="20.0" disabledeltatime="true" sound="Content/Items/Weapons/stunbaton.ogg">
<StatusEffect type="OnUse" target="Contained,Character" Condition="-25.0" stun="15.0" disabledeltatime="true" sound="Content/Items/Weapons/stunbaton.ogg">
<RequiredItem name="Battery Cell" type="Contained" msg="Loaded Battery Cell required"/>
<Explosion range="100.0" force="0.1" shockwave="false" flames="false" camerashake="5.0"/>
</StatusEffect>

View File

@@ -38,7 +38,7 @@
characterfile="Content/Characters/Endworm/endworm.xml"
spawndeep="true"
commonness="1"
difficulty="5"
difficulty="20"
minamount="1" maxamount="1"
musictype="deep"/>
@@ -48,6 +48,13 @@
difficulty="5"
minamount="1" maxamount="1"/>
<MonsterEvent name="Under attack" description=""
characterfile="Content/Characters/Husk/husk.xml"
commonness="5"
difficulty="15"
minamount="2" maxamount="3"
musictype="monster"/>
<ArtifactEvent name="Artifact" description=""
itemname="Skyholder Artifact"
commonness="1"

View File

@@ -583,7 +583,7 @@ namespace Barotrauma
public int GetSkillLevel(string skillName)
{
return Info.Job.GetSkillLevel(skillName);
return (Info==null || Info.Job==null) ? 0 : Info.Job.GetSkillLevel(skillName);
}
float findClosestTimer;

View File

@@ -449,6 +449,14 @@ namespace Barotrauma
DebugConsole.NewMessage("Deleted "+saveFile, Color.Green);
}
var logFiles = System.IO.Directory.GetFiles(ServerLog.SavePath);
foreach (string logFile in logFiles)
{
System.IO.File.Delete(logFile);
DebugConsole.NewMessage("Deleted "+logFile, Color.Green);
}
if (System.IO.File.Exists("filelist.xml"))
{
System.IO.File.Delete("filelist.xml");

View File

@@ -1019,7 +1019,7 @@ namespace Barotrauma
bool showUiMsg = picker == Character.Controlled && Screen.Selected != GameMain.EditMapScreen;
if (!ignoreRequiredItems && !ic.HasRequiredItems(picker, showUiMsg)) continue;
if ((ic.CanBePicked && pickHit && ic.Pick(picker)) ||
(ic.CanBeSelected && selectHit && ic.Select(picker)))
(ic.CanBeSelected && selectHit && ic.Select(picker)))
{
picked = true;
ic.ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);

View File

@@ -11,7 +11,7 @@ namespace Barotrauma.Networking
{
const int LinesPerFile = 300;
const string SavePath = "ServerLogs";
public const string SavePath = "ServerLogs";
private string serverName;

View File

@@ -1,3 +1,13 @@
---------------------------------------------------------------------------------------------------------
v0.3.2.0
---------------------------------------------------------------------------------------------------------
- server log
- more reliable door syncing
- deattaching items takes some time
- welders and cutters do damage to players/enemies again
---------------------------------------------------------------------------------------------------------
v0.3.1.5
---------------------------------------------------------------------------------------------------------

Binary file not shown.