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

Merge branch 'master' of bitbucket.org:Regalis11/barotrauma

Browse Source
This commit is contained in:
Sebastian Broberg
2016-08-28 16:42:34 +02:00
parent a53f7d5c1f e715f07922
commit 11b514153f
5 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Items/Fabricators/fabricators.xml
+4 -1
View File
@@ -131,7 +131,10 @@
<fabricableitem name="Morbusine" requireditems="Sulphuric Acid, Auxiliorizine" requiredtime="30"> <fabricableitem name="Morbusine" requireditems="Sulphuric Acid, Auxiliorizine" requiredtime="30">
<RequiredSkill name="Medical" level="60"/> <RequiredSkill name="Medical" level="60"/>
</fabricableitem> </fabricableitem>
<fabricableitem name="Calyxanide" requireditems="Velonaceps Calyx Eggs, Corrigodone" requiredtime="30">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
</Fabricator> </Fabricator>
<ConnectionPanel selectkey="Action" canbeselected = "true"> <ConnectionPanel selectkey="Action" canbeselected = "true">
Subsurface/Content/Items/Medical/med.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Subsurface/Content/Items/Medical/medical.xml
+61 -22
View File
@@ -55,7 +55,7 @@
<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="25" height="5" density="40"/> <Body width="8" height="16" density="40"/>
<Holdable slots="Any,RightHand,LeftHand"/> <Holdable slots="Any,RightHand,LeftHand"/>
</Item> </Item>
@@ -68,9 +68,9 @@
pickdistance="150" pickdistance="150"
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.">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" /> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6" />
<Body width="25" height="5" density="20"/> <Body width="8" height="17" density="20"/>
<ItemComponent> <ItemComponent>
<StatusEffect type="OnUse" target="Character" Health="0.1" duration="20"/> <StatusEffect type="OnUse" target="Character" Health="0.1" duration="20"/>
@@ -95,7 +95,7 @@
<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="25" height="5" density="20"/> <Body width="8" height="16" density="20"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<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">
@@ -115,7 +115,7 @@
<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="25" height="5" density="20"/> <Body width="8" height="16" density="20"/>
<ItemComponent> <ItemComponent>
<StatusEffect type="OnUse" target="Character" Bleeding="-0.1" duration="10.0"/> <StatusEffect type="OnUse" target="Character" Bleeding="-0.1" duration="10.0"/>
@@ -140,7 +140,7 @@
<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="25" height="5" density="20"/> <Body width="8" height="16" density="20"/>
<ItemComponent> <ItemComponent>
<StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/> <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
@@ -164,7 +164,7 @@
<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="25" height="5" density="20"/> <Body width="8" height="16" density="20"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<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">
@@ -180,9 +180,9 @@
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
pickdistance="150"> pickdistance="150">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="25" height="5" density="10"/> <Body width="8" height="17" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0"> <StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0">
@@ -204,9 +204,9 @@
<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"/>
</ItemComponent> </ItemComponent>
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="25" height="5" density="10"/> <Body width="8" height="7" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<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">
@@ -224,7 +224,7 @@
<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="25" height="5" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
@@ -242,7 +242,7 @@
<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="25" height="5" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
@@ -260,7 +260,7 @@
<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="25" height="5" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnFire" target="this" condition="-50"/> <StatusEffect type="OnFire" target="this" condition="-50"/>
@@ -278,9 +278,9 @@
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
pickdistance="150"> pickdistance="150">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="25" height="5" density="10"/> <Body width="8" height="17" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-5.0" Stun="10" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" Stun="10" disabledeltatime="true">
@@ -298,7 +298,7 @@
<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="25" height="5" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true"> <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
@@ -314,9 +314,9 @@
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
pickdistance="150"> pickdistance="150">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
<Body width="25" height="5" density="10"/> <Body width="8" height="17" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-1.0" duration="60.0"> <StatusEffect type="OnUse" target="Character" Health="-1.0" duration="60.0">
@@ -334,7 +334,7 @@
<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="25" height="5" density="15"/> <Body width="8" height="16" density="25"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-5.0" duration="60.0"> <StatusEffect type="OnUse" target="Character" Health="-5.0" duration="60.0">
@@ -353,7 +353,7 @@
<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="25" height="5" density="15"/> <Body width="8" height="16" density="15"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<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">
@@ -372,7 +372,7 @@
<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="25" height="5" density="10"/> <Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-10.0" duration="60.0"> <StatusEffect type="OnUse" target="Character" Health="-10.0" duration="60.0">
@@ -380,6 +380,45 @@
</StatusEffect> </StatusEffect>
</Holdable> </Holdable>
</Item> </Item>
<Item
name="Velonaceps Calyx Eggs"
category="Material"
spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical"
pickdistance="150"
description="Dormant eggs of the Europan lifeform colloquially referred to as 'husk parasite'.">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Holdable>
</Item>
<Item
name="Calyxanide"
category="Material"
spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical"
pickdistance="150"
description="An antiparasitic drug used in the treatment of husk parasite infections.">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="8" height="16" density="10"/>
<Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" HuskInfectionState="0.0" setvalue="true">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Holdable>
</Item>
</Items> </Items>
Subsurface/Source/Items/Item.cs
+9 -9
View File
@@ -1,18 +1,18 @@
using System.Collections.Generic; using Barotrauma.Items.Components;
using System.Linq; using Barotrauma.Networking;
using System.Xml.Linq;
using FarseerPhysics; using FarseerPhysics;
using FarseerPhysics.Dynamics;
using FarseerPhysics.Dynamics.Contacts;
using Lidgren.Network; using Lidgren.Network;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using Barotrauma.Networking;
using System; using System;
using Barotrauma.Items.Components; using System.Collections.Generic;
using System.ComponentModel;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using FarseerPhysics.Dynamics; using System.ComponentModel;
using FarseerPhysics.Dynamics.Contacts; using System.Linq;
using System.Xml.Linq;
namespace Barotrauma namespace Barotrauma
{ {
@@ -648,7 +648,7 @@ namespace Barotrauma
public AttackResult AddDamage(IDamageable attacker, Vector2 worldPosition, Attack attack, float deltaTime, bool playSound = true) public AttackResult AddDamage(IDamageable attacker, Vector2 worldPosition, Attack attack, float deltaTime, bool playSound = true)
{ {
float damageAmount = attack.GetDamage(deltaTime); float damageAmount = attack.GetStructureDamage(deltaTime);
Condition -= damageAmount; Condition -= damageAmount;
return new AttackResult(damageAmount, 0.0f, false); return new AttackResult(damageAmount, 0.0f, false);
Subsurface/Source/Networking/GameServer.cs
+2 -2
View File
@@ -1474,13 +1474,13 @@ namespace Barotrauma.Networking
similarity += sender.ChatSpamSpeed * 0.05f; //the faster messages are being sent, the faster the filter will block similarity += sender.ChatSpamSpeed * 0.05f; //the faster messages are being sent, the faster the filter will block
for (int i = 0; i < sender.ChatMessages.Count; i++) for (int i = 0; i < sender.ChatMessages.Count; i++)
{ {
float closeFactor = 1.0f / (20.0f - i); float closeFactor = 1.0f / (sender.ChatMessages.Count - i);
int levenshteinDist = ToolBox.LevenshteinDistance(message.Text, sender.ChatMessages[i]); int levenshteinDist = ToolBox.LevenshteinDistance(message.Text, sender.ChatMessages[i]);
similarity += Math.Max((message.Text.Length - levenshteinDist) / message.Text.Length * closeFactor, 0.0f); similarity += Math.Max((message.Text.Length - levenshteinDist) / message.Text.Length * closeFactor, 0.0f);
} }
if (similarity > 6.0f) if (similarity > 5.0f)
{ {
sender.ChatSpamCount++; sender.ChatSpamCount++;