From 1311a286f5028a6a29d7469f0bdbec66f26b7b34 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Sun, 3 Sep 2017 16:57:32 +0300 Subject: [PATCH] Added battery recharge docks, moved applying OnActive statuseffects to the Powered itemcomponent, removed smoke particles from stun baton hit effect --- .../Content/Items/Electricity/battery.png | Bin 9557 -> 12180 bytes .../Content/Items/Electricity/poweritems.xml | 29 +++++++++++++++++- .../Content/Items/Weapons/weapons.xml | 2 +- .../Components/Machines/Deconstructor.cs | 2 ++ .../Items/Components/Machines/Fabricator.cs | 4 ++- .../Items/Components/Machines/MiniMap.cs | 5 +++ .../Components/Machines/OxygenGenerator.cs | 2 -- .../Items/Components/Machines/Reactor.cs | 8 ++--- .../Items/Components/Machines/Steering.cs | 6 ++-- .../Items/Components/Power/PowerContainer.cs | 18 +++-------- .../Source/Items/Components/Power/Powered.cs | 6 ++++ .../Items/Components/Signal/LightComponent.cs | 4 +-- 12 files changed, 57 insertions(+), 29 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Electricity/battery.png b/Barotrauma/BarotraumaShared/Content/Items/Electricity/battery.png index 63ad87974e2f2db280a90ffead6c4dfb1d557c36..97611a87436ae4bc502af2cf59c173d464474375 100644 GIT binary patch literal 12180 zcmb_?WkVc1)9xZg7F}Ex*TuECEl{L5Ebi__iaQ00LviS$#ogVt*h0}laY`x0tvH-#-_@fYqiUNKue_US-u)b>nw}ZSF17VeogkJK$4mMY<_at&?F?)E*1&}0;lynt z0!F`yI2r=sIvL9$Y3d6CS{Z6&$}_5Fi}^(B6?)ZAjU1ZJ#4FQIO`U}&gG z8zDsXBqyYDaJG4k)3>?&BomYvG_}ojKiX2I;6Ol}Yv`x}I%Xa@y!`-&;NPsp`@nRQBWwl~5{6n5m4FE&pbKnQw z(V)K5yP*G@$nK^Zvee&Qsc!t+$r*9K>lqp@(!;&`O27MYO0cQKa5=-TurEUljkcu_ z0_|>UYsy|=GQDY%R6k^Vgs=7)Zy>wpv-Dmn;;oM=!n!Jk%nuiyzi)wpPUS?d2tzg8&G+swos z%t9pqy>`S~9F>EP9T9LcZTeymOCCCl5uyucSAh2lw*rjNi%8Z$<%C9uIl!ao3V{$t zR^nRs;sQkv9ku9rj8+-spBnuJmB3c*t<@5yB`jXnW$tykpF-n6C5t2GKpcdh94#wG zMsh^NR&`{ta9F6@<-JW{m#yaub=gx??M(Bef8QJ_Qoq=kqZj6~KXiG!n_k*PL=G(E zYK%ffUKUSi(P79Z6&KqUt_3P8u$nGO-|zmcZ(=|PQ`LqM!JzRAlQ}8UOdr_NrPmj* zP2{)-7T+q^D=GH;lsN51LY4){H{_6CpuxsgKV-$GvFN1PZJcAkOe|bJ_$0PoWA8@a zq9Fq0aAdI`(tGg%Z`}GD&zoH%)ndx>e39i>5(!_f^PkCG*YrJB(#DnGwQAf>N05-`!95WA) z5`&5}9ClmgpgF@*o0!mSzC(L>gsaw`5xmfy(Otcc_j?pWPn;$pq)D>I(tn8c>P(CN zh%tM?y-`%VeiqZ*{yi2e2Xzw{v8I!e^wO!5@An5xHm=-6bD@TM5?e~ckXS2d-;hT| zzjK^LYL&oKYg?#d>bO)rj`TfY~P9g3%z~t|>c@rGG4dYwBiA zJ11BNTLZoxe9$I={kl4lNU=Q$zR8;4c5m4oou-7pXK0zMPQ(?-jSz;E?G7h=pv1+{sk;32>e(8$n z3&=FPUBiOsdN&8FosIJ3FCJcl4kydro2Zk$7C1(Z)mrA1RcucY=?%e)o2}LjyzLP> zMurZK8}RgTL?72QXPinotis=6ZQBy93?#+EFmOZc6O^`9@(TxG>28 z|4@qscQGxyAl?v-qWh!~#WU+esn(TfGoKQFacyL_J2bOV>^;aDew2b*f#Ztp1o?$lkKP;KaF)Df7=5*pG{6yZoKs_S5%ge8>I?UK*ovUH1A^)b!GO zk<}W4gTFSS%9R(Z4^DazqxWL(|a_5sVgi(#uI0;0Tt6B3AA@TqzT z7&Z8ysSW=hC=%R{Z(ui@4Wr^vsjLLYv6mMa#{ZXUNvgW$rHjKh0hxM^qS{P}5va zw3(H-INk>{#xkJWv^e|yyocQ`Nel{~{mHfZN_hN)b8HzYYp=&X44;+iR?yO4$RkR3 zfb(o5%Q6ptI?cp`Nag-wqRvCUq1kw@Blk29BsVQBy3 z)w{Kz{>`VKQrl;LaQ^H8H?M`aR$CNqzbZ(EI~H6g^1Na@6+RB=q_YV1J}{_TuEt%~ z*$9s!XPt+P*GRK8qqYtW&(XLa%*6`Z5a1K9jsRf;i&(?C->!{@{YWM=Anz~9lOtL; zutqncu<(mLqA}7j5SVNQbOl7l>$FqwcPe2IH(~@^BTb^B)+!T2T{pi!hSoS%I?5MW zdd;34@z3CEg$m>AfFjbo+J+XQ4Nr3azW*V;?kk;KIU1l2^hpLQEzSAQcq}&Qo6tw7 z_;@QTPplk>&`JL6Ns{_NJXxBr0s3Q;uz97kVFB7Oy}kM&fiA7&4sC&sQJBFNmXM%y z+r!)OvM>zyEkc?n%sjupxoh_qm;Xq}_s_S(z~4`&c0^;`&pUR~zg7dAR?f0#g7WtK z6VxPV?!PMZi-Pe7L+ik0>rufI9GQCOu(v(NJGr0P$2#-8LKDi|p#cY?JIm3L)8kZX z>S|vdc1rX%Xt7Za7h_9Ze}Ci*qTxmCIOABCHmjp@A&}&xanf0}6U&)BbVnWNha;jQ zE=v7%{4Qd~?*3V1>UK8ep0UiY7G zMAqRAhBf6zW8YdPRUjap?ECC&Y+i<<@)M+gr_FiKArl8T(qw`J%2+Cw!wjXKt&T=X z+8tST?eG5F0E z82vc*G|yR>n8^xL6fe+z{8p2knGB7NLc!}4{Az~?V@P`0OZ>Yt*=xJUvuOp*h~ru9 zYIAl)Ss56)ENz3k;GiGb59M_wjo@og*? z6J@my1($Fm_m>_z=z+#(b#U2j6|e>E{hMk;PjM1S|yA$bxA&=^hEZtXgRo!QMq-Pt1rFp3jl%|2_OtmIK{fi$6<* zzyGaR7?!y77OoR2-=rl6I$wy(m7#;O?*=C9=ZM_<*+S?9(cg9rWiJ#$oK1Q1+)HZAP zY%8;e&PS9=AB(T^Y&om40d;?OaaP$B8!pmbdMIRHM?ii(UG%xI@QBEX>zw_HcgaCs z#|Q0~dt2hjlb3$F={pVTzFa@G{rzCzqu18Hb35ABH}aOdS5D|k{5u>}+W)UU?9nm^ z%Y*eGgSE+&*op}bqGD22751nm_b8TM-8-1~m=;04c_FcU&ekIn+gbQT&|ZoLQagS3 z9S*+S7{e=IjFQQ=EUMHi&}a_jWn5Q}F~J6)<_b#dY{-Vnq%Rqkvkgx^qH`$2xHb3n zTLn!vr~B~-ZgXH=(pepu(*|SX>s@g8+AAXWyu!^CLH9rp1bf{E8nGo=MXuXkeW@uY zh}-yGU8CbNhn}Z{kM{)|$-s}vD_M065O)RG~W_mqjhn^vkdGH}P%Al)*nh_7Ur;CAPo_*f11=Bmv(@kW3%Y#V9cRvxie z#lG74%P#oBCl!Rd%$^r~s?Z+13vuo9{iv!Tmp*~1S0^=k?WCtUUJk1TuNTxhE*&~y zKLtJRF;v%mwJP=oHolP~gKjk}g0we5oy#D0V@X5Ln`T+f_{fxf65HLs{-JT606RsB zS+)9A!f}xqO9+e3QL2IK4%9pNBs1o>WTKs7(M}&`RUp zbyDh4A%Exg_B9=ZmyK@v>TKEc5ska&itX4#!3qjOa9A6TO`K-R;Hs z^4UCQ1hrJsO94gwPPUfxh-M4>>T0q8UumK+Hb(3%(2i0~bVO;orD}NvH`@aKYd4b5 zlMK;U;=3_+BZ|DHa@}jd7ROd1tjmsvID5X49NKEU=rHO;R8<8Pr zBjHD}az$B95|w5jINj5Q_fM@#K4;NDZQg`e)0dzUIqOYeU>DnNYyKtONFk}1etvXj>|l~l4e?~M1cz)tGu1O+g^E2&YojJGyznOha+>@K2xx+ z&pX^!-$-^j{~MR1GrIsX1;6Dh8*2ls^rqqBc&mQV`W<2YHV&;fU~w?VldQ$1n{>R! zA`Xm<+;TKdLr)NK`ihPeMH(!_V2agAx#I02Pm`X!efFEeB>f?lq@@43|90v zd;v!`Z-6#^EXD$e`O&=Ri=up&VYo0O7MtJ=Lfv4qU1b_+hcfWE{C%-0*TIJrk0OVR zp9^1zNd9dj4Dk0Te;A0_Mj7RM)R=26d8r>uSI7&JJBw)H-||uks>fEq_rKCbrUr&( z5wr87F+7ZaP%D0zgGkZ~_F3!+&iM8nQpi%YmT@)=*0{_R>AOottJ$l4elDcO61a0D zd@&XIGs}-l_;iO7uJpB-6_+Kpu3&TO&zCGT zPc7EgWNl{TQF1m0aSo^x=NA&V72;panLEm zw^)M&An5e*$YXVV;eW$md-k3?-C|a79ZolCyHXZvCrZ@6Jqv+XtJajGH zcs3E1RpozsSJgx_rttS#Wo-@5u!=S&9qGL|(x5Q2C2O@&R;jQ$-VZcYqsBqzqpHxj zNon3o5hYo{{GD>(kTAl<+*~ELG?Y*X3!1BNn4RUWTcCUITAWXxDfO47V~KjJ`UkP) zi!HKl{Zh*1qn8zS!I}V?Kx&KmFh1hc^Wv^A?vf;FE5g7ralq*9oJyKN9Bk0ok!uMD z@gbLpk{j zYs?PfqM@-yoWxg$6MZ0~D?fQ729$-%=S@z~V;E^(kYOlc?wn!RiB9UvM_$jlg>?N7 z6&gYb+Id>5iwm%dKn^s6!4{>pZwov|r2XSLZ_s>wAP1XyyWH<2|wHig_n zB<~ADM(dvcwE6B-_+0+nP2!0Ph0vn$pmD~wK(%tmCxj>GVSa}uFv1`r!|{UI*faBa zhTc*F>BwU5zZ~_kn{}6wbOsFCfPEraX11RMtQOQYXbK!L?N0a6pT}yU%KEPaBbC|k z3%j#92F2BEvC(AroFs2nLPkpV+HSQ&ekt623Atr^+2QY#o627AOr2a4Ej=PJ+z);^ zdQ;4L*`A$srwRo!nq!2eUxJ&7ZypkZ#WY1m-i`u&L66V)?PP!)0+RYaXNb90PT~_z zy_x3A+qbSaYwXce*p^(c6a+ILMdy*wP(~50uDbZVYawUJ`@Od}cjNiK{bu)X!;WXq zYRk|}L!NK~`K9ug^yN^kY+-|sjOazovyE2lb~YZ`i^A@=6BpmV5pYyfNb#reC6#~9 zK7a}|th0o@LkShm40%=lDg!sA!e_k+DnS{2q)XPyi)i&|DQnDFfBb!-MChT_JY^6J zfx`TPFNJ#hY3^6@P9-(+9xlGNdtz7?M zR8bBua}m$f<+O^&2=~bV6A-)Z8&`TNRmGAdmG;p7gaW3NGI-v6r5`3@9RUe~Ec-h; z-Vtgse>z*zij!^3HbP19R{z!gv=1K_0hQu9VYRsir7!nAIRrnB(d-KKk==e*f5ex% z2%hnH5)gU^zg%UnJFd3$vb!@am=cR&v`3{7`Y=C!gkMU5ujFgB64767lc%%6^g%bG zII0}8#q(8D5*9$?Z4r`jRYV#sd%BGfwrHC-XqJ9B3&i3ZR-J7T%acxJ0}t&;n<2ne|lizryA+8hzfpLo3PYxrrzZL+;f(_7hzri@Rp7hy zg26PxR49$t3FXml0E#(V7q+W1Z6ck_faavi45FVE;}v(e7eb7oIi2AXzN(^@2l9#m zB5)t!BhvGN^L$GauAINSNE(u>P#gF$>DhP0(JzTz;pW?RmXFlD`)PvNujRforecqu z;)i%66moQ@7*vH*1`@a{1V&{Flv>-?;l3<$X@wx}SM>o22)c zm((}xw5eMwaltjb09U0cXbqFPf8c!C$$ydPoJNU=rjyCTb7il;BCcr@(B&z*Ok`@3 zDPbn9NluPMTuJi%&vm*djdLm-{4>q+uT^3vIr`gbOlkpqop+h*n zAl<8Q#FH;*AbLw>KsT{2=-B3Dqi5u!)Ge#UdzE{x)n7otw!1mK#5+XpgUUGt-826B zolRa)*&fPF??erEa7+q49k#TboP+ne1n*^0+)?7k+`XyX`NU;v=k`q;=lhssV1Z6c za%_<`+h0JtFuG!_d#ul8bsq9lT6E==ES%Jr8Pgr(hp_v@K$IkEDVd@}9v6vfRuT4( ze$u`(tjEIqj-(b!W3M-hdA#YeDi64l=i7RBR#G?kdas7NrRlX)Mrdw7%=~*-k@#%1 z$E{Eac@nbnmWJ`{iO|WP@i~2u7`!hi4IVU_RN=txwN=TW)(6 zo~fc7X=vTM&+>-EMIPgoM=1@8S_IvjRb@pc&E5Jpyg(n*Lngbtdjb$R0;R@sg`w#TZve+lSkK0kUSg9 zbTL?!u$By#5^RnoAhueE<4yD6n#n8EEdOu*vp+0ze zKNP55jyPemthXeKifQK4VZ)Dn6@y;+H4nR+3}6yYnNtoQLitSlUK^mvX7yD`iI+fY zFm7luN-o>Rf?kEfdoff73rr=@&f%;rJwKer_YaMHg}PF{2sbeV$Muc_Qaxm}i^%LB zkIr0jWl+6id6&?MEhDCRXs|ZONz&a)rx+}{5=#KGIaL|OF{7t<{a8q|EW#(hx}KtD#N=qu20$b`EV}#c&))aayDdypXs0zDi*cU8G z69wWf)|iPIYDv>yOIlL4;)9jhE90P{ zIkEad0b;g>_l9Izw5sHKdiJQKwjg`$ac9YdIiIj03dK)fU&c@^XkK0e9JBfNY;fox zK3y@T6`)8jCj-B|PCc%+Jao|_6l_S-+_2Z7B3pIs>vC;GtAx*MbJ9g|_fnFEOS(hCWu6mn>{K^o!ni=hh~* zZ__n@TomK2=rcKON$^f~2dSj@hdEABsZz1x|D12k;(VIv5#4IG;&jU)KyZf|T=wPB zYPT`L3&rhK)!@6e1BV~L z)44!W_lYewd#X$lYAprO7|Ga#=<9t65r|%rA(x-R((r2$aJJ-85HdGvzk7HUNLTw` z`WK&oH$L7M4X3+NsUW-3!QDHIQ5H5W@)xGdl^ zS7S3KcVuKgC6ei~?SJvrtze>2HFwrbuYMSbYN8~IYqi9ojjXZ;Cr6xjq!;x&n>>Pv zu7_JW#q>EZ%ug8w&=#?WO}=>UNKDz0qbmtL0^A={r36DmA{EY6!0x#PPCZ@DH{!h) z1TMFtw92l$1miL#Y!~psUVDq%xv?&j7~1ik;D_A7uO-1s9vv=cN1nNSi+E%nyjo6R0D|*x;PJ#(v1?dc5UydH;RWcFU_!bFUu6tQ754?RLe=&ay!KHPLs) zdd3?&)M9={uSd~{l{kVU+BT}dIf^I$0k`=x`B-HXSi;ds@?36uQ4A%?Bx;pi8;E+2 zjVZ32LXki&;MwWeZZLF6AE8-6j2J%m=UJ1GU^pch3Ni+SlBIFw&oAKQin^)~`aFDM z2ex$$C+N2KRwoxRGJtQ<-qM$?W(_}PWp6`9G%CZJh(%_0x0|fjET$2`2r^qXh*hk7N%B}k z4YoW-QPYB0Mu(kw{FvCsPX;vh-Zp!mK|W|CB~!*9Adx`~TP^@|wxM>_=tzj2Gg2zf z$kbdNgpvfyA}|YI=mncsyLc-n2cLyxiC-;dRJUC4C$c3@=@gTBJSOWf$4|Js)~sc{ zYirV2C@+p9S`@VwMZ>pQt_&hRh#h`hLt+a5Zrc7fp|-gY^=p*YP)Kz4NA03-e(zmE z0v<;I`mN~TYM=iW3`a*J4gdQE& z8?vDoC4d*4p`83vUx4@rL3x9?@TSM^Z#H=bq;eY>pQY5Z@0KF|KMCBYu(#Qq@U_;m&Wqdrs>yvqrpjvG|G+(kMBU?8l7^8sXpQXRAYIT7jj5+x zAE6~8#HbXuBd0-A0ae<_e~Y&r^3W_qYVDX6Ex<5jZsbkViMA$zC5+n!oA)5W(6HaN zI5rNn5~ry^F26XbglqAe@Fj{hTr$QCwhN$tM286WA2? z3JnDW;&SE#@Mf{AhEVR0GZy^^_SiFpogF);$zg&I>4It)ydZ6Bu-*E0>7j^z%WnkR z--O-MIVrF{HMl`LcHWC&C@nim+N2@q`uc~|O~~`K+5O&=M@Sum^jiLdjKK&l9(uTl z_0!jR;eA^LkW0 zZXS6~171E>{K=RQ`InP947|^O@_N3?f1+_9<%CS@97{a~wCAQejp2dgN&(rHn zw<{?7zE0M4%N$EYTPPDo$c=~T)ALTt2J5D!@N4mn5>ZDflG%ygTc~seB&I_krTzFr zM>?(?ZwOOK{w|~SPUF&|@sZm_LYSdE&QV{5A(Nw8gzeVYP7LoU#(6>3x*!^Zw`x&) zVabg1>Jm3^l1DYuLx-iY2_ZQDeEqVuklmM^(PdI;ggR;oEQT@K8jzm#qfVub3yZC z@1~FToWH&Xy)8VC;)V1*u98$4;bO!0<7+6e(ddiXjVX@{ku<9Zdv?}RHMLF zkM=*wb-@Rzk5@^(gZq8AsomcDU@Dr6uiKm3de3{YNx@gL?Gq`vyM`r!+c=ZU>aDk{ z+qnc*rN!$`OBwRVtQ}=!WBMEk!coTn0|QPc+^XDsH;@WQ;3O#&3(1WDD+PNp+2IG8 zCG*JFWR3yGldDU8-#w?{RzO|L{kJprz?&0vhn(0O6R~ZYmqD|=gR*C#Y77!Ak@HoN?sm>*Q1!Te15x(z#KmiK zlL0c>Z!t|ucm2~$T0n-VE_9d-lEIBX&NG`i!@>M^+pq9s(e-uLoXWG^HXy8EP^N$zwkY}k#@a8y!o|*Z! zD`*Ejt5i04^E5bb^L8vL_SP8UIF1DN{Vnv&ckJZ@y?a4?H*W{Uw-?Sy)F^_I4 z(gs$%U)X$}CVlxDT(Mb7{Aefnd_p6ZeZ{|2?;GfF`+KYqk; z(y|OF=|*yj-71X{_A$rLLqreVN(ZRCG@O>kORS;^)rm^3FV!&kFdjK-#8oG;u^>{q6Q`f>?Y|F;|o+*r%dl_o|}rhP$uZ z>@kFtYilNCM?%V*FJq>8gG18$GSmj<9-_0l%xpqtvQ9M?@fvf1Nng|W8>WQ(OW~|QFIZT%SFj%GrQp>DCX>-9I7W+XY^4_s zi9M=1QidNgB+LepJ7MvaFsy`2U60R%IP~3a;*no%K2D(rA0b``+xEC&eaT+5951T% z30{wcV`rfg0zLhpMz&_Kev7tNz?aN_k5v`FxZFQ@xb( zao=Cs1}mk9)0L_mvv-3=;Yz$#H8N{~0>$F$FZv8kTpES?AHG)45ob?Mhfme+*u2hI zLS8xw+)2e)$7swCI9}Dr~wb(|KVx?;K&LuH0TJaK1l-bx8eVD=i?au%PF9rdnv3vO#Q!a P_5dY$HMv@-dHDYW2Bu>d literal 9557 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 - + @@ -86,4 +86,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml index 98b5f1c6c..85e4bac96 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml @@ -115,7 +115,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs index 84677d23d..2c187067a 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs @@ -33,6 +33,8 @@ namespace Barotrauma.Items.Components } if (voltage < minVoltage) return; + + ApplyStatusEffects(ActionType.OnActive, deltaTime, null); if (powerConsumption == 0.0f) voltage = 1.0f; diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs index 377ac89c3..c27ef715e 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs @@ -209,7 +209,7 @@ namespace Barotrauma.Items.Components public override void Update(float deltaTime, Camera cam) { #if CLIENT - if (progressBar!=null) + if (progressBar != null) { progressBar.BarSize = fabricatedItem == null ? 0.0f : (fabricatedItem.RequiredTime - timeUntilReady) / fabricatedItem.RequiredTime; } @@ -217,6 +217,8 @@ namespace Barotrauma.Items.Components if (voltage < minVoltage) return; + ApplyStatusEffects(ActionType.OnActive, deltaTime, null); + if (powerConsumption == 0) voltage = 1.0f; timeUntilReady -= deltaTime*voltage; diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs index e7eb33697..ef5cfd31f 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs @@ -62,6 +62,11 @@ namespace Barotrauma.Items.Components hasPower = voltage > minVoltage; + if (hasPower) + { + ApplyStatusEffects(ActionType.OnActive, deltaTime, null); + } + voltage = 0.0f; } diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs index f63f66027..f7b527123 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs @@ -64,8 +64,6 @@ namespace Barotrauma.Items.Components powerDownTimer = 0.0f; } - ApplyStatusEffects(ActionType.OnActive, deltaTime, null); - running = true; CurrFlow = Math.Min(voltage, 1.0f) * generatedAmount*100.0f; diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs index 62a09f944..a36eaad89 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs @@ -186,16 +186,16 @@ namespace Barotrauma.Items.Components } ApplyStatusEffects(ActionType.OnActive, deltaTime, null); - + fissionRate = Math.Min(fissionRate, AvailableFuel); - - float heat = 80 * fissionRate * (AvailableFuel/2000.0f); + + float heat = 80 * fissionRate * (AvailableFuel / 2000.0f); float heatDissipation = 50 * coolingRate + Math.Max(ExtraCooling, 5.0f); float deltaTemp = (((heat - heatDissipation) * 5) - temperature) / 10000.0f; Temperature = temperature + deltaTemp; - if (temperature>fireTemp && temperature-deltaTemp fireTemp && temperature - deltaTemp < fireTemp) { #if CLIENT Vector2 baseVel = Rand.Vector(300.0f); diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs index 5d226a275..79ac3102f 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs @@ -129,7 +129,9 @@ namespace Barotrauma.Items.Components } if (voltage < minVoltage && powerConsumption > 0.0f) return; - + + ApplyStatusEffects(ActionType.OnActive, deltaTime, null); + if (autoPilot) { UpdateAutoPilot(deltaTime); @@ -138,12 +140,10 @@ namespace Barotrauma.Items.Components item.SendSignal(0, targetVelocity.X.ToString(CultureInfo.InvariantCulture), "velocity_x_out", null); float targetLevel = -targetVelocity.Y; - targetLevel += (neutralBallastLevel - 0.5f) * 100.0f; item.SendSignal(0, targetLevel.ToString(CultureInfo.InvariantCulture), "velocity_y_out", null); - voltage -= deltaTime; } diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs index 517b2b8d0..0821bbe09 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs @@ -110,9 +110,7 @@ namespace Barotrauma.Items.Components float chargeRatio = (float)(Math.Sqrt(charge / capacity)); float gridPower = 0.0f; float gridLoad = 0.0f; - - //if (item.linkedTo.Count == 0) return; - + foreach (Connection c in item.Connections) { if (c.Name == "power_in") continue; @@ -125,18 +123,12 @@ namespace Barotrauma.Items.Components gridPower -= pt.CurrPowerConsumption; } } - - - //float gridRate = voltage; - + if (chargeRatio > 0.0f) { ApplyStatusEffects(ActionType.OnActive, deltaTime, null); } - - //recharge - //if (gridRate >= chargeRate) - //{ + if (charge >= capacity) { rechargeVoltage = 0.0f; @@ -149,9 +141,7 @@ namespace Barotrauma.Items.Components currPowerConsumption = MathHelper.Lerp(currPowerConsumption, rechargeSpeed, 0.05f); Charge += currPowerConsumption * rechargeVoltage / 3600.0f; } - - //} - + //provide power to the grid if (gridLoad > 0.0f) { diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/Powered.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/Powered.cs index 9ba4f1f55..ae3b06291 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/Powered.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/Powered.cs @@ -91,6 +91,7 @@ namespace Barotrauma.Items.Components #if CLIENT if (voltage > minVoltage) { + ApplyStatusEffects(ActionType.OnActive, deltaTime, null); if (!powerOnSoundPlayed) { powerOnSound.Play(1.0f, 600.0f, item.WorldPosition); @@ -101,6 +102,11 @@ namespace Barotrauma.Items.Components { powerOnSoundPlayed = false; } +#else + if (voltage > minVoltage) + { + ApplyStatusEffects(ActionType.OnActive, deltaTime, null); + } #endif } diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs index 2ec42e2e4..9158891a7 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs @@ -135,9 +135,7 @@ namespace Barotrauma.Items.Components #if CLIENT light.ParentSub = item.Submarine; #endif - - ApplyStatusEffects(ActionType.OnActive, deltaTime); - + #if CLIENT if (item.Container != null) {