From 7125780fe46c5a5a8bdb2b2fb8ba65a315c9221e Mon Sep 17 00:00:00 2001 From: "Aaron C. Meadows" Date: Sat, 16 May 2015 21:55:58 -0500 Subject: [PATCH] Squashed 'MonsterHitDice5e/' changes from b3a8461..a62642c a62642c prod-MonsterHitDice5e: Updated prod version of MonsterHitDice5e at version . git-subtree-dir: MonsterHitDice5e git-subtree-split: a62642cbba0027a7facdff369ff5a8e0dad614ed --- AaronDebug/.AaronDebug.js.swp | Bin 0 -> 32768 bytes CharMod/.inlineparser.js.swp | Bin 0 -> 12288 bytes MonsterHitDice5e.js | 65 +++++++++++++++--------- TokenMod/.foo.js.swp | Bin 0 -> 12288 bytes _Others/HBPowerCards/.PowerCards.js.swp | Bin 0 -> 16384 bytes package.json | 40 +++++++-------- 6 files changed, 60 insertions(+), 45 deletions(-) create mode 100644 AaronDebug/.AaronDebug.js.swp create mode 100644 CharMod/.inlineparser.js.swp create mode 100644 TokenMod/.foo.js.swp create mode 100644 _Others/HBPowerCards/.PowerCards.js.swp diff --git a/AaronDebug/.AaronDebug.js.swp b/AaronDebug/.AaronDebug.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..b4bdbc45a293c4b2f2ee9f170314dc12e19c1af5 GIT binary patch literal 32768 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 literal 0 HcmV?d00001 diff --git a/CharMod/.inlineparser.js.swp b/CharMod/.inlineparser.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..8908d49eba1c92470034d98bf8aad322ce2d88f4 GIT binary patch literal 12288 zcmeI2K}*~~7=}mbB?oP(f<2CFVH1#KwFN<0Z0%_&f)w;B<0k8-Y$jn6ZAD^l{S*BW z9(rldJ+wciJ@*gz&g`zNi+U_r-oTS#X1@KtZ=TzdIcgnrcI8I+Qs8-FU&H6oFCmmN zxel{L#rcPFym8C8lc;X4Z`qhyy10=rDorAnHon^4m3amG(ZD1Km#;D12jMbG(ZD1Km!lZfQp6Km>1#_*zf=2 z|Nnm;3-KF#2VcNvZ~;C712o9MTkr~OgB9=$EP@5_7dd}|AK)AK3S6BB=!q@U01eOp z4bT7$&;Sk401eOp4g5<3bscO8&%M0ov7egQ&b=CVn8>ztH^w{e^0>WKUiw*i91bs& z8#{OLY0p0l`^s&uHYawQL2xd{2~AR+7;W>XJ?ZjPXGJ2H+ilrUMcN3Yi#=6FqBi1k z?Kiu9Rc&TTS*qitx!OC?-73X8x^S6mn@&h+8?FQU9?!x|75;U+LA2)$JCKJVvZmUf dXcRxSb*E1Y0oN%eqtU2s&fqHl*+f?;as{Q@mi_<$ literal 0 HcmV?d00001 diff --git a/MonsterHitDice5e.js b/MonsterHitDice5e.js index 51498c94bb..feac24735b 100644 --- a/MonsterHitDice5e.js +++ b/MonsterHitDice5e.js @@ -2,30 +2,48 @@ // By: The Aaron, Arcane Scriptomancer // Contact: https://app.roll20.net/users/104025/the-aaron -on('ready', function(){ - on('add:graphic',function(obj){ - if( - 'graphic' == obj.get('type') - && 'token' == obj.get('subtype') - && '' != obj.get('represents') - ) - { +// TODO: Add rerolls on copy. + +on('ready', function() { + "use strict"; + + var bar = 'bar3', + hdAttr = 'npc_HP_hit_dice', + conAttr = 'npc_constitution'; + + + on('add:graphic',function(obj) { + var sets = {}; + + if( 'graphic' === obj.get('type') + && 'token' === obj.get('subtype') + && '' !== obj.get('represents')) { + setTimeout(_.bind(function(id){ - var obj=getObj('graphic',id) + var obj=getObj('graphic',id), + hdAttrib, conAttrib, bonus = 0; - if( - undefined != obj - && '' == obj.get('bar2_link') - ) - { - var attrib = findObjs({ + if( obj && '' === obj.get(bar+'_link') ) { + hdAttrib = findObjs({ + _type: 'attribute', + _characterid:obj.get('represents'), + name: hdAttr + })[0]; + conAttrib = findObjs({ _type: 'attribute', _characterid:obj.get('represents'), - name: 'npc_HP_hit_dice' - }) - if( attrib.length ) - { - sendChat('','/r '+attrib[0].get('current'),function(r){ + name: conAttr + })[0]; + + if( hdAttrib ) { + if( conAttrib ) { + bonus = _.reduce(hdAttrib.get('current').match(/(\d+)d\d+/g),function(m,die){ + m+=parseInt(die.match(/(\d+)d\d+/)[1],10); + return m; + },0)*((conAttrib.get('current')-10)/2); + } + + sendChat('','/r '+hdAttrib.get('current')+'+'+bonus,function(r){ var hp=0; _.each(r,function(subr){ var val=JSON.parse(subr.content); @@ -34,10 +52,9 @@ on('ready', function(){ hp+=val.total; } }); - obj.set({ - bar2_value: hp, - bar2_max: hp - }) + sets[bar+"_value"] = hp; + sets[bar+"_max"] = hp; + obj.set(sets); }); } } diff --git a/TokenMod/.foo.js.swp b/TokenMod/.foo.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..0d9efaa66caef2dafc9be2e179ebd68ceebaced8 GIT binary patch literal 12288 zcmeI2L5tHs6vt;pgd*#T9z;*mdYFX9rn?G4mmbuE^sp-8?qw}9O{Q(SX{IDoYmqAG z2hpg-jFk-aEVJt;jN3{E*cj_T#wTpa!!M2)`dJ$IdBlIH<9Ms--+IvT zAL#>??C8+%Yuy+v%epKRtq}ntaGbz8yS}yAwDGI8D!+JP_xKiy5CI}U1c(3;AOb{y z2oM1x@ZS(Km>>Y5g-CYfCvx)B0vO)01+SpD@Z_w zjJ;aN`~Nu>Y5g-CYfCvx)B0vOImB7MXxZA9f|5O&Ng3(KrJU|Si z2vjnagm;G0I09c~3s3knF6y(Pt_yxo^I#}b85ouFzD}_q(?Pbs*|oOTf~z=F{CPfE z=5$w^KUOXHSl`A#A!{PXO1PzA)OYNPTUy$C-saeMzc+Hk?_z{^q>ezM2vN25w@^wp zi%c+d@-5A7;bkXq8fSwBK4&*7F^y~zN5=6V&+0z1;~bi9AEuhba;{S0*#pIW6uL#h zPr?XC<-91ov=Lmm`^~P!l5aUD9w^6d literal 0 HcmV?d00001 diff --git a/_Others/HBPowerCards/.PowerCards.js.swp b/_Others/HBPowerCards/.PowerCards.js.swp new file mode 100644 index 0000000000000000000000000000000000000000..c25cfac7f9840d2010631302aca538aa3091c395 GIT binary patch literal 16384 zcmeHOO^h5z74CpTyaW>hA`%x=ZpUOM-kqPd*A{D=sON8Y(9F(iW_FEZhf&XT&2-y6 z-9vZJ{>0w+jC??F;t&pi2pl3oBn~+QaX>`;NL)bSzzs!0iue-;4*Y+wy1J)l)(&uu zx}|To>b+O5s=luGs=KzgU)ZfT*`?eC1=mLuMSZ8cbMuQe<-|`EMb|yo$&I;gxcffo zA99trK5(6fC==qB<{ajIZ;%&~eA~6{)k0p|uIGELz~r8v-z;sr``jz*p5fS^||kM1lQr1g}6l!26il!26il!26il!26il!5m! z1Ht5^au4%+pPb|K^7kVPzyB?-4Jp5|p#PWDm!$j~3;KUb{pY3p?FIcmq~4YCk{m!Z zj=xL&HK~7XLH{?YzbW-6<%FX4@0W5Mafr)U&`WXpD`g;MAY~wBAY~wBAY~wBAY~wB zAY~wBAZ6e^$$)Ms$|o?huhEM#UXG*p|35#WC_e>W0fqnv8o)W=uOC*Fp95b7z5r|j zE5I`Fao{hf6y+Dd%YX%(0)F=)MR^aS14ZB|;0H^JVgQc;ub)&D8@LVZ0*?T{e++#AZvx*3z6E>*xChw4P2dJl z0iFVW^Z`ZrI&cI$4_pGC1pf3W<_mlqxDR|5$N_&mp(x)2ra%r@0iFbYg|mfU0jYd3CU9?aC(&nEk9)lXAoGflM#ku z1nAPVhCzl5^LbWoSG8`HZMUvf+hwg?VOqPbUB_D5(>+!nIj+YIbnk0$;FMpuBu*U zxF6<v2Ra3=1)9)M#Rnt?&jUlD9A@~a=?7owqR8#6helIwwbDqffzsB>NxSCO#7ZJM`=7pS;dhL|wOUPO>nO;3IdduLh0BScyXW?A<={M{hIv5dqDr-`YU46n#@ zyhvbq=SX%(&Bp#HhtK#Z!{y;<#awdQsQ{RZBYC*yah+diil4yK;N+~JS~)|j$@ zKA!l@au_msF!QzD(5_e8y>hG3YQvjoopeX;$s5vvhYf%;-L{br5HT!F#sN0XnLBwO zd*OY2s6*_OhwhZ^>(~w_^r7N_K2)TB44F0-op*M&w~<#nz4}%Iy!6VOTDwW}KQ`i+ z0N-@?nKK=858+}nJ-`Ovp9Y**uq}s&qwZ|BuJyECt*g=eAIhdlbEi!(ToJy>kuLRc z5fQ0VKXAuPY>0m7xV+Qpwwk?av(>G}H!4(VjRrd1tXC@4t=>+%@j&&w9Qy-qeVdhA zTebSePFw5NTU$!J8gtv8J3yooA<@Q<6`5Rj^aubiv+cgNvsD&elp|Vm2+G)9P3*Hi zJt^P`f;N9=#MklDaHq7h#(j{}u(|DyGAdT^IR;1NsplaOx>$J`dV<0OP3+reSV}&g zOc)u@#Jyc9hB>oc9UD)MHFQ5<(}|%6+(3SrZ$QeOQ1@RZK)dJR;^g!#_c)vSh@$_67k8LoY?hmU92GufFYbLUPb z_v~}oqoXX8Dtmers|U+dWWQM!g=4I>$BNbrJe(n-!bot=%Pehg{G zpkw%^<