Doctor class, a bunch of chemical/medicine items, medical fabricators

2016-03-25 15:35:41 +02:00
parent f585235887
commit 277762a72a
8 changed files with 352 additions and 7 deletions
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -455,6 +455,9 @@
    <Content Include="Content\Items\Clothes\clownshirt.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="Content\Items\Clothes\doctorgear.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="Content\Items\Clothes\engigear.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
--- a/Subsurface/Content/Items/Clothes/clothes.xml
+++ b/Subsurface/Content/Items/Clothes/clothes.xml
@@ -187,6 +187,47 @@
    </Wearable>
  </Item>

+  <Item
+  name="Doctor's Coat"
+  category="Equipment"
+  pickdistance="150"
+  tags="smallitem">
+
+    <Sprite texture ="doctorgear.png" sourcerect="75,0,53,18" depth="0.6"/>
+
+    <Body width="52" height="17" density="30"/>
+
+    <Wearable slots="Any,Torso">
+      <sprite texture="doctorgear.png" limb="Torso" sourcerect="0,0,31,58" origin="0.5,0.48" depth="0.01"/>
+
+      <sprite texture="doctorgear.png" limb="RightHand" sourcerect="51,0,15,47" origin="0.45,0.55" depth="0.005" hidelimb="true"/>
+      <sprite texture="doctorgear.png" limb="LeftHand" sourcerect="51,0,15,47" origin="0.45,0.55" depth="0.13" hidelimb="true"/>
+
+      <sprite texture="doctorgear.png" limb="RightArm" sourcerect="33,0,17,40" origin="0.5,0.5" hidelimb="true"/>
+      <sprite texture="doctorgear.png" limb="LeftArm" sourcerect="33,0,17,40" origin="0.5,0.5" depth="0.14" hidelimb="true"/>
+    </Wearable>
+  </Item>
+
+  <Item
+    name="Doctor's Trousers"
+    category="Equipment"
+    pickdistance="150"
+    tags="smallitem">
+
+    <Sprite texture ="doctorgear.png" sourcerect="76,19,51,13" depth="0.6"/>
+
+    <Body width="51" height="13" density="30"/>
+
+    <Wearable slots="Any,Legs">
+      <sprite texture="doctorgear.png" limb="Waist" sourcerect="0,0,1,1" origin="0.5,0.5" hidelimb="true"/>
+      <sprite texture="doctorgear.png" limb="RightThigh" sourcerect="0,61,24,46" origin="0.5,0.5" depth="0.10" hidelimb="true"/>
+      <sprite texture="doctorgear.png" limb="LeftThigh" sourcerect="0,61,24,46" origin="0.5,0.5" depth="0.14" hidelimb="true"/>
+
+      <sprite texture="doctorgear.png" limb="RightLeg" sourcerect="26,61,17,48" origin="0.5,0.5" depth="0.11" hidelimb="true"/>
+      <sprite texture="doctorgear.png" limb="LeftLeg" sourcerect="26,61,17,48" origin="0.5,0.5" depth="0.15" hidelimb="true"/>
+    </Wearable>
+  </Item>
+
  <Item
    name="Clown Costume"
    category="Equipment"
--- a/Subsurface/Content/Items/Clothes/doctorgear.png
+++ b/Subsurface/Content/Items/Clothes/doctorgear.png
--- a/Subsurface/Content/Items/Fabricators/fabricators.xml
+++ b/Subsurface/Content/Items/Fabricators/fabricators.xml
@@ -42,7 +42,9 @@
      <fabricableitem name="Underwater Scooter" requireditems="Steel Bar, Polycarbonate Bar, Polycarbonate Bar, FPGA Circuit" requiredtime="30"/>
      
      <fabricableitem name="Fulgurium Battery Cell" requireditems="Steel Bar, Fulgurium Bar, FPGA Circuit" requiredtime="10"/>
-      
+
+      <fabricableitem name ="Stun Grenade" requireditems="Steel Bar, Flash Powder, Chloral Hydrate" requiredtime="20"/>
+
      <fabricableitem name ="Incendium Grenade" requireditems="Stun Grenade, Incendium Bar" requiredtime="20"/>

      <fabricableitem name ="IC-4 Block" requireditems="C-4 Block, Incendium Bar" requiredtime="20"/>
@@ -63,6 +65,44 @@
 		<ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.85, 0.7" slotsperrow="1"/>
 	</Item>

+  <Item
+    name="Medical Fabricator"
+    linkable="true"
+    pickdistance="150"
+    category="Machine"
+    description="A machine that can be used to manufacture various medicines.">
+
+    <Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="0,128,64,128"/>
+
+    <Fabricator canbeselected = "true" powerconsumption="100.0">
+
+      <GuiFrame rect="0,0,600,400" alignment="Center" color="0.0,0.0,0.0,0.6"/>
+
+      <sound file="fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
+
+      <fabricableitem name="Corrigodone" requireditems="Stabilozine, Chloral Hydrate" requiredtime="20"/>
+
+      <fabricableitem name="Chloral Hydrate" requireditems="Chlorine, Ethanol" requiredtime="20"/>
+      
+      <fabricableitem name="Erythrozine" requireditems="Stabilozine, Iron Powder" requiredtime="20"/>
+      
+      <fabricableitem name="Fibrinozine" requireditems="Stabilozine, Phosphorus" requiredtime="20"/>
+
+      <fabricableitem name="Flash Powder" requireditems="Aluminium, Potassium" requiredtime="25"/>
+      
+      <fabricableitem name="Auxiliorizine" requireditems="Corrigodone, Flash Powder" requiredtime="25"/>
+      
+    </Fabricator>
+
+    <ConnectionPanel selectkey="Action" canbeselected = "true">
+      <requireditem name="Screwdriver" type="Equipped"/>
+      <output name="power_in"/>
+    </ConnectionPanel>
+
+    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.15, 0.7" slotsperrow="1"/>
+    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.85, 0.7" slotsperrow="1"/>
+  </Item>
+
  <Item
    name="Deconstructor"
    linkable="true"
--- a/Subsurface/Content/Items/Medical/med.png
+++ b/Subsurface/Content/Items/Medical/med.png
--- a/Subsurface/Content/Items/Medical/medical.xml
+++ b/Subsurface/Content/Items/Medical/medical.xml
@@ -6,15 +6,81 @@
    Tags="smallitem"
    pickdistance="150"
    price="50"
+    canuseonself="true"
+    description="A syringe filled with a potent general-purpose medical compound.">
+
+    <Sprite texture ="med.png" sourcerect="0,0,25,5" depth="0.6"/>
+
+    <Body width="25" height="5" density="20"/>
+
+    <MeleeWeapon slots="Any,RightHand,LeftHand"
+              aimpos="5,0" handle1="-5,0" holdangle="10" reload="1.0">
+
+      <StatusEffect type="OnUse" target="Contained" Condition="-25.0" disabledeltatime="true" sound="Content/Items/Medical/syringe.ogg">
+        <RequiredItem name="chem" type="Contained"/>
+      </StatusEffect>
+
+      <StatusEffect type="OnUse" target="Character" Health="-3.0" Oxygen="20.0" disabledeltatime="true">
+        <RequiredItem name="Erythrozine" type="Contained"/>
+      </StatusEffect>
+
+      <StatusEffect type="OnUse" target="Character" Health="3.0" Oxygen="3" disabledeltatime="true">
+        <RequiredItem name="Stabilozine" type="Contained"/>
+      </StatusEffect>
+      
+      <StatusEffect type="OnUse" target="Character" Bleeding="-10.0" disabledeltatime="true">
+        <RequiredItem name="Fibrinozine" type="Contained"/>
+      </StatusEffect>
+      
+      <StatusEffect type="OnUse" target="Character" Health="10.0" disabledeltatime="true">
+        <RequiredItem name="Corrigodone" type="Contained"/>
+      </StatusEffect>
+
+      <StatusEffect type="OnUse" target="Character" Health="20.0" Oxygen="100.0" disabledeltatime="true">
+        <RequiredItem name="Auxiliorizine" type="Contained"/>
+      </StatusEffect>
+
+      <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
+        <RequiredItem name="Chlorine" type="Contained"/>
+      </StatusEffect>
+
+      <StatusEffect type="OnUse" target="Character" Health="-5.0" Stun="10.0" disabledeltatime="true">
+        <RequiredItem name="Chloral Hydrate" type="Contained"/>
+      </StatusEffect>
+      
+    </MeleeWeapon>
+
+    <ItemContainer capacity="1" hideitems="true">
+      <Containable name="chem"/>
+    </ItemContainer>
+  </Item>
+
+  <Item
+    name="Defibrillator"
+    category="Equipment"
+    Tags="smallitem"
+    pickdistance="150"
+    price="50"
+    canuseonself="true"
    description="A syringe filled with a potent general-purpose medical compound.">

    <Sprite texture ="med.png" sourcerect="0,0,24,5" depth="0.6"/>

    <Body width="24" height="5" density="20"/>

-    <Holdable slots="Any,RightHand,LeftHand" RemoveOnUse="true">
-      <StatusEffect type="OnUse" target="This, Character" health="30.0" Condition="-100.0" disabledeltatime="true" sound="Content/Items/Medical/syringe.ogg"/>
-    </Holdable>
+    <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="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"/>
+      </StatusEffect>
+    </MeleeWeapon>
+
+    <ItemContainer capacity="1" hideitems="true">
+      <Containable name="Battery Cell"/>
+    </ItemContainer>
  </Item>

  <Item
@@ -25,15 +91,195 @@
    price="20"
    description="Treated with a hemostatic agent that quickly seals most minor wounds.">

-    <Sprite texture ="med.png" sourcerect="0,14,14,18" depth="0.6"/>
+    <Sprite texture ="med.png" sourcerect="0,16,11,16" depth="0.6"/>

-    <Body width="9" height="15" density="20"/>
+    <Body width="11" height="16" density="20"/>

    <Holdable slots="Any,RightHand,LeftHand" RemoveOnUse="true">
      <StatusEffect type="OnUse" target="This, Character" bleeding="-10.0" Condition="-100.0" disabledeltatime="true" sound="Content/Items/Medical/bandage.ogg"/>      
    </Holdable>
  </Item>

+  <Item
+    name="Iron Powder"
+    category="Material"
+    Tags="smallitem,chem"
+    pickdistance="150">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" color="0.2,0.2,0.2,1.0"/>
+
+    <Body width="25" height="5" density="40"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+     name="Stabilozine"
+     category="Material"
+     spritecolor="1.0,1.0,0.8,1.0"
+     Tags="smallitem,chem"
+     pickdistance="150"
+     description="A mild stimulant which is used as an incredient in the manufacture of various medicines.">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" />
+
+    <Body width="25" height="5" density="20"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+     name="Erythrozine"
+     category="Material"
+     spritecolor="0.9,0.9,1.0,1.0"
+     Tags="smallitem,chem"
+     pickdistance="150"
+     description="Most commonly used for treating oxygen deprivation.">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" />
+
+    <Body width="25" height="5" density="20"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </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.">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" />
+
+    <Body width="25" height="5" density="20"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="Corrigodone"
+    category="Material"
+    spritecolor="0.8,0.0,0.0,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150"
+    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"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="Auxiliorizine"
+    category="Material"
+    spritecolor="1.0,1.0,1.0,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150"
+    description="A highly potent corrigodone-based stimulant.">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
+
+    <Body width="25" height="5" density="20"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+  <Item
+    name="Chlorine"
+    category="Material"
+    spritecolor="1.0,1.0,1.0,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
+
+    <Body width="25" height="5" density="10"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="Ethanol"
+    category="Material"
+    spritecolor="1.0,1.0,1.0,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
+
+    <Body width="25" height="5" density="10"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="Aluminium"
+    category="Material"
+    spritecolor="0.7,0.7,0.7,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
+
+    <Body width="25" height="5" density="10"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="Potassium"
+    category="Material"
+    spritecolor="0.8,0.8,0.8,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
+
+    <Body width="25" height="5" density="10"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="Flash Powder"
+    category="Material"
+    spritecolor="0.8,0.8,0.8,1.0"
+    Tags="smallitem,chem,explosive"
+    pickdistance="150"
+    description="An analgesic which is 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="10"/>
+
+    <Holdable slots="Any,RightHand,LeftHand">
+      <StatusEffect type="OnBroken" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg">
+        <Explosion range="500" damage="5" stun="3" force="0.1"/>
+      </StatusEffect>
+    </Holdable>
+
+    <StatusEffect type="OnUse" target="This" Condition="-100.0" delay="3.0" sound="Content/Items/Weapons/stungrenade.ogg">
+      <Explosion range="500" damage="5" stun="25" force="0.1"/>
+    </StatusEffect>
+  </Item>
+  
+  
+  <Item
+    name="Chloral Hydrate"
+    category="Material"
+    spritecolor="1.0,1.0,1.0,1.0"
+    Tags="smallitem,chem"
+    pickdistance="150">
+
+    <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
+
+    <Body width="25" height="5" density="10"/>
+
+    <Holdable slots="Any,RightHand,LeftHand"/>
+  </Item>
 </Items>

  
--- a/Subsurface/Content/Jobs.xml
+++ b/Subsurface/Content/Jobs.xml
@@ -51,6 +51,18 @@
    <Item name="Ballistic Helmet" equip="true"/>    
  </Job>

+  <Job name="Doctor" description="." maxnumber="2">
+    <Skills>
+      <Skill name="Weapons" level="10,20"/>
+      <Skill name="Construction" level="10,20"/>
+      <Skill name="Electrical Engineering" level="10,20"/>
+      <Skill name="Medical" level="50,70"/>
+    </Skills>
+    <Item name="ID Card"/>
+    <Item name="Doctor's Coat" equip="true"/>
+    <Item name="Doctor's Trousers" equip="true"/>
+  </Job>
+
  <Job name="Assistant" description="Assistants don't have any specific responsibilities or areas of expertise. This job is a good choice for newcomers who want to get a hang of working on board the submarine without taking up tasks that they aren't qualified for." allowalways="true">
    <Skills>
      <Skill name="Weapons" level="20,30"/>
--- a/Subsurface/Content/Map/locationTypes.xml
+++ b/Subsurface/Content/Map/locationTypes.xml
@@ -18,9 +18,10 @@
    <Hireable name="Assistant" commonness="10"/>
    <Hireable name="Engineer" commonness="3"/>
    <Hireable name="Mechanic" commonness="3"/>
+    <Hireable name="Doctor" commonness="1"/>
    <Hireable name="Security Officer" commonness="1"/>
    <Hireable name="Captain" commonness="1"/>
-
+    
    <nameformats
      f0="The City of [name]"
      f1="[name] City"
@@ -38,6 +39,7 @@
    <Hireable name="Assistant" commonness="2"/>
    <Hireable name="Engineer" commonness="2"/>
    <Hireable name="Mechanic" commonness="2"/>
+    <Hireable name="Doctor" commonness="2"/>

    <nameformats
      f0="[name] Outpost"
@@ -56,6 +58,7 @@
    <Hireable name="Assistant" commonness="3"/>
    <Hireable name="Security Officer" commonness="1"/>
    <Hireable name="Captain" commonness="1"/>
+    <Hireable name="Doctor" commonness="1"/>

    <nameformats
      f0="[name] Research Facility"