From 0ef02764afe0d48739c9c5266f8cce0bf600da3d Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Mon, 15 Mar 2021 12:11:36 +0900 Subject: [PATCH] nyochio too. --- DiscordDivaBot/munimuni.jar | Bin 9711778 -> 9711892 bytes DiscordDivaBot/src/sig/DivaBot.java | 25 ++++++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/DiscordDivaBot/munimuni.jar b/DiscordDivaBot/munimuni.jar index e5f8db4985b6bc3a29225b2a0c7e2a397e3912c0..7b30890682ce36438b25c076adb89f78c65d31b5 100644 GIT binary patch delta 4041 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 LQd0s)LPGK%N7bcc delta 3911 zcmYM%c{Eh*1Hf^^M0T<@_KbZjBc`!t%`#*!vX*@hg)o|g$j)3wSzb#>A-gP5k+CIY zmwl=6MwDuLm%r zpMFkHZ|q7uAtX+(XoQ)akmy};a z`#tU3%VrCTTptS(_tUZN4&-dXw8*!$PNiPfr$^;2%mnZ`2XZ<)$2vL(2Y$IssJl%0 z^I|^8!xX0$Kcv<3Gj8QK;bZLfl1UbwqxiPpAlG16ZKid?w5LL|D}nudd{Y7Co`jBX zN4^MaaO&wZ6^kqp3qO2hrh+u;5vm&z+!c$M4f@-&%RvM1uZ38Ij$oF>L`eUu=TPP6F==MU@opts0(-d4)d0$4@)OL|#0uk9QP(vhLRzoIfkUvtpf5arsG?}* z;7sji81mGWWy3p6^kL5%b*j|byyhQm2-mod&v`iR5#;ZFK&b>yl%3JLuCgw2v-~c1 zY30Rpll z(1@(*@^U1iASAAuJMDo@{J1QYGwXONKA`4JjEKOxgf!yp6HmH1c*NL!YHb+AbP{hw ze)Bvrli)tPB+_2v>_lp_Sw&pPQyD}#D}P@qMW&}j9o$Tn7uk68^hN`Bv7jd0Co9P< zIq9NWFMR&SJ;o7Arl7?%kK9*vGP4AWPg?!YTb=FIefhQFE?x7>9s_@~lc6cnPD+Ak zexTb!bh)Lc$!KO_xZTxB(`y~)nV5qn#*x+s=L!4MjePc+p9&fWca}q%)_>XPrP=Yl zFZ*4$-mawZGiA}6`uN_+gOY(;Mr6JwMrub6x^mKi@?3Dy`&A`}|A?#hIV?g-ta5AM z7Y6ze&m;FnYG8I}F8*)Fta6{)zFm9oS`{Jesx&*61!CiGY!LBOOtFjcYn}G4zxHb~ zOqCFF&A`t;C?q7v*^LkqXju62aQjbe%B`hTD?h5b-67MYGg;<9Zo$0Fq1^@}gfcI* z6mJdMJZ=lEMwl7B9ZXFOl1Lc}rncN$oWH}S>6o?_xkF{!6SoXQ@;7$zTC!g;k1{+S z4EA00i+iB(gegMUVA9Z3uKz=xyXMq^SFlg3?&zfEb4P(Jp%>vYDJI^pbnlWe__&v_ z_aATK8CD)q6g0cn7M}EQZY>o!$v{@CX6!3f`x{Xa+DTs;UXn-a_V$g6cevEF`y#*g zhkji3*M7Rubv7cfJN)T{H{*WMXN*6AKnZ#GHx+ixBE%f$CAwUCL11j?&@5cfs2#)^1aEI#F!vQb)KS zOTASghve4qHLRvv4on0xRhwh>?n6?GGabAWsltJUPSh8fx~o}U?}Ttkf+hq#i`>Gd zFWeVLxqOBXJNnqIuDLSgyo!6ZU!cR^F72;DY_VBRJiKGZQzM8;9c`;PU#sHfSZVs?_(_aAC11wwf!_9GUj`2rWYN1> zc?W5}j>x}s3y$8+VB3)izy2oEsy~rk=X;`a$>V>!V@Af<>1c z4T3KJ=f1m!j&oTL^KmPl>RmeD(C}8bnS7%-MtS0@5Z-m`wi;)EN=5^n3~|u{SCV9a zQ>-3+FZ-PhSNtS0PqJm*rSgq-5t*AIMeCG(^!sm(!(AOIPx)3`313rhw;bqVsG(vZ z$^^Jn)EckSX|wUG$8)2Vh~rOtNZjs+@2&;~Kd#z#SiR1ZmJIk>OThA*Wtxp2nFV=P zP!43K^ALk0&*iY6RJyCa<%;|cjXNdw?b?#4g-&8I&qNftcrf-$v|M>y_Wempb6f$* zsj~||_>VxO>AGZ(B;l%X|FIc<`lCvYwU4~4v(3vd6tzvnV@Vg*t#1h51G%mg&VhiI zGDgM#?v3FH$5f%PbCKnl8RYP$fc_hPuhWixpRIA1!ZOE|F?kOoHvM!(%>1))+X-|}S!oI)y zYeN4v^LS&@XLY-5Os*5-#zd-&jcr-FHuv@AHr5UXB4K4FnP~)tf>0~YZV_D9zpstS zGtX-!1_?+%K2SN~-XSb-vg}+;w^`Lg$L0QK(gK&*B})DdCin$ZoPW{C>Kh|8ACT)& zR3R<3>{aye(U_I>=uyv$2eI!%G#n~BGtv(^+`4$q^ysj^=Iirud1ve?)7eni%tXz` zr{0`Y*b)`?Zx-f@mT=#ytSHyBu(yo1x3JatbO-nF%6pvEgC;1?xM$H$Bb2FQa8#vN zLXKs=?fwwk4_89LTYqkSJ{j(*p=CF3TV8X{%{JW|&#qg?Dw}Jv$&G(4*2tQ`dy^<057A_WmvVU=q0)#MpBW#e`Gm>!^YGN;pH~eonDxpIx#HX5%9!Ph z+CbI*)(7Q@WrVjnWH;F#D>`h>@7~4^-4r_BIa}{)srbzB>Rxy5UMD+iL)^)dR{!8Y zzQ|K`0V)YwCh{1o(apiW8`@3F@zO@(Chu;gsh;r}N>}vx!)a~KbTV`xa7v7oj?SCE znIi3S34C5BnBbF5@GyWLU;yC234jq`0!{+V01LnhumS7<2fzt%0o=eTfCu0O_yB%D z05}aG06{3KRp1)n0eAvlfH&X+_yT@_KM()}0zp795CU8W zLV++K9Jm481R{V)APTqzL<2EEEI@nSalmbW0NerMfxAEgkO(9J_kd&|1-K8S0%<@x zkO5=@SwJ?B1LU@w;ED9L;GH6w%R;nYJW`GDm7E-76SQgTzRZ9-KK6T7BKasng7imn#8i1vQmG;&PhX58jVeOM^e>c%=E@@f-AP{w z>{N;-DyazlcOnH$z??`GN{|8l;RVu1C9q)0oTRJ_uD-;DsNnj)g%!$RVYM5nm$o6> vhbZbRND@bbvpn`AS)jq(Y!r!zhGb~B(2a(K>4#!T3us7Nz diff --git a/DiscordDivaBot/src/sig/DivaBot.java b/DiscordDivaBot/src/sig/DivaBot.java index e12723a..6f64512 100644 --- a/DiscordDivaBot/src/sig/DivaBot.java +++ b/DiscordDivaBot/src/sig/DivaBot.java @@ -70,9 +70,15 @@ public class DivaBot extends ListenerAdapter{ /*ev.getChannel().sendMessage(ev.getAuthor().getName()+" typed '"+ev.getMessage().getContentDisplay()+"'!") .queue();*/ //System.out.println(bot.getEmotes()); - ev.getChannel().addReactionById(ev.getMessageIdLong(), ChooseRandomMuniEmote(ev.getMessage().getContentDisplay().hashCode()+ - ev.getAuthor().getIdLong())) - .queue(); + if (ev.getMessage().getContentDisplay().toLowerCase().contains("nyoc") ) { + ev.getChannel().addReactionById(ev.getMessageIdLong(), ChooseRandomNyochioEmote(ev.getMessage().getContentDisplay().hashCode()+ + ev.getAuthor().getIdLong())) + .queue(); + } else { + ev.getChannel().addReactionById(ev.getMessageIdLong(), ChooseRandomMuniEmote(ev.getMessage().getContentDisplay().hashCode()+ + ev.getAuthor().getIdLong())) + .queue(); + } //messageHistory.put(ev.getMessageIdLong(),ev.getMessage()); } } @@ -88,6 +94,18 @@ public class DivaBot extends ListenerAdapter{ Random r = new Random(seed); return muniEmotes.get((int)(r.nextDouble()*muniEmotes.size())); } + + private Emote ChooseRandomNyochioEmote(long seed) { + List emotes = bot.getEmotes(); + List muniEmotes = new ArrayList(); + for (Emote e : emotes) { + if (e.getName().toLowerCase().contains("nyochio")) { + muniEmotes.add(e); + } + } + Random r = new Random(seed); + return muniEmotes.get((int)(r.nextDouble()*muniEmotes.size())); + } /*@Override public void onMessageDelete(MessageDeleteEvent ev) { @@ -108,6 +126,7 @@ public class DivaBot extends ListenerAdapter{ message.toLowerCase().contains("muni")|| message.toLowerCase().contains("むに")|| message.toLowerCase().contains("무니")|| + message.toLowerCase().contains("nyoc")|| (message.toLowerCase().contains("vj")||message.toLowerCase().contains("visual")))); }