From ef78f2d0f69ac9d6f9438fbb9b939705f5ce9117 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Sun, 14 Feb 2016 22:22:24 +0200
Subject: [PATCH] Husk improvements, option for admin to talk to dead players,
 spectators or one specific player, entitygrid bugfix

---
 Subsurface/Content/Characters/Husk/husk.xml   |  16 +++----
 Subsurface/Content/Items/Weapons/weapons.xml  |   2 +-
 .../Source/Characters/AI/EnemyAIController.cs |   8 ++++
 .../Characters/Animation/AnimController.cs    |   3 ++
 .../Animation/FishAnimController.cs           |   3 --
 .../Animation/HumanoidAnimController.cs       |   4 +-
 Subsurface/Source/Characters/Character.cs     |  25 +++++++----
 Subsurface/Source/Characters/CharacterInfo.cs |   2 +
 Subsurface/Source/Map/EntityGrid.cs           |   9 ++--
 Subsurface/Source/Networking/GameServer.cs    |  39 +++++++++++++++---
 Subsurface/Source/Networking/ServerLog.cs     |   2 +-
 Subsurface_Solution.v12.suo                   | Bin 846336 -> 846336 bytes
 12 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/Subsurface/Content/Characters/Husk/husk.xml b/Subsurface/Content/Characters/Husk/husk.xml
index 137bd0eeb..47e6bd822 100644
--- a/Subsurface/Content/Characters/Husk/husk.xml
+++ b/Subsurface/Content/Characters/Husk/husk.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Character name="husk" humanoid="true" needsair="false">
+<Character name="husk" humanoid="true" needsair="false" doesbleed="false">
   
-  <ragdoll headposition="114" torsoposition="88" 
+  <ragdoll headposition="134" torsoposition="108" 
            stepsize="42.0, 12.0"
            walkanimspeed="4.58"
            movementlerp="0.4"
-           legtorque="-15.0"
-           thightorque="5.0">
+           legtorque="15.0"
+           thightorque="-5.0"
+           walkspeed="2.0"
+           swimspeed="2.0">
 
     <!-- head -->
     <limb id = "0" radius="13" mass = "6" type="Head" attackpriority="2" impacttolerance="5.0">
@@ -78,18 +80,18 @@
 
     <!-- body to left leg -->
     <joint limb1="12" limb1anchor="0,-1" limb2="6" limb2anchor="0,14" lowerlimit="-30" upperlimit="120"/>
-    <joint limb1="6" limb1anchor="0,-15" limb2="7" limb2anchor="0,20" lowerlimit="0" upperlimit="150"/>
+    <joint limb1="6" limb1anchor="0,-15" limb2="7" limb2anchor="0,20" lowerlimit="-150" upperlimit="-10"/>
     <joint limb1="7" limb1anchor="-3,-21" limb2="8" limb2anchor="5,7" lowerlimit="20" upperlimit="90"/>
   
     <!-- body to right leg -->
     <joint limb1="12" limb1anchor="0,-1" limb2="9" limb2anchor="0,14" lowerlimit="-30" upperlimit="120"/>
-    <joint limb1="9" limb1anchor="0,-15" limb2="10" limb2anchor="0,20" lowerlimit="0" upperlimit="150"/>
+    <joint limb1="9" limb1anchor="0,-15" limb2="10" limb2anchor="0,20" lowerlimit="-150" upperlimit="-10"/>
     <joint limb1="10" limb1anchor="-3,-21" limb2="11" limb2anchor="5,7" lowerlimit="20" upperlimit="90"/>
   
   </ragdoll>
 
 
-  <ai attackhumans="500" attackrooms="50.0" attackweaker="50" attackstronger="-30"
+  <ai attackhumans="500" attackrooms="5.0" attackweaker="50" attackstronger="-30"
       sight="0.5" hearing="1.0"
       attackcooldown="5.0"/>
 </Character>
diff --git a/Subsurface/Content/Items/Weapons/weapons.xml b/Subsurface/Content/Items/Weapons/weapons.xml
index 6a2794628..f9d079e81 100644
--- a/Subsurface/Content/Items/Weapons/weapons.xml
+++ b/Subsurface/Content/Items/Weapons/weapons.xml
@@ -109,7 +109,7 @@
     <MeleeWeapon slots="Any,RightHand,LeftHand"
               aimpos="50,0" handle1="-5,0" holdangle="10" reload="1.0">
       <Attack damage="2" stun="0.2" damagetype="Blunt" sound="Content/Items/Weapons/smack.ogg"/>
-      <StatusEffect type="OnUse" target="Contained,Character" Condition="-25.0" stun="15.0" disabledeltatime="true" sound="Content/Items/Weapons/stunbaton.ogg">
+      <StatusEffect type="OnUse" target="Contained,Character" Condition="-25.0" stun="20.0" disabledeltatime="true" sound="Content/Items/Weapons/stunbaton.ogg">
         <RequiredItem name="Battery Cell" type="Contained" msg="Loaded Battery Cell required"/>        
         <Explosion range="100.0" force="0.1" shockwave="false" flames="false" camerashake="5.0"/>
       </StatusEffect>
diff --git a/Subsurface/Source/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
index 233f6e223..6507992cc 100644
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -107,6 +107,14 @@ namespace Barotrauma
 
             Character.AnimController.IgnorePlatforms = (-Character.AnimController.TargetMovement.Y > Math.Abs(Character.AnimController.TargetMovement.X));
 
+            if (Character.AnimController is HumanoidAnimController)
+            {
+                if (Math.Abs(Character.AnimController.TargetMovement.X) > 0.1f && !Character.AnimController.InWater)
+                {
+                    Character.AnimController.TargetDir = Character.AnimController.TargetMovement.X > 0.0f ? Direction.Right : Direction.Left;
+                }
+            }
+
             if (updateTargetsTimer > 0.0)
             {
                 updateTargetsTimer -= deltaTime;
diff --git a/Subsurface/Source/Characters/Animation/AnimController.cs b/Subsurface/Source/Characters/Animation/AnimController.cs
index 551b0c245..e86eba7a6 100644
--- a/Subsurface/Source/Characters/Animation/AnimController.cs
+++ b/Subsurface/Source/Characters/Animation/AnimController.cs
@@ -43,6 +43,9 @@ namespace Barotrauma
             stepSize = ToolBox.GetAttributeVector2(element, "stepsize", Vector2.One);
             stepSize = ConvertUnits.ToSimUnits(stepSize);
 
+            walkSpeed = ToolBox.GetAttributeFloat(element, "walkspeed", 1.0f);
+            swimSpeed = ToolBox.GetAttributeFloat(element, "swimspeed", 1.0f);
+
             //stepOffset = ToolBox.GetAttributeVector2(element, "stepoffset", Vector2.One);
             //stepOffset = ConvertUnits.ToSimUnits(stepOffset);
 
diff --git a/Subsurface/Source/Characters/Animation/FishAnimController.cs b/Subsurface/Source/Characters/Animation/FishAnimController.cs
index 91162eaf5..9b8b81393 100644
--- a/Subsurface/Source/Characters/Animation/FishAnimController.cs
+++ b/Subsurface/Source/Characters/Animation/FishAnimController.cs
@@ -31,9 +31,6 @@ namespace Barotrauma
             
             flip = ToolBox.GetAttributeBool(element, "flip", false);
             
-            walkSpeed = ToolBox.GetAttributeFloat(element, "walkspeed", 1.0f);
-            swimSpeed = ToolBox.GetAttributeFloat(element, "swimspeed", 1.0f);
-
             float footRot = ToolBox.GetAttributeFloat(element,"footrotation", float.NaN);
             if (float.IsNaN(footRot))
             {
diff --git a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
index e7b2e5813..c47a903c9 100644
--- a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+++ b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
@@ -241,7 +241,7 @@ namespace Barotrauma
             
             float footMid = waist.SimPosition.X;// (leftFoot.SimPosition.X + rightFoot.SimPosition.X) / 2.0f;
             
-            movement = MathUtils.SmoothStep(movement, TargetMovement, movementLerp);
+            movement = MathUtils.SmoothStep(movement, TargetMovement*walkSpeed, movementLerp);
             movement.Y = 0.0f;
 
             for (int i = 0; i < 2; i++)
@@ -502,7 +502,7 @@ namespace Barotrauma
 
             if (TargetMovement == Vector2.Zero) return;
 
-            movement = MathUtils.SmoothStep(movement, TargetMovement, 0.3f);
+            movement = MathUtils.SmoothStep(movement, TargetMovement*swimSpeed, 0.3f);
 
             //dont try to move upwards if head is already out of water
             if (surfaceLimiter > 1.0f && TargetMovement.Y > 0.0f)
diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 485007862..51fc5f421 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -391,7 +391,10 @@ namespace Barotrauma
 
             Properties = ObjectProperty.GetProperties(this);
 
-            Info = characterInfo==null ? new CharacterInfo(file) : characterInfo;
+            if (file == humanConfigFile)
+            {
+                Info = characterInfo == null ? new CharacterInfo(file) : characterInfo;
+            }
 
             XDocument doc = ToolBox.TryLoadXml(file);
             if (doc == null || doc.Root == null) return;
@@ -453,22 +456,26 @@ namespace Barotrauma
                 }
             }
 
-            if (Info.PickedItemIDs.Any())
+            if (file == humanConfigFile)
             {
-                for (ushort i = 0; i < Info.PickedItemIDs.Count; i++ )
+                if (Info.PickedItemIDs.Any())
                 {
-                    if (Info.PickedItemIDs[i] == 0) continue;
+                    for (ushort i = 0; i < Info.PickedItemIDs.Count; i++ )
+                    {
+                        if (Info.PickedItemIDs[i] == 0) continue;
 
-                    Item item = FindEntityByID(Info.PickedItemIDs[i]) as Item;
+                        Item item = FindEntityByID(Info.PickedItemIDs[i]) as Item;
 
-                    System.Diagnostics.Debug.Assert(item != null);
-                    if (item == null) continue;
+                        System.Diagnostics.Debug.Assert(item != null);
+                        if (item == null) continue;
 
-                    item.Pick(this, true, true, true);
-                    inventory.TryPutItem(item, i, false);
+                        item.Pick(this, true, true, true);
+                        inventory.TryPutItem(item, i, false);
+                    }
                 }
             }
 
+
             AnimController.FindHull(null);
             if (AnimController.CurrentHull != null) Submarine = AnimController.CurrentHull.Submarine;
 
diff --git a/Subsurface/Source/Characters/CharacterInfo.cs b/Subsurface/Source/Characters/CharacterInfo.cs
index 09c967ca6..ab8e073b8 100644
--- a/Subsurface/Source/Characters/CharacterInfo.cs
+++ b/Subsurface/Source/Characters/CharacterInfo.cs
@@ -132,6 +132,8 @@ namespace Barotrauma
                 return;
             }
 
+            name = "";
+
             if (doc.Root.Element("name") != null)
             {
                 string firstNamePath = ToolBox.GetAttributeString(doc.Root.Element("name"), "firstname", "");
diff --git a/Subsurface/Source/Map/EntityGrid.cs b/Subsurface/Source/Map/EntityGrid.cs
index f4524c3c1..c0aef6943 100644
--- a/Subsurface/Source/Map/EntityGrid.cs
+++ b/Subsurface/Source/Map/EntityGrid.cs
@@ -32,16 +32,17 @@ namespace Barotrauma
             Rectangle rect = entity.Rect;
             //if (Submarine.Loaded != null) rect.Offset(-Submarine.HiddenSubPosition);
             Rectangle indices = GetIndices(rect);
-            if (indices.X < 0 || indices.Width >= entities.GetLength(0) ||
-                indices.Y < 0 || indices.Height >= entities.GetLength(1))
+
+            if (indices.Width < 0 || indices.X >= entities.GetLength(0) ||
+                indices.Height < 0 || indices.Y >= entities.GetLength(1))
             {
                 DebugConsole.ThrowError("Error in EntityGrid.InsertEntity: " + entity + " is outside the grid");
                 return;
             }
 
-            for (int x = indices.X; x <= indices.Width; x++)
+            for (int x = Math.Max(indices.X, 0); x <= Math.Min(indices.Width, entities.GetLength(0)); x++)
             {
-                for (int y = indices.Y; y <= indices.Height; y++)
+                for (int y = Math.Max(indices.Y,0); y <= Math.Min(indices.Height, entities.GetLength(1)); y++)
                 {
                     entities[x, y].Add(entity);
                 }
diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
index d4b9647db..1c5870cbb 100644
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -882,6 +882,9 @@ namespace Barotrauma.Networking
 
             GameMain.GameScreen.Select();
 
+
+            AddChatMessage("Press TAB to chat. Use ''/d'' to talk to dead players and spectators, and ''/playername'' to only send the message to a specific player.", ChatMessageType.Server);
+            
             yield return CoroutineStatus.Success;
         }
 
@@ -1267,17 +1270,43 @@ namespace Barotrauma.Networking
 
         public override void SendChatMessage(string message, ChatMessageType type = ChatMessageType.Server)
         {
-            AddChatMessage(message, type);
-
-            if (server.Connections.Count == 0) return;
+            string[] words = message.Split(' ');
 
             List<Client> recipients = new List<Client>();
+            Client targetClient = null;
 
-            foreach (Client c in ConnectedClients)
+            if (words.Length > 2)
             {
-                if (type!=ChatMessageType.Dead || (c.Character != null && c.Character.IsDead)) recipients.Add(c);
+                if (words[1] == "/dead" || words[1] == "/d")
+                {
+                    type = ChatMessageType.Dead;
+                }
+                else
+                {
+                    targetClient = ConnectedClients.Find(c =>
+                        words[0] == "/" + c.name.ToLower() ||
+                        c.Character != null && words[0] == "/" + c.Character.Name.ToLower());
+                }
+
+                message = words[0] + " " + string.Join(" ", words, 2, words.Length - 2);
             }
 
+            if (targetClient != null)
+            {
+                recipients.Add(targetClient);
+            }
+            else
+            {
+                foreach (Client c in ConnectedClients)
+                {
+                    if (type != ChatMessageType.Dead || (c.Character != null && c.Character.IsDead)) recipients.Add(c);
+                }
+            }
+            
+            AddChatMessage(message, type);
+
+            if (!server.Connections.Any()) return;
+
             foreach (Client c in recipients)
             {
                 ReliableMessage msg = c.ReliableChannel.CreateMessage();
diff --git a/Subsurface/Source/Networking/ServerLog.cs b/Subsurface/Source/Networking/ServerLog.cs
index dc9a8881d..5accd96ee 100644
--- a/Subsurface/Source/Networking/ServerLog.cs
+++ b/Subsurface/Source/Networking/ServerLog.cs
@@ -9,7 +9,7 @@ namespace Barotrauma.Networking
 {
     class ServerLog
     {
-        const int LinesPerFile = 500;
+        const int LinesPerFile = 300;
 
         const string SavePath = "ServerLogs";
 
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index 24f2594e4a96c781b48a950c90db38ff7fd574ba..f9fca93467d47ef1f6eff0a58c11fc0400d106a2 100644
GIT binary patch
delta 5541
zcmd6r2~<_p8prP*E_VXCjDiTB@G2-y43fGKFHYeQ;6xLe;%p>ZP|jS`v<yo)%4dZ=
z6up*1F&M{6U)Lcsm!X-NDUp_1*<@-hE5r9cXr=4bdiGwu_s&|s_5b#_&z`=$_jeDt
z4#&F=$1m%`cyVl4kT4hwZ9!LNFj%1jxxp~LcuaG4f7Q$j%;>DyJwIEW&KI!TYrf^J
z88>pZh0J7O>U0?;ui#P3WL~6-mf_$*um}W!9N+^4dLGQwIAeClJunx*bsrc9?#5uf
zpuIr?2n0#Mi1)rxcNoLiDfI(mbMLp|8v}NL5}sq6w(iIiV}F^Ijg^=K^@#<W(=f5|
z=6Lzj&l7tWE&jTR@wW{%-&tPZmi9J-AqF(6o4s4hUa-`|-qC(e-G!<2hW2Ty_VI~g
zjcQk)bRRu-W8oX8`-_Xi)J;B@{-l0}vm?apBCO>atbQP3xdQkg)|a5|z<YqY*+q26
zI#}_*3vX_NE(OoQei6C_M1X@R+tK<QEwzi*L-dIUz?FeEQ&Am-stoWtd|!gw;oAni
z2pt2mz^mXeh=>1HXisoIu%O)nVt%3(@5Cw6Peew0;Jyo723D{h^v7#y(A8)jg<<t6
zP>!Dn894wo>rm4IT7}vr;0vR{@C395{(aEfP&Xa?4dr{F)$kn!39xgadT(j4d%zwI
zZ4PSChm%fXVybIIWKE=hgZSe?MISdC)MJ?2Ul-IiHxtx#G}%vtHAPg9$iIr{dCd6t
zBHDnJ|9(Wt)l)cB_jfI7l0yzfS(c!q0&rRlb;kQ8z`7H08wTdUo~w>@Mk&itI)u{a
z&@RxIp`So!LOVd!wN546ihUaj$5&tvxD6}@E8!ono^&>kScX@-qf`!WA?%jWm!R)K
zLzx<!62T^@T~k^W=mA)Xiv6hQ0-geK;AQyU2ZLab2esfaZ~)v5^mawiaJ=&g^dzvr
zZh+Q+zk{#A1n>=51wKRlcBl(F82TJDsPCkN`k#mWBYbCp0yZ0I-Zs`&b$bxF-aBof
z1MtEFARm=k&>I7(PvyTB$WRRbn}O7~^WO<%U+mJK6v%*o4y1vqUNCp3%Ei{;nzW4S
z*(Gz7^-4A4q@0lz>MkB@Oh8tCMg6`mh8&;Bdg8B`lWUR>e$+}WPnP7Um22e;%#e2U
z;X&%?zyR%Ht?a-ml=D_iX~s@4)ulLU9F3QKH6>V_V6}FpgsA1crRGTH^^9E6%%M64
zDb%+e>q2?aEW@mC*PQFSq>IrkU7ri(wPWcP_An}E-S|Q~)?vNUfrXHAl&@{-VfKwL
z9OW722jI%T!JYR$Z|c}*GIs58pg&V7Wg_oQmFF!TwA}uz%BCtISZSpk&Q_^2Q`>24
zD&;(;DZ?4JYmpy`Mz&s=z(O=-KbA|?d(4TXyloB9(p>CN%&$wWeSs-bQ|k4XTp`S%
zIkvERR(pvlTrFRPcx+|$zO_d<ib`J;_p!@NRWfCb;~e6&CXEMbfpyHgnOa^aRY#pe
zF2V=PFJV{n>V~U(c^CCk-C+KRp!9gzM(x5aYTkh&HlGULVbfLbZT{NA1~xZTV`sz_
zR+5J~{J<`E*OX078<iTlKC(UIT4XogAXL{k4ss-Lhn#u+IFy&b(`nZw87FZrs@0j_
z#L(LPSi_88$E3Wji1sWrn}0*oi(PpKQcj81v@4OvQT{2B&MU5KcJY+RFt0<C4L3B)
zJ1vUnfm7B@Ez`;O1=J{)5y8SDbBq>~$=_wyLKcFM-Pv@avN+b2#V`A4$~>&A#NL5-
z<!UE;V(@*~{1}j-?=tjLT*-K@&a$^J=m_%+-1_0GhrJYb2&e%0APl~dpc3{FG}S+=
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

delta 5389
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
M0AJmC)>fnZ6O)p)zW@LL