From 5f1a2bed767a0799cbb842fdad496dcb7649e0f9 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 31 Jan 2020 12:42:22 +0800 Subject: [PATCH 1/2] rising bass changes --- code/datums/martial/rising_bass.dm | 52 +++++++++++++++++++++++++--- icons/mob/actions/actions_items.dmi | Bin 11500 -> 11771 bytes 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm index 9e00c90a92..46dfe27f77 100644 --- a/code/datums/martial/rising_bass.dm +++ b/code/datums/martial/rising_bass.dm @@ -1,8 +1,6 @@ #define SIDE_KICK_COMBO "DH" #define SHOULDER_FLIP_COMBO "GHDGHH" -#define REPULSE_PUNCH_COMBO "GHGH" #define FOOT_SMASH_COMBO "HH" -#define DEFT_SWITCH_COMBO "GDD" /datum/martial_art/the_rising_bass name = "The Rising Bass" @@ -10,6 +8,9 @@ dodge_chance = 100 allow_temp_override = FALSE help_verb = /mob/living/carbon/human/proc/rising_bass_help + var/datum/action/risingbassmove/repulsepunch = new/datum/action/risingbassmove/repulsepunch() + var/datum/action/risingbassmove/deftswitch = new/datum/action/risingbassmove/deftswitch() + var/repulsecool = 0 /datum/martial_art/the_rising_bass/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,SIDE_KICK_COMBO)) @@ -20,7 +21,7 @@ streak = "" shoulderFlip(A,D) return 1 - if(findtext(streak,REPULSE_PUNCH_COMBO)) + if(findtext(streak,"rplse")) streak = "" repulsePunch(A,D) return 1 @@ -28,13 +29,44 @@ streak = "" footSmash(A,D) return 1 - if(findtext(streak,DEFT_SWITCH_COMBO)) + if(findtext(streak,"deft")) streak = "" deftSwitch(A,D) return 1 return 0 +//Repulse Punch - Slams the opponent far away from you. +/datum/action/risingbassmove + name = "" + icon_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "" + var/movestreak = "" + +/datum/action/risingbassmove/Trigger() + if(owner.incapacitated()) + to_chat(owner, "You can't use [name] while you're incapacitated.") + return + var/mob/living/carbon/human/H = owner + if (H.mind.martial_art.streak == "[movestreak]") + H.mind.martial_art.streak = "" + else + if(HAS_TRAIT(H, TRAIT_PACIFISM)) + to_chat(H, "You don't want to harm other people!") + return + H.mind.martial_art.streak = "[movestreak]" + +/datum/action/risingbassmove/repulsepunch + name = "Repulse Punch" + button_icon_state = "repulsepunch" + movestreak = "rplse" + +/datum/action/risingbassmove/deftswitch + name = "Deft Switch" + button_icon_state = "deftswitch" + movestreak = "deft" + + /datum/martial_art/the_rising_bass/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.IsKnockdown() || D.lying == 0) var/turf/H = get_step(D, A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH)) @@ -75,7 +107,7 @@ return basic_hit(A,D) /datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D) - if(!D.IsKnockdown() || !D.lying) + if(!D.IsKnockdown() || !D.lying || repulsecool > world.time) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) D.visible_message("[A] smashes [D] in the chest, throwing them away!", \ "[A] smashes you in the chest, repelling you away!") @@ -85,6 +117,7 @@ D.apply_damage(10, BRUTE, BODY_ZONE_CHEST) D.Knockdown(90) log_combat(A, D, "repulse punched (Rising Bass)") + repulsecool = world.time + 3 SECONDS return 1 return basic_hit(A,D) @@ -132,6 +165,11 @@ return 1 return ..() +/datum/martial_art/the_rising_bass/add_to_streak(element,mob/living/carbon/human/D) + if (streak == "deft" || streak == "rplse") + return + . = ..() + /mob/living/carbon/human/proc/rising_bass_help() set name = "Recall Teachings" set desc = "Remember the martial techniques of the Rising Bass clan." @@ -149,10 +187,14 @@ . = ..() if(!.) return + deftswitch.Grant(H) + repulsepunch.Grant(H) ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT) ADD_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT) /datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H) . = ..() + deftswitch.Remove(H) + repulsepunch.Remove(H) REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT) REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT) \ No newline at end of file diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi index 43c9d20a936042a54c6a91c93db346dd15ee7c5f..f5ba86c0fa986b3054636964de2537d4323042e2 100644 GIT binary patch literal 11771 zcmaKSbyOSQ*7hU>cPUmJ3beR81h*DwY0=^iZGqqxLUAe5QlP~P)Nprq3sT&*!KJu= z>HWR;zW0xJeOXy&PEKZ>*=IlddCs0a6RD%6N{B~`2LJ$}x|-56005!8z!DA?y4{hl z(LoR7_&zsqSF&-lf;qUjJ2<}q0PnPq6ZLOa`AIN`jV|%pHiH9lJ;=oksH4}Ya187G z3my^)uyu-?HHRXetBY^4Egd+jy~C>0jnfW9@@*aaGl;pIQj9;9nY*J7|DC)t_Vngf zgotRNu558l@ZR?v$pZ>1BjVK(Z{*f@cx>>pLnr(O$?|)9httCXF-S<#Li_rstEb5) z)WfZhlL(I?;Pb7K?p7KS_G5&=*>17xR1mlY^nQk`;iuNaW6`UOPRi}Jx zPnC=CE0${~MK)jd={Fk(wvbrn0paI{oHy(PkF#w*%@Mz#)F5orp!pF-FfG>&)@{nT z^4i*5&(#`29mxX##!skOXB?Y`!gi7Jej4`|vLP1MWhS zHZ2@T8I(++N8$A7D#uN7e0+Rq8xVEJack6#IQZ31bOx zKf898@u_P{4V-UsZejuWPpUTQfSsAz54m62vkMC`N=rw6eOnN{xdWH(yTi-peFk2M zMmJT@?v~8%@>`YK8+sOmPrvfKqA5Kqkt#}H15`6h;!)gjS!-*C2Kmtk${rNAlFkeo zS{cgA%Zk9#pHGnhYZ`TWDxFuw+AE=M5S@6MxDSzv6$|f+mt9{%&r|}M+??%RHp3$# zBj5H~hs?w2be&U?yJ(Xhr-{>IDRRfsb18d?1=(~xZr;0D?@uQGb~HP3QjfpYT-MZUkQWh*EP153CdU7qB_;d(cV67!+W$%Y>cXnPme)aD- z6+Jy#+EgR+9p{$!9DALq&H)-K>qIKLzX;Rh%p%j$2-qGxu$)Auuc@BRt)AUL(*qBd zT9H2)9u-NQT(^lB5?f?Fx zG3<`hA16KCBqBOmSw-d1%&b&GV&aAu{W+0(dUIvv3r`eP`KAb%lS}H|ndl9J53$^y zbkf7@gTFt3gD&E`ch`kKbWe+*LCVrjj^#zqD(?N3x^rT@rEGqA;D*|caJ4m20*8i% zGK9Wa@B3(RR-Y+tvZ$~ahkO#dP~oF`HMpu`d43=t5fRZMf2IDIPL52y%iG<vKX70_ zcQKrHu(Ld{jSlT$24~Qjd7G*;+dI5cdTGf5_go|cT$-wcMIYG+vSr0KJN#llI8vdE z?!17Hd{KtrXfp#q{;tl|z`nN1>(>~vi-+25>>VJW$ixXm5*nS%n{&SLaBM;(>(+>M z>)SiUyW5+C`DG!1Df$RQXYc}q3nqDNmJv$}i5@ac-+sC_W&T7H9z(W$k0kc~vbsuxaGT3ee!nai>QfEah|{5_bOj@q~i#iz1dZVN3j z;5MkRCw;05`Hf89p5T8qTQ$gcwN9m#(9l4N_5?0DM@(#rxP`Fn{He{^##6@jiqQK9<)ES_^|b6o^w}l z`6K=0!NhDP29R;LNmqTQOUu|&*u2w%eI^yA9r(u(g2y!rQfhT1^f!p#zoy%{0s)lK z951GwD~-M#ghJIx`8zlOovsT|IO5`xUc=PqUCh;xnXfe8w(%NE1ClZ#Bv$uPY`0t6kh{w|%&C z-cv5>MLc{*oW*$<*CR66z8E*sV2Lk?;%ohS;#8s#76mKW=TK6}c$b=MAQ;PjX%B(+ z(x&0R6n_F-ghLu5p}kzi35@VN_Uq|joSxllOCl2;oh7oLgE-p^h(^FI{ zT{84(jtV+dOdGenYAZ!h>W(ucZ;n%}-95(=uGPhuWtoYLt8X#IjAmU|Rql`e(sjvM z$Fj8iBEZi@pR_5q+LHaD#=DdjFc&-t_tUp1-6baj9`eo|XEY$-Z>5SF%))o|%zyaf0*qA@!H-dokTTJ(rh# zyqIKpX|ahi2-F~n3|D8izfk;3i*XN*l|U_FaheC=>n3PqN|sm2+#mOPHZ2~wM$VpS zw7bp~HZuCAFHXOR#}z=uX+CzpMdggeGcA77H1!!Yga;_fbj0?LpB%1TR}3|yc|t)+ zNtQa;1&WO@M@z~anla3iZtRDLhtwjD6poIL=7OKlUjP^!92AGGMU9Ba8l7c8Zy5}AE%M-n%*IPVO)%!R_Vxm?(OF@8mOfNkIOtc8sk17b-Ou0Kq->{3o zVy1i3bJtL$NFMHX;JY z+K#xTGkW~{&!6(I9#cHi{oryqYI7Vdl=br`k?oPe8i9u5$+{86u3T7OAMKpqJ{_;1 zWas|kU`!{HEsL73z#!=Jj8X3eC}$+%-F-2QvQ2%+!NyOug3V2EfsaGR(M^h#ap~_o zpEr}U#B}k`m$OJDn-$V{N~NxD>@;`Ypn$B(+TPu?G#w5Ok4l5<9Yp{!!`?lJltacr zz&1Nmr3_a$6f??8ipmHT5Uj-K$QHSnB+JXI1-rmf9H@;w)$+fH3!oOXX2P<~%c-x& zMgrv$7^lfAnO0}ZDv8nySXo#QwOfN1lZk6BQLP*&dvCpAaD!U z7%=2MNG%9KmBh7lU2)QEWP(n%jEr%!I5xXk(Ry8^r!O&NR#^0m8;{AO5;^Jcn>$V1 z4g71s>SgTN3+c*Z)mS=LQj8D1A-{jys@rraiN!VRmhNK#sLVb4-5c6mp&5t`7^Dss8kr+;03vb+rlYJ z2M()|6+4SkgSDZ7{INe6MBONI7+^AHfcE5RCJ&FUq;-TRu&ROq z4NXlD5R66G_7)T0ACA3Ce;7WL(TD@6X=}GmkHTIS*2n(*De3Oz!Hjmp5!EA78X8<+ zV{1$0*)x`v%TAUDoe}Ub10~g~vy!xC|HP}PS%Ixkh#sS1P8F z^%qAkYGiu);g93eTc%uLLfOIwc^~JHqDqslu2(idN!;L3&sa*(@|nEf_~VEA*oE;WA+&i11Rz|etq%Weoz$Rg z9dbYyze~@Xi<=b{+dZsp@~nD>gZMjWhZm`_N!|_&JhvuLQyd9m1;p1MuEtvJ$x<)5kP87di z07PkT4n1eMu(hfo>*s9*P2-N~ZJBHBtxaYd2@0rWCyf$jSrEImJoOBkfo~tSpB!@P zI#LoG;vyS@=5#o|EjJafwnD?t!LE*y&+SVMNbCg&Y|vacUg%hAryLwtNLUb-I2|7mm}cWEjB(|meJotPe3Ca8LrRai&}#DDyR zrGOK2Lq0M+64@&8Nlg$-Z0B{iFR0+Q?;7E^kU*kUi_m7M@D1yT3F02U1l{ z)vXeR9Q?W5|o%>wMJ2d*!ff7jyhm}RD^^{bz2*C^Xm+wIGIdW<*RYO zww%<5P`oGjMb6(<$Mf*0$yVcExf4o#c-PB|T3nMMe`ek@Z4m( ziFmsWN%%i=Cjt&876grl9%i?jl`JrNwCbbxhl1JC&!6+v1ZWZjm@u!1=`evgVdTK; z*{XMm8TBD(csO|)Bg*jarN}tV@Yo@f7!U8nwnOjuv$VDv|Sst&~6TjG?ycnkJJ934lLf2kxN>RDJYqh;&)t zvTnM)7P_o`O6rN(P`T0eup>wd@_u;q7kjd8^~*Gqs3VM)-d`va+3HF!z@_3cabm)= zgBo#u4yTTPqwrDz%PXfaan5asZqFbx9c?KUrLH=fqjOSRigx zbrZJqwK&!~=!mka21h6DVcRgG=3D514{oSD*|mWGoaQ zsQ(Klc#n3vTnY{V6r8CxT3-~n)h+QajywpxSP(~7EedOYoWa+d_qVnbOig96fvcv{ zg!;WY-b*M;9$+f88sZbMOjkvvM0W7{at8PQA zshm4wmE887a@sF8xtO%6pfNfy_q=#F0rFZUz~%MLkM?L2R)2F&HPZO`%@eT4Edmo7 zRUX~Al@7IA!h{umURQTDhnML@e|!t>B;E5OyKMUUHLQdBI0bdl${i z!(=9GeDp{}PJT`~!PJGcbma*&GqTuT4>LkEW1VUG?)jh5@i4a?sv9}g~z z6F4Dl;KA++Z|0tg@S6aeCjbv#DlN6vmJ_7Po~I4xGSXw}P}EN^C(6Xqz*2*^=(P)* zt1Y0km^}i-S$y*P_i3d(xzV|cqmz@zUAldp%sDfs^rr=EBWD)d@)`F)48gWI@B;1q zDyF)vrwC824Fa`__e{SpWB5C5D`A+F__*jhMpGhl+zG#WEzb#`jc$Hwf*}eVy-7S# zG8c95pY&(1<(I6eu4!#QvW9>)gZdwJh~__;z*M1Ld0Ao5!x|4~r83}NQwD@?YT)EV{%TfMsORz3ZXpWCiwZ?fJs)Ldv zG>=ciyZOfaPoM6FWPj!nq6v)sMQ6bL2jkk@$nD$rkdQS4F+6 z>zJd07x}MlclIdGy_iH)mskMwo%q;hp2|I0WB3oP!P;bwJk90&_2jLw=iKM(p}xs0 zsN%awy6Jk*!|7Gm{umAr;5G31Nv`;xA+tMj3D*t$TWI@WjSe;q!-HHfUg@577YPEG3%13L*9Bvnhh?>^SpbbY9?ns`<0 z`R3DM?vdRE%lr2-3#cKyPY#tZVGgDN|6s2j8^BLGZ9f`GES~n+v^{Wt*SB<^MCT#+ z;M)*ir}`j6(GjJD+Pg<=5)PzYktQe}SUk_qC4{%af!!z(n2DZllx6)w2+#PyJW$lG z=OAl~H3kAKPQUie3C}rllK1umiJv*Gy_ye@aB3~YRBm$`qvn~aS#x+lpuF@5hrlIQ zzUVE}Cvjx@=2nZd=o^Cb)TQdn3QRszZ-yRTY>aQL>as`XQHbgJ}Ax zkgFi-n(J4{_+?JH{i!?-^o0?1U_^TmAD)6~>Uduxj_P)Es8?ahM|?37D>Eu_DH*u~+*Z!xh;&F@G}R#(q2^{C5B-jpQlt_T^3 zV?YogaVPIy8**ovi^ip)TMsh!BHIKcE99pHE%^AYP_A8!nFho^SBqn=V@(m8CXSIN z9=yVL7iz08tW1|$x`dTH69*>0|7F0#lQ6$b-!KY~Dpp#^E@T68pg?j1 z&&wu%t3?O%|Luh#3%?`GJo)-77oNTLPZSnr&9ok#e!98FZLy@IBvE#L*3u)KAxt~Zk z3@0jXmQB|i5^bElXIYDx83H8dPcVPpnGqc%!=@&my!Gj2<~D2~+OBzEpt<86R!`+r ziqUf8P5gwRe?>|zfL`F1cf`qzLLw=eL3K|;?w9KP<_54NL9>xhP?=4%`MN1s%>M~3 znV$+GiR%$??IQC$gT!5ajjJ@8fbdc1l<*Qb`f51qne@>z`jBrd_vh%# zZOK39);}`|s?!WlI7~eR!Z0+0@E&8L=b%O`kF=D?PsO5u;{h@X^@Dex+{Lu$F2OIx z^#K6g#J`te(ErKhl2_MOh|e?;_^nq?8x=ZGVN^@yqqXX+wG_yM`+o1s#RPjYEbomf zN7bXmZ_JW`tPFu!>%K8Sl6hnQfQ(QF>d;B1UOTS9q$GlRg`8hj#lP^({71d}ltgNr z76wvn6C3zmR1azqkRsW*hc9{Ug}$B*nB)ofZvvWFMP)Pft+OLswjWelkx&uAy9K1* zE*R&7cNEsz_p+9QexZgV@f$Q`LV>Pjz zAzAGKr-k>Gc~f`qK`mI^GxrIXURNKXO-r|A{(T^v46O&ZR^3vRIyA=t-XoUG!aIv^ z7jl`~#TYP|=DK!wN!UOV#QPt~LLYK2bAT>#AlGNDQEj0}(PND8gi_ayovpULQ@v?Q zkGz{(v}Ph@Cu8FrMRwVc%fNm`v7XH!y{)%||Vwsjs7&xo{%|5H9wyF)e2cJ|AXJ2cD79WWVH# z-M?-kiN@RT1<<~^s{BHte6Ge9_>iwOJP2VLq+@B5-J~{b0z6>B49wj5Fb2MS`gKwJ z^qvJBf~?r4Z|NF180hktyV90ZeKm9wGhlKhwKv|W-AndsI23A0R-RVa93PVi|E`kc z<{f8ye!&X5<_)6bY5t}c_;tLm)slGu8J>fq_6~e)NYP>JV~W`_Nr%2zD5C36z#!-# zX8_vur;~x$^P%qVmrxF8zU1QwHHm0X*!K-CfQTbQ*rsknB!kQ^s0ddr!AT&li5q;J zmN*{#)|V2|tWnZ@fWlFuM&&r@Tk0lPbt% zh6*Y!2i>yFex@8O1yL9nwsqo{@+I@8-6QM~#XcdB!yB&SCBR-_$H%M`F{pWWB}DDZ z7LOg)&{~CUM~cw5r-({6 zv;06VlFie5(zc?h%8RqRo>RM?DKhTKI|jt%(>td^mirc7FWZ$6*$)C%EtvQUiiVi` z-}g64(Rkc4d~-k4oeHIjrdv%fkG^@l@AFNjeBL3hbvR0v4+su_;E~fbcNVIJI$LY_ zV=kIXUp3G-gPTamA*pVYw~g0)CnCg=#koG|*Jo0vXJ}~X4SSq8S(Xyuv3q6+GBC+h z#3I(*GEGmWD=iQ&-fpXPB5h&;<)vrNEP0VCM53qZRn;Esh+CXrJyQ7yzU#`fS)G^Z z(48J=x;#~c$;XeMNXT=nCp}1ZI~%7`<>e~cZz^sQA5A^tT8{75r&coiSV6=6@#Dv` zd4GirI`Yn&^LZJPsy72oRi}!A;CQ+!&85E=RZGg_Y^J_a$&WsY3&;`q{%7Hl|CIAn zfB3pyvoqU+H?r{Q=AvWS-RNokNw}IakiYHLbGp`0H15+&I{V?MZY>J3_C2*(2lXwM zF9x{ID=on2+EN?2duKzxQ8T>$r@6F%bz?DTUR}%wnb$196p!VAMZPR-mY5TqA{W?{DiAC$-4Sqib7rI8MTNZU8H7J?sQIKn>M5x`r*Fnx z=Nr~eGftm`KlXcJA{%)oL|`L0!RbHTcX4rG{E}yjH94Re)BN`Of=x(>JcPt0Er$qQ z&bN1R3huRT8_sSNvo|!PVes1#VEKlVm~lty!;W-U+3if0jc{8v z{dfLzQ*xJiNf;{K%W`k77C?wNO)Ons9DOe??k0vGV4z(4=Dil*jgCGepyp?azl@k^ zK3sB|f~iWbtf(xt6EAk`-ySIXCpA$p22@b-@YsO>S69~IQ5a?1PSaZ%?ZDt3gYGu% z`E>mf-K5X<{YPBYFgd>)p5)Zs1_wNroG&AbiBWGiy;@Jl%??*qiNgZGA}{0HL6u!j zWG=fimAvRu(~#^H_aiPY0l(8%Vkm5c!>_LvEeMeP_k4LplP5YKbCAseNFC|2D?B43 zSgD=k3vzkfj8Tl zk3UJ%qwxrnaARyoq%CWqikqM1dEE0*

inuZqI2l3Ei1N5r@vS608C{SA{wKRq}W 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 From 6304ddbc9e1519f98bb6d9709f9a624270cbfcc2 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 31 Jan 2020 12:44:38 +0800 Subject: [PATCH 2/2] one fix --- code/datums/martial/rising_bass.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm index 46dfe27f77..779428669c 100644 --- a/code/datums/martial/rising_bass.dm +++ b/code/datums/martial/rising_bass.dm @@ -50,10 +50,12 @@ var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "[movestreak]") H.mind.martial_art.streak = "" + to_chat(H,"You relax your muscles and return to a neutral position.") else if(HAS_TRAIT(H, TRAIT_PACIFISM)) to_chat(H, "You don't want to harm other people!") return + to_chat(H,"You get ready to use the [name] maneuver!") H.mind.martial_art.streak = "[movestreak]" /datum/action/risingbassmove/repulsepunch