Merged linux changes, water effect using a BasicEffect and a simpler pixel shader, multi-colored wires

2015-09-08 21:55:27 +03:00
parent 7eae6fb026
commit ea15397725
18 changed files with 221 additions and 197 deletions
@@ -19,6 +19,54 @@
    <Wire/>
  </Item>

+  <Item
+    name="Red Wire"
+    Tags="smallitem"
+    spritecolor="1.0,0.0,0.0,1.0"
+    pickdistance="150"
+    linkable="true"
+    canbepicked="true"
+    price="10">
+
+    <Sprite texture ="wire.png" depth="0.55"/>
+    <Body radius="15"/>
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+
+    <Wire/>
+  </Item>
+
+  <Item
+    name="Blue Wire"
+    Tags="smallitem"
+    spritecolor="0.0,0.6,1.0,1.0"
+    pickdistance="150"
+    linkable="true"
+    canbepicked="true"
+    price="10">
+
+    <Sprite texture ="wire.png" depth="0.55"/>
+    <Body radius="15"/>
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+
+    <Wire/>
+  </Item>
+
+  <Item
+    name="Orange Wire"
+    Tags="smallitem"
+    spritecolor="1.0,0.5,0.0,1.0"
+    pickdistance="150"
+    linkable="true"
+    canbepicked="true"
+    price="10">
+
+    <Sprite texture ="wire.png" depth="0.55"/>
+    <Body radius="15"/>
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+
+    <Wire/>
+  </Item>
+
  <Item
    name="And Component"
    Tags="smallitem"
@@ -8,7 +8,7 @@

    <Sprite texture ="railgunbase.png"/>

-    <Turret barrelsprite="railgunbarrel.png" canbeselected = "true" linkable="true" origin="0.5, 0.85" barrelpos="117, 57" 
+    <Turret barrelsprite="railgunbarrel.png" canbeselected = "true" linkable="true" origin="0.5, 0.85" barrelpos="128, 128" 
            rotationlimits="180,360"
            powerconsumption="500.0">
      <StatusEffect type="OnUse" target="This" sound="Content/Items/Weapons/railgun.ogg">