diff --git a/FreshShit/StinkyDetector/event3.lua b/FreshShit/StinkyDetector/event3.lua index e2ccfce..fc7df69 100644 --- a/FreshShit/StinkyDetector/event3.lua +++ b/FreshShit/StinkyDetector/event3.lua @@ -39,7 +39,7 @@ function(allstates, e, prefix, msg, ...) local faction = UnitFactionGroup("nameplate" .. i) local _, race = UnitRace("nameplate" .. i) local raceFaction = aura_env.raceFactions[race] - if not raceFaction then + if not raceFaction and aura_env.config.debug then print("Unknown race faction", race) else faction = raceFaction @@ -72,6 +72,11 @@ function(allstates, e, prefix, msg, ...) end return end + if not note then + if aura_env.config.debug then + print(string.format("Could not get note for %s (%s) with deliminer '%s'", msg, note or "nil", aura_env.separator)) + end + end if threat < aura_env.config.threatThreshold then if aura_env.config.debug then @@ -80,6 +85,9 @@ function(allstates, e, prefix, msg, ...) return end + local stinky = aura_env.stinkies[name] + if not stinky then return false end + if not allstates[name] then PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master") end @@ -87,7 +95,7 @@ function(allstates, e, prefix, msg, ...) allstates[name] = { show = true, changed = true, - name = string.format("%-30s", name), + name = string.format("%-20s%2d%35s", name, stinky.threat, note), progressType = "timed", duration = 60, expirationTime = GetTime() + aura_env.config.alertThrottle, diff --git a/FreshShit/StinkyDetector/export b/FreshShit/StinkyDetector/export index 376dbe1..a152c27 100644 --- a/FreshShit/StinkyDetector/export +++ b/FreshShit/StinkyDetector/export @@ -1 +1 @@ -!T3tAZTXr29BzrkvgOmixasD444JWtjstrYWbAvTLSardmnaMfZb25GuuEfkl7njvQSvC(wQk3BvjvYh16DDfFS27hsLVd8pkVxFmtpZ0ZaakQJ44IIIZmD3V(1VR(9EDpt3Uz7wTncABS2QnV5QR32WPTHj(p4Pe)EhqDheoS9HRFZgTn665Bs93K0BKPV342gBAB94ht8nN0PLNNDOf8OhDu)(b0W27UY1FR3Q5BTEJgnV5TAU2TASw7(RCDa8xiQWH3OXQnA0yTRF9MxVXnx7gTng4Bz26IX02gNSTSV2YZ2ZhqLdB2(WgTpCn2)Vo7)Vo(Wqa1ht6rXImi9cT8CdyJNqIFiCbuEFlxRGH8RHl5pfUo03AWaQFah6TIFaEPjTBu)(CK5o7CWX7EVdGYz3sI8jRH9k12EpZaoCdI6spJ6gAaTY6rTnoDRnmADQrRnobaMlXHkQxe2)gJTjxa9JbRjqhqj2ajogih7tzaX44Do4aERsqTqoY3ZZoYX1Gp0B22WNyAffauHgaBkGA3)yple2To64d2zxKvABnWTTb)gFVqcsQq6i2TNqhiiCqtS9imMFua90E2KGG2Dzd3E4dDIa2SKcYln7tdSEmn7dHh3vi1OYrBY4OnzC0MmoAJvVbwzIRLdjK2EtaC9i28XixIaXg(v7yoa4hg)8iIpDsNDJSTN05(dTGMz4ZgqC(N5fadWQ3aFVOXYMAG4ikYe4bIja7oOh110YDatYHrQrsdqcP(Ue7FciMWixRDtG(y5yHIViz88eoqpGagsCd3fKcHbOXjBS9E3ZGrg3WT3qp)JP(3dz)X4Vur46qLSavUnE05M33Q)qJBHsNE9ot2R3QX6iBfRJrOL7Olm6rCDP(3MpKGr25Tn2(O7Fixh6(wMOg7nqYi2X76dcGCAHXwNSZoq16Jpce4jHefs7EUm8Hpy6BnGlpqIcbGC04WereoCfIyBTZHT25ewBmTuQemWpGrQ6k5N4Grr30WeuLWhEkxZkGIGiqQO565sr44qSCx8AhRTVy1NlhhBcWlk02ckW4O716G9oChaEEGwnxAPrEAHWWbhIroDrTAyCVnipHYUoKh1(WB2GPtgshZiTNZ5oOGUHdmYWNHwiaDvlhqoo0BsNdSodUFe9ca2H2O8zFcOnb1frcuATTXEUt6ihtHOSCHisxbI0Su0OrmAm0Nscbt6WFdg6zBk7rf84gsSJv3KAgIQYlaI0yo0KyK5U0GaYaqXKHpEa1airiHsGaoSYPYYujvXOntf7QeP2WM6hMhHYrLWPmzyjbBqmoYOFX4tO3GbiIRGpzbuxbyWzLgirIT53iWY1qOEZIH6MX1mwC7qVqR(xmPZTJSSHzWxzshUXfrNfWUHxjwvsHpCuucIbCq4HIKSMnPJjnK2lKA((iIDRsrSfhwt6uLyAIfj471YtKuX7nWklq(Yh0aKzvUMcDcq83Ajq8ZhAbZs6xezOue9(82MflVVeKkmhv07p(sXWZdvLrVEAym(vOiq5JEnmUqMbPlLCb3)PjDgzzBRL0IfKsYTiM)hWGqAIAZMpNQrCGMLMMGtQsLlIkvMHBb0Y1EULfKeJmO7sY7ZYCqCB9lRA08h6LW7tl5oVXDbwaAE9LIUcGGpfEFFlkZDd(eaMM7kFqoYi0MGjDiO7RmfhlAqkymPJTvqidzUXcqipbcNW(cnAfjiXAfHUm6XUEaDjiYN((PifOFYard4iTOpcU5AaB4AJ99gat(J4)apLG7AK2h8qwlGOAOsVtzbQ0R0ybyr39ifi2lki0Zb797n2edpqgbf4wMh6FzpoWn2aUxB4GgMENkeDaYI(GdX6W7jKMkUYyLvw5pfj8t6WDjH(GhozFmwWtPUNTQaM)zr0iOgV7KoF0tuknGoMa(IIKvOOk)pFxfLczc0JzH8Xl2O1Eh(b)0t3ENw7SvRJobQlgEg4wIpt(u098GeRQdm1MS)K9tW3ai4r3bi6A7bXsH8BPwaIOypg1R3ymKqVk1HB35rHKhFXi21goEJay6ttUZbcYXNWUF6)(0VC2Fo73Nn9BN9jt)IzFmVG)XzF6SpE6xp97M9j8h8Vo9zZEkuJNn7xc)cfb)(SPFvLjDEsXi22GZLdTPHeE14JkwuNXSb(Z6BrrRLc2GCmNQmukxZJ7nedLYwBzcBnD98SPe3j7l7so6T)Ko8FCuECfy0gxa2LzFwC)LTarNbpUpXoGILexgItOiKJMHOM6Oou1uCUHSM6WWM3xzSRwhFAyKVRclqwOl9C(iiYLP7vvGT1rCQECpxxa)AjTu(JqsaZGbdsGQVdW)djDTPv)ONupfHp7pNEQLRjLRgLd3K)8en9k2DRQYgDkQ1SAk4RWF0xUkpwET(AMW0fxH2iy8)8nqs1z0M4sbR2fjQi9ct4JxCvywPuCpknlJ3knejlGJ46bX9eBZHNLGvZfPaqAgsDtWyah1dUSqIfGJS1JbHZWQvyyllaqxvxJE7k1kaWcriv2Pqyyvq(um(EBysohXJRwdeRCTqXYk3(E7DW2vQDjq3TPNHjbn40TJCglf8lchzYZRA5gaXfwv7Si1t8XjhZ(sXQJ945QJzhdYxOSBHdHZLHJ(yWTzOHdNVv9rvTtRZTwAbiG1yILFqv5KqqVz6vSTM5iLHiJ0QxL7FN9moENt0jw9Ir865umtrC7QYqtsmpxLcGQq9fQmOW68vMLhvp5YB(bfC8JOFF0kKAmzx5scVCShjKfEEmlLM9)AHTPIL5(EHjQ(8Gbl1N3aVi)EL7zneHnWfjZhu4QdEiXrd0uug4jEOitJcuUUeXQNQ7RR0jlJsJU0q96KXZy1fUGb0r9iHv)OyoOk5qHkJrgKpE7AlTnAHUX3lmh)6UmV2PbEPi1)69eflGKFbKKLqp4hMI5)hnfZRGzxE9jrakoGHKPvbjFhqXQY1cM0b)D2No93m9lN(nI7E6Kot)dt)UP)(PF3S)Qz)Qz)n4Zrz3Nlk2pmTZRd6bVsMX512SK8QtB4hM85Yo5ZK9ZUoiYGTvw3c3uAdQRbIyR9W3dmt60CLMnG)h(TlxAYH8ilhsCftbuVWyG(ladvt2xU3bsVAi8op3sHi6z45nuEmhOXvwN(TRwvB1v7i9GslmYH76woJSPTi3QzGOsDzhwNd2xKRHrweAUlHrmTNDrblErcNqYL1dljRHDXvWQrWihzhsQ0)S8yLe4MjvraOQvckL3Y20ph(9FE2hp93c)(LG1SFpBri)IFeAxiM0Tq546snmut4ZsnwYglqmUwpf7SEkM2CdcGp6ywsINa7(uYOnGgfyqoJAU6wxmIin8PTi(ICZTjvgqw9y2E4yx(8fBr6nKwcC1wB1UsxBmI31ePnf9GkT8czlF8d5sYO7vkLMS8YpurFJnhIszaXSzTus1pOYjuZUr2J01W4IG2DJAP6VP)9Svf)BM9xp9R10YufNV1NyrDP(66rEb5BX9CpNemKAQPnXfPbl)hG57)C0haWxGVD2NQdtZwfnq5Fd8y4PZ(vt)6PptheulgBD986avqXQauaONNdYDhs9fBqwp)b(wooe)vLYsS6DUfUjA6YUkCiW34lO6AX7VfE1H5S6rC5vKVZIGN3ncKFTcX5aVGxKPv)(w9ISdRKEO9bE(ENrWTxSMbMsH5jkhB9ytVap)rehnnvTuOTRJUVChCJzNP)N(pn9la6)3I75IPF5Spg4bFLosSUQLhN2mYD0iQwbR4IY3QTPNBspxREdRaOfxpdw)Vm7PSDkY3bou(SzFcW))lls4OOQMhp2XzmXL4PbiYskLs(RX9Scif)uKqPdtsxb0uacRngFHFgq1YN03AKgqikq207qy7vkFkvSNu6shcwYGIScqXuQBVH42CZoakBiIZ1Y0tBCbvt3GpfaYBXqVEHr4Ead6imIbAyigSSNNPCd1HtxqmTVy1vbb)Jj4Mz2d012(WDzLCbGjor(J8Yk5FmjyKNoITOaO1RHiaFlOLSGqmDRH03iqmKG(nlN4VfS8btkp93cwv(D64ePRaYvZkFbf(nWV)oOcFfk4m9B0kBPPACdqDQCSxqGvxeZ9P2Kqjl6iYOGrwUzq5744PtPH9yu8ViHoj0Y3uzjASM(Fcy6xOFwdzr5B1pncFZx00grbYH9DOCPpc67AagyGcdtrsKjUya3ThZa6BeYnFcLAbEgH7fpEuuqXNtCfKVmJ(99IS1j)YFUMz9iHHu3(u3b6N7tTyP8FbSrU49WKbBG1axUKFOVxe4OvgCDtBWJn7l0zzuuYvDpEcX5)(xBtmDT0owJleG6T0nJ52E48KmxX6rIcOX9d07U80XHPn7IyecS(qD8chYyT7fQihiSjq7d(rhYho(qvpJYy35vFzBUpMM1VbSDZUtVASUkMNVB4tg55EXqnWiUiP87gkMtTPebkIIUEUW1rUHw2C2akUgGPSWHYkImGKtVE6FhIEWSL)bC3lcZB(zZEQUrIUQXnaMNVOUFiFBMcseeLNp(cJzY1zyOdtWayis3semmO)6cU3g7RZfErO3jMmDo)lchYID33AWWWyhCcOiy4U9ylnbVNuD(CIVRa8oc5fK4ne9)rTlZsA(pWebbMo)CWIZ3Q3Cu2QuKZD)FAscl0P4qS8j9OIiw0edYr(9e0jX0bz8r3KsmlPcTGUH6wwf89STlP8nTHz(3XUFjv52EDTTkRpUtKdjU8nSTTiU9YuLTbcy)YRYHi7qbt0xRB7cANZPV8jqipwLxP7dbjq1I0mUNilnOuLXyId)LVdQ56nIlZN2J6gAFH8fei7(6wUVS)a2KGPIQFo5efUgSK6JDUsy5OqF6(8bCa9qH57Ik89M0520qCiuTgBl8NEuXurYPbksLmlqxujWhKdztGngm4drgwltIhvXsjYpPZ7Gz0tFUT3ptcXIxyaKFWIo5lN(FH2jytcaXPm7ZM0z2VKTXW)6z)fWKdFwL0D7ILWGe6I(bUkESKqmdfj(wz6N1VYBxULyOqykwqHRyOMSDqEra4lhoVFs6W0l4)UQc(7lykjP(snVqLM4OK2WKvtNqP4mURnJ0XTKpl42Ix5T8zooJIE6vnkv3(aS6pKN7IYRX7Kx6oTHGSlOrM3x2IurKPWojd)5iQcuixt1ihWLQkCd(PPfsXLLPnkcWlDZkS)sz5RCEHwzrDlQuY7HLWSU2fqu5T1klxsApvcePqA6IDJCuRbGBhg5iaP6MoKTyCwS6GzOqTz6weoj0Ll1aaxoq3ZTVxvlDR2hhCk0jCL4kGgZWMraECgFLb5lmyzkVfSyHX6yYUFuHtii)zdjjV6OfAP4K3S1Pix3F1n6dodufjIXk(fV8qlk75sYMU8SR5nHBw5(YPPxoAur)SYks)w4dimQ1kS)Hxzf)aUT4FuLLa0gscdywGgu1QE8RI3IafODLulQ2xONxTKOdrDdU9UNxYKcOE)RaILULtpRYxIf2vw5h7h5ohr1mlee3(dsP(XMroJNNZbZ)7fe)vYv(UIY)R47oI4vuv7xuOf6dauMpAqkFnHsE3ubHNJU7MB060do62NUZpzNdBD69oC39oO1oNSZ2PCErXZLyPl0lSvxD1A5McXmLZmPFT0Y7IqLkAC6p2npQpFF3S1b7CVJj(bGGoylYGvm6Vx10yqS5Bw70BJj1KRX(LmhV)JxK7eexSBKkSQPidPN7A(toepqsGsP(CL2Dy9uTTH6OHMTm0UYPHkiXcBHxHGQU3TMB7waQ7szAqviehDZJUxGd8f5lywbCzOWfYSosubnc48gWxz655k(Lupkx3n5xKQ)I3kEOcCK7ixVZDRu(wi7kscvl2KAx)T4OKAIvkGajRXstFs2FHlb(WiQwMZHFD77T32ZdFyriu2(sRqTfrcE2YlYwgKXaAychhZwkZRsHVb8NxBEaup(MBJRmFZK6eRmlvI6vd9kLmzwIMsHV8PCXg6fB5jhsyVHvve(QWZLfUPqlFSN41yfdP4HCLKiklBSlMEDhlxt2s4(syWelvCzgkBNIZ9sE8OnnXxYmdNzQN0ydu4C(cu2BiT3Oy3nz)jOTrjUmM97BPWJ2HwM4hZfikftDFxkfFe6kYT4ixbcWbq8hOV2gnJXTTgI7nrrAAk0Jy5iO1EB9b7CYPnB0iTZWjpxXl3AP3UEP(yUKBwD19wS2DT7dA(W0ZLN0I0ZFuqoX5BSp(kQw4(cUzg)fwkZACDGmBgYJ996b9bFZ(Y7S)KjDUMjpzl)CSFXvS7pslgvRwPoAjQQ8JAHESYaAyQx)vDFbBs2s0RM8fer(KKpIiYNe6PIyAJ1g7wu2s2Rlc45Vng67eC0Va6DAceCbvLwFXJWmiKesJs)frAoHugBc4oGbG7AC7t3y7Tp6qvfNgzTAKkyZIBwQGnj22mKlq9YcIgv5PYVgsAkYjyGMayJbo69qDjaQZQEUyBzEkWvtROG4vMJd4HH2PTgi0bzphDiO5Ank5nDGHFQP0mgNNZl7aBtqIvC1KV1wlwazceNAtghqnJxGZ0lqah089C(CHiJ0PcU3tqxwmekjsrSpdg6DUUelSyTgvthSqbnUCjHldXJV75IPDPtXXccdW9IOqXIj1yXB95dTWfOjl9(MnkxEP4HFAXGu3VcdUlnmvhzXx)M4(UDHbvPV8m6K)I7N3lzHNxAepdBn3BmW1mzBb3KQvpUJR9cCSLLx)cB8Ht5hKBeQ09l9OCjvFtSLPb9wRrgCR2lbRdLXRkjVtZBDAUEJ5BEh)SGVxap(MQvWe8og3eHYu2xBjn4hVwpiCzP8qhmxuOPUBjqak2xeSV94pxagNve35uXq(e4MNliQSpSspvT6g06b4npCXMRJfUykOUCQJIWqVhpNrYHRGIwrm(RDvp1Lkhtf53)kXE1cUJzswS3(ZR7xgTl9XHRjyegRt6ijQskVMLFp9F9nl5f0v6oaXpm)cUZu5hZ2g9wjV)zd4jWG7cALQpyYtes06(UGYwuUh(M1QuG3GPEnszyrDExw0EviRTawBsf0Q0VwL3hqp(7qjVdEWApm)kcf)wbYRY6pulDN3RlWI2S8PNlZCf5swhVRzCeCAUQxd9VM)2azsXJUbxC)T)gxl4nQehFaVnSK6bX8vr)BpxTfmTpcXN5SyqsQ(ReAKSZxoQKSvVqPtPOuYE8D0e1v6dEGxoesJrwJhN6TU3ms8cPzJXYiX3Qy(uEh0hRAvuFFHNZG4QK0Xt0PmeZY3QgO1BdVixZDHaoQwzp8qpbmAt)WpK90Gp8d32ZrKQYv9gmG9b99UemLMvkoJq5683v779CCuGOfDn7t8SEYPPkX24Y6h5kRZDKKT77QRldzCNqBXsfigEhlFmv0uvzUkzv7Mn0ud6JgBXRJUiTFtnBWl1dfI66YFCOhMLOYg6jVR4X9vjJZYC2UsJ0B2)NuA(MNS)IL5R5KLl8dk(pJLeNZYLCRw8AEG3aRETnIt1doHxm6WM)HLgocdgI2CxpOxpC9cpPA0ES(8ZGEf0PLhrslY5VtQtAPnpQvRJUB(JwNcpdEEn(mXHFEeDNQh3YDC1rM7HFt898nVVpzCBJ7hFv2tok8SYPTXopAmkSDo5I8NjqYZwkqcKD2fPCmrze4z71Etr)JN9uEoDjSVE9fCotP7iPQGdFQ4ZZiXzOs3soJl2SGZQHUfE2ISz(dch2bRLMd4JU5pCk6M64bORUtELU5pOBqrl8SbIFKaL)0AOB6V3)DZEi0WpCA0Fwj0vs2odp)dwd)o83()9d \ No newline at end of file +!T3x6VnYr2H)3YYGbMewslP0C444JijsnJK1iPOMAf2mEOyr2fj7L9b3(qA041eES3KGGFlIZ3cqoqYc8li5JZUznIpw79db57K)hL3RoAwD3v3KusZrCm0OrK1XRE17QEVxvDxTQ1QzlJGwgRVwT7U2gTmCAzyI)dkL43DFQB)WbToyJ7wTLrhpFtQ)wKUdn99g1YylBRN(uIV542n98SdTGIEYH96fqdBTZQ3(TERAV1gvRw7U3R263R66T6T6TbWFPObhCNQRvTA11V9TRD7Q3D970YOVVLzZlhrBzCCD5yTTNTNpGkhuR1bvBDW6S)Fd2)FBSWqa1hr6sXQmiDdT8CdyZNqIFi8bO(EwUwbd4Fg(iVu4ZH(w97t9d4qVzCb4hnPDI61JJmpOX(hTZj7d1Z(kjYNSooQuB7Dnd4WniQd9CQBOb0lRN0Y4ST30O5zgn38yayr4GAmYMCja84MEKpL1uJJASpaCwzWGrj2a52WL4qdKyAK7mulKxuxp7ihxd(uVwldFIPvuaqfQcSPaQDVJ8Sq418WJ2VXoiR02QVBld(x89cjiPcPJicDmTVGWbDX2JWy(rb0Z6AtccA1HnD7If6ebSzjEXRnDPbwpLMUqO4ocPgvoAnghTgJJwJXrRU2DWgtCTCiH0wBbGRlXMph5sei2W)udZ(a)W4Nhr8PJBVtKT942NoWc6MHpBcX5FMxcetRU999Igj7QbIJOitGhiMaS7GUuxtl3(mjhgPgjnajK67sS)jGycJCT(Db6JLJfk(IKXlMXb6ceWqIB4oGuimbnoEZ67EIbJmUPB3bE(hr9pbLeIXFPIWTHgzbQCB(Klmp1Q3aJ7HsNEDpxoQ3R6giBfBJrOL7Wln6sCDP(3NpLGz2fTmQF4PhW1Ho1Ye1yVdsgXbEhFqyItlm2(4gnGM1dlce4jHefs7UUm8Hpz6z1NlpqIcbGC4OWzIiC4keX2UXbnBCmRpMwkncM47ZivDK8tCYOOBAycQsyHNX1ScOiicKkAUEUueooel3fV1XA7lw75YXXMa8IcTTGkmo8KM7V7bna45bA1CPLQzPfcdhCig50bvWH5DDqEcLDDipP1b3TktNmKoIrAVGZDqbDdhyMHLHA7GUQLdihh6nU9(wNdFFi9sa2H2O8zpcOnbTfrcuATLXUUJBlNtHOSCUishbIuRq0OAmAmWNscbt6WFdg4zBkhrf84osSJ12zTmevLxaeP6COjXiZdPbbK(GIjdF8aQbqIqcLabCy1tL1PsQIrBMk2njsTPn1pmlcLHkHlzYWsc2HyCKr)IXNqV(9rexbFsdOocWGRk1xIe15FrGLRJq9U5d1TIBzS42bEHw9UCC77hzzdRGV642CJlIblG9fEJynjb(Wrrji6ZbHhksY6242M0qA3qQ57Ji29keXwCynUDzIPjwLGVxjlrsfV3eBSa5lEsdqM14kk0jaXFRLaXVyGfSkPFEKHcr0t59nnwEQeKkmhv07p(kXWZcvLzVEAym(LRiqXZEnmUqMbPRKCb3vQXThAzBRL0IvKqYnpM)hWGqsIATAxt1ioqtttNHtQsLlIkvQPBo0Y1V2YcsIrk0Dj59PzoiUTXvvnA(t9c49jLCN38ohla1U9srxbqWxcVNVfL5UbFbatZDKfKHmc9jyCBc6(ktXXIgKagJBBBfeYqM7SaeYJHqiSVuJwXmKy98qxg9yhpGUee5tF)eKc0pzGObCKM0NaF5waB4wJ896dl(J4FFpLG7QM0h8qwpG4DOsVtzbQ0TWybyr39efi2nki0Zbh9tgzIHhiJAcClZd9VSlh4gBcFxB4GgMENjeDaYI(GdX2WhjKMk(KXQaHP5H1p8Th3Mr0Ek4)O0aNfkrsCnfmXWbO7tbqKiW)d02lOVbgGIRxi2GlixcullOhE(G36ooe)X7HqpGcn6(uigYo)5aWXPz5kc4cfRu2Eyhw9pfLdg3M7He9rpE8EyOPNrDpFnXu8plIgbT4Dh3(J(yLAdOJiGRXixgQQ0)93vsPsM(1iwSP8QnAU7bFWp9S6nA2y7MhEm0wmArWljFM6Iy45rZwwhysHVbqSSU9r012dcTdf)KkLiIIJyu3UJWiu9kTc81gpjK80lhY(SHJ3qaM(0zFZbI5YNW((K)1jF50)c2VpFY3o9tN8ft)eEf)Jt)SPFYKVEY3n9t5f8Vm55tFg0INp9xc)cvb)(8jFvPXT)48rS6GVUdSPHeEZ4ZkwqWXSbEz9SOOXBbBqoNtuhQ0PP4UdWi7S1wNW0xhppBkXD8EYHKJE7nUn)hhLIlbZ24kWHmDzXJx6kedguCpIDafRjUoeNqrihntrnTrDQQP6mtznTHHnVVYCxTn(0WiFxfwGSsx6f8zqKltjTSaBxbXPvIh5veWVYSEk)rijGjuHbjWsKdW)djDSPL)OpELee(0)C2zwUMuUAugCt(ZhRzuXHBnv2OtE9M1sbFf(J(6v5XYpRVLZy6IpH2iy8)SDqs1z0M4AHfrYtur6uOWLZ4MWSsP4TwswgVxAisw9KMuL2C4jTyTmbUGwKPUZWyah1dU0qIfVLS3JaHZWYLyyllEuxvp1E7svYbWcriv2Pqyynq(um)EBynxhrXLRaIvUwOyzP7FYU7xVuLRa6wNEoMt2GZQh5msk4NhoYKNxZYnactTS2vrwzMlxzy2xjwDSdy3Cm7yq(cLDl8pDUmC0LhUndnC4S9QhQQD2kCRLO3bwJiw(bLLlcbJMPx(2AMJugImsRELo9b7ACuJJ1jw9Ir86AkMPiUDtzOzwiy3KcGQq9fQmOW68nMLhvp5YA(bfC8JOFF0kKAiI34scVCShjKfUoMLsY(FTW2u(YCFVWevpIiQXc85nWlYVBXEwdb8dCrY8bfUzLhqC0anfLbEEqYZ0OaLxrIyRKy4xrzqwgLgDzf71jJNXQlCbdyG6scl)rXCqvYHcvgJmiB82vwAB0cDJVxyo(1DzETld8srQ)17fkwaj)CijlHEWpSeZ)hAjMxbRU86tIauCadjtRbs(oGIvPBfmUn(70pBYVzYxo5BeF7zJBp5pm57M87N8Dt)RN(RM(3GLJYUxlk2pSSZRd6bVswX512SK8QtB4hw85QU4Z49sVpiYGTv23c3eAdQ7bI4KgXpsoJBxB1AvH)h(TdxAYH8elhsCdtauVWyG(ladvJ3tEugsUBi8bpZwHigzO8QkfZbACJ1PF7Qv1wD3osoP0cJm4UUTZiDAlYSBgiQSICaxHd2xK7HrAeAUBHrmTN9HC28IzCcjxwpSKSg2hUb2ncg5i9usL(NMhRKa3uPkcavLcqPSw2qBm3k4hHwbIjuQEkl2U3YvwO0CDLMjQ58zPMoPdhqDcOWr1oDwGac4ttMvL4fZoLsgUj0PadY5uZ12(YHePrqTvX3WBU9PIaYAhXoEj7Wx7yBs3b0cGR2wRou66Jr8b6iPzPhvQPxiBRKFmxQgD1sP2zB18Jv09yRNOuhqmRvjHe(JkDm1StK9qDDmUkOF3PsIXBYFpBhY)MP))M81A6zIQZ27JTOUuFDJiVIS94e3libdOMA6tCvAWY)byT)Fl6pa4xW3o9Z0HPPBIgO8)h8E4zt)vt(6jpxheuRg79kzvgkHIvbOaqxphK7oG6lo7UXNQJ1KYsS2DHfE0q6W(u4aGVX3C11Jp6n8MdRF1L4YBi)qpbL3jcKFXttId5sEvMw96z1nYoSuYP2h457Dobp5ZAMykvMLOCK1tn9c88hsC00v1AH(Ub6kZdWZmEQXFY)0KVaO)FlE(lM8Lt)eGh8v6iX6AwwCARi3HdPAfSIRkBVQtVWKEHw9gwfqpUDkS(FE6ZyNAKVdCU85t)uG))xLNWrEnnlE0WzeXL4PbiYAkKs(RXZVcif)mKqPdts2a0uacRnhDPFkq10N0ZAOgqiQq21hqyhJlFkvC(u6qhawYGQScqXuQB3b4jWZgputdqCUsQrAZlPAggSuaiVfd96ggHhpnyGWOhOHHyGZEEMYZ6hUkcX0(Y1wde8pIGNZApqxR(b7WQbp7uor(d9sl5FejyONoITOcO3RJia)0XnBZHy6wdOVrGykbJBAoXFly573dIQ)hGvLFNoorYgGC10YxqLFd87VdAWxHcot(gTYwAAg3au7sh5fey1bXCFQnjuYIoKmmyOLBku(boE6uAyfJI)5j0jHw2UkRrJ10)Dat)c9RAiRkBV(Pr4dLJM(iQqoTFaLl9rq)ydWGeuyyksImXfd4B7YmG(gHCZNqTwGls4XeKhrfu9fexb5l1SFpViBDYV8Y1SQhjmK62J62x)AFQvlL)ZHnYfVhmBYgy13Ll5h67fbECLcx3YgCDZ(sDwgf1CtpIhtC(V(12etxlTZ14kbOEpDRyw3dxNK5kwxsuanECehXXqex6hDzmcbwFOoEHdyS2DdvKde2eO9aFQd5thFOPNtzS7SQVSd6htZ63a2UzFtVASUgMLVB4tg65E5anWiUkP87MkMtTPebkIIUSZpAKBOLnNnGIRby6lCOSQi9jz0RN83HOhSA5FapjJW6MF(0NPBMORzCdGz5lQNnY3MPGebr85JplBMCDgg6WemagI0TebddgVoG7TX(6CPxe6DIjtNZ)YWbS449T6pim2bNakcgUBp2stW7kvNVG47kaVJqEbjESttR6qMM08VHjfcmD(BbloFREZrPBsEo39)QjjSqNIdXYN0LkIyrtmih63vqNelhKYhDtkXSGg0eggQBrnW3Z2UG63Ygw5VHDVcAY996yBv0y8GihsC9BABBrC7MQj1bcyVIBYbi7qbt03Q77cANZzS8jqipwf3OtHGeOAr6KCprGZjJpxjy5csXq5BfubfWtCYXxj7bmhGgpPEYt9mklBmI4WFAeHbEJQX15t7sDdTVu(etK(KLlpz4FaBP3ejvyozLf(my)2hhCL5hQQLCmFehqpwSOrEv(ESjkofWKoSA6zftXmJEViz2SWRrvpFq6NTS5iyzgiE0kPs9Pkwkr(XTFhmNI6ZU(EPsjx8wtGsbSyI(Yj)NO1j2spq0rt)8XTN(lzhn9VE6FjSK0Nxk5WUyPPygDr)exfpwsiMIIe)vzcW1V3FxTn5ixyk2sJByOo7aP8IaWxnCwrZxVG)7Qk4l1SNLWn1Srvy6QM1hMSAY0yfNZFT5epUN81ERlEgaZM76uk6j33Qed7JWM)yEgtkUfVtwP7KgcsVLkPEaIZtfrMe9z7XqgIQafY0vnYbCPQCpIHA6HuCzz6JIa8s3TChVew(kMxOvwu32An7bttywx7wyQ84RLMljTNkbIuinz1UroQTaWTdICeGuDvv22bAXAdMxe1UPBBaLqxUzhaC5aDx3EELT0TFJCWPqNW9cmhAmdBgc4X589nGV1KfP8MZ2vgRJjh(H5UGG8NnLK8YdxOndu(LTpd56(RTzpWzGYiruN3lxr2ZvKnD1zxZBb30Y9fttVA0O8(bFWb5(TWNqySYLy)d)KvCbCBX)OslbOnKegWSanOS1kXpmGlcuG(vqROAFKIE1sIoa1n427UUKjfq9(3aelDBOFALVzwyxD1FSFK7CevtT9tC7piL6hBg5mAEohm)xGs8Nrz5dpl)VIxelINzxTVILs9wqkN3vsjFHkn7vLuIhw3Tp8HBTzZZ2)W7FwJFsJdAE2jhSZU73SXXnQNW5ffpxILUqVWwBT1QKzjeZeoZK8bJlRlcLkPXP)y38O(8t(Z2734KJi(bGGogCgRA0FVYjXGyZ3S(P3gtIfxJ9lzoE)hVn7ZqCX5Hk3MMGmKCTR5V4q8ezguk0NRKUdRNQvhAJgA2Yq7kMgQGelSfEfcQ6PhBU9BbOUlLPbvHqC2np6EooWNNVGPfWLHcNlZ6qrd0iGZ7aF)WNNR4xr9Omd34FrIXl(WaIkWrUdD9UWTuXhITBijuTytIZD4IJsQjwjhcKSfln9z2jCCjWhgr1YCo8R7FYU1Nh(WFrluWjJlxTfrcE22lYwgKrFA4mooMJwMxLcFd4LxzEaup(M5CZmFZK6eRmluI6vd9kHmzAIMsLV8PCXg6fze1He2DqzfHVs8CzHhl1IN7Z8ASKHu8qU)veLnR2ftQVJLRjBJJFjmzILkUktL6j4CVKNpAtt8vmZWPw6jj2avoNxjNDhq7om2Dt2FcAzuGlJPFHFk8ODGLj(2TbIsXu3lQtXBLV8CloYvGaCae)glSLrTyCBB2ltgrAAk(ThkmdAU72FqJJpRw1QPEZ1exUIxUvsEAbt86KjZQ6QNUzTNB4hv7XjxlFwpsU(ro5eNFUc57JBUNm5AP8xyPmRX1bsTxjh571fgd(XnMpy)jJBFltEYw(544IBJYFKwmQsLcD0s0u5Rvd9yLb0XepaU6Eh6m7qzV2S3HjYsM9AmrwsONkIPnwBCyrzl5OUiGN)8GOFqWz)cO3PjqWfuvAJfpcZGqsink5RiQ5eszSjGhagaEOX9pBZ61p8avfNQPTAKiyZ87wIGnj22mKlq9J5enQsPY3htAQYjOVMayJbo69WksaScR5zITL5PaxnTKcIxAooGhgAN0AGqhKvo6qqT1RwWZAbd)utPzmopNh3c2rVeB4AZE5JTybKjqCQnzua1mEdotUbbCqZp17ZfImsNk4EpbDzXqOzrkIJzWaVl0LyHfR3OAA)fkOXLljCPiE8ZSxmTlzkowqyaUxefk2mPQlEVVyGfUbnPP33TAXYl5p9tkgK47RYG7sdt1zw8NFt80(UWGQWhFhDYFXJZ7nBJNxAepfBnZbk4wMSd(7SMTs8ax5f4ClnV(f28dxYpiZmuz4x6z5sQ(oZwMg0B9QPWTkVeSoueVQG8onV9P52vNV5D89K(Ub84BkxctW7i8OlktzFLL0GF8E9GWLLYdDWCrHM6PLabO4CrWEzSFTamUQiEETIH8XWxUwqu50FLCPA1Jf2JWV84fBTow4IjG6vp7c5KTHt45tsskeu7scAtLB6L1u5MQtS9UrSLTGNMMzBeCV5n8lJMN(y01eOcJTkDYevxLFML7p9VBql4Xhw6QaXpm7MXZmhmIDW(TMD016ZtUb390sLF04pwiTR7TwkBd7E8BwPuoEkM4HCLHfRWhY8ohdPTtW6tIaAL(8Q80k6XFcp5dWJw)Xz3TO4NzrEt24XAP78rDb2qNLp1DPwhjtI84dnJJipZGYNpjtkEpx4IN4(34wbVrP4yh49HLWpiEWs6FE(QSGPesi(mNnkss1FLqJKd(YrLK96LkDIlV9QrsIn0lPKeRpxtkKgRzsA)7Oj20K3xfVCiwgdTgnkXBhbZiXdlOngXNeFlJzD6DqprzNC3SphT6NextHO9UghXnLmuZ7uYff4XXM7coXb8x8bNbxV0WlY1Chi8VYL2fVtEGLjPF4hYkn4d)W6EoIehVMx)(SxWZpKGjyUu(5NlZG)UAFo4JJjhxdvZZkqA)Q10K4vvs7v)QGB93ADZBTXDyE3lFgQ5pXcjFQ(xrx2m5bm0KL2wmuCwUZkPPPY8kZA2DRQPf0NmYI3gDzf5n1Cy8uVrtwrxU(d9Wm6veHz2BwG4XQG5zrbgvQAYhhKpUW9gy8ElwwkNtgjX3g()mwc3optIiBYB5(E9T62YioTCOdiXOdZFawktjmyi6Zd9Gr9GnY9Aws7Ds1pdgvWYI8(9ArU8OsCnHT1HnBE4dZEVqL7fi1RXxOt8ltRhu(OMUJkp0Cx8cDWZ38uFYOwgNg)P0x7z4f9ulJgpzekSDb5YSxOvYlgnqcKDXBPChNze4z71AlX4hqpJTnA4nVa7wuZZPdHDpmKZnMMUlxTCUg1IVzUe3gqDk42AzRCU1r6K7TKZwzVsNyxrCAUQA6K9AwPtIl6Io6UdH6K9kBcLZWB5k(LBv27DKojV5k6K(6uIFnlP)w)OJKSDoEtESoEJs06)5d \ No newline at end of file diff --git a/FreshShit/StinkyDetector/init.lua b/FreshShit/StinkyDetector/init.lua index 1f6ae5f..791c422 100644 --- a/FreshShit/StinkyDetector/init.lua +++ b/FreshShit/StinkyDetector/init.lua @@ -1,4 +1,5 @@ -- TODO: Add zone detection and all that shit so we're not always in orgrimmar +-- see GetSubZoneText() and GetZoneText() ---@type Message[] aura_env.messageQueue = {} @@ -158,12 +159,12 @@ Stinky = { ---@param self Stinky ---@return string FormMessage = function(self) - return string.format("%s в Оргриммаре!", self.name) + return string.format("%s in %s!", self.name, aura_env.GetZone()) end, ---@param self Stinky ---@return string FormAddonMessage = function(self) - return table.concat({ self.name, self.threat, self.note }, aura_env.separator) + return table.concat({ self.name, self.threat, aura_env.GetZone() }, aura_env.separator) end, } @@ -225,6 +226,10 @@ aura_env.raceFactions = { ["Worgen"] = "Alliance", } +aura_env.GetZone = function() + return string.format("%s (%s)", GetZoneText(), GetSubZoneText()) +end + local killSpamTime = 30 local recentlyKilled = {} aura_env.RegisterKill = function(source, destination, spellName, overkill)