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

Picking items from outside the sub, replcaed fabricator.png with separate sprites for each machine, descriptions moved from itemprefab to the mapentityprefab base class, editortutorial progress

Browse Source
This commit is contained in:
Regalis
2016-01-15 17:10:21 +02:00
parent 0fc085c86d
commit e3ebc28afb
34 changed files with 203 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Subsurface/Content/Characters/Human/human.xml
View File

@@ -11,16 +11,16 @@
thightorque="-5.0">
<!-- head -->
<limb id = "0" radius="13" mass = "6" type="Head" attackpriority="2" impacttolerance="4.0">
<limb id = "0" radius="13" mass = "6" type="Head" attackpriority="2" impacttolerance="5.0">
<sprite texture="Content/Characters/Human/[GENDER]head[HEADID].png" sourcerect="1,1,37,38" depth="0.04" origin="0.5,0.5"/>
<damagedsprite texture="Content/Characters/Human/damagedhead.png" sourcerect="1,1,37,38" origin="0.5,0.5"/>
</limb>
<!-- body -->
<limb id = "1" radius="14" height="21" mass = "20" type="Torso" attackpriority="3" impacttolerance="6.0">
<limb id = "1" radius="14" height="21" mass = "20" type="Torso" attackpriority="3" impacttolerance="10.0">
<sprite texture="Content/Characters/Human/[GENDER]torso.png" sourcerect="0,0,29,58" depth="0.05" origin="0.5,0.6"/>
<damagedsprite texture="Content/Characters/Human/damagedtorso.png" sourcerect="0,0,29,58" origin="0.5,0.6"/>
</limb>
<limb id = "12" radius="13" mass = "20" type="Waist" impacttolerance="6.0">
<limb id = "12" radius="13" mass = "20" type="Waist" impacttolerance="10.0">
<sprite texture="Content/Characters/Human/[GENDER]legs.png" sourcerect="0,0,32,29" depth="0.045" origin="0.5,0.5"/>
<damagedsprite texture="Content/Characters/Human/damagedlegs.png" sourcerect="0,0,32,29" origin="0.5,0.5"/>
</limb>

2
Subsurface/Content/Items/Door/doors.xml
View File

@@ -25,7 +25,6 @@
<input name="set_state"/>
<output name="state_out"/>
</ConnectionPanel>
</Item>
<Item
@@ -54,6 +53,5 @@
<input name="set_state"/>
<output name="state_out"/>
</ConnectionPanel>
</Item>
</Items>

BIN
Subsurface/Content/Items/Electricity/signalcomp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

2
Subsurface/Content/Items/Electricity/signalitems.xml
View File

@@ -100,7 +100,7 @@
<Body width="16" height="16"/>
<Holdable selectkey="Action" slots="Any,RightHand,LeftHand"/>
<Holdable slots="Any,RightHand,LeftHand"/>
</Item>
<Item

6
Subsurface/Content/Items/Engine/engine.xml
View File

@@ -27,7 +27,7 @@
category="Machine"
pickdistance="150">
<Sprite texture ="fabricator.png" depth="0.8"/>
<Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="0,0,64,128"/>
<Steering minvoltage="0.5" canbeselected = "true">
<GuiFrame rect="0,0,0.5,0.5" alignment="Center" color="0.0,0.0,0.0,0.6"/>
@@ -54,8 +54,8 @@
linkable="true"
category="Machine"
pickdistance="150">
<Sprite texture ="fabricator.png" depth="0.8"/>
<Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="64,0,64,128"/>
<Radar canbeselected = "true" powerconsumption="100">
<GuiFrame rect="0,0,0.5,0.5" alignment="Center" color="0.0,0.0,0.0,0.6"/>

BIN
Subsurface/Content/Items/Engine/fabricator.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
Subsurface/Content/Items/Fabricators/fabricator.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

8
Subsurface/Content/Items/Fabricators/fabricators.xml
View File

@@ -6,8 +6,8 @@
pickdistance="150"
category="Machine"
description="A machine capable of manufacturing a wide range of items out of basic raw materials.">
<Sprite texture ="fabricator.png" depth="0.8"/>
<Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="0,128,64,128"/>
<Fabricator canbeselected = "true">
@@ -55,8 +55,8 @@
pickdistance="150"
category="Machine"
description="Disassembles and breaks down items to reusable components and material bars.">
<Sprite texture ="fabricator.png" depth="0.8"/>
<Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="64,128,64,128"/>
<Deconstructor canbeselected = "true">
<sound file="deconstructor.ogg" type="OnActive" range="1000.0" loop="true"/>

BIN
Subsurface/Content/Items/MiniMap/fabricator.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

4
Subsurface/Content/Items/MiniMap/item.xml
View File

@@ -2,8 +2,8 @@
name="MiniMap"
category="Machine"
linkable="true">
<Sprite texture ="fabricator.png" depth="0.8"/>
<Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="64,0,64,128"/>
<trigger/>

BIN
Subsurface/Content/Items/machines.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

12
Subsurface/Content/Map/StructurePrefabs.xml
View File

@@ -1,18 +1,24 @@
<prefabs>
<largehorizontalback sprite="Content/Map/testroom.png" sourcerect="0,0,896,64" depth ="0.9"
description="A decorative structure with no collision detection"
width = "128" height ="64" resizehorizontal="true"/>
<smallhorizontalback sprite="Content/Map/testroom.png" sourcerect="0,64,896,32" depth ="0.9"
description="A decorative structure with no collision detection"
width = "128" height ="32" resizehorizontal="true"/>
<largeverticalback sprite="Content/Map/testroom.png" sourcerect="0,96,64,448" depth ="0.9"
description="A decorative structure with no collision detection"
width = "64" height ="128" resizevertical="true"/>
<largeverticalback2 sprite="Content/Map/testroom.png" sourcerect="64,96,64,448" depth ="0.9"
description="A decorative structure with no collision detection"
width = "64" height ="128" resizevertical="true"/>
<smallverticalback sprite="Content/Map/testroom.png" sourcerect="128,96,32,352" depth ="0.9"
description="A decorative structure with no collision detection"
width = "32" height ="128" resizevertical="true"/>
<smallverticalback2 sprite="Content/Map/testroom.png" sourcerect="160,96,32,352" depth ="0.9"
description="A decorative structure with no collision detection"
width = "32" height ="128" resizevertical="true"/>
<engineeringLabel sprite="Content/Map/testroom.png" sourcerect="464,336,153,16" depth ="0.99"
@@ -40,12 +46,15 @@
width = "16" height ="16"/>
<leftwall sprite="Content/Map/testroom.png" sourcerect="688,368,32,496" depth ="0.05" castshadow="true"
description="A vertical wall with collision detection"
width = "32" height ="64" resizevertical="true" fliphorizontal="true" body="true" health="500"/>
<rightwall sprite="Content/Map/testroom.png" sourcerect="688,368,32,496" depth ="0.05" castshadow="true"
description="A vertical wall with collision detection"
width = "32" height ="64" resizevertical="true" body="true" health="500"/>
<topwall sprite="Content/Map/testroom.png" sourcerect="144,464,496,32" depth ="0.06" castshadow="true"
description="A horizontal wall with collision detection"
width = "64" height ="32" resizehorizontal="true" body="true" health="500"/>
<topwindow sprite="Content/Map/testroom.png" sourcerect="208,352,128,80" depth ="0.05"
@@ -61,9 +70,10 @@
width = "64" height ="128" body="true" health="100" resizevertical="true"/>
<smallhorizontalback sprite="Content/Map/testroom.png" sourcerect="0,65,896,32" depth ="0.4"
description="A decorative structure with no collision detection"
width = "128" height ="32" resizehorizontal="true"/>
<largeplatform sprite="Content/Map/testroom.png" sourcerect="896,0,128,64" depth ="0.9"
<largeplatform sprite="Content/Map/testroom.png" sourcerect="896,0,128,64" depth="0.9"
width = "64" height ="64" resizehorizontal="true" body="true" platform="true"/>
<platform sprite="Content/Map/testroom.png" sourcerect="896,64,128,32" depth ="0.9"