From 7f78582df7d167a1bd07981c97f1713ef232698f Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Sun, 31 Jan 2016 17:39:50 +0200 Subject: [PATCH] MonsterEvent spawns monsters at start, writing networkeventtype using WriteRangedInt instead of WriteByte --- .vs/Subsurface_Solution/v14/.suo | Bin 755712 -> 783360 bytes .../Animation/HumanoidAnimController.cs | 2 +- .../Source/Characters/Animation/Ragdoll.cs | 2 +- Subsurface/Source/Events/MonsterEvent.cs | 9 +++++++-- Subsurface/Source/Networking/NetworkEvent.cs | 4 ++-- .../Source/Networking/ReliableSender.cs | 7 +++++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.vs/Subsurface_Solution/v14/.suo b/.vs/Subsurface_Solution/v14/.suo index 36e94009580317b5faad5eadde8821b33f9a0859..fab9934e561e081f24b7a1192bb7cd92278c3b54 100644 GIT binary patch delta 16324 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 XeR8vRaI+kLszkg=lnR#cPd1jtx z{xfrUPPX$DB^IT2xvbc14Q)2tm8(~;BCy$kxj+nX2l6z81~40O6=8RT^MD{A-#fkR z+vP<|ir_o%i0^W*mv)F@l_Ch*?MH;VTmek7(n zzWV~{Nx&$e6EGQ&-+ITX*(}$)M{Vbn)y`x#TU%fcvWu0e>gF*CH^@+I7!9w9A)Ap^ zNQ{-DdE<`j!fil0umOcr z5K5)oj<6gbOhNc1((ghz4)`AN1cYxRl)^Sdybmw~mwr2VfDf6&18V7zj)RG9kzWgwqiw0 zye9(p0VhyR1B4@hA;>ooP6n@*Y9>6@;oyh5c>29QYP9StQaL1GJ}y67J1u5Zd;0(`MU_8ssw!U!?-qzM5Yb zUsx9o!Q2XUEW?|Q(*IyIy;=#~Qq+jC2${n=(DJ8PyX8gPdvbl4`UT4Eqb;c{QmsKW zOqx~X+AyU!Ao>5%s6+q0%@tJ>=i8*jD7$PFyGiNXunojnh#sUs)AJF&i7*r4dYZmT zd8zI1k)4Ita3tG+7JyVq8NyIt7Qj&^4cTky?rrv7>;+oBSs4-11gVcAH47zl#Jz0W zl{@W|iFM;m$=#Kg@=^7bPZzuLEZ*{lq=IgIpm(3rUcK94vpwy-thCw|Uw+*D51T96 z`uEMX9eRAtT&0=)8grF;{W)`$`L{CHt5*xJUR{ax@jqd%ccTNpXs-7|y8no|qF(u| z-QKg{k)1g+)PDM7YETyHt-_UR)X+dU=iZAii_HW zepVvsN#HL)A|NS@wi2>aH_#p$ehbI9S-Ix;xO9Bt+-Akun>^d?ZsFc;&t&RB z%Vv9zW^cE*q0(3E*}iWTqnxW=zG4pN;Kk!h2U%+Fi}bHHtU&E304>l+_<{X4O{~U6jdkLf?Bsa>4z4 zY1wgmkZ%=-qK5G%FruC)(f7tu_wj+Itsl}d>!&*+q4}K<8pC?!j9uZCr`bkE8zXrb zRh?n|z4zy7ls2CkwB}{S@Md-i7ReXw2XtR+-lJC5Fx1PWRO{>4t7d{~@AO`dYen(l zyo^iYbe)R?4n^ihf1?-!Ih?(zVixAi)GKzcNuIr`8xugyrlUGzfbKb zUtIn_-Xw+pd}{HCcoFa5$4#nwh?i2$c_WCnuI0y^UG6wBQ+zw<@uS77yH4;HKSo=6 zC~m4+$J3~4F7HY;%giuJDm8;dP6RJuWsAAu^YUg?)60wycSiF+G2a|^kpk8xE(x+U;!>I4k`gKylJU)>2eWG>{U(VweqsI%CURlRRzQre%4AT}3Y zv2G%*1Fuq(Uct0j0LUr25aHv%B47!y7YJUw^MN$t)ZFQ>uX08Y=!SAOXUiU+3m;_nVonAt8*<*rIh>X7p99&rEU^GRX<(* z7!p*}`L$pryEq;*syja(7&9JDAr~vfSlbL+_2wpRPaX?BShJ;P(yKe$K0%|iS(w+e zo(C=i<$eM10;M$nQT`|;y{LwWLvxKJM(h#eHm~P3P25pn^kS@%(pU4@lqu8z+WAkl zgY$xW%#eoLpLpQ(BQaSQ`g~@|F>6F)qj_WDdB{j(RJhP+M(KTwhV~IXifF#ZM^Ijg z8bwQAS7Sx-P+rW0`x#!!c%K_O^*TIHrMP?_*OkgNzKA&s2flGMyGzZQUEf6=4?U!Y z(V!qDl3q^dGq=Tej)ONT#rNg)>#**C0q>}t&vdmFY{NZC$qYzEs$5Cs<6FpIah_b^ zG0$$Cn{sy06RYQ~dg-8FHI(~3522hwBSd_^klPtOKUjCIca6bNxe~eCXp5Fw)o+ao z68YbF!i`Do_)?m02ix}BQM(EJyiTrhylJg3T6bgNaiBA6Z%Dc*ljOerx>KTp@wE)c z+JI57b%{0#*38?;*~oN@p?Um8`~Tfiv!A6XVG2#y&j$4WzguXeJ5BfSY%%g7zK;1? z@p07ek7kVU6mSot4jbXs!;*LoJ4G{-cp>|gzD(j*trToP=bpxj1$CTX!J3HJxm>|$ zJfoC*tHToL;xp1bDxfX7#MRT-Dkam{j^tPBE7BSR{jHRhq3o8yYAAL5gf$nPJiJ=< zMe!Kc7qlmmlFM*%@gSDR3;_0h^mO+z{`|EN$BBv8@2d5L!>IC&3 z#7D{^EvR4*-zfd0a1XYZG8(kO-W02Y8Mq!3T^?1)XDRKOV~q42cEk(M67JC<2q(VS z_|Ca!mAWK&dUVgvo@rcE{%QY6I=q61l5y5*N@<^2Eh*rDRa~~%V85!M?^83GQrDZY zVz7^IVw9fF8&hJ1>ZG=t_+Qx~VlVSa^p{TdSf`_Hr!#NwYnR&d=**P|x{AmAwh@{E zSw9D|F&gI)J_{Z0-pteCdT4D9AH2TcJ(a1!Ftp<|d#?(1IO&|a9h1{cww=Y@zM}KP~H$*LFwPti$n9W^euJ93+m*5xvD#Mi0_~6JQ)RH2QwG8n#!m=8%2BE7) z{%OL5xp!|q_k^v{e{G=lscJZ_ei-)VS%HmyYVJ%5j#R?g4q~aSKb=e04J!FmPoRoX zMgUd3Ya}@TG3EVU9qww>V_WLJ2dig}+)eFQuy88=%!*@cD1EUppH7|8W2xo|!{uLi z_VVMZZx-JtX_vS-iw7_Y`KOsC(%!;?O?wVvro|p`xSYoGE4_t7jpkvqPruVMF8g@x z;EZ0wpJQc5IEP5-b~TOCFYs<`S?#h>^;Zo3xg1AygR0;!8gBa6^YfkiIM6BZ%GYobBF3;hJcRS)}N?U@T$7BtcGiJq6LdxUgV&bQ9Qx$fmF4I0}glF`R0CHD7M`MXSHT`0M%nlyrHz_)m1e0sCwSEC;0Xg1Om_BfbZ? zB-4P$fR(^e;HG<#m|N{dWQ~-xpC$1gQVHYsv&`SL8ySqR)j zx`xOD<(sb|w7JZeza*U3zHJG=P};ZHAbC%$%XhP_7$%xzIe5Oji#CL>Q#0>&1|X` zs`C2Bpvzr(D-oZ`kF(0P%0kxi1Vs85@FDOK@GrI+NpG%k`eLanq{udL01OZo0Hq2JxBX2 ztvy>!UplnE7&FoD*}xAA;AD`H?R2@V+9co!^z&NX!kwr(O)igvs8dI{!K98VH*)Gq z(87-D#yDBF0V+dq)rl||2m#!6X-|W{bQ49L)M1P*@E>;jE~y#x#(thko=Z^kk1VP9 zRj`iuR5g~d?v&m|-CZ_EV+Ndp?XLbkv#9qYnj4Gv1iX*MsYJG|0Go@cwmch**!IEZ z=w`A+C+cqLVRF+;RgY-cn?Isqw~AP0SGD9`QEb<8HQ_Pz`Hb3)RZZH|Py3oWFI9KY znwhGD4lYyUMOlAsxFXVG^eSC=nrRCZ>a1(0#OXd-m?}J-^dojEdJ0}z@y02kGxjQsBqa&|siN3*h?8JU?RD%7Zf^NwN zMu|aKu4y1zT~!>|(A7U{=}e{cYOM{MT$@w#grhmV+z|3Ss%Z@xKxNRI6CcX30|oBa z+Smu9n(3+|lqJ$sO>5MwhixJ>IM(){ttakN@@+$)%W<~Re!b4HwY0Uu=fU*;qxx(* zv{z|KQ>wK~-gt1FPW!cL-vMom@Ql)n70RjBIJtD)MSZF@2g{}O2o^)GkMzN`S=R@Z zCBpuee`DSzZgc1j7@gRQDs~>waPDg93xwj-=V5OXq=Zq;93`HT?lxRB>m98%n?va% z>;ouimzhA1gy?@luj)TbXv;g=ZRCDKiD@zkyUYh{E_5d!|72$p@OGDN7P>dymM2~d z)m5d@G?bEMT(&Miu5G4m3jWD%a@ozMl@U6&iwDb<4wyjNjs1#e^Th5*Id6(JEuNg0 zv3K-5tYb4)xyo>PD^dbz+6Ep(CxXF6V)kn>lpU(~u067tP8Ac(*5bW6`YPrKE_wLW zfPXEoJeV)fH~LUXBeNxaF<0-e6)v%dIPRq7_waBU@u=R6wWRZLj!;92oQqMRs&GAx zYRYk}d82qsBJ~t1%63elDl$T-=714J@6OgIlXDCR!=gv^Va(|tM{62%lZzpqVauj; zOAn{P$yS0>UYJS9hXLelrYDK2=29D58X33K?FaO}mCf|&tij&cex=Wj+eERS-_g%@ zXlGfHs<3Xv7U(`ZwHP15%=(PWVxp_Fw1P1^IM-UJ*}kD~r5dMg%2IVpOC_5DEHYZxx|;K|j8x~azhH^QlRG1O%Cs?KX4CPf@Qozx;NN-_7_lTI zWe366GauB$sA9U_Pvqq3C5*N|sCN>b3iN75b7$&7B50|8ft7Vt9c9aOUe;SxDvR|9 zM!8GWQ`UkITp^+v-S!S`dBk`;CVSeL$>YZsOnPYijO@{quD?tjojdvgI{dKFmc1w$ z(R3;qU>NGO{Bh&+>3)sJ(X?es06QovnN!wBRa%eEA3e5Ue7>yZ7IjXTG;7NE(GSj` zV4vQG)wUn|^JV=-X;Hq>nbICN`qIJ2j62!O*99_Zm<9z&QE1S!@SCk_cqAQr*l<&W zr}dz^Hh#H}T(@QXOgAmZK-upZiL<6op`w%49kqYn?QaZpL_wK-fs9|P&&crfy9Zv= zd4H+q@%f2kXN;ibWqK!f`rX;rGiPM~Ov#3~EJ^KF>HQN#mvKRKl6K(@aF&2A~yPm0F< zVo^H$q|uHBmgtcY@pYX+P$ieyrm{P~ehS^7^g2m?h0=dq()CLs*OOTOgzDNOEly69 zjMt^TER@r@7qKUdwzPYu(S-H;Ax?jL(nzT7a!=`r{7=)W9K<6K&-lsQzkjk3XxyDU zVOrMsSp{WNRId4_>7BC5=F(`*Kx7sm^T+9WT{<1^Z)Bj(jBYx9!=tE#rFS|tGx-xjVO4ke8l|i zS|Otg58$G#Wr2FsV$Ta!u3u#|X0aMVWeZf7=-^QgHlX}ebATA|qP`VpgpD+x@D-_( zRZ^~+S#r^h5qTT+BIfg{t+jP;9xn*X5=lPwP+ZwAO)1-?D`l^125tS+ks&fF^j&t! zFIN*q;+yIbG}O^d5=qDp{?aSR>bboPcYg_>M?Pwxz-#^XcNnza}O&{I_JYBP0s7^ z{$+hMURDJDBpi`0F)He3wfs+HZ0z85oJwU+k(&bebL<8yr%6+(o zT<7Xx>p|ibZ}#sUvI2v$7u&-ma~~(kcFMm;-)%HHjyC~UcU~9HMd0cQ6!M}u+4p;% z=)29-#0h4MQR%_}$KsnX_aoj!#h_#5*fQn6rjH`elcr1T)r|#=O1-M{hK)e<4fKAu zyN=%bn(1kEWIlemu}EI8?X?@p!1Pxt`AY z3D#OV#9NWzhZO8}|5uDxfbqV@s7W=5q@VZ7ADPLfC2D!EDx;MYcaJ`U!mIU=h7+-K zn~Hgri`gP+x{OUi%2*n-gEyod_vpO?@Wb8Of3goBOxGLHp{bI4RCuz`z+}^T&^`Pt@DT2KAGq{T_b?h((VcowJ9`kZicmv}w7u zhl!MNx3P;{k6STxD9;=~lQWHDw6?(Pi3=_G&jU}xLC3AZu71=Dy78m>XwLzw1s!@u z*ZsLxz1Hecjwhk}x~EDWv&wZBlmna(dybd6$M-5vro7oKmGZvhhv?9JV<^4zn9&** zFR$3?tH%snCTKjHa<=OD-G&)Odn@q6gSbBM-1jata>%oVdnm8k5hHR286PrV39q8} z`x{N@wKaO9h+8w3JXT(N{Zh4FHF!40lm=@&ktBNwy2f69Oi*q`T#RdkMpWg?`)1EZ z-pTpj@d3+z7twq2__)N?ZQHeS|KwIW_(5>4h69X%e}n2oU%SZ3%Ys)w*4MzI+`bHx zyLAn&jwSbT#a$Z#gwm(VF{sCVZ1m&_%SBaHR-~`Y;I$jT_p7W-$j$6nEYOaLu_xUe9G&yS%$KLY98&_G_=1nmM zP;_4m_=4d^GTVE7uhrQJ83|kVk)=$@Mvo zO0JkzG=8n%;B@h{p6q+Y5k*CW9|?3gXdJ|VkRyf8*63lP&)h z((;@!2X`lXbaNdDrV)=DfK*2iD2wrTm5!8PIY4F6{=uYi8jlgM{O4i1^)DrVdXv4o z+PXx0&syz#S z;e_!wlX9R5%G|-DMb=qk6Z4il)SPM}ppuk}##^}L{6e2dm`o9`j5AlO^!f>hLpWxc zml##`b7(?aXx0Q%{ACrGe68&;F~IR3n8Rt{5f&x#ou-CuPoiT09a`_`O!;jb5#qa7 z%~NcBQ3wvlvV2B&s%Ymh1Wtkvft`27yI=0XZ<#C5?`2qa4}_V?D)DjyYsEGzRirdB zzqZrbdvOMRrG*hMh95AOGRpr9zngUR$A)TN6SD&E>#(Fa*FnDMgC>S1e=C;hoIsSH z7iU(ewBUk{o!u^s-@FGMVPfbJGuc65Bdh@;=fBM$sN{Pbdd+EJF3O~mwLFS)a|}(y z&M|Q}nD-nM>#Q=*nUwhwhETg?whUaKdmJ6=V26|#sAy4YcPue!!K;pBv9`t>6;3Jp z9U+wbl2t$n#~cY_YnEd`V{&C!I8Xb~(VbI4w1pLO94-ed{;CG}k}dpX^OXtXl1jr9~A5<0GlbFAiK*kWsI3>9}U(?qV<@nLJ)`m}}Va~fxs z{a*)ZOxf*t%MBibQO(sNG6#(d{R!0)b`eKDddKRv*#(Lkn{$b|sIY!hM#T4t`{9 zqW9WbU8wOHFqn>?Sg+D|A6cFs(gf1*_4>oG&u)LQMp2`~I4S#l1P`X9Jys;G*<&Tp z(LX~`S3k9OVhjCKyB4tP7K|L9TSLTiZ(H$<-ailH_Z)j8G|m$xLrx=82S z%K3j1QurIZNn3=r3h4YkD_-QBw|XfwsE5@?ynDql1)H!HMo((+tUZEa6-yIQY1W!x zN>8*R#gbE2yPpy87i1HVEyqsXyJ01KcaYUOg>s^eJ`}LS!Y+BE#l_qsR_6x3Dr-C) z{n)x+dbE}l{kG+<(|^~uti?Zo-UwMZp3WV>oW!^! WD)jk5)Qy=SuupAk4e+*50{;hEI2iK) diff --git a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs index 06b255839..a9b3c1157 100644 --- a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs +++ b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs @@ -953,7 +953,7 @@ namespace Barotrauma Vector2 targetMovement = character.GetTargetMovement(); - Vector2 currPosition = prevPosition + targetMovement * timePassed/1000.0f; + Vector2 currPosition = prevPosition + targetMovement * timePassed/500.0f; return currPosition; } diff --git a/Subsurface/Source/Characters/Animation/Ragdoll.cs b/Subsurface/Source/Characters/Animation/Ragdoll.cs index 217bce765..e5ca45086 100644 --- a/Subsurface/Source/Characters/Animation/Ragdoll.cs +++ b/Subsurface/Source/Characters/Animation/Ragdoll.cs @@ -827,7 +827,7 @@ namespace Barotrauma foreach (Limb limb in Limbs) { limb.body.LinearVelocity = Vector2.Zero; - limb.body.AngularVelocity = Vector2.Zero; + limb.body.AngularVelocity = 0.0f; // if (limb.body.TargetPosition == Vector2.Zero) // { // limb.body.SetTransform(limb.body.SimPosition + diff, limb.body.Rotation); diff --git a/Subsurface/Source/Events/MonsterEvent.cs b/Subsurface/Source/Events/MonsterEvent.cs index 3f2d316b6..3550ede4d 100644 --- a/Subsurface/Source/Events/MonsterEvent.cs +++ b/Subsurface/Source/Events/MonsterEvent.cs @@ -25,6 +25,11 @@ namespace Barotrauma spawnDeep = ToolBox.GetAttributeBool(element, "spawndeep", false); } + protected override void Start() + { + SpawnMonsters(); + } + private void SpawnMonsters() { WayPoint randomWayPoint = WayPoint.GetRandom(SpawnType.Enemy); @@ -63,13 +68,13 @@ namespace Barotrauma { if (monsters[i].IsDead) continue; - if (!isStarted && monsters[i].SimPosition != Vector2.Zero && monsters[i].SimPosition.Length() < 20.0) isStarted = true; + if (!isStarted && Vector2.Distance(monsters[i].WorldPosition, Submarine.Loaded.WorldPosition) < 5000.0f) isStarted = true; monstersDead = false; break; } - if (monstersDead) Finished(); + if (monstersDead) Finished(); } } } diff --git a/Subsurface/Source/Networking/NetworkEvent.cs b/Subsurface/Source/Networking/NetworkEvent.cs index c0d4e3a5e..17e22e8d7 100644 --- a/Subsurface/Source/Networking/NetworkEvent.cs +++ b/Subsurface/Source/Networking/NetworkEvent.cs @@ -125,7 +125,7 @@ namespace Barotrauma.Networking public bool FillData(NetBuffer message) { - message.Write((byte)eventType); + message.WriteRangedInteger(0, Enum.GetValues(typeof(NetworkEventType)).Length, (int)eventType); Entity e = Entity.FindEntityByID(id); if (e == null) return false; @@ -182,7 +182,7 @@ namespace Barotrauma.Networking try { - eventType = (NetworkEventType)message.ReadByte(); + eventType = (NetworkEventType)message.ReadRangedInteger(0, Enum.GetValues(typeof(NetworkEventType)).Length); id = message.ReadUInt16(); } catch diff --git a/Subsurface/Source/Networking/ReliableSender.cs b/Subsurface/Source/Networking/ReliableSender.cs index c535f1a4e..3bd660632 100644 --- a/Subsurface/Source/Networking/ReliableSender.cs +++ b/Subsurface/Source/Networking/ReliableSender.cs @@ -188,7 +188,9 @@ namespace Barotrauma.Networking.ReliableMessages sender.SendMessage(message, recipient, NetDeliveryMethod.Unreliable); - idSendTimer = Math.Max(recipient.AverageRoundtripTime, NetConfig.IdSendInterval+idSendInterval); + float roundTripTime = Math.Min(recipient.AverageRoundtripTime, 0.5f); + + idSendTimer = Math.Max(roundTripTime, NetConfig.IdSendInterval+idSendInterval); idSendInterval += 0.1f; } } @@ -246,8 +248,9 @@ namespace Barotrauma.Networking.ReliableMessages receiver.SendMessage(resendRequest, recipient, missingMessage.ResendRequestsSent==0 ? NetDeliveryMethod.ReliableUnordered : NetDeliveryMethod.Unreliable); + float roundTripTime = Math.Min(recipient.AverageRoundtripTime, 0.5f); - missingMessage.ResendTimer = Math.Max(recipient.AverageRoundtripTime, NetConfig.RerequestInterval); + missingMessage.ResendTimer = Math.Max(roundTripTime, NetConfig.RerequestInterval); missingMessage.ResendRequestsSent++; }