- added med bays to the vanilla subs

- some new wall prefabs - medical item statuseffect tweaking - fixed textBoxes not being deselected in waypoint editing hud after applying the changes
2016-03-26 23:25:04 +02:00
parent 2f7295eaad
commit c8597f76be
13 changed files with 67 additions and 34 deletions
--- a/Subsurface/Content/Items/Fabricators/fabricators.xml
+++ b/Subsurface/Content/Items/Fabricators/fabricators.xml
@@ -15,15 +15,15 @@

      <sound file="fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>

-      <fabricableitem name="Harpoon Gun" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="20">
+      <fabricableitem name="Harpoon Gun" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
        <RequiredSkill name="Construction" level="30"/>
      </fabricableitem>
      <fabricableitem name="Spear" requireditems="Steel Bar" requiredtime="10"/>

-      <fabricableitem name="Plasma Cutter" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="20">
+      <fabricableitem name="Plasma Cutter" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
        <RequiredSkill name="Construction" level="30"/>
      </fabricableitem>
-      <fabricableitem name="Welding Tool" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="20">
+      <fabricableitem name="Welding Tool" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
        <RequiredSkill name="Construction" level="30"/>
      </fabricableitem>

--- a/Subsurface/Content/Items/Fabricators/materials.xml
+++ b/Subsurface/Content/Items/Fabricators/materials.xml
@@ -8,6 +8,11 @@
    canbepicked="true"
    price="50">

+    <Deconstruct time="5">
+      <Item name="Iron Powder"/>
+      <Item name="Iron Powder"/>     
+    </Deconstruct>
+
    <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>

    <Body width="24" height="12" density="50"/>
--- a/Subsurface/Content/Items/Medical/medical.xml
+++ b/Subsurface/Content/Items/Medical/medical.xml
@@ -42,8 +42,7 @@

    <MeleeWeapon slots="Any,RightHand,LeftHand"
              aimpos="50,0" handle1="-5,0" holdangle="10" reload="1.0">
-      <StatusEffect type="OnUse" target="Contained" Condition="-25.0" disabledeltatime="true">
-      </StatusEffect>
+      <StatusEffect type="OnUse" target="Contained" Condition="-25.0" disabledeltatime="true"/>
      <StatusEffect type="OnUse" target="Character" oxygen="1" setvalue="true" sound="Content/Items/Weapons/stunbaton.ogg">
        <RequiredItem name="Battery Cell" type="Contained" msg="Loaded Battery Cell required"/>
        <Explosion range="10.0" force="1.0" shockwave="false" flames="false" camerashake="1.0"/>
@@ -70,7 +69,7 @@

    <MeleeWeapon slots="Any,RightHand,LeftHand"
              aimpos="5,0" handle1="-5,0" holdangle="10" reload="1.0">
-      <StatusEffect type="OnUse" target="This, Character" bleeding="-10.0" Condition="-25.0" disabledeltatime="true" sound="Content/Items/Medical/bandage.ogg"/>      
+      <StatusEffect type="OnUse" target="This, Character" bleeding="-0.5" Condition="-25.0" disabledeltatime="true" sound="Content/Items/Medical/bandage.ogg"/>      
    </MeleeWeapon>
  </Item>

@@ -98,9 +97,14 @@
    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" />

    <Body width="25" height="5" density="20"/>
+    
+    <ItemComponent>
+      <StatusEffect type="OnUse" target="Character" Health="0.1" duration="20"/>
+      <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
+    </ItemComponent>

    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="3.0" Oxygen="3" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" Health="0.3" Oxygen="0.3" duration="10">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
@@ -112,6 +116,7 @@
     spritecolor="0.5,0.5,1.0,1.0"
     Tags="smallitem,chem"
     pickdistance="150"
+     canuseonself="true"
     description="Most commonly used for treating oxygen deprivation.">

    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" />
@@ -119,26 +124,32 @@
    <Body width="25" height="5" density="20"/>

    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="-3.0" Oxygen="20.0" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" Health="-0.3" Oxygen="2.0" duration="10">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
  </Item>

  <Item
-   name="Fibrinozine"
-   category="Material"
-   spritecolor="0.6,0.4,0.2,1.0"
-   Tags="smallitem,chem"
-   pickdistance="150"
-   description="A hemostatic agent that slows down bleeding.">
+    name="Fibrinozine"
+    category="Material"
+    spritecolor="0.6,0.4,0.2,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150"
+    canuseonself="true"
+    description="A hemostatic agent that slows down bleeding.">

    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" />

    <Body width="25" height="5" density="20"/>
+
+    <ItemComponent>
+      <StatusEffect type="OnUse" target="Character" Bleeding="-0.2" duration="10.0"/>
+      <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
+    </ItemComponent>
    
    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Bleeding="-10.0" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" Bleeding="-0.5" duration="5.0">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
@@ -150,14 +161,20 @@
    spritecolor="0.8,0.0,0.0,1.0"
    Tags="smallitem,chem"
    pickdistance="150"
+    canuseonself="true"
    description="Highly effective at treating various types of physical trauma.">

    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>

    <Body width="25" height="5" density="20"/>
+    
+    <ItemComponent>
+      <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
+      <StatusEffect type="OnUse" target="Character, This" Health="-0.5" duration="10"/>      
+    </ItemComponent>

    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="10.0" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" Health="2.0" duration="5.0">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
@@ -176,7 +193,7 @@
    <Body width="25" height="5" density="20"/>

    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="20.0" Oxygen="100.0" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" Health="5.0" Oxygen="20.0" Bleeding="-0.1" duration="5.0">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
@@ -194,7 +211,7 @@
    <Body width="25" height="5" density="10"/>

    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
@@ -209,7 +226,8 @@
    pickdistance="150">

    <ItemComponent>
-      <StatusEffect type="OnUse" target="Character" Health="-2.0" disabledeltatime="true"/>
+      <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
+      <StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0"/>      
    </ItemComponent>

    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
@@ -217,7 +235,7 @@
    <Body width="25" height="5" density="10"/>
    
    <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0">
        <RequiredItem name="Medical Syringe" type="Container"/>
      </StatusEffect>
    </Holdable>
--- a/Subsurface/Content/Items/Tools/tools.xml
+++ b/Subsurface/Content/Items/Tools/tools.xml
@@ -14,6 +14,7 @@
    <Deconstruct time="10">
      <Item name="Polycarbonate Bar"/>
      <Item name="Steel Bar"/>
+      <Item name="Aluminium"/>
    </Deconstruct>

    <!-- physics body -->
@@ -66,6 +67,7 @@
    <Deconstruct time="10">
      <Item name="Polycarbonate Bar"/>
      <Item name="Steel Bar"/>
+      <Item name="Aluminium"/>
    </Deconstruct>
    
    <Sprite texture ="tools.png" sourcerect="0,0,41,16" depth="0.5"/>
--- a/Subsurface/Content/Items/Weapons/weapons.xml
+++ b/Subsurface/Content/Items/Weapons/weapons.xml
@@ -31,6 +31,7 @@

    <Deconstruct time="10">      
      <Item name="Steel Bar"/>
+      <Item name="Aluminium"/>      
      <Item name="Polycarbonate Bar"/>
    </Deconstruct>
  
--- a/Subsurface/Content/Map/StructurePrefabs.xml
+++ b/Subsurface/Content/Map/StructurePrefabs.xml
@@ -33,6 +33,9 @@
  <cabinsLabel sprite="Content/Map/testroom.png" sourcerect="464,384,83,16" depth ="0.99"
    width = "83" height ="16"/>

+  <medicalLabel sprite="Content/Map/testroom.png" sourcerect="464,400,110,16" depth ="0.99"
+    width = "110" height ="16"/>
+
  <arrowUp sprite="Content/Map/testroom.png" sourcerect="592,367,16,16" depth ="0.99"
    width = "16" height ="16"/>

@@ -45,15 +48,15 @@
  <arrowRight sprite="Content/Map/testroom.png" sourcerect="608,383,16,16" depth ="0.99"
    width = "16" height ="16"/>

-  <leftwall sprite="Content/Map/testroom.png" sourcerect="688,368,32,496" depth ="0.05" castshadow="true"
+  <leftwall sprite="Content/Map/testroom.png" sourcerect="990,274,32,512" 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"
+  <rightwall sprite="Content/Map/testroom.png" sourcerect="990,274,32,512" 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"
+  <topwall sprite="Content/Map/testroom.png" sourcerect="208,439,496,32" depth ="0.06" castshadow="true"
    description="A horizontal wall with collision detection"
    width = "64" height ="32" resizehorizontal="true" body="true" health="500"/>

@@ -88,7 +91,13 @@
  <bgpanels sprite="Content/Map/testroom.png" sourcerect="768,320,224,224" depth = "1.0"
    width="64" height="64" resizehorizontal="true" resizevertical="true"/>

-  <bgpanelswindow sprite="Content/Map/testroom.png" sourcerect="768,544,224,224" depth = "1.0"
+  <bgpanelswindow sprite="Content/Map/testroom.png" sourcerect="752,560,224,224" depth = "1.0"
+    width="64" height="64" resizehorizontal="true" resizevertical="true"/>
+
+  <bgorangepanels sprite="Content/Map/testroom.png" sourcerect="528,784,224,224" depth = "1.0"
+    width="64" height="64" resizehorizontal="true" resizevertical="true"/>
+
+  <bgorangepanelwindow sprite="Content/Map/testroom.png" sourcerect="528,563,224,224" depth = "1.0"
    width="64" height="64" resizehorizontal="true" resizevertical="true"/>

  <stairsright sprite="Content/Map/testroom.png" sourcerect="0,704,256,320" 
--- a/Subsurface/Content/Map/testroom.png
+++ b/Subsurface/Content/Map/testroom.png
--- a/Subsurface/Source/Items/Item.cs
+++ b/Subsurface/Source/Items/Item.cs
@@ -284,14 +284,6 @@ namespace Barotrauma
            }
        }

-        //List<string> highlightText;
-
-        //public List<string> HighlightText
-        //{
-        //    get { return highlightText;}
-            
-        //}
-
        public Item(ItemPrefab itemPrefab, Vector2 position, Submarine submarine)
            : this(new Rectangle((int)position.X, (int)position.Y, (int)itemPrefab.sprite.size.X, (int)itemPrefab.sprite.size.Y), itemPrefab, submarine)
        {
--- a/Subsurface/Source/Map/WayPoint.cs
+++ b/Subsurface/Source/Map/WayPoint.cs
@@ -216,6 +216,8 @@ namespace Barotrauma
            textBox.Text = text;
            textBox.Color = Color.Green;

+            textBox.Deselect();
+
            return true;
        }

@@ -230,6 +232,8 @@ namespace Barotrauma
                textBox.Text = (assignedJob == null) ? "None" : assignedJob.Name;
            }

+            textBox.Deselect();
+
            return true;
        }

@@ -267,14 +271,14 @@ namespace Barotrauma

            y = 40+20;                    

-            new GUITextBlock(new Rectangle(0, y, 100, 20), "ID Card tags:", Color.Transparent, Color.Black, Alignment.TopLeft, null, editingHUD);
+            new GUITextBlock(new Rectangle(0, y, 100, 20), "ID Card tags:", Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD);
            GUITextBox propertyBox = new GUITextBox(new Rectangle(100, y, 200, 20), GUI.Style, editingHUD);
            propertyBox.Text = string.Join(", ", idCardTags);
            propertyBox.OnEnterPressed = EnterIDCardTags;
            propertyBox.OnTextChanged = TextBoxChanged;
            y = y + 30;

-            new GUITextBlock(new Rectangle(0, y, 100, 20), "Assigned job:", Color.Transparent, Color.Black, Alignment.TopLeft, null, editingHUD);
+            new GUITextBlock(new Rectangle(0, y, 100, 20), "Assigned job:", Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD);
            propertyBox = new GUITextBox(new Rectangle(100, y, 200, 20), GUI.Style, editingHUD);
            propertyBox.Text = (assignedJob == null) ? "None" : assignedJob.Name;

--- a/Subsurface/Source/Sprite.cs
+++ b/Subsurface/Source/Sprite.cs
@@ -213,6 +213,8 @@ namespace Barotrauma
            //    }
            //}

+            if (texture == null) return;
+
            spriteBatch.Draw(texture, pos + offset, sourceRect, color, rotation + rotate, origin, scale, spriteEffect, depth == null ? this.depth : (float)depth);
        }
        
--- a/Subsurface/Submarines/Aegir
+++ b/Subsurface/Submarines/Aegir
--- a/Subsurface/Submarines/Nehalennia.sub
+++ b/Subsurface/Submarines/Nehalennia.sub
--- a/Subsurface/Submarines/Vellamo.sub
+++ b/Subsurface/Submarines/Vellamo.sub