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

Another variant of the new monster, new menu category for alien items/structures, another ruin-specific music clip

Browse Source
This commit is contained in:
Regalis
2016-05-03 00:09:41 +03:00
parent 9f30ecc1b7
commit 2c76a6ad3c
12 changed files with 115 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Barotrauma.csproj
+13
View File
@@ -361,6 +361,10 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Characters\Fractalguardian2\fractalguardian2.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Characters\Fractalguardian\fractalguardian.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -670,6 +674,9 @@
<Content Include="Content\Lights\light.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Lights\lightcone.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Lights\penumbra.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -1041,6 +1048,9 @@
<None Include="Content\effects.mgfx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Items\Artifacts\alienweapon.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Items\Button\beep.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -1197,6 +1207,9 @@
<None Include="Content\Sounds\Music\amb_JD_drone_clattering_machine.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Sounds\Music\Controlled Chaos 2.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Sounds\Music\Controlled Chaos.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Subsurface/Content/Characters/Fractalguardian/fractalguardian.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 188 KiB

Subsurface/Content/Characters/Fractalguardian/fractalguardian.xml
+10 -9
View File
@@ -4,16 +4,17 @@
<sound file="Content/Characters/Fractalguardian/guardian1.ogg" state="Attack" range="3000" />
<sound file="Content/Characters/Fractalguardian/guardian2.ogg" state="Attack" range="3000" />
<ragdoll waveamplitude="100.0" wavelength="1000" speed="2.5" flip="false" canentersubmarine="false">
<ragdoll waveamplitude="50.0" wavelength="500" swimspeed="3.0" walkspeed="0.3" flip="false" canentersubmarine="false">
<!-- head -->
<limb id = "0" radius="65" type="Head" steerforce="3.0">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,0,129,128" depth="0.05"/>
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,0,129,128" depth="0.04"/>
<attack type="Hit" range="120" duration="0.2" damage="50" stun="2" force="20" damagetype="blunt"/>
</limb>
<!-- body -->
<limb id = "1" radius="50" type="Torso">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,125,108,105" depth="0.01" origin="0.5,0.5"/>
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,125,108,105" depth="0.03" origin="0.5,0.5"/>
</limb>
<!-- body -->
@@ -22,17 +23,17 @@
</limb>
<limb id = "3" width="30" height="175" type="Tail">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.04" origin="0.5,0.5"/>
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.01" origin="0.5,0.5"/>
</limb>
<limb id = "4" width="30" height="239" impacttolerance="100.0">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="183,0,53,238" depth="0.08" origin="0.5,0.5"/>
<attack type="PinchCCW" range="150" duration="0.5" damage="30" stun="5.0" damagetype="slash"/>
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="183,0,53,238" depth="0.05" origin="0.5,0.5"/>
<attack type="PinchCCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>
</limb>
<limb id = "5" width="30" height="239" impacttolerance="100.0">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="236,0,53,238" size="-1,1" depth="0.08" origin="0.5,0.5"/>
<attack type="PinchCW" range="150" duration="0.5" damage="30" stun="5.0" damagetype="slash"/>
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="236,0,53,238" size="-1,1" depth="0.05" origin="0.5,0.5"/>
<attack type="PinchCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>
</limb>
@@ -47,6 +48,6 @@
<joint limb1="0" limb1anchor="-30,10" limb2="5" limb2anchor="0,-110" lowerlimit="90" upperlimit="180"/>
</ragdoll>
<ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0"/>
<ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0" attackcooldown="1"/>
</Character>
Subsurface/Content/Characters/Fractalguardian2/fractalguardian2.xml
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" ?>
<Character name="fractalguardian" humanoid="false" health="800.0" doesbleed="false">
<sound file="Content/Characters/Fractalguardian/guardian1.ogg" state="Attack" range="3000" />
<sound file="Content/Characters/Fractalguardian/guardian2.ogg" state="Attack" range="3000" />
<ragdoll waveamplitude="0.0" swimspeed="1.0" walkspeed="0.3" flip="false" canentersubmarine="false" rotatetowardsmovement="false">
<!-- head -->
<limb id = "0" radius="80" height="30" type="Head" steerforce="3.0">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="299,0,171,208" depth="0.05"/>
<attack type="Hit" range="120" duration="0.2" damage="50" stun="2" force="20" damagetype="blunt"/>
</limb>
<limb id = "1" width="30" height="178" impacttolerance="100.0">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="183,60,53,178" depth="0.08" origin="0.5,0.5"/>
</limb>
<limb id = "2" width="30" height="175">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.1" origin="0.5,0.5"/>
<attack type="PinchCCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>
</limb>
<limb id = "3" width="30" height="178" impacttolerance="100.0">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="236,60,53,178" size="-1,1" depth="0.08" origin="0.5,0.5"/>
</limb>
<limb id = "4" width="30" height="175">
<sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.1" origin="0.5,0.5"/>
<attack type="PinchCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>
</limb>
<!-- head to body -->
<joint limb1="0" limb1anchor="-37,-40" limb2="1" limb2anchor="0,80" lowerlimit="-60" upperlimit="0"/>
<joint limb1="1" limb1anchor="0,-80" limb2="2" limb2anchor="0,80" lowerlimit="0" upperlimit="120"/>
<joint limb1="0" limb1anchor="37,-40" limb2="3" limb2anchor="0,80" lowerlimit="0" upperlimit="60"/>
<joint limb1="3" limb1anchor="0,-80" limb2="4" limb2anchor="0,80" lowerlimit="-120" upperlimit="0"/>
</ragdoll>
<ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0" attackcooldown="1"/>
</Character>
Subsurface/Content/Items/Artifacts/alienweapon.ogg
BIN
View File
Binary file not shown.
Subsurface/Content/Items/Artifacts/artifacts.xml
+16 -10
View File
@@ -2,6 +2,7 @@
<Items>
<Item
name="Skyholder Artifact"
category="Alien"
pickdistance="150">
<Sprite texture="artifact.png" depth="0.7" sourcerect="59,0,60,61"/>
@@ -21,8 +22,9 @@
</Item>
<Item
name="Thermal Artifact"
pickdistance="150">
name="Thermal Artifact"
category="Alien"
pickdistance="150">
<Sprite texture="artifact.png" depth="0.7" sourcerect="0,0,58,56"/>
@@ -61,10 +63,11 @@
</Item>
<Item
name="Oxygenite Shard"
pickdistance="150"
tags="smallitem"
impacttolerance="8">
name="Oxygenite Shard"
category="Alien"
pickdistance="150"
tags="smallitem"
impacttolerance="8">
<Sprite texture="artifact.png" depth="0.7" sourcerect="119,96,9,32"/>
@@ -81,6 +84,7 @@
<Item
name="Sulphurite Shard"
category="Alien"
pickdistance="150"
tags="smallitem"
impacttolerance="8"
@@ -104,7 +108,7 @@
<Item
name="Ancient Weapon"
category="Equipment"
category="Alien"
Tags="smallitem"
pickdistance="200">
@@ -118,12 +122,14 @@
<Body width="85" height="40" density="15"/>
<Holdable slots="Any,RightHand+LeftHand" aimpos="100,50" handle1="0,11" handle2="2,11"/>
<Holdable slots="Any,RightHand+LeftHand" aimpos="100,0" handle1="0,11" handle2="2,11"/>
<RepairTool structurefixamount="-5.0" limbfixamount="-3.0" range="600" barrelpos="30,15" particles="largeplasma">
<RepairTool structurefixamount="-5.0" limbfixamount="-2.0" range="600" barrelpos="30,15" particles="largeplasma">
<Fixable name="structure"/>
<StatusEffect type="OnUse" target="This" Condition="-0.5"/>
<StatusEffect type="OnUse" target="This" Condition="-1.0"/>
<sound file="alienweapon.ogg" type="OnUse" range="800.0" loop="true"/>
<LightComponent LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
<sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5"/>
Subsurface/Content/Map/StructurePrefabs.xml
+9 -9
View File
@@ -109,32 +109,32 @@
<bunk sprite="Content/Map/testroom.png" fliphorizontal="true" sourcerect="0,546,173,129"
width="173" height="129" depth = "0.9"/>
<RuinWallHorizontal sprite="Content/Map/ruins.png" sourcerect="0,896,832,128" depth ="0.95" castshadow="true"
<RuinWallHorizontal category="Alien" sprite="Content/Map/ruins.png" sourcerect="0,896,832,128" depth ="0.95" castshadow="true"
width = "128" height ="128" resizehorizontal="true" body="true" health="500"/>
<RuinWallVertical sprite="Content/Map/ruins.png" sourcerect="896,0,128,832" depth ="0.94" castshadow="true"
<RuinWallVertical category="Alien" sprite="Content/Map/ruins.png" sourcerect="896,0,128,832" depth ="0.94" castshadow="true"
width = "128" height ="128" resizevertical="true" body="true" health="500"/>
<RuinWallHorizontalSmall sprite="Content/Map/ruins.png" sourcerect="0,842,832,54" depth ="0.95" castshadow="true"
<RuinWallHorizontalSmall category="Alien" sprite="Content/Map/ruins.png" sourcerect="0,842,832,54" depth ="0.95" castshadow="true"
width = "128" height ="54" resizehorizontal="true" body="true" health="500"/>
<RuinWallVerticalSmall sprite="Content/Map/ruins.png" sourcerect="842,0,54,832" depth ="0.96" castshadow="true"
<RuinWallVerticalSmall category="Alien" sprite="Content/Map/ruins.png" sourcerect="842,0,54,832" depth ="0.96" castshadow="true"
width = "54" height ="128" resizevertical="true" body="true" health="500"/>
<RuinBack sprite="Content/Map/ruins.png" sourcerect="0,0,512,512" depth ="0.98"
<RuinBack category="Alien" sprite="Content/Map/ruins.png" sourcerect="0,0,512,512" depth ="0.98"
width="64" height="64" resizehorizontal="true" resizevertical="true"/>
<RuinBackCarvings sprite="Content/Map/ruins.png" sourcerect="512,0,233,512" depth ="0.98"
<RuinBackCarvings category="Alien" sprite="Content/Map/ruins.png" sourcerect="512,0,233,512" depth ="0.98"
width="64" height="64" resizehorizontal="true" resizevertical="true"/>
<RuinBlock sprite="Content/Map/ruins.png" sourcerect="0,513,514,296" depth ="0.99"
<RuinBlock category="Alien" sprite="Content/Map/ruins.png" sourcerect="0,513,514,296" depth ="0.99"
width="514" height="296"/>
<RuinFractalBall sprite="Content/Map/ruins2.png" sourcerect="0,0,512,512" depth ="0.97"
<RuinFractalBall category="Alien" sprite="Content/Map/ruins2.png" sourcerect="0,0,512,512" depth ="0.97"
width="512" height="512"/>
<RuinClaw sprite="Content/Map/ruins2.png" sourcerect="512,517,126,270" depth ="0.97"
<RuinClaw category="Alien" sprite="Content/Map/ruins2.png" sourcerect="512,517,126,270" depth ="0.97"
width="126" height="270"/>
</prefabs>
Subsurface/Content/Sounds/Music/Controlled Chaos 2.ogg
BIN
View File
Binary file not shown.
Subsurface/Content/Sounds/sounds.xml
+1
View File
@@ -47,4 +47,5 @@
<music file="Content/Sounds/Music/amb_JD_drone_clattering_machine.ogg" type="deep"/>
<music file="Content/Sounds/Music/Controlled Chaos.ogg" type="ruins"/>
<music file="Content/Sounds/Music/Controlled Chaos 2.ogg" type="ruins"/>
</sounds>
Subsurface/Content/randomevents.xml
+10 -2
View File
@@ -67,8 +67,16 @@
<MonsterEvent name="Under attack" description=""
characterfile="Content/Characters/Fractalguardian/fractalguardian.xml"
commonness="5"
difficulty="10"
commonness="3"
difficulty="1"
minamount="1" maxamount="1"
spawntype="ruin"
musictype="monster"/>
<MonsterEvent name="Under attack" description=""
characterfile="Content/Characters/Fractalguardian2/fractalguardian2.xml"
commonness="3"
difficulty="1"
minamount="1" maxamount="1"
spawntype="ruin"
musictype="monster"/>
Subsurface/Source/Map/MapEntityPrefab.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace Barotrauma
[Flags]
enum MapEntityCategory
{
Structure = 1, Machine = 2, Equipment = 4, Electrical = 8, Material = 16, Misc = 32
Structure = 1, Machine = 2, Equipment = 4, Electrical = 8, Material = 16, Misc = 32, Alien = 64
}
class MapEntityPrefab
Subsurface/Source/Map/StructurePrefab.cs
+9
View File
@@ -92,6 +92,15 @@ namespace Barotrauma
if (ToolBox.GetAttributeBool(element, "flipvertical", false)) sp.sprite.effects = SpriteEffects.FlipVertically;
}
MapEntityCategory category;
if (!Enum.TryParse(ToolBox.GetAttributeString(element, "category", "Misc"), true, out category))
{
category = MapEntityCategory.Structure;
}
sp.Category = category;
sp.Description = ToolBox.GetAttributeString(element, "description", "");
sp.size = Vector2.Zero;