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

Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Browse Source
This commit is contained in:
juanjp600
2017-12-03 11:59:34 -03:00
parent 3db407fe52 8735dffd04
commit a19579088f
5 changed files with 100 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
+41 -59
View File
@@ -4,7 +4,6 @@
name="Medical Syringe" name="Medical Syringe"
category="Equipment" category="Equipment"
Tags="smallitem,medical" Tags="smallitem,medical"
price="50" price="50"
canuseonself="true" canuseonself="true"
description="Injection is often a much more effective method of administering drugs than taking them orally."> description="Injection is often a much more effective method of administering drugs than taking them orally.">
@@ -32,7 +31,6 @@
name="Bandage" name="Bandage"
category="Equipment" category="Equipment"
Tags="smallitem,medical" Tags="smallitem,medical"
canuseonself="true" canuseonself="true"
price="20" price="20"
description="Treated with a hemostatic agent that quickly seals most minor wounds."> description="Treated with a hemostatic agent that quickly seals most minor wounds.">
@@ -54,14 +52,13 @@
name="Iron Powder" name="Iron Powder"
category="Material" category="Material"
Tags="smallitem,chem" Tags="smallitem,chem"
price="5"> price="5">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" color="0.2,0.2,0.2,1.0"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" color="0.2,0.2,0.2,1.0"/>
<Body width="8" height="16" density="40"/> <Body width="8" height="16" density="40"/>
<Holdable slots="Any,RightHand,LeftHand"/> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10"/>
</Item> </Item>
<Item <Item
@@ -69,7 +66,6 @@
category="Material" category="Material"
spritecolor="1.0,1.0,0.7,1.0" spritecolor="1.0,1.0,0.7,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
description="A mild stimulant which is used as an incredient in the manufacture of various medicines." description="A mild stimulant which is used as an incredient in the manufacture of various medicines."
price="10"> price="10">
@@ -82,11 +78,11 @@
<StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/> <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
</ItemComponent> </ItemComponent>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="0.3" Oxygen="0.3" duration="10"> <StatusEffect type="OnUse" target="Character" Health="0.3" Oxygen="0.3" duration="10">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -94,7 +90,6 @@
category="Material" category="Material"
spritecolor="0.5,0.5,1.0,1.0" spritecolor="0.5,0.5,1.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
canuseonself="true" canuseonself="true"
description="Most commonly used for treating oxygen deprivation." description="Most commonly used for treating oxygen deprivation."
price="50"> price="50">
@@ -103,11 +98,11 @@
<Body width="8" height="16" density="20"/> <Body width="8" height="16" density="20"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-0.3" Oxygen="2.0" duration="10"> <StatusEffect type="OnUse" target="Character" Health="-0.3" Oxygen="2.0" duration="10">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -115,7 +110,6 @@
category="Material" category="Material"
spritecolor="0.6,0.4,0.2,1.0" spritecolor="0.6,0.4,0.2,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
canuseonself="true" canuseonself="true"
description="A hemostatic agent that slows down bleeding." description="A hemostatic agent that slows down bleeding."
price="50"> price="50">
@@ -129,11 +123,11 @@
<StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/> <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
</ItemComponent> </ItemComponent>
<Holdable slots="Any,RightHand,LeftHand"> <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" Bleeding="-0.2" duration="5.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -155,11 +149,11 @@
<StatusEffect type="OnUse" target="Character, This" Health="-0.5" duration="10"/> <StatusEffect type="OnUse" target="Character, This" Health="-0.5" duration="10"/>
</ItemComponent> </ItemComponent>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="3.0" duration="5.0"> <StatusEffect type="OnUse" target="Character" Health="3.0" duration="5.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -175,11 +169,11 @@
<Body width="8" height="16" density="20"/> <Body width="8" height="16" density="20"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="1.0" Oxygen="2.0" Bleeding="-0.05" duration="60.0"> <StatusEffect type="OnUse" target="Character" Health="1.0" Oxygen="2.0" Bleeding="-0.05" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -187,18 +181,17 @@
category="Material" category="Material"
spritecolor="1.0,1.0,1.0,0.6" spritecolor="1.0,1.0,1.0,0.6"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="20"> price="20">
<Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="8" height="17" density="10"/> <Body width="8" height="17" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0"> <StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -207,7 +200,6 @@
spritecolor="0.0,0.9,0.1,1.0" spritecolor="0.0,0.9,0.1,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
canuseonself="true" canuseonself="true"
price="20"> price="20">
<ItemComponent> <ItemComponent>
@@ -219,11 +211,11 @@
<Body width="8" height="7" density="10"/> <Body width="8" height="7" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0"> <StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -231,18 +223,17 @@
category="Material" category="Material"
spritecolor="0.7,0.7,0.7,1.0" spritecolor="0.7,0.7,0.7,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="20"> price="20">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -250,18 +241,17 @@
category="Material" category="Material"
spritecolor="0.8,0.8,0.8,1.0" spritecolor="0.8,0.8,0.8,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="20"> price="20">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -269,20 +259,21 @@
category="Material" category="Material"
spritecolor="0.1,0.1,0.1,1.0" spritecolor="0.1,0.1,0.1,1.0"
Tags="smallitem,chem,explosive" Tags="smallitem,chem,explosive"
impacttolerance="8"
price="50"> price="50">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true"/>
<StatusEffect type="OnFire" target="this" condition="-50"/> <StatusEffect type="OnFire" target="this" condition="-50"/>
<StatusEffect type="OnBroken" target="This" Condition="-100.0"> <StatusEffect type="OnBroken" target="This" Condition="-100.0">
<Sound file="Content/Items/Reactor/explosion.ogg"/> <Sound file="Content/Items/Reactor/explosion.ogg"/>
<Explosion range="500" damage="5" stun="3" force="0.1"/> <Explosion range="500" damage="5" stun="3" force="0.1"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
@@ -291,18 +282,17 @@
category="Material" category="Material"
spritecolor="1.0,1.0,1.0,0.8" spritecolor="1.0,1.0,1.0,0.8"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="20"> price="20">
<Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="8" height="17" density="10"/> <Body width="8" height="17" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-5.0" Stun="10" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" Stun="10" disabledeltatime="true">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -310,18 +300,17 @@
category="Material" category="Material"
spritecolor="0.5,0.0,0.0,1.0" spritecolor="0.5,0.0,0.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="20"> price="20">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -329,18 +318,17 @@
category="Material" category="Material"
spritecolor="0.5,0.0,0.0,1.0" spritecolor="0.5,0.0,0.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="50"> price="50">
<Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="8" height="17" density="10"/> <Body width="8" height="17" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <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="60.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -348,18 +336,17 @@
category="Material" category="Material"
spritecolor="0.2,0.35,0.06,1.0" spritecolor="0.2,0.35,0.06,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
price="50"> price="50">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="25"/> <Body width="8" height="16" density="25"/>
<Holdable slots="Any,RightHand,LeftHand"> <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" Health="-5.0" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -367,7 +354,6 @@
category="Material" category="Material"
spritecolor="0.8,0.3,0.8,1.0" spritecolor="0.8,0.3,0.8,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
description="A potent muscle stimulant." description="A potent muscle stimulant."
price="50"> price="50">
@@ -375,11 +361,11 @@
<Body width="8" height="16" density="15"/> <Body width="8" height="16" density="15"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" SpeedMultiplier="1.5" setvalue="true" duration="60.0"> <StatusEffect type="OnUse" target="Character" SpeedMultiplier="1.5" setvalue="true" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -387,7 +373,6 @@
category="Material" category="Material"
spritecolor="0.0,0.0,0.0,1.0" spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
description="A highly potent neurotoxin." description="A highly potent neurotoxin."
price="200"> price="200">
@@ -395,11 +380,11 @@
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <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="-10.0" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -407,7 +392,6 @@
category="Material" category="Material"
spritecolor="0.0,0.0,0.0,1.0" spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
description="Dormant eggs of the Europan lifeform colloquially referred to as 'husk parasite'." description="Dormant eggs of the Europan lifeform colloquially referred to as 'husk parasite'."
price="200"> price="200">
@@ -415,11 +399,11 @@
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01"> <StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -427,7 +411,6 @@
category="Material" category="Material"
spritecolor="0.0,0.0,0.0,1.0" spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical" 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."
price="300"> price="300">
@@ -435,11 +418,11 @@
<Body width="8" height="16" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <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.0" setvalue="true">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
<Item <Item
@@ -447,7 +430,6 @@
category="Material" category="Material"
spritecolor="0.6,0.8,1.0,1.0" spritecolor="0.6,0.8,1.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
canuseonself="true" canuseonself="true"
description="A mildy toxic solution that slowly releases oxygen into the bloodstream when injected."> description="A mildy toxic solution that slowly releases oxygen into the bloodstream when injected.">
@@ -455,11 +437,11 @@
<Body width="8" height="16" density="20"/> <Body width="8" height="16" density="20"/>
<Holdable slots="Any,RightHand,LeftHand"> <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.1" Oxygen="10.0" duration="60">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
</Items> </Items>
Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml
+10 -11
View File
@@ -10,12 +10,12 @@
<Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/> <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
<Body width="24" height="8"/> <Body width="24" height="8"/>
<Pickable slots="Any"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnBroken" target="This" Condition="-100.0"> <StatusEffect type="OnBroken" target="This" Condition="-100.0">
<sound file="Content/Items/Reactor/explosion.ogg" range="3000"/> <sound file="Content/Items/Reactor/explosion.ogg" range="3000"/>
<Explosion range="500.0" structuredamage="250" damage="200" stun="5" force="20.0" severlimbsprobability="0.5" decal="explosion" decalsize="0.5"/> <Explosion range="500.0" structuredamage="250" damage="200" stun="5" force="20.0" severlimbsprobability="0.5" decal="explosion" decalsize="0.5"/>
</StatusEffect> </StatusEffect>
</Pickable> </Throwable>
</Item> </Item>
<Item <Item
@@ -28,13 +28,13 @@
<Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/> <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
<Body width="24" height="8"/> <Body width="24" height="8"/>
<Pickable slots="Any"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnFire" target="This" Condition="-50.0"/> <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
<StatusEffect type="OnBroken" target="This" Condition="-100.0"> <StatusEffect type="OnBroken" target="This" Condition="-100.0">
<sound file="Content/Items/Reactor/explosion.ogg" range="3000"/> <sound file="Content/Items/Reactor/explosion.ogg" range="3000"/>
<Explosion range="600.0" structuredamage="150" damage="300" stun="5" force="20.0" severlimbsprobability="0.6" decal="explosion" decalsize="0.5"/> <Explosion range="600.0" structuredamage="150" damage="300" stun="5" force="20.0" severlimbsprobability="0.6" decal="explosion" decalsize="0.5"/>
</StatusEffect> </StatusEffect>
</Pickable> </Throwable>
</Item> </Item>
<Item <Item
@@ -47,14 +47,14 @@
<Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/> <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
<Body width="24" height="8"/> <Body width="24" height="8"/>
<Pickable slots="Any"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="Always" target="This" Condition="-0.35"/> <StatusEffect type="Always" target="This" Condition="-0.35"/>
<StatusEffect type="OnFire" target="This" Condition="-50.0"/> <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
<StatusEffect type="OnBroken" target="This" Condition="-100.0"> <StatusEffect type="OnBroken" target="This" Condition="-100.0">
<sound file="Content/Items/Reactor/explosion.ogg" range="3000"/> <sound file="Content/Items/Reactor/explosion.ogg" range="3000"/>
<Explosion range="600.0" structuredamage="150" damage="300" stun="5" force="20.0" severlimbsprobability="0.6" decal="explosion" decalsize="0.5"/> <Explosion range="600.0" structuredamage="150" damage="300" stun="5" force="20.0" severlimbsprobability="0.6" decal="explosion" decalsize="0.5"/>
</StatusEffect> </StatusEffect>
</Pickable> </Throwable>
</Item> </Item>
<Item <Item
@@ -68,14 +68,14 @@
<Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/> <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
<Body width="24" height="8"/> <Body width="24" height="8"/>
<Pickable slots="Any"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnFire" target="This" Condition="-50.0"/> <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
<StatusEffect type="OnBroken" target="This" Condition="-100.0"> <StatusEffect type="OnBroken" target="This" Condition="-100.0">
<sound file="Content/Items/Reactor/explosion.ogg" range="2000"/> <sound file="Content/Items/Reactor/explosion.ogg" range="2000"/>
<Explosion range="500.0" structuredamage="50" damage="300" stun="5" force="20.0" severlimbsprobability="0.6"/> <Explosion range="500.0" structuredamage="50" damage="300" stun="5" force="20.0" severlimbsprobability="0.6"/>
<Fire size="500"/> <Fire size="500"/>
</StatusEffect> </StatusEffect>
</Pickable> </Throwable>
</Item> </Item>
<Item <Item
@@ -111,14 +111,13 @@
description="A highly unstable liquid that may explode when subjected to heat or physical shock." description="A highly unstable liquid that may explode when subjected to heat or physical shock."
spritecolor="1.0,1.0,1.0,1.0" spritecolor="1.0,1.0,1.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
impacttolerance="4"> impacttolerance="4">
<Sprite texture ="Content/Items/Medical/med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="Content/Items/Medical/med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="25" height="5" density="10"/> <Body width="25" height="5" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true"/> <StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true"/>
<StatusEffect type="OnFire" target="This" Condition="-50.0"/> <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
@@ -130,6 +129,6 @@
<StatusEffect type="OnUse" target="This" Condition="-100.0"> <StatusEffect type="OnUse" target="This" Condition="-100.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Throwable>
</Item> </Item>
</Items> </Items>
Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
-2
View File
@@ -108,7 +108,6 @@
<Item <Item
name="Stun Grenade" name="Stun Grenade"
category="Equipment" category="Equipment"
price="200" price="200"
tags="smallitem,weapon"> tags="smallitem,weapon">
@@ -127,7 +126,6 @@
<Item <Item
name="Incendium Grenade" name="Incendium Grenade"
category="Equipment" category="Equipment"
tags="smallitem,weapon"> tags="smallitem,weapon">
<Sprite texture="weapons.png" sourcerect="98,0,11,24" depth="0.55"/> <Sprite texture="weapons.png" sourcerect="98,0,11,24" depth="0.55"/>
Barotrauma/BarotraumaShared/Source/DebugConsole.cs
+19 -1
View File
@@ -722,12 +722,30 @@ namespace Barotrauma
} }
})); }));
commands.Add(new Command("kill", "kill [character]: Immediately kills the specified character.", (string[] args) =>
{
Character killedCharacter = null;
if (args.Length == 0)
{
killedCharacter = Character.Controlled;
}
else
{
killedCharacter = FindMatchingCharacter(args);
}
if (killedCharacter != null)
{
killedCharacter.AddDamage(CauseOfDeath.Damage, killedCharacter.MaxHealth * 2, null);
}
}));
commands.Add(new Command("killmonsters", "killmonsters: Immediately kills all AI-controlled enemies in the level.", (string[] args) => commands.Add(new Command("killmonsters", "killmonsters: Immediately kills all AI-controlled enemies in the level.", (string[] args) =>
{ {
foreach (Character c in Character.CharacterList) foreach (Character c in Character.CharacterList)
{ {
if (!(c.AIController is EnemyAIController)) continue; if (!(c.AIController is EnemyAIController)) continue;
c.AddDamage(CauseOfDeath.Damage, 10000.0f, null); c.AddDamage(CauseOfDeath.Damage, c.MaxHealth * 2, null);
} }
})); }));
Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs
+4 -4
View File
@@ -73,14 +73,14 @@ namespace Barotrauma
{ {
base.Init(); base.Init();
monsters = SpawnMonsters(Rand.Range(minAmount, maxAmount, Rand.RandSync.Server)); monsters = SpawnMonsters(Rand.Range(minAmount, maxAmount, Rand.RandSync.Server), false);
if (GameSettings.VerboseLogging) if (GameSettings.VerboseLogging)
{ {
DebugConsole.NewMessage("Initialized MonsterEvent (" + monsters[0]?.SpeciesName + " x" + monsters.Length + ")", Color.White); DebugConsole.NewMessage("Initialized MonsterEvent (" + monsters[0]?.SpeciesName + " x" + monsters.Length + ")", Color.White);
} }
} }
private Character[] SpawnMonsters(int amount) private Character[] SpawnMonsters(int amount, bool createNetworkEvent)
{ {
if (disallowed) return null; if (disallowed) return null;
@@ -101,7 +101,7 @@ namespace Barotrauma
{ {
spawnPos.X += Rand.Range(-0.5f, 0.5f, Rand.RandSync.Server); spawnPos.X += Rand.Range(-0.5f, 0.5f, Rand.RandSync.Server);
spawnPos.Y += Rand.Range(-0.5f, 0.5f, Rand.RandSync.Server); spawnPos.Y += Rand.Range(-0.5f, 0.5f, Rand.RandSync.Server);
monsters[i] = Character.Create(characterFile, spawnPos, null, GameMain.Client != null, true, false); monsters[i] = Character.Create(characterFile, spawnPos, null, GameMain.Client != null, true, createNetworkEvent);
} }
return monsters; return monsters;
@@ -127,7 +127,7 @@ namespace Barotrauma
{ {
if (monsters[i] == null || monsters[i].Removed || monsters[i].IsDead) if (monsters[i] == null || monsters[i].Removed || monsters[i].IsDead)
{ {
monsters[i] = SpawnMonsters(1)[0]; monsters[i] = SpawnMonsters(1, true)[0];
} }
} }
} }