From b2a963739b4e8aa7168e8a33ff4f639b6d0aeaca Mon Sep 17 00:00:00 2001 From: Ho-spair <62695577+Ho-spair@users.noreply.github.com> Date: Sun, 11 Jun 2023 12:45:12 +0800 Subject: [PATCH] Fix invalidity skill (#190) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复技能失效技; - 新增全局技能以令非锁定技失效仅使用标记即可实现。 --- image/photo/skill/quest.png | Bin 0 -> 5717 bytes lua/core/skill.lua | 5 +++++ lua/core/skill_type/active.lua | 2 +- lua/fk_ex.lua | 1 + lua/server/events/hp.lua | 28 ++++++++++++++++++++++++ lua/server/events/usecard.lua | 2 +- lua/server/mark_enum.lua | 3 +++ lua/server/room.lua | 16 ++++++++++++-- packages/maneuvering/init.lua | 36 ------------------------------- packages/standard/aux_skills.lua | 18 ++++++++++++++++ packages/standard/init.lua | 4 ++++ packages/standard_cards/init.lua | 2 +- 12 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 image/photo/skill/quest.png diff --git a/image/photo/skill/quest.png b/image/photo/skill/quest.png new file mode 100644 index 0000000000000000000000000000000000000000..5913400d111d18954473c13a3515b728a61a03a2 GIT binary patch literal 5717 zcmbVQ30RWbx<<_*O+9LA&W5EqAP5LTn!D7L6i1w=5O5YyNX)df97^k!b7kgso`+qL zsF|jjrkUn|Wth6v94eYDbH3PaclSB>oO{l5d7htt{cFAJ{oeIWKMxn|Z7sz`6-5C6 zfH=m=+>v*8Ma(qe~m_wv%e*P6GhMWVSCp!1Wt@006<&AeNKVnV zI6`y?0YwCw9#S`sLh}g1NOZhKPsjgTFp+@vr$mI|d1np^!v~PSRB`}N{ii3xmYY3L#EO3WC96eZUW@_M?WZti1tGu{QQg{ za1a6RM+8BTa6AZ)L=r$q1O$(Qknlt!L)4%9%_)Qv+gY%^|Br$oQV2Yb|B;6v89@Hm=>e^{qc{OJsQ1nF=9&v*YxB7*;wei}aV z->CnOqWOoce^CFw6ZikA{)cl2fp~HNiPvhu!0q#Zx0})*p#lG6)V{C%rGfnk=XJ&H z;m>x=d-&PVNn{>%1g~AowRN%qfWPr!%n#$D#@@XYr{ZQ?x;|>uH@#$KtA>!4JSTNY*~VQeyNtwJ+&y#|{>`Qy`|tHT zn0o84!{k%im<$oS7p7vqE)nmrEqbiD5?4Lp`X$jwskcnYRNy3+_nNJfKF zs3R6^?-yqQc-OF_an#}$u8a?8l3$L`Ws2WLv*B^$ zW;EB5tGFUyDVSXMtorORlu0#EsvOet~h)RY1PBDZawzdA+kfK*e3?Im38bynf@W-%Wd1t!Nv?ttbglDeO|7 z>)5XR%c<%t57BUlTVj>4&)!>buj@V-)dLY~X@!uUi}0UiMykUT|V~ z{HaR)2(@kwp%}ftWo)4LB#4vheu5)sS*R6euwova=;b`1sdfiRl_Wa%b|!v_IPAk@ zKWW!Ny>#umJdfbF*gBd~y^3dLwFdZv`wgm9=kB|VV}|#iuQt<7e5Z}}lOH?{%gXNZ zA3L*7%n&G&n)2Ciys#voESht?Y*3e#M&0@r-|E0G&*yStEUmBpjP@>QXd$iMk`pcz zn*u?{j=;aA~Ss+8Wn@G%LHqKZ}M(#B<}M*2i%9uAnv3eon0-BOirSp)}gMxi&- zsglp6n$zOS2BkPQZ5OSNw%;@M(jy}_;*PYv0-wz=V78T1nACKcsAwbnuXAKNeP2t+ z-|3EZzxqgXsTZx=Bmk7wXlzTDa5R7c3?C+*?gq5+Afj-_)viqHI zb$jQn58*4a9-{IK;qj|bthQtML3458fxbdp>#0IZr%L#+@A<1qYw9&E^YNLE0@dw; zm5WDMt0fPN8{5Xy+`Cy!Xu2bI}yc55djHX z^cn5`kP;^SDvwgSqyOfm(PLSml-VxWNS241vu{V9GBO?ksxI=T&m#x+`u2wP1&*%v z4{NRjM#7e@j+!h}ZJXI<*RZ#c%`PGC(IxkgT4XEJig{tdOG%rF2;EqJPGjv+uGTA; z#&VX^D_{GrnkQxQ@aMoa4J^mHed}>X`|Xgd1Mbf>j+G8|;$X8{RiRhCchw5kXDZeA znnyw9BJTMmoSL!u6|>2#wmIj_65X?9TTpoVRO5P>f2vR_pfdW%a7ejMTxGP=n?1Pv zBQ07**I{4*`P3>+_Qf@rokl~_SK*~MZz0pFOjoORl_;Ccx9XD%^enVO8_`*05+DAN ztw;^0mxyKV_z+<~*1eH$s(Bd&OuEe%>gK8ZZjNmi?Co-!-4PTX zR^|#SfeDTHd5)h{$~@^vVLTMSmcvJbiRCi=*T!b;BC2MAt}R}_hfM+2?921Yk(y*Dtg}-)K@WyC!;$>*^;Qq=%ZpM)WmRl+hwU3uM9Pvo z6-Dhw%nEzzhrpOrX!#*#_TngRqX{kT^=l=dimG;Ck?01~FO_G_TR5Cn-mY`aaIxeL zCcH5Mwy^rbQmgkj3m~M%bqBZ1sm@z~4vp{=XJDeC4^%$BaM ze*SMRy}qU9;vtK{)=V#MFw$o3xYD5gr5#SO6M76WhAa6JUfVvT`ug)Pf`**wJJkh! z^wp%VsNR{wb~dVa6XtvRZf7KMPkTVip1pR#&b9d5vR0GJ(f=5C5U(&*D_d}azGxVC z`y4}A^^tSAK%{(`{fI)ms>_s)8}ZOv;ar;yGKIX4B`T+l+Yl-}E?awce0Ol#OHn@# z_oDjr&F&fiSE}7R=V4ffXSzmvNyUcwRG|hpntMh$i+M&bf40o%8GcBex#$Uj;6C|%_<2nRSm#@Zijv_Kb?7M%(H7D+@PhcWWnU1 zNNt!o%S~>$+4>jfdXe&e_bQ`Fo#!Ljj<%Ai7?nk;tG9&L=iA&U^iFlUHiJLrk_kuP8&SQsC+6kd`G`*%ha@N?wpIfZv}QyES@6EW#;j;0(r&%bO{G^HrX}hcz-OAD&yYySWo2O9-qJE$OV+`WQ>L=kc2p{ z7WTPrCe=;sQQ!A(kW~*N*PgW*-e_KYy5oxK*R;V4W5wJL!`&0+9tyZG>2*gt1m8A4 zg-jpP;k^99BEH@u;W~hH%V5olnU|l7d+(;rAG>3{R+UlpK`EPW!?7OTkm4DtJNM+x z8*1_fl@$zieyzcmQEAHPEUpX^EZ+f$SnPX~8K$$=zeJr`tOhE!cSW22kiDt&0hEm)z9?HcBn>`v%o`I~=k zZGEYLBtB{x9dG-x<7MNC2NyVx((Aghq|u%-po)j*vF4dG$syt`Z(EMM87V9`zA`tB z3>ltYt5D!*Gx9j<_mW*j7!%S{*H7dd8sqPN=sYe6`|`R^aDufnHFR=JWHk3-9zSQK zz14e)Tku$AmwX1AWAPwxlK%whMUGKo3Zko)U>^$@cYanVIDkAB+$b>nWml!0P)g(I zJW7TeIk|~rmHthS8e4z%g+=S^c~^d3r}t1TJsusOx-bsrmo^Ej%ihvY>CcnhmlI!r zfNUHsJ);~f?ws7{VdlL2qUZ*C<^5+y_?y(G#x4QzIqc$RS9suMuthM-ge2~D#;9FI zA2hv*ep>X!!QwpLpz*55q+jsdekuVe)(S>3^WXJ-qFiW)17!3CWXO_nK^P-J&fG$i zaz@ot(cN78_kz2!RON;OeaybpKQG>0*;F~$aXmc$QY5VWv?JeY^qs6VvoNi55;*hO zmxfG^)`%471#a(b78cH|2mmzW5~3l@1f@L9dxzSY|1~peoUK!(+tTZ~$ilK>XoKfu zYDwv}7WmHV;a-i7ev3u6#8g-hF zenlxYUW&JU=ji-$L+sJxxzvz5r+pnXmPZB>*bP+5NG8p4F{M$)L4NtLlUq+!q2uWy z#Is_f!m|F|M9sjkubs1EC3zg~;+ga{ z55*bJaqmwLM>WH>S~q1^z8cD)Vm1yhXK}89k<^%c!PQ_AunkJ}x}Tp9G+<&l+6le& z#B`xtUKx#wS~gGujG(zM=EkLz#un^dof?@6#E3 zZ7M`FDwAV>i;+H8xDhr=1DM1Pi7RsRo3#S@_SAn`tvhzIvkCh~}z*fu13H?tS*!zV~(wCHbXPbH*re5>!y`2EBImAr1{ik>+tw-*nDYV$OtfZ> zV%%aTA3}rGjGo2fbeL7$sh