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

tweaks and stuff

Browse Source
This commit is contained in:
Alex Noir
2017-12-20 20:44:21 +03:00
parent 1fe71b5fe6
commit e5f60b29e1
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
View File

@@ -143,10 +143,6 @@
<fabricableitem name="Calyxanide" requireditems="Velonaceps Calyx Eggs, Corrigodone" requiredtime="30">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
<fabricableitem name="Liquid Oxygenite" requireditems="Stabilozine, Oxygenite Shard" requiredtime="30">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
</Fabricator>
<ConnectionPanel selectkey="Action" canbeselected = "true">

24
Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
View File

@@ -241,7 +241,7 @@
</ItemComponent>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Bleeding="-0.2" duration="5.0">
<StatusEffect type="OnUse" target="Character" Health="0.3" Bleeding="-0.2" duration="5.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Throwable>
@@ -317,7 +317,7 @@
category="Material"
spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical"
description="An antiparasitic drug used in the treatment of husk parasite infections."
description="An antiparasitic drug used in the treatment of husk parasite infections. Might require higher dosage to cure the infection at later stages."
price="300">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
@@ -325,7 +325,7 @@
<Body width="8" height="16" density="10"/>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" HuskInfectionState="0.0" setvalue="true">
<StatusEffect type="OnUse" target="Character" HuskInfectionState="-0.2" setvalue="true">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Throwable>
@@ -345,12 +345,12 @@
<Body width="8" height="16" density="20"/>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-0.1" Oxygen="10.0" duration="60">
<StatusEffect type="OnUse" target="Character" Health="-0.5" Oxygen="10.0" duration="60">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
<StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true">
<sound file="Content/Items/Reactor/explosion.ogg"/>
<Explosion range="300.0" structuredamage="40" damage="30" stun="5" force="20.0"/>
<Explosion range="300.0" structuredamage="50" damage="30" stun="5" force="10.0"/>
</StatusEffect>
</Throwable>
</Item>
@@ -408,7 +408,7 @@
<Body width="8" height="17" density="10"/>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-1.0" duration="60.0">
<StatusEffect type="OnUse" target="Character" Health="-1.0" duration="30.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Throwable>
@@ -418,7 +418,7 @@
name="Uranium Powder"
category="Material"
spritecolor="0.2,0.35,0.06,1.0"
Tags="smallitem,chem,medical"
Tags="smallitem,chem,medical"
price="50">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
@@ -426,7 +426,7 @@
<Body width="8" height="16" density="25"/>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-5.0" duration="60.0">
<StatusEffect type="OnUse" target="Character" bleeding="0.1" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Throwable>
@@ -464,7 +464,7 @@
<Body width="8" height="16" density="10"/>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-10.0" duration="60.0">
<StatusEffect type="OnUse" target="Character" Health="-5.0" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Throwable>
@@ -504,18 +504,18 @@
Tags="smallitem,chem,medical"
description="A devious poison with a delayed effect.">
<!-- price="2000" Should be mixed by traitor medics more than anything -->
<!-- Direct counter to Amanitin is Liquid Oxygenite -->
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/>
<Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-0.5" duration="20.0">
<StatusEffect type="OnUse" target="Character" Oxygen="-15.0" Health="-5.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
<!-- Here's a problem: if a chemical with delay is injected into more than one person, only the last person will get that delayed effect.
Everyone else gets off scott free! Woo!!!..... -->
<StatusEffect type="OnUse" target="Character" Oxygen="-20.0" Health="-1.0" duration="60.0" delay="20.0">
<StatusEffect type="OnUse" target="Character" Oxygen="-15.0" Health="-1.0" duration="60.0" delay="20.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Throwable>

2
Barotrauma/BarotraumaShared/Source/Items/Item.cs
View File

@@ -777,8 +777,6 @@ namespace Barotrauma
private bool IsInWater()
{
if (parentInventory != null && parentInventory.Owner != null)
FindHull();
if (CurrentHull == null) return true;
float surfaceY = CurrentHull.Surface;