Husk sounds & event, removing logfiles with cleanbuild command,
This commit is contained in:
@@ -335,9 +335,6 @@
|
|||||||
<Content Include="Content\Characters\Husk\DivingSuit.png">
|
<Content Include="Content\Characters\Husk\DivingSuit.png">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="Content\Characters\Husk\head1.png">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="Content\Characters\Husk\husk.xml">
|
<Content Include="Content\Characters\Husk\husk.xml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
@@ -926,6 +923,15 @@
|
|||||||
<None Include="Content\Characters\Endworm\endwormidle.ogg">
|
<None Include="Content\Characters\Endworm\endwormidle.ogg">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</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">
|
<None Include="Content\Characters\Moloch\attack1.ogg">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB |
@@ -1,5 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<Character name="husk" humanoid="true" needsair="false" doesbleed="false">
|
<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"
|
<ragdoll headposition="134" torsoposition="108"
|
||||||
stepsize="42.0, 12.0"
|
stepsize="42.0, 12.0"
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
<MeleeWeapon slots="Any,RightHand,LeftHand"
|
<MeleeWeapon slots="Any,RightHand,LeftHand"
|
||||||
aimpos="50,0" handle1="-5,0" holdangle="10" reload="1.0">
|
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"/>
|
<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"/>
|
<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"/>
|
<Explosion range="100.0" force="0.1" shockwave="false" flames="false" camerashake="5.0"/>
|
||||||
</StatusEffect>
|
</StatusEffect>
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
characterfile="Content/Characters/Endworm/endworm.xml"
|
characterfile="Content/Characters/Endworm/endworm.xml"
|
||||||
spawndeep="true"
|
spawndeep="true"
|
||||||
commonness="1"
|
commonness="1"
|
||||||
difficulty="5"
|
difficulty="20"
|
||||||
minamount="1" maxamount="1"
|
minamount="1" maxamount="1"
|
||||||
musictype="deep"/>
|
musictype="deep"/>
|
||||||
|
|
||||||
@@ -48,6 +48,13 @@
|
|||||||
difficulty="5"
|
difficulty="5"
|
||||||
minamount="1" maxamount="1"/>
|
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=""
|
<ArtifactEvent name="Artifact" description=""
|
||||||
itemname="Skyholder Artifact"
|
itemname="Skyholder Artifact"
|
||||||
commonness="1"
|
commonness="1"
|
||||||
|
|||||||
@@ -583,7 +583,7 @@ namespace Barotrauma
|
|||||||
|
|
||||||
public int GetSkillLevel(string skillName)
|
public int GetSkillLevel(string skillName)
|
||||||
{
|
{
|
||||||
return Info.Job.GetSkillLevel(skillName);
|
return (Info==null || Info.Job==null) ? 0 : Info.Job.GetSkillLevel(skillName);
|
||||||
}
|
}
|
||||||
|
|
||||||
float findClosestTimer;
|
float findClosestTimer;
|
||||||
|
|||||||
@@ -449,6 +449,14 @@ namespace Barotrauma
|
|||||||
DebugConsole.NewMessage("Deleted "+saveFile, Color.Green);
|
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"))
|
if (System.IO.File.Exists("filelist.xml"))
|
||||||
{
|
{
|
||||||
System.IO.File.Delete("filelist.xml");
|
System.IO.File.Delete("filelist.xml");
|
||||||
|
|||||||
@@ -1019,7 +1019,7 @@ namespace Barotrauma
|
|||||||
bool showUiMsg = picker == Character.Controlled && Screen.Selected != GameMain.EditMapScreen;
|
bool showUiMsg = picker == Character.Controlled && Screen.Selected != GameMain.EditMapScreen;
|
||||||
if (!ignoreRequiredItems && !ic.HasRequiredItems(picker, showUiMsg)) continue;
|
if (!ignoreRequiredItems && !ic.HasRequiredItems(picker, showUiMsg)) continue;
|
||||||
if ((ic.CanBePicked && pickHit && ic.Pick(picker)) ||
|
if ((ic.CanBePicked && pickHit && ic.Pick(picker)) ||
|
||||||
(ic.CanBeSelected && selectHit && ic.Select(picker)))
|
(ic.CanBeSelected && selectHit && ic.Select(picker)))
|
||||||
{
|
{
|
||||||
picked = true;
|
picked = true;
|
||||||
ic.ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);
|
ic.ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace Barotrauma.Networking
|
|||||||
{
|
{
|
||||||
const int LinesPerFile = 300;
|
const int LinesPerFile = 300;
|
||||||
|
|
||||||
const string SavePath = "ServerLogs";
|
public const string SavePath = "ServerLogs";
|
||||||
|
|
||||||
private string serverName;
|
private string serverName;
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
v0.3.1.5
|
||||||
---------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user