From f49b4fcb68674a7bd081124980a57fbe5baf7e89 Mon Sep 17 00:00:00 2001 From: JAJames Date: Thu, 28 Jan 2016 05:08:48 -0500 Subject: [PATCH] RenX.Core: * Removed unnecessary banCheck() calls in Server * Removed old debug line FunCommands: * Added a few extra 8ball possibilities. :p --- FunCommands/FunCommands.cpp | 47 +++++++++++++++++++++++++++++----- Release/Bot.lib | Bin 24762 -> 24762 bytes Release/Plugins/RenX.Core.lib | Bin 172438 -> 172438 bytes RenX.Core/RenX_Server.cpp | 22 +++++++++++----- 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/FunCommands/FunCommands.cpp b/FunCommands/FunCommands.cpp index e1120dc..87da1c9 100644 --- a/FunCommands/FunCommands.cpp +++ b/FunCommands/FunCommands.cpp @@ -37,8 +37,7 @@ void EightBallIRCCommand::create() void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString ¶meters) { Jupiter::StringS msg; - unsigned short r = rand() % 20; - switch (r) + switch (rand() % 31) { case 0: msg.set("No."_jrs); @@ -68,7 +67,7 @@ void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString msg.set("Fuck me."_jrs); break; case 9: - msg.set("Good thing I bend that way. ;)"_jrs); + msg.set("Good thing I bend that way!"_jrs); break; case 10: msg.format("Hai %.*s ;)", nick.size(), nick.ptr()); @@ -77,10 +76,13 @@ void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString msg.format("Let's ban %.*s!", nick.size(), nick.ptr()); break; case 12: - msg.format("Sorry %.*s, but your IQ must be at least %d for me to care.", nick.size(), nick.ptr(), rand() % 50); + msg.set("Fuck your lineage."_jrs); break; case 13: - msg.set("Ask me those kind of questions in #Jail"_jrs); + if (channel.equals("#Jail"_jrs)) + msg.set("Ask me those kind of questions in #Politics"_jrs); + else + msg.set("Ask me those kind of questions in #Jail"_jrs); break; case 14: msg.set("I don't talk to slut-mongers."_jrs); @@ -98,7 +100,40 @@ void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString msg.set("I hurr u liek mudkipz?"_jrs); break; case 19: - msg.set("Walk this way, babycakes ;)"_jrs); + msg.set("Fortune might be in your favor."_jrs); + break; + case 20: + msg.set("Fortune might not be in your favor."_jrs); + break; + case 21: + msg.set("Based on the tragectory of James Bond (9007) in relationship to the 9th circle of hell located on the 3rd planet of Sol, you're going to hell."_jrs); + break; + case 22: + msg.set("Based on the tragectory of James Bond (9007) in relationship to the 9th circle of hell located on the 3rd planet of Sol, yes!"_jrs); + break; + case 23: + msg.set("Based on the tragectory of James Bond (9007) in relationship to the 9th circle of hell located on the 3rd planet of Sol, it's approximately as likely as getting a \"yes\" from me."_jrs); + break; + case 24: + msg.set("Fucking campers."_jrs); + break; + case 25: + msg.set("The 8ball seems to be stuck. Try again later. (Dang, you can't even get an 8ball to work for you? That's pretty sad yo)"_jrs); + break; + case 26: + msg.set("The 8ball says... Go away? Wow, it really must not like you. Go away."_jrs); + break; + case 27: + msg.set("Swag"_jrs); + break; + case 28: + msg.set("Based on the orbit and trajectory of the 33rd moon of the planet assinine 6, no."_jrs); + break; + case 29: + msg.set("Based on the orbin and trajectory of the moon assinsix 9, yes!"_jrs); + break; + case 30: + msg.set("Come visit me on the 5th planet away from Sol, and I'll give you whatever you want."_jrs); break; default: msg.set("Nothingness. You suck. Go rot."_jrs); diff --git a/Release/Bot.lib b/Release/Bot.lib index 3ae9a14c4fbcbedb7452bc9ea83a48f1dfb49b73..e6a1efb37a7afa6de2ef0d6fd0c9159b4570d9cb 100644 GIT binary patch delta 1622 zcmZWpT}YE*6y8$Hen{KYz7ox)sIbr^Yw4WZoKD@Jb2@+8+7B2Jgau(2L6nde{WlKX zL{LFD23q2UAXM(oi?A-c2&0R-D+;2EE~@jMbJjO;yV-f(=RD_}=RNP1v&QAD@m^Ko z(Ic&`3zqYh^aCs*ZE>#h5=R-!UQ?^hR>Pmvj)1YiFq>H%wtY1c8_yx$R=NeT$+jXL zyVFkC?r6dmZORQv;`l;NTevwXxHE8e=*5Nx%c^QiauYJ4` zjX1^uwGn$tYv7Mh%yoM;u=yz|;7@ZgF?`+6#wZbcfGFXB)EBST0_;`BvJZ|0P0D{? za8O#tomvWVi#kSQg+fC*=Vi!Ts&={!`)k1doau=P7>pf-%aICZ8KaaHA2`FY8uWRD zlz$EIppXs|=T7*P&M6r*(*^ob*@_pKt>}j8@nT*0Q<9Qa2Ia=pGmw?L(pm~G`i(q;y4)&_fkAumLs)o}&a`J eN%^-@4{L_82T2dtku}+!5*fvrN>Sd8)Zu?VXY$Md delta 1622 zcmZWpO-Phs5Z?8tEJe*#`%L`V6cr4ALNi@;cU@g||6EtspLTU!FeC^I!VW={kca*> z8M;J}LYD$9@gNA5d-D+1u|pUg>Q)#;hYr=eGqZgw?p}7D_nBvAo_F5ej2Sm$#s@_y z4W}C$*UXm-=?9p7+WJc2HI5d|$8#E*no9XIanxf>Hk3@Q4>o->5*yDU+?<_+*mQHM zj?K3aw$xI@7{n~qNP_Q{ZmzQCu1+tRdNy>@U@#aBDe$96gM0RL7;n#Gf+T!s)f1F} zzs(*$*I=d1l%Yh*P$UJvV9YYXr?v{6@zBAHVq~N;BOey*X^C|-SZFsX?WgTl&O{5~ zFJrmZkdEE85^u>mtYgEYgjLysjLq6;&{f+Fj_d6dkK6k=UgLPz-o(VVU1LI^wfq5uz7vu7O%M&OtVd+ul>QFSXxow*9qIxYYEAj50Xi5%42J5+^6 z6d!0JrAu^|Jyhpvmzy~llRz~J_{Km}=hFL(Nb2Nb}}il7HXhWhse$y%H;#jb1AEwpXO1ehn&JgtfY+C~wiM!5bHE zL=}!vqBi1Kb}9UEiMe*C22E~C^0=d1Obp+3voT7<;vtIPBlX3r9S?i8XfA*=-W=t> z%iAw4<4$dOxkVkLv3$M(o%70P%2qqwjQv$&f7a;aB=m*Ew1JCb~d3Dp%tL#_~I%cr;BH{v4sCt$w+2^$cX?TLZH4QjDHm zHwx9@vw|mwtzh-bDlCT!pl5)F4-eelSN@0^OqH*Lcfm5S4a%xvVLCd6NA+~{anQVP z*qWdWD^70*rN>#D2DL*xSOC)-aIn|qZX8T*R5cv!B6q$HiHJ(d8X@fF@D(nUfR&FN z#J1y@GDY6}#Zmpuld}beET|ScH9|E{ fMC9K}J*+v#9z`5nN7f{BLSz(YW`gqWOw|1Y^w_?{ diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 72531a668bb13b255b4efb0b45d1f0b776646045..b85f7213d1eb5251899e18c6959b6302866429bc 100644 GIT binary patch delta 10626 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≷`-jb?fTn6`nxJMIuuRAq!D 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 Myljroe_6);ANA@~9{>OV diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 2cc6cce..ec8843d 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -392,7 +392,8 @@ void RenX::Server::banCheck() { if (RenX::Server::players.size() != 0) for (Jupiter::DLList::Node *node = RenX::Server::players.getNode(0); node != nullptr; node = node->next) - this->banCheck(node->data); + if (node->data->isBot == false) + this->banCheck(node->data); } void RenX::Server::banCheck(RenX::PlayerInfo *player) @@ -436,7 +437,6 @@ void RenX::Server::banCheck(RenX::PlayerInfo *player) else netmask = Jupiter_prefix_length_to_netmask(entry->prefix_length); - printf("%d vs %d" ENDL, (entry->ip & netmask), (player->ip32 & netmask)); if ((this->localSteamBan && entry->steamid != 0 && entry->steamid == player->steamid) || (this->localIPBan && entry->ip != 0 && (entry->ip & netmask) == (player->ip32 & netmask)) || (this->localRDNSBan && entry->rdns.isNotEmpty() && entry->is_rdns_ban() && player->rdns.match(entry->rdns)) @@ -1233,8 +1233,12 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) this->players.add(r); r->uuid = calc_uuid(r); - RenX::exemptionDatabase->exemption_check(r); - this->banCheck(r); + + if (r->isBot == false) + { + RenX::exemptionDatabase->exemption_check(r); + this->banCheck(r); + } for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnPlayerCreate(this, r); @@ -1263,8 +1267,11 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (recalcUUID) { this->setUUIDIfDifferent(r, calc_uuid(r)); - RenX::exemptionDatabase->exemption_check(r); - this->banCheck(r); + if (r->isBot == false) + { + RenX::exemptionDatabase->exemption_check(r); + this->banCheck(r); + } } } return r; @@ -2298,7 +2305,8 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (player != nullptr) { player->id = tokens.getToken(3).asInt(); - this->banCheck(player); + if (player->isBot == false) + this->banCheck(player); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnIDChange(this, player, oldID); }