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

Some new items that can be crafted out of Incendium, stairs can be used while wearing a diving suit

Browse Source
This commit is contained in:
Regalis11
2016-01-21 16:58:46 +02:00
parent 97b3d8451c
commit f0d7d2f26d
10 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/Subsurface_Solution/v14/.suo
BIN
View File
Binary file not shown.
Report20151219-1856.vspx
BIN
View File
Binary file not shown.
Subsurface/Content/Items/Fabricators/fabricators.xml
+4
View File
@@ -33,6 +33,10 @@
<fabricableitem name="Fulgurium Battery Cell" requireditems="Steel Bar, Fulgurium Bar, FPGA Circuit" requiredtime="10"/> <fabricableitem name="Fulgurium Battery Cell" requireditems="Steel Bar, Fulgurium Bar, FPGA Circuit" requiredtime="10"/>
<fabricableitem name ="Incendium Grenade" requireditems="Stun Grenage, Incendium Bar" requiredtime="20"/>
<fabricableitem name ="IC-4 Block" requireditems="C-4 Block, Incendium Bar" requiredtime="20"/>
<fabricableitem name="Battery Cell" requireditems="Steel Bar, Copper Bar, FPGA Circuit" requiredtime="10"/> <fabricableitem name="Battery Cell" requireditems="Steel Bar, Copper Bar, FPGA Circuit" requiredtime="10"/>
<fabricableitem name="Fuel Rod" requireditems="Steel Bar, Uranium Bar"/> <fabricableitem name="Fuel Rod" requireditems="Steel Bar, Uranium Bar"/>
Subsurface/Content/Items/Fabricators/materials.xml
+6 -1
View File
@@ -75,7 +75,12 @@
<Body width="24" height="12"/> <Body width="24" height="12"/>
<Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/> <Holdable slots="Any,RightHand,LeftHand" handle1="0,0">
<StatusEffect type="OnBroken" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg">
<Explosion range="500.0" structuredamage="2" damage="20" stun="5" force="20.0"/>
<Fire size="100.0"/>
</StatusEffect>
</Holdable>
</Item> </Item>
<Item <Item
Subsurface/Content/Items/Weapons/explosives.xml
+20
View File
@@ -18,8 +18,28 @@
</Pickable> </Pickable>
</Item> </Item>
<Item
name="IC-4 Block"
description="A compound made of C-4 and incendium."
category="Equipment"
Tags="smallitem,explosive"
pickdistance="150">
<Sprite texture="weapons.png" depth="0.8" sourcerect="112,0,16,7"/>
<Body width="16" height="7"/>
<Pickable slots="Any">
<StatusEffect type="OnBroken" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg">
<Explosion range="500.0" structuredamage="250" damage="300" stun="5" force="20.0"/>
<Fire size="150"/>
</StatusEffect>
</Pickable>
</Item>
<Item <Item
name="Detonator" name="Detonator"
description="A device that detonates any contained explosive when receiving a signal."
category="Equipment" category="Equipment"
Tags="smallitem" Tags="smallitem"
pickdistance="150" pickdistance="150"
Subsurface/Content/Items/Weapons/weapons.xml
+18
View File
@@ -71,6 +71,24 @@
</Throwable> </Throwable>
</Item> </Item>
<Item
name="Incendium Grenade"
category="Equipment"
pickdistance="200"
tags="smallitem,weapon">
<Sprite texture="weapons.png" sourcerect="98,0,11,24"/>
<Body width="11" height="24" density="15" friction="0.8f"/>
<Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10">
<StatusEffect type="OnUse" target="This" Condition="-100.0" delay="3.0" sound="Content/Items/Weapons/stungrenade.ogg">
<Explosion range="500" damage="5" stun="1" force="0.1"/>
<Fire size="100.0f"/>
</StatusEffect>
</Throwable>
</Item>
<Item <Item
name="Stun Baton" name="Stun Baton"
category="Equipment" category="Equipment"
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+6 -1
View File
@@ -630,7 +630,12 @@ namespace Barotrauma
onGround = false; onGround = false;
IgnorePlatforms = true; IgnorePlatforms = true;
movement = MathUtils.SmoothStep(movement, TargetMovement, 0.3f); Vector2 tempTargetMovement = TargetMovement;
if (TargetMovement.Y != 0.0f)
{
tempTargetMovement.Y = Math.Max(Math.Abs(TargetMovement.Y), 0.6f) * Math.Sign(TargetMovement.Y);
}
movement = MathUtils.SmoothStep(movement, tempTargetMovement, 0.3f);
Vector2 footPos, handPos; Vector2 footPos, handPos;
Subsurface/Source/Characters/StatusEffect.cs
+8 -3
View File
@@ -33,7 +33,7 @@ namespace Barotrauma
private Explosion explosion; private Explosion explosion;
public readonly bool Fire; public readonly float FireSize;
private Sound sound; private Sound sound;
@@ -146,7 +146,7 @@ namespace Barotrauma
explosion = new Explosion(subElement); explosion = new Explosion(subElement);
break; break;
case "fire": case "fire":
Fire = true; FireSize = ToolBox.GetAttributeFloat(subElement,"size",10.0f);
break; break;
case "requireditem": case "requireditem":
case "requireditems": case "requireditems":
@@ -215,7 +215,12 @@ namespace Barotrauma
if (explosion != null) explosion.Explode(entity.WorldPosition); if (explosion != null) explosion.Explode(entity.WorldPosition);
if (Fire) new FireSource(entity.WorldPosition); if (FireSize > 0.0f)
{
var fire = new FireSource(entity.WorldPosition);
fire.Size = new Vector2(FireSize, fire.Size.Y);
}
if (sound != null) sound.Play(1.0f, 1000.0f, entity.WorldPosition); if (sound != null) sound.Play(1.0f, 1000.0f, entity.WorldPosition);
Subsurface/Source/Map/FireSource.cs
+10
View File
@@ -44,6 +44,16 @@ namespace Barotrauma
public Vector2 Size public Vector2 Size
{ {
get { return size; } get { return size; }
set
{
if (value == size) return;
Vector2 sizeChange = value - size;
size = value;
position.X -= sizeChange.X * 0.5f;
LimitSize();
}
} }
public FireSource(Vector2 worldPosition, Hull spawningHull = null, bool networkEvent=false) public FireSource(Vector2 worldPosition, Hull spawningHull = null, bool networkEvent=false)
UpgradeLog.htm
BIN
View File
Binary file not shown.