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

Updated content package to v0.8, removed scorpion, minor modifications to the tutorial sub (removed some unnecessary doors & hatches, added more lights)

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-21 20:08:13 +02:00
parent 59e1f776f2
commit 9c8141bffa
16 changed files with 9 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Barotrauma/BarotraumaShared/BarotraumaShared.projitems
View File

@@ -201,12 +201,6 @@
<Content Include="$(MSBuildThisFileDirectory)Content\Characters\Moloch\moloch.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Content\Characters\Scorpion\scorpion.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Content\Characters\Scorpion\scorpion.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Content\Characters\Tigerthresher\damagedtigerthresher.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -742,7 +736,7 @@
<Content Include="$(MSBuildThisFileDirectory)Data\clientpermissions.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.7.xml">
<Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.8.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(MSBuildThisFileDirectory)Data\permissionpresets.xml">
@@ -862,13 +856,13 @@
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Moloch\idle2.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Scorpion\scorpionattack1.ogg">
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Tigerthresher\thresherattack1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Scorpion\scorpionidle1.ogg">
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Tigerthresher\thresheridle1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Scorpion\scorpionidle2.ogg">
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Tigerthresher\thresheridle2.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Characters\Watcher\attack1.ogg">

BIN
Barotrauma/BarotraumaShared/Content/Characters/Scorpion/scorpion.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

50
Barotrauma/BarotraumaShared/Content/Characters/Scorpion/scorpion.xml
View File

@@ -1,50 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Character name ="scorpion" humanoid="false">
<sound file="Content/Characters/Scorpion/scorpionattack1.ogg" state="Attack" />
<sound file="Content/Characters/Scorpion/scorpionidle1.ogg" state="None" />
<sound file="Content/Characters/Scorpion/scorpionidle2.ogg" state="None" />
<ragdoll waveamplitude="50.0" wavelength="2500" speed="1.5">
<collider width="45" radius="22"/>
<!-- head -->
<limb id = "0" radius="37" height="81" mass="6" type="Head" steerforce="1.0">
<sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="11,12,74,155" depth="0.02"/>
</limb>
<!-- body -->
<limb id = "1" radius="33" height="51" mass = "40">
<sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="94,32,66,117" depth="0.03" origin="0.5,0.5"/>
</limb>
<limb id = "2" radius="30" height="60" mass = "40" type="Torso">
<sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="94,32,66,117" depth="0.03" origin="0.5,0.5"/>
</limb>
<limb id = "3" radius="30" height="60" mass = "40" type="Torso">
<sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="94,32,66,117" depth="0.03" origin="0.5,0.5"/>
</limb>
<limb id = "4" radius="30" height="60" mass = "40" type="Tail">
<sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="94,32,66,117" depth="0.03" origin="0.5,0.5"/>
</limb>
<limb id = "5" width="26" height="98" mass = "6" ignorecollisions="true">
<sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="190,30,49,98" depth="0.15" origin="0.3,0.5"/>
<attack type="PinchCW" range="120" duration="0.5" damage="80"/>
</limb>
<!-- head to body -->
<joint limb1="0" limb1anchor="0,60" limb2="1" limb2anchor="0,-45" lowerlimit="-10" upperlimit="45"/>
<joint limb1="1" limb1anchor="0,45" limb2="2" limb2anchor="0,-45" lowerlimit="-10" upperlimit="45"/>
<joint limb1="2" limb1anchor="0,45" limb2="3" limb2anchor="0,-45" lowerlimit="-10" upperlimit="45"/>
<joint limb1="3" limb1anchor="0,45" limb2="4" limb2anchor="0,-45" lowerlimit="-10" upperlimit="45"/>
<joint limb1="0" limb1anchor="-10,-65" limb2="5" limb2anchor="10,40" lowerlimit="200" upperlimit="240"/>
</ragdoll>
<ai attackhumans="100" attackrooms="50.0" attackweaker="50" attackstronger="-30" sight="0.5" hearing="1.0"/>
</Character>

0
Barotrauma/BarotraumaShared/Content/Characters/Scorpion/scorpionattack1.ogg → Barotrauma/BarotraumaShared/Content/Characters/Tigerthresher/thresherattack1.ogg
View File

0
Barotrauma/BarotraumaShared/Content/Characters/Scorpion/scorpionidle1.ogg → Barotrauma/BarotraumaShared/Content/Characters/Tigerthresher/thresheridle1.ogg
View File

0
Barotrauma/BarotraumaShared/Content/Characters/Scorpion/scorpionidle2.ogg → Barotrauma/BarotraumaShared/Content/Characters/Tigerthresher/thresheridle2.ogg
View File

6
Barotrauma/BarotraumaShared/Content/Characters/Tigerthresher/tigerthresher.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<Character name ="tigerthresher" humanoid="false" health="300.0" bleedingdecreasespeed="0.1">
<sound file="Content/Characters/Scorpion/scorpionattack1.ogg" state="Attack" />
<sound file="Content/Characters/Scorpion/scorpionidle1.ogg" state="None" />
<sound file="Content/Characters/Scorpion/scorpionidle2.ogg" state="None" />
<sound file="Content/Characters/Tigerthresher/thresherattack1.ogg" state="Attack" />
<sound file="Content/Characters/Tigerthresher/thresheridle1.ogg" state="None" />
<sound file="Content/Characters/Tigerthresher/thresheridle2.ogg" state="None" />
<ai
combatstrength="400"

BIN
Barotrauma/BarotraumaShared/Content/Map/TutorialSub.sub
View File

Binary file not shown.

3
Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.7.xml → Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.8.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<contentpackage name="Vanilla 0.7" path="Data/ContentPackages/Vanilla 0.7">
<contentpackage name="Vanilla 0.8" path="Data/ContentPackages/Vanilla 0.8">
<Item file="Content/Items/idcard.xml" />
<Item file="Content/Items/itemlabel.xml" />
<Item file="Content/Items/Artifacts/artifacts.xml" />
@@ -42,7 +42,6 @@
<Character file="Content/Characters/Husk/husk.xml" />
<Character file="Content/Characters/Mantis/mantis.xml" />
<Character file="Content/Characters/Moloch/moloch.xml" />
<Character file="Content/Characters/Scorpion/scorpion.xml" />
<Character file="Content/Characters/Tigerthresher/tigerthresher.xml" />
<Character file="Content/Characters/Watcher/watcher.xml" />
<Structure file="Content/Map/StructurePrefabs.xml" />

BIN
Barotrauma/BarotraumaShared/Submarines/Aegir Mark III.sub
View File

Binary file not shown.

BIN
Barotrauma/BarotraumaShared/Submarines/Nehalennia.sub
View File

Binary file not shown.

BIN
Barotrauma/BarotraumaShared/Submarines/The Blind Carp.sub
View File

Binary file not shown.

BIN
Barotrauma/BarotraumaShared/Submarines/The Nibbler.sub
View File

Binary file not shown.

BIN
Barotrauma/BarotraumaShared/Submarines/TutorialSub.sub
View File

Binary file not shown.

BIN
Barotrauma/BarotraumaShared/Submarines/Vellamo.sub
View File

Binary file not shown.

2
Barotrauma/BarotraumaShared/config.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" musicvolume="0.5" soundvolume="0.5" verboselogging="false">
<graphicsmode fullscreen="true" vsync="true" />
<contentpackage path="Data/ContentPackages/Vanilla 0.7.xml" />
<contentpackage path="Data/ContentPackages/Vanilla 0.8.xml" />
<player name=""/>
<keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Attack="R" Run="LeftShift" Crouch="LeftControl" Chat="Tab" RadioChat="OemTilde" CrewOrders="C" Ragdoll="Space" /> />
<gameplay>