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

Captains spawn with a revolver and 2 rounds, heavier harpoon gun recoil & impulse when the spear hits someone.

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-10-18 23:52:03 +03:00
parent 6bfca5f7fe
commit 87e9936c60
6 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/BarotraumaShared.projitems
+3
View File
@@ -1000,6 +1000,9 @@
<None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\railgun.ogg"> <None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\railgun.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\revolver.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\smack.ogg"> <None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\smack.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
-2
View File
@@ -5,7 +5,6 @@
name="Engine" name="Engine"
linkable="true" linkable="true"
category="Machine" category="Machine"
pickthroughwalls="true"
> >
<Sprite texture ="engine.png" depth="0.8" sourcerect="0,0,373,113" canflipx="true"/> <Sprite texture ="engine.png" depth="0.8" sourcerect="0,0,373,113" canflipx="true"/>
@@ -35,7 +34,6 @@
name="Shuttle Engine" name="Shuttle Engine"
linkable="true" linkable="true"
category="Machine" category="Machine"
pickthroughwalls="true"
> >
<Sprite texture ="engine.png" depth="0.8" sourcerect="0,115,224,73" canflipx="true"/> <Sprite texture ="engine.png" depth="0.8" sourcerect="0,115,224,73" canflipx="true"/>
Barotrauma/BarotraumaShared/Content/Items/Weapons/revolver.ogg
BIN
View File
Binary file not shown.
Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+55 -4
View File
@@ -4,8 +4,7 @@
<Item <Item
name="Spear" name="Spear"
category="Equipment" category="Equipment"
interactthroughwalls="true"
pickthroughwalls="true"
price="50"> price="50">
<Deconstruct time="5"> <Deconstruct time="5">
@@ -18,7 +17,7 @@
<Pickable slots="Any"/> <Pickable slots="Any"/>
<Projectile launchimpulse="20.0" doesstick="true"> <Projectile launchimpulse="20.0" doesstick="true">
<Attack damage="20" bleedingdamage="2" structuredamage="50" damagetype="Blunt"/> <Attack damage="20" bleedingdamage="2" structuredamage="50" damagetype="Blunt" stun="0.2" targetforce="50"/>
</Projectile> </Projectile>
</Item> </Item>
@@ -42,9 +41,12 @@
<Holdable slots="Any,RightHand+LeftHand" controlpose="true" <Holdable slots="Any,RightHand+LeftHand" controlpose="true"
holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/> holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/>
<RangedWeapon barrelpos="49,10"> <RangedWeapon barrelpos="49,10" spread="1" unskilledspread="10">
<Sound file="harpoon1.ogg" type="OnUse"/> <Sound file="harpoon1.ogg" type="OnUse"/>
<Sound file="harpoon2.ogg" type="OnUse"/> <Sound file="harpoon2.ogg" type="OnUse"/>
<StatusEffect type="OnUse">
<Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" camerashake="5.0"/>
</StatusEffect>
<RequiredItems name="Spear" type="Contained" msg="Spear required to shoot"/> <RequiredItems name="Spear" type="Contained" msg="Spear required to shoot"/>
<RequiredSkill name="Weapons" level="30"/> <RequiredSkill name="Weapons" level="30"/>
</RangedWeapon> </RangedWeapon>
@@ -54,6 +56,55 @@
</ItemContainer> </ItemContainer>
</Item> </Item>
<Item
name="Revolver Round"
category="Equipment"
interactthroughwalls="true"
price="10">
<Sprite texture="weapons.png" sourcerect="52,99,8,3" depth="0.55"/>
<Body width="8" height="3" density="40"/>
<Pickable slots="Any"/>
<Projectile hitscan="true" doesstick="false" removeonhit="true" >
<Attack damage="40" bleedingdamage="3" structuredamage="100" damagetype="Blunt" stun="0.5" targetforce="50"/>
</Projectile>
</Item>
<Item
name="Revolver"
category="Equipment"
price="700"
tags="weapon">
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="Aluminium"/>
<Item name="Polycarbonate Bar"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="26,97,25,19" depth="0.55"/>
<Body width="25" height="15" density="50"/>
<Holdable slots="Any,RightHand,LeftHand" controlpose="true"
aimpos="90,10" handle1="-11,-7"/>
<RangedWeapon barrelpos="14,6" spread="0" unskilledspread="2">
<Sound file="revolver.ogg" type="OnUse" range="3000"/>
<StatusEffect type="OnUse">
<Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" sparks="false" camerashake="5.0"/>
</StatusEffect>
<RequiredItems name="Revolver Round" type="Contained" msg="Out of ammo"/>
<RequiredSkill name="Weapons" level="40"/>
</RangedWeapon>
<ItemContainer capacity="4" hideitems="true">
<Containable name="Revolver Round"/>
</ItemContainer>
</Item>
<Item <Item
name="Stun Grenade" name="Stun Grenade"
category="Equipment" category="Equipment"
Barotrauma/BarotraumaShared/Content/Jobs.xml
+5 -1
View File
@@ -14,7 +14,11 @@
<Item name="Captain's Trousers" equip="true"/> <Item name="Captain's Trousers" equip="true"/>
<Item name="Headset" equip="true"> <Item name="Headset" equip="true">
<Item name="Battery Cell"/> <Item name="Battery Cell"/>
</Item> </Item>
<Item name="Revolver" equip="false">
<Item name="Revolver Round"/>
<Item name="Revolver Round"/>
</Item>
</Items> </Items>
</Job> </Job>