From 987f2e228e1a7cb8af54655bd74ea0538c8025ce Mon Sep 17 00:00:00 2001 From: U~man Date: Fri, 10 Jul 2020 09:34:02 +0200 Subject: [PATCH] FIX: Manifest, plus added slow --- package/ose-v0.6.zip | Bin 83913 -> 84050 bytes src/module/actor/entity.js | 14 ++++++++++++++ src/module/combat.js | 7 ++++++- src/module/init.js | 0 src/system.json | 2 +- 5 files changed, 21 insertions(+), 2 deletions(-) delete mode 100644 src/module/init.js diff --git a/package/ose-v0.6.zip b/package/ose-v0.6.zip index 521125cef5786bac4748275098096bff27959512..c940b4bf7216fe8f2a03f2927221fb80e4952a3d 100644 GIT binary patch delta 5410 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 delta 5236 zcmaJ^2{@GN`<`#czOQ4KEi%N&z8g#SB_v4+AxmVZVnmTdGI)hbWX(Q>vUj9p zNwSqCS&IKR&N-dVx&GI0=DNP`d+z7GpZ9*>=Uw}gDPP>AWUw+tQP3gCKO*85g9H+O zDw>m@S0tbkqB^58C2SCa*u;_5h^n$g27)Pxg;2tV##@eIS(=VbYTK(GiBDwhUvDnU ze_R*BN?*h_*OFz%R<}cQ_eHt&;LiFMJ&lN?ioxygGl}DT+Y_@W*Q>0&*8}bBuS|;B z8Kqp$Pb}ejTSBy};uPUd(RCIdib^AB8hazZS;yasn9zRXezAj8MosygDMd|5s*{qP*l$)38-^6bRKinQ`kyYJD{7A*{(n`dc*Dk#i9 z5Gk%*R+~ruoVkYR4blFo+ff^dX5t6%LyzuW*N z4{o{rAvpnW7J@A*HdJzzS6!T|mgHx3Yo?dE9Xp@ltKXZe;8LG8U#~Vm?!;Qw=3Mcl z?rSYgM8vvd*}Dz>qy{kY?_S00@=;HTuC;u+CE@3(?0fj)VzaG)`YES~oye-Kjo};5 znlj|7hSZMZ(~MeeapyN3o8(fkOa+bGEgiu@`kHqG-*0sah2%eVb3`fG8S5wxu0$fH z%^O-T>g9HYL!C^1ayw z?;!J1yZSrr*4hrr%9NVsKq(D-12K}rFLW=VKNA>OiOV4h8nA2nf#yqUU-trn@GsWv{u4AM3O}>pKiCyP3MHFTcN^<$-CRP z-+kNa@;oZpz7QreeksuT<4*EN-kwUUjZ?8Sl?aU^=7yaJJmc8E>(FkZ{%DC5xX5V>raC#vb)pJ;P6KtVO&x ziTdM}!$4i{mKUYGeR;vs(dY)-{h#X(cB~9#0k={BC?z)Ta@}nNZrQ0Q2Ji;%kJ`s@qbv6jn$4r6GL`G#n7c$uGqGV>0X>B%bMGcKDk4?gZ$sD~F<*pp}sA@|0l$0}< zwDUV%Zw^xoB)+$BR!C_R=MrejUpOu4e9CHm_>uD`ymOYJvqPiTndka_&x?YkRJKZE9tvD{$F*0MWsD;iMT^)A znQ(89jd!wyjEFY*ueL@y70*!iYO;CBHaDTlD z6J2Qd`A(-UPTIGuv#?X$c;E8cr2pEmRZUL)wOo9!wWpcfu~(!78&Bm+PQ~^4qL#A>*IKu{W}WgXU6?6I<}Y6-d9SN!+Kz&sWXn+`D)kL5x!q^;^B&lZ@t@d*4CR8 zWl+n7fBb@PvZy1?*K&O>8GpW`wWGQ2T5r%F{*Dn^AwH0FWv75IxoQx zlDONXX;#a1YbgvNcOa-K$%`R;UOZWV^vZgufq`2jsJ3m;*64x6{YRP@;=zn}^XrZk zu`@0-!|^nsxXr^&CIY^fkE256uRTyZW0LtO(RT7`yU3W9nHL)-j-(d-toMVOVO3V` z!jkOmCg+qh6;G=gxz7_s3wAy16=V!+EoKTPkDhE&)BeM4V$LOPoX!cewarYP{I2^N z{8~^5#1<_ALBNrC31xtpSe$c^n)dIVV2+Rj_zB@Ttbm#lVj;>DSwZANgzZ8Bn!n2s z$4hHb;2jghLg>w8CMFh}pa`E5(8T;o83=XZ>1X0_73cq?goSz2b; zh2BA0V4a16{-7M1>zz=)MfKorMBD?J2h#OV6pm9X(D)cnZ-)7f3!7i>IG#x#6!$(* z%|*)~Fz9xnTmbex{RhF_?mID^HwCqGl}qyWvG%xq5_Ni@nyVZw4jFDOEiH>)Sq}-B z<{HKMU4IrulZ!vnd1WBC0@*L{T}(^&xP^Sm0P9-FMP7Pgt?si)Wd*2rlZCWgyxT1C z$^Oz6L!FnYC{C`w_UHAm!5zt_T1e^3_BOv}9lh;oQG@1f9ci-c>hU7cdFxYlyQW*M z$v8)|wz%6WSDQ{-7@5fx>Qx%76eIZbaA;RDK0kVGFp}=CvG@iy<6vQLz;sHyG4u2sj?CILCx9_3uhbVgk*7< z^DAG2&(#&|>pf7PtI8eD&*rbID#4Bk+_hDH6q@OI7thO3S;8Q{y{%f4dTf>@VnWye zqjV|l!%KymwCCr3e&*x%#wFq9T`!rZXi#^~TzI%-hVbhn(HiHOyygtV?d+c8+b!iF1<;O`}NF zy~}eGySjk?+CKfvCeP&-9b3)S!kXYyhI!*?2FV~3_rZ@}`&!Q5X=3HE@eI6k=Exl3 z+E2ZA^tavFqNWN%S1vN0dokU5H)7gqpOK8%)@^x)b?TmQMQ3|8CeVs5qb9k(yp)dpG%WM}<9A^Sk}ICLg>!{DKlcZOK96Z8q?2J`x+nNLw=ZvRt9s1qz;@c zRdA9cJiU8~qrT-6^$SDK!GicV$tPbmPbF_1D|blrJy!kg0@|y#al`9+?IFLK+%g6g z8z;WhMN#1ZrPzB|Fa5lLEN-LSuaa|*D0j;W#--vGzWQ|G3oKF%PBppdUI@(UKcyq> zdgQIc@_SXv3&O=2t7Rd(bv1mEmkqG-Cd~C5<#m`3B&ryU%ojV%q|;D;YvqL5se2VR zEsTCL6%%ZmCus3s+1}siEg(5W6OF1^<6F>xMtC()vL*e?wc!Px2+zo~0_UR7H#^p})yMT~t+c>e`O6ak}_b z$tFRo`*dYN7BAhst0X*pQqW!#K3#gph6=n!it6uq1uK#khxo2@P9;Sn?p)`O=lHSz z+rxuO0;Piqp8CZD#i{k*UK+^MMZP^e=xgOX(yJs9q8f>h8F4$T`AXq35bzd?|3&!eKpJiDZ5JS*+ zDH=V*9j(Zl@^UmFt<;Ajts2HYq|?M}H&4kq<~JW_Ie$@eJ2~f0-Hkx>@mJ@Xm6<{o zR{2~>k$HK;c%ya6XV|UulYD}w%Bo8rI2}1-H(;4mY4+G)x0smXduPEn!9&q&Vdb^C zRBmM0zA?Y6O`Y}jBdO0^j`GfYmVG$kP&MpbF8df$r>PifKCnxqoav9BO^`h_lA&|m z$XAo~;DOMNiTNJXC=qb$Rh4Ip+8<^qmtT8@(P|?6Gk^RBLVtjvY z@|XJpdZRmxT<-LNJWTRZ)Mw4?MH0S=pA-&wgVF1(39!| zO3ecqWA>jm@kR1dR`DUk?0f*QUrGd9Bpr z^vz4^ll30w@s8fr+drD;R+>EC?YtJL@-uC$+<$7cuEGHktJHk6w*CC;NBfkPzHf7Z=@XIB2t_q*d9@Saj!*EzM~a#@Vqby_^AoG4gXzXq zFL7m$Cryl=GWSJ4KP`Bi?+9J62>M~kHMv%n(*)PbwZJwiNjB#)GC;HFGAb;)S#O!$$@~%%DUd)32^jCe=p&m=nGW$nio=_+6z+0DFMl#$Y+H*4q*tQsanm$|Y-K0R1JY)^U0Tu;F3)%&i3XnP^1rih>9psEwiZ(y^tN>w<%a#Os zD?Wf#gfLJAIH3rMfgg&HAo61Z;8%jUK{$*clTyJwG6<`FstDJm0>C>(hzBSr!A=iA zxC}UeuM%_sN&`R%(ni*068bXHU`YvL5F+dO{cy*zcd;iwgb=lt#j*)n*=T@OhUJGS zLt>Bw$Wn&*ex(j*DZ}-J7Xn9RNC^B;hD8(?60k*Fpi&uDzgYyvlp)@Kj&eX#3F1Sl z7lZpMkOtDT7>uhx!a!RE=B<_zqKeUAO$BbL3)rU$9VDL!fu$eh*Rp{N%=Q}^IwdQ;HxSm=KR0Ia+44Uzd$$HAh&bp zeVl{b0%cv#ItR)AuUh`;O0q6v5@Di)8~CV0bYMyiZtz7Cp{a2{$k2coz)>=AuZeJy zB>Wek0Ruf9AXo#E-OJJM6OH$md~%LXcY}0w=m2;?rl5vEy9PXt4r{{3(g7@l>1+wcMkkNp1`Grhrn+40N5EtS43wzX&+ion zuQZ`UNZmgT!p=O~|IZct7Z4XxZfiPDlt1fG&hVF`|AU%wSd*l0^kk{E5iwLHmG}KD->&P(c8m-tY`! zgV+HNGsFh|Fog9L>Oq32aasuU(L(#dq8=PBkl`<~K0G5V^kDK1(_dt`t7$+yOaYt* zFfWMp_n=M&aAhQY7`Nd52Nwji25>!*$RI|KPO14+|^P5{BDWei$BPqK2^SO3B|#I2l5ksBWp>A(%u9vZVj) X3k<46_CHQ8pkV~DP^HO1@ZkABrgD=Y diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index 118f59b..0f40fc5 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -11,6 +11,7 @@ export class OseActor extends Actor { // Compute modifiers from actor scores this.computeModifiers(); + this._isSlow(); // Determine Initiative if (game.settings.get("ose", "individualInit")) { @@ -362,6 +363,19 @@ export class OseActor extends Actor { return mod; } + _isSlow() { + this.data.data.isSlow = false; + if (this.data.type != 'character') { + return; + } + this.data.items.forEach(item => { + if (item.type == 'weapon' && item.data.slow && item.data.equipped) { + this.data.data.isSlow = true; + return; + } + }) + } + computeModifiers() { if (this.data.type != "character") { return; diff --git a/src/module/combat.js b/src/module/combat.js index 0637674..e866200 100644 --- a/src/module/combat.js +++ b/src/module/combat.js @@ -19,7 +19,12 @@ export class OseCombat { // Set init for (let i = 0; i < data.combatants.length; ++i) { - data.combatants[i].initiative = groups[data.combatants[i].flags.ose.group].initiative; + console.log(data.combatants[i]); + if (data.combatants[i].actor.data.data.isSlow) { + data.combatants[i].initiative = -1; + } else { + data.combatants[i].initiative = groups[data.combatants[i].flags.ose.group].initiative; + } } } diff --git a/src/module/init.js b/src/module/init.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/system.json b/src/system.json index 8d2ea44..ddd0b07 100644 --- a/src/system.json +++ b/src/system.json @@ -34,5 +34,5 @@ "gridUnits": "ft", "url": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose", "manifest": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose/raw/master/src/system.json", - "download": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose/-/raw/master/package/ose-v0.5.zip" + "download": "https://gitlab.com/mesfoliesludiques/foundryvtt-ose/-/raw/master/package/ose-v0.6.zip" }