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

2016-01-15 17:10:21 +02:00
parent 0fc085c86d
commit e3ebc28afb
34 changed files with 203 additions and 78 deletions
--- a/Subsurface/Content/Items/Door/doors.xml
+++ b/Subsurface/Content/Items/Door/doors.xml
@@ -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>
--- a/Subsurface/Content/Items/Electricity/signalcomp.png
+++ b/Subsurface/Content/Items/Electricity/signalcomp.png
--- a/Subsurface/Content/Items/Electricity/signalitems.xml
+++ b/Subsurface/Content/Items/Electricity/signalitems.xml
@@ -100,7 +100,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand"/>
+    <Holdable slots="Any,RightHand,LeftHand"/>
  </Item>

  <Item
--- a/Subsurface/Content/Items/Engine/engine.xml
+++ b/Subsurface/Content/Items/Engine/engine.xml
@@ -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"/>
--- a/Subsurface/Content/Items/Engine/fabricator.png
+++ b/Subsurface/Content/Items/Engine/fabricator.png
--- a/Subsurface/Content/Items/Fabricators/fabricator.png
+++ b/Subsurface/Content/Items/Fabricators/fabricator.png
--- a/Subsurface/Content/Items/Fabricators/fabricators.xml
+++ b/Subsurface/Content/Items/Fabricators/fabricators.xml
@@ -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"/>
--- a/Subsurface/Content/Items/MiniMap/fabricator.png
+++ b/Subsurface/Content/Items/MiniMap/fabricator.png
--- a/Subsurface/Content/Items/MiniMap/item.xml
+++ b/Subsurface/Content/Items/MiniMap/item.xml
@@ -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/>

--- a/Subsurface/Content/Items/machines.png
+++ b/Subsurface/Content/Items/machines.png