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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Source/Characters/Animation/Ragdoll.cs
This commit is contained in:
Regalis
2017-04-06 21:59:52 +03:00
parent 9330bd08de a2e21a78f9
commit 77614dfa4e
11 changed files with 90 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Items/Diving/divinggear.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
<StatusEffect type="OnFire" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg" disabledeltatime="true">
<Explosion range="500.0" structuredamage="100" damage="200" stun="5" force="3.0"/>
<Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
</StatusEffect>
</Pickable>
</Item>
Subsurface/Content/Items/Tools/tools.xml
+1 -1
View File
@@ -118,7 +118,7 @@
<Holdable slots="RightHand,Any" holdpos="30,-15" handle1="0,5" handle2="0,-5">
<StatusEffect type="OnFire" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg" disabledeltatime="true">
<Explosion range="500.0" structuredamage="100" damage="200" stun="5" force="3.0"/>
<Explosion range="250.0" structuredamage="15" damage="25" stun="5" force="3.0"/>
</StatusEffect>
</Holdable>
</Item>
Subsurface/Content/Particles/ParticlePrefabs.xml
+8 -5
View File
@@ -159,18 +159,21 @@
</smoke>
<explosionfire
startsizemin="1.0,1.0" startsizemax="1.5,1.5"
sizechangemin="0.5,0.5" sizechangemax="0.6,0.6"
startrotationmin ="0.0" startrotationmax="360"
startsizemin="0.25,0.15" startsizemax="0.5,0.25"
sizechangemin="0.2,0.2" sizechangemax="0.3,0.3"
startrotationmin ="-50.0" startrotationmax="50"
startcolor="1.0, 1.0, 1.0" startalpha="1.0"
colorchange="-0.6, -0.6, -0.6, -0.5"
lifetime="5.0"
growtime ="0.05"
drawtarget="air"
collideswithwalls="true"
collisionradius="100"
blendstate="additive"
velocitychange="0.0, 0.5">
<sprite texture="Content/Particles/explosion.png" sourcerect="0,0,128,128"/>
velocitychange="0.0, 1.0"
animduration="1.2"
loopanim="false">
<animatedsprite texture="Content/Particles/FlameRoundParticleSheet.png" sourcerect="0,0,2048,2048" columns="10" rows="5" origin="0.5,0.8"/>
</explosionfire>
<weld