From 09009edbd751e3220a82a78efa4e44f762fe174d Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Fri, 17 Jul 2015 19:18:32 -0500 Subject: [PATCH] add weaponlist search, improve stats in planner --- mhapi/model.py | 6 +- web/img/Blastblight.png | Bin 0 -> 2133 bytes web/img/Dragon.png | Bin 0 -> 1483 bytes web/img/Fire.png | Bin 0 -> 1865 bytes web/img/Ice.png | Bin 0 -> 1009 bytes web/img/Paralysis.png | Bin 0 -> 2014 bytes web/img/Poison.png | Bin 0 -> 1527 bytes web/img/Sleep.png | Bin 0 -> 824 bytes web/img/Thunder.png | Bin 0 -> 666 bytes web/img/Water.png | Bin 0 -> 1425 bytes web/index.html | 27 +++- web/js/common.js | 67 ++++---- web/templates/weaponrow.ejs | 49 ++++++ web/templates/weaponstats.ejs | 40 +++-- web/weaponlist.html | 285 ++++++++++++++++++++++++++++++++++ web/weaponplanner.html | 42 +++-- 16 files changed, 461 insertions(+), 55 deletions(-) create mode 100644 web/img/Blastblight.png create mode 100644 web/img/Dragon.png create mode 100644 web/img/Fire.png create mode 100644 web/img/Ice.png create mode 100644 web/img/Paralysis.png create mode 100644 web/img/Poison.png create mode 100644 web/img/Sleep.png create mode 100644 web/img/Thunder.png create mode 100644 web/img/Water.png create mode 100644 web/templates/weaponrow.ejs create mode 100644 web/weaponlist.html diff --git a/mhapi/model.py b/mhapi/model.py index 3799710..8eed700 100644 --- a/mhapi/model.py +++ b/mhapi/model.py @@ -312,7 +312,11 @@ class Skill(RowModel): class Weapon(RowModel): _list_fields = ["id", "wtype", "name"] _indexes = { "name": "id", - "wtype": ["id", "name"] } + "wtype": ["id", "name"], + # subset of all data that can be used for searching and + # not be too bloated + "id": ["name", "wtype", "final", "element", "element_2", + "awaken"] } def __init__(self, weapon_item_row): super(Weapon, self).__init__(weapon_item_row) diff --git a/web/img/Blastblight.png b/web/img/Blastblight.png new file mode 100644 index 0000000000000000000000000000000000000000..2503fc832e748fe84e0dd87fa4dffae7b536fc03 GIT binary patch literal 2133 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 literal 0 HcmV?d00001 diff --git a/web/img/Fire.png b/web/img/Fire.png new file mode 100644 index 0000000000000000000000000000000000000000..5cc90b57550eaba1589864b7a7b3233f3d95553d GIT binary patch literal 1865 zcmV-P2e$Z$P)C0002GP)t-s00006 z2M7iS2nGiT1_uZR2M7iS2nGiT1_uZR2M7iS2nGiT1_uZR2M7iS2nGiT?@c8Y3kp#l z5P2#Udny;mK_CVP2(&vLwLBi+Nh2~84L}(Wi7pt7Fc_FK8lW~CrZ*g_I2>Ie6Hgrx zzCIqqKp-O!4AMj)ZzmMxN+eq$5o{(EWh4{ZMo6blLu z3JD7c2}2qWNgEI-5ezI7468XD84U_G6%EgMON;;j01$LiPE!C7ATU5sU~qtspRd2q z-|r(Df{FkD1};fNK~#8N?OWH9t2huf7z{Q^#NeFM#2Yq-|NpI>1)G+wMzZgfT(wnm z9(iydI_n5`{%82aCv?NMUDwNM1g<-?`I!i={y_8LXqD7>IzO@=Wq!LH7X&ao)q=VN?7A6XHQkX5EbHfmIy(K^W{p#rDmn@lm`D*`=5qmLhcNWnl+0{FH6OTs}#aiE4k zAN=2n4Mady0H%b8c||}?6Ljn5Pq;`b0&3bDq{u40)MGX3o0bFdR$Pv1znPjq;5|f$1d=#}4e8~~m zk(;pz<@RKssX-COQeB`k5fEb}(*-?V6X5QKuFMo5DAND%g1JEAV02r$&|$HUPKakI zb3l_9gUSI3V}EvxF7TQk2%wbL4t2B*9^#0>aY6-SC9Mt&EC&z!2t|H1nq>$y7M6pr zQ6ykcNNdM7LSPZK;v9uiS{B-DA3Pk}2~5Zd(oU%kTZNN|g9EJ;*%I3T?tpkr2zgsj zIhoU~$W=mMjW|4gZu)_G0yAhnh+Cd-A)pzCWuIXh-TMf{RLTR=^FslFt~GEGN!hhc z{cZxU1bdve6VUnEwm&d91dt+_5gKa&0nPFs0h%kUKc)=JRW zmGCWUu%FB(Gbm3WFmHyD?$E}swC!>zmX^JWHD?%I5m-~2`Gh+qj`g)V})sco*b-Neb3Ba}l5%ua`MG3PDo0P$79 zitc0RF#H{?^P{%GGC<5A#4;Ls)7M`Z`+O0hd$U^ZG*MlmZaqfPw|~Gq&%XHZCcdv^ zION~He)$z_gS5_10p~8o+|K~pRRSZmm_GeMo90UEKXG!=Y;31s47(mk>m2-$f}o2R zE8j3`Zcs10KJ4F3!S;FP9i!86V0dv*0OPxb%eF5!JWGf1UEW0CM~|>w%eiud+c&kl zl;z^5m2J&1o3oXEtt^M7P)>z~82X_M^dJMom{&C<_qNx$Pg$OaFqEZ0LwkT&*&ayK z_QffPZ^pV*ZNDUU;7O_ryt}o1Qic+~aB@wvX$p7+BJ-7!$_6NLvr36(UvyuTdLP zB3sqeks??}t$4oZMZTgcg#5>Y0G&V$ft-Hh_jNvt=~{p?kVJrO1A9hHI#Bmr7weHG zivXbk_7|XSG^|pZfT4mw3ReqsUp@k%bUo11Ujb5KHU>FbkIG1<(F~pT#K)pt)cT(@r<5{#?HCqD5n8R-l93~KtH00000NkvXXu0mjf DD%2l# literal 0 HcmV?d00001 diff --git a/web/img/Ice.png b/web/img/Ice.png new file mode 100644 index 0000000000000000000000000000000000000000..dabf84468c42b7fd2be84bafcc99e04104b1285c GIT binary patch literal 1009 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&O%Cu0aRt(B>>R|S^=Do$IdB)K z-adUvO6Q)YCFlE>ADFr0uAs2kilfiW6XvVw7`q0>7Bo#Oo_5sQ)xUN2rs%Ayoc;rT zC2Ip>vqP&lrIvL_E2vD|c*DTLv8r#$tj*_Ro3^{Eakt5%+fX&7wI50J{4GXBQd1LgSa$*GS>uhD8!58nfKF zqC~_yUR@SjqP#6fpmJN?AGU2xJbqpxwx{ju)TNShw`$#+^)dO3hFarZ`TeUFysy|O z>Z)(F>byl#_Da_Y%ySpmU)tCx+GzW7N@kkN#YGNZeXJ@kn>?RoQa07Lv8jabEc@|E zCS27_O9JQ5)_$p+*}!rt*?5A#!iRZgT#_*l(u<$2HLqB^k?H1#JA2G6{xNV}nZN$O zgG+y={81sbfMs)RO?xf95)RjI`u4x#7?;e{8>tzM|9+lf)Gtt*${Tlp(}Gd`0m~eR zD4}5ak4(O^R{zzEcyOvsT4asG+|0Qe<*hrGl`OXTe89|r(N1(p|N0su2d;ph*D{{4 zh&{M=$3}LM-|*@f%{j1b)`Sl|9@>qTNp4@>PFZvA9%Hc4 zlQ{zRnn%xfeZ2hX<$LbDKbiSH&peB`_Zb_lW&W^s=FfXdANDSsd1q?-UQ5&bnaT2% z({`*Z6bCx*N79~Ld_uK2g5M?hLc=cMWCiU%4=Wga_{Y&!P^Y*bI`Rx{{w zJ)Y0C!Cj+ zUql?>(R&ABDuQX>C%$TmDK5x UPvuBm1I#20p00i_>zopr06cZSK>z>% literal 0 HcmV?d00001 diff --git a/web/img/Paralysis.png b/web/img/Paralysis.png new file mode 100644 index 0000000000000000000000000000000000000000..cff1f2376fcc7e0ea60a86f9602a3241069c9c2c GIT binary patch literal 2014 zcmb_dYgAKL7QQ$4Mg!p$9zp>D!Ab=rfhsXlnnpmtg@nZjDk=%`s(^qz6a_DGEdtU4 z(24p~yRuB**AWjr{L_`wEgSog`ZRg*tHD~R!&pzMT-`?w- zz1KSVfdM|c+UD8-0OP05TcS(E)UI0X;oHUmq|q04Nl|&=4>-224xl8Dua(HX95M217!?&`|Ke0g%H1!^6Rd2rw!NjE)9lW5M`%Fd+d< zN&=IU!OTn$LBOmmu(+7O;}J?q2xVo2OP2^jA)&XI@bDpFa1a_EhQ`LA@o{Kk0($lg zl1ib;NoaZ+di@$&T!d6ANTY$4m!Wj%Bn5vO^VFb#zX2ctf>&83p3XjVy{+%b*o1U) zTK0NjQKi}bG(Q9YR)zR^v3942P5t5m;+$3+WvyGg)m}Z^KHbRfa05=$4DO`&My^`0 zKCkt;FZ6YNK-9BG%)a!0+NPUg^8uvj_H#EWI+!O?Y=arZM~Y!B!}Y$!HY~KF#eMRy z`IqCgPlG9&QIc>mXn(=35?#JoqVb#iz9x1KF6L{I<)Uy2zws-}{*=@yj~*qcF%?a9 zKK^c3h$c2|XZQ}6fA2KFGTTv-ZRrV$S8)Z*f+=1G|D`aC>($0yGO3Cbw!is28c~Es ztAjWA#qr>+f(nPd;Y>A$>7F#n9M}wvFM37jCG{FKysx_ z@}N#KQqJuUO{(qFK}mv#@NfO-&8r_!(XMFJt`^1oWiDup{ozdtFUA?}jc$}QciZg! zT`-2M(IoYOY`mdr^lsJYK~K?I4$^1A&u~K^+{jo+vkw;Mh#vZyI7}^bp<1eH~7@8dG&OW_~)2! zqi;higC0niP5EchUS*nK3(@nCU1_(k0cOOa@iV?S_ve}=9iD;f%rGMh%!q@!+L*k| z+C~bADXNHUr)!}#bueY>a`l@H#N)MwUc!uX{g;g`he&#AZM}GSbr?*yXqi6(E5Cu4 zBc1R9P|xr$5b@V1@}O z_wUVuJ5oN%voU$sCLW&HogK7SALel%1=6lk{7-4w?me|oW!k+VMw?3SJR2@vobaFV zP8tammR{=QTaTX*)*E{zZDsImf9R$jbZH5G7QhABE94i_jM#sbJ25R7mI{`+fF@+HITAAtm9RJ?i?=L z;Cv;gT#D(FMK3Q0+(M(w?=#q&RD$~v;uk*R)!X|RU(RcaiNDdO+kU*?FW;+<#5^F8 zj26n=C%c@@NuLqdHwr^mZ*`NAeZo}R=(W^zCuJwG$nMq4;j(5)WdkRDUE!Va>q#Qy zl$GPsPuj;G)CUUxMJ?)QJ1bhUIRnQf_QwC1Bm3y7zCeSKCWu+Zy}%iGdmKj=E%_?G zlNAWKgR{p@MeZLnJ%}}o9*UUwzLnaHMu~`3+#C)}>_YDSefo3t1gc*vk1MQpOIv2lrN84qZ-WS1PfIT$1@8@bI4X?Tu?ItU1@GW>JpUbULPvVg z5$bMPg>rFXwc*h~N7lU2iM;L2ZjGL}9h-%epx-m2y_NIcYTq#Ys}7IwtF z>9e=%Crx6%Qm&vpfUhm!^XkwaUqoJ!#BM8dxbZ(g0-j`THK)VxXNlc>+}1z10^Zek bBWsxIayKfsIs0VF$`|eD9pEL{&PD$NGT3_A literal 0 HcmV?d00001 diff --git a/web/img/Poison.png b/web/img/Poison.png new file mode 100644 index 0000000000000000000000000000000000000000..022b7e9518b52d028742d1009d2822d22289d073 GIT binary patch literal 1527 zcmVC0002$P)t-s00007 z2M7lT2nPoU2L}iT2M7lT2nPoU2L}iT2M7lT2nPoU2L}iT2M7lT2nPoUu0oiFD24|I z2pkR?CK4kj4=6DfEH)E2Mi@s%9X?hZS8yb8btHCpCw6@%euOi04+#*YK98qAlo1ON zdN6BcC|QChgMuu4I~g^THHVfqiJ?1?cqMsIAxB#uTze*bdntHkA!mOodT1hPYa(oI zB5qqHP=+plZ!BUi5iglLhMG8w7Yi644IryPmS!Mlj4^{=AYXMQc8@oGJ{3QJCxK2H zPi-S^q&<>gAYon}Uyw6}ojQ$)FM)e(&yD~901$LiPE!C7ATU5sU~qtspRd2q-|r(D zf{FkD1guF!K~#8N?VHzHEmMxlDEQMI63U$-227qfDoBi*lNF6*_o6|3OK^oPSpJJk9eqFHoX0KngAjy3utNiFAGkUJKKQ^r%SK2e&=>T1EBR_u3K z{>|zCA5Uls3*J~ECd9~ds~vLx3<0aJzyESa)A`7!f=#q?kiz=$r?Y=H`$%cFg90ID zWmTZA1OL$x1!M=&4v;DJf(P>J48VeBG2(;pmad&D482pxXYsp7v$+v6y~!|gD|%-S z^e@z)3-SYIzzvP@^7wmqaB+JuO{65Oaz|$!FrmP~+2D-NRg)yL0$i^2jecA~P z6fq8jq>B7;m&@!is9v)6P@m8Y_IL-NEKGP=nC+m$lx(b}87YH<41HI_TAUKiWeT?qB%iCz1g`rZr0=X zr0}-sfI>A$$19?4R03N1RW(P$-l_#O%N5kCB@K16T1K}VcPU;j8k^m&2Mp81IZ dRnL|!e*kNo+%>@Ph1LK7002ovPDHLkV1j@lsO|s& literal 0 HcmV?d00001 diff --git a/web/img/Sleep.png b/web/img/Sleep.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8913d53b0e5be6d0e342e65bab045b352fdd1a GIT binary patch literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&B?tI~xB_Wbb`Fw|l$J>T7T2gr zmij&luKBt?)rN|u5{Ywdd4zd{Ez7f23jLf666=m zAfRC25Rg#N&_93u{`2?WD@!$XF)%Qdc)B=-RK&fV^?KbZ0|B@03IRd0y#-%)-T$w7 zp5NofugHxre0pD2HEtD}{Bn!NI!+d*#xJfyAC*42etOTr!MG~+(7#&7XM0)>|7LP> z017BBFgstcgtKDSzRyw(|30^xGW?yI!sD=iok}{xud5IAlO4UxGQOGBJHGBOYj(?= zZNKQNxLE!5`nLM#H|KNO|8uKrtM`5#-}~=X&PVkv|8{KoQE&VE_{Zp9-;US)+4c2J z_?~~a&i@eal*!2ZGdI8f{l)&r^|P%f?s;P$``cA-uE+FWAAcxvIMml~`eEK=mXIB3 zpDppUfXydouhg{1eRf;45>!{1nEDzXu+-8!=q> zm-*kq__;3fiG!y6B@5OYf6pz5kAKGe?zi+$vHg=iGk*DJG>_ll^xsswhJSgVtl3^1 zF5dE3_^gRn6|=X`#zplj=KPWUrF>98;O&9@1O5^MqKoCH&Cn70!r1>ur~hjCAJZS4 z%v}f9TSX)V9TYTJWb#A!pm4%>V>S)m$KU4{aIN6;&UpK8#>>ZB@1B>q@ap!*-@@F- z8cyZ@QQr4gDc+6qU)qP~6CWrr+V|Ak*X?}L%Hlb<{(t<>hAA2g8b6+vXsG+waI$`) z3gfD+mxT9BNNCu|ed|3x2jjH*P??)dX=eOKB^&B$Co()#aN0j<595pF{1I!_&91B8 z5A!t9s7AH;ey7 zdCsvvQ`d57zoh-bruo_me}8|t{&wm7hRY`Z{<6$4JfI*N+%WahnHc{xI>mP#ByBwbr2GJCq%wF@#%j(j_}NcMDy2Ke)|ui8`xIgZKxAo$0JL3nU#Fc^^RdneG7&%s@pzuEV;bdSf+b_ZN;Mc12Ogn(+y?jCR*T2kG zU&Z~|>r@XMyf61dr{VWM#?7nV%U|d-ozGeTMEC6%to-$l@od27NQUp84BxLGwRdS@@-MB)Bv)gmFrZWBwtPk#q*6(LAsNbz|P1kHH!=u~Z z|9siqVEMJQ|H;L!-&PO)Ckb-}{FnUs=VjSe7Q2c)Wgoq_#4G(tj4KhWQ+~UEQE*?! z8Gp_Uxl^9A>%OJdvvk|fxqn@mi&*sMa%ikk^P5qk>l$y<8U$yg&x_M8>t5>f&nt-v-;OXk;vd$@? F2>{+n7Dxa9 literal 0 HcmV?d00001 diff --git a/web/img/Water.png b/web/img/Water.png new file mode 100644 index 0000000000000000000000000000000000000000..fd13eace1d09df9c77e2692c73a88d729d7408ad GIT binary patch literal 1425 zcmV;C1#bF@P)C0001!P)t-s00006 z2M7iS2nGiT1_uZR2M7iS2nGiT1_uZR2M7iS2nGiT1_uZR2M7iS2nGiTpWO2X2M8=Y zLrapSP?xH2nW~D);FZth5EK`Ar?^vcepZ{WTcEUDe~e(Ixn_);KUZLIvd49|%t>T# zfWX#*w8xCW){oBQ86qW>)9ISm?lwwMdc4siFEnMTy=$(*g~i*xidj|w000nlQchC< z5Fju>P+)L?kDsr<&)@GO8iI-d00f;$L_t(|UhSIKlB+Nbh9L=r6hNky^xn3d_kX&> zWY%l4B8OOjnKQHBRk->!R@-S_Qj|heUp9D$rs#yrOL+pi>;YF-e*oPcfy;j2s!lX%*P@xYDk%R>jb$Ku@dI0-itgagjp+Kmt zE3qDP0Ox_FY9QIc13N_nipe-fc;KjLKygGb@&ivvCYm?|IiZpxaBv9XFmzNLzzPs6 zaRiDEK>ZO687G4hGR7IUy_HE~C?QT--q(y!1U!v`QM(iA8J=)%b#G|n19*M}cAF9C z!Bf2U;;`p3P6|&+8OQB4Kat}`1hZzGX&Vl}DTq_C9VhgK0~YX47QzV)W`b_x2&|4n zyNwc*9HD|^(tJ5G8FIi&PGDx^0pP(4cnybvZX*Z0>;zla>N8=_`mpMX%qC3+ATB}G z<%o?M48ZpoUL=0UfmmNZIl#*tl7=kkyD|ZQn{=ECbo~sZ$dCm!^=}}_t-b|4w=4iD zf#~*#1*rNCuD+S+1!+u30GtZ+#fecv|B5Xzq#fW85|HzTlhM)XZ^J8)WqHB3f<+j^ zsQR$n;Cso{i3hL)d6og*9WjeIh{qHI{5}7OX+!$}O(Bv7EK6pU0i_A>fM$Sy!5!L& z^fpX2V1xT3hp>-LfW+MQgOWvdPreGSfx^|#+2aPykV`_k2mbguAJ_+$d?S1S3ZH&X zfVa34`B|Lifgsl}=7E^lWeqq3g}r|#0?xa%0rjfDj2nO|ff@t0ezyi(f^H4C&V8~0 zcqRBwNkI;t*KI-?()H)478BBt#gga$;eYc6HR^yx>jqA9UvR-4fhE5cT*!pq)-Ui` zvNRgXH$*oH`JkvDTuas!1M0s-syTfI{sVtNa3=i2#Fn@YuYWc({|9>z94L#+QCU-d z4VItVeH2~zcNFcnA2S~j6!l?8=?RU}$B|Ruzry?kMb4D*P%od0PP1zHVEb%mr%Nvf z@nCY@RLIZXc=)5iWI`Fv@o07t5r>#>PVkc*bwGEX52vT?5(UHZV;fxovtrceRI_3{ zkD_Rs^A_b?Dwejib)i$aqnFy;J9Snx>=pxo_{IcAttAypLXaj*m|#p?(+Rv3q)0th zz}Cr&N`WVF3L%#li%R;cR&d@O-~|plUVQ2=i+L&(Y^ZQW%GCu>JZlyD3) zk6~=R{)-JJ@z&WYO=HN3({z=sy@Vked9xWftOm|NtB>U}BCe%1f^NAqdF*|<3DS;m zkbF&y36o%AXw9RWlb2lKPE1{Ei-9$D|0zDT23p(nO>1g1ggv#)zNU`ez_4;AQ!B?9 f^tAt#Uw-)u$CIy;(v#1?00000NkvXXu0mjf=o@(1 literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html index a220ea2..c9bd782 100644 --- a/web/index.html +++ b/web/index.html @@ -10,10 +10,29 @@ + + + + +
+ + + + + + + + + + + + + +
+ + + + +
+
+ +
+ diff --git a/web/weaponplanner.html b/web/weaponplanner.html index 4c48483..4fd861b 100644 --- a/web/weaponplanner.html +++ b/web/weaponplanner.html @@ -91,7 +91,7 @@ var template_stats = new EJS({ url: "templates/weaponstats.ejs" }); $(document).ready(function(){ - setup_weapon_autocomplete("#weapon_type", "#weapon", + setup_weapon_autocomplete("#weapon", autocomplete_predicate, init_page, update_search); }); @@ -107,6 +107,11 @@ show_trees(oe.state["weapon"]); } }); + $("#weapon_type").change(function(evt) { + update_weapon_autocomplete("#weapon", autocomplete_predicate, + update_search); + $("#weapon").val(""); + }); } function load_qs() { @@ -120,12 +125,16 @@ if (weapon) { show_trees(weapon); console.log("replaceState: " + weapon); - set_state(wtype, weapon, true); + save_state(get_state(), true); } } - function set_state(weapon_type, weapon, replace) { - var state = { "weapon": weapon, "weapon_type": weapon_type }; + function get_state() { + return { "weapon": $("#weapon").val(), + "weapon_type": $("#weapon_type").val() }; + } + + function save_state(state, replace) { var url = "/weaponplanner.html?" + encode_qs(state); if (replace) { window.history.replaceState(state, "", url); @@ -134,20 +143,30 @@ } } + function autocomplete_predicate(weapon_data) { + var weapon_type = $("#weapon_type").val(); + + if (weapon_type != "All" && weapon_type != weapon_data["wtype"]) { + return false; + } + + return true; + } + function update_search() { var weapon_name = $("#weapon").val(); - var wtype = $("#weapon_type").val(); if (!weapon_name) return; - if (window.history.state["weapon"] == weapon_name) { + if (window.history.state + && window.history.state["weapon"] == weapon_name) { console.log("weapon not changed, skipping update"); return; } show_trees(weapon_name); console.log("pushState: " + weapon_name); - set_state(wtype, weapon_name, false); + save_state(get_state(), false); } function show_trees(weapon_name) { @@ -164,7 +183,7 @@ var html = template_stats.render(data); $("#weapon_stats").html(html); }); - + $.getJSON(DATA_PATH + "weapon/" + weapon_id + "_tree.json", function(data) { // first pass: collect all components and sort them @@ -217,8 +236,8 @@
- - + -
+
@@ -246,4 +265,3 @@
-