mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-02-12 19:31:00 +00:00
Re Submit changes
This commit is contained in:
ChocoTaco1
parent
b85a8d3f33
commit
e3a21ccb29
5 changed files with 367 additions and 99 deletions
20
Classic/scripts/autoexec/Autobalance.cs
Normal file → Executable file
20
Classic/scripts/autoexec/Autobalance.cs
Normal file → Executable file
|
|
@ -61,9 +61,6 @@ function Autobalance( %game )
|
|||
//Select lower half of team rank as canidates for team change
|
||||
if(!$Autobalance::UseAllMode)
|
||||
{
|
||||
//Reset clients canidate var
|
||||
ResetABClients();
|
||||
|
||||
$Autobalance::Max = mFloor($TeamRank[$BigTeam, count]/2);
|
||||
for(%i = $Autobalance::Max; %i < $TeamRank[$BigTeam, count]; %i++)
|
||||
{
|
||||
|
|
@ -127,14 +124,17 @@ function DefaultGame::gameOver(%game)
|
|||
{
|
||||
Parent::gameOver(%game);
|
||||
|
||||
//Reset Autobalance
|
||||
$BigTeam = "";
|
||||
|
||||
//Reset all clients canidate var
|
||||
for (%i = 0; %i < ClientGroup.getCount(); %i++)
|
||||
if($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF")
|
||||
{
|
||||
%client = ClientGroup.getObject(%i);
|
||||
%client.abCanidate = false;
|
||||
//Reset Autobalance
|
||||
$BigTeam = "";
|
||||
|
||||
//Reset all clients canidate var
|
||||
for (%i = 0; %i < ClientGroup.getCount(); %i++)
|
||||
{
|
||||
%client = ClientGroup.getObject(%i);
|
||||
%client.abCanidate = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function serverCmdEndThrowCount(%client, %data)
|
|||
%throwScale = %throwStrength / 2;
|
||||
%client.player.throwStrength = %throwScale;
|
||||
|
||||
%client.player.throwStart = 5; //was 0
|
||||
%client.player.throwStart = 2; //was 0
|
||||
}
|
||||
|
||||
//Tank UE code by Keen
|
||||
|
|
@ -154,9 +154,9 @@ function stationTrigger::onEnterTrigger(%data, %obj, %colObj)
|
|||
//OG Blaster Buff
|
||||
function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC)
|
||||
{
|
||||
//Takes 10 blaster shots to kill a heavy, 13 normal.
|
||||
//Takes 11 blaster shots to kill a heavy, 13 normal.
|
||||
if(%targetObject.client.armor $= "Heavy" && %damageType $= $DamageType::Blaster)
|
||||
%amount *= 1.3;
|
||||
%amount *= 1.15;
|
||||
|
||||
Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
|
||||
}
|
||||
|
|
@ -291,6 +291,13 @@ function VehicleData::createPositionMarker(%data, %obj)
|
|||
return %marker;
|
||||
}
|
||||
|
||||
//Conc Throw (Almost Normal Grenades) 1500 Normal
|
||||
function ConcussionGrenadeThrown::onThrow(%this, %gren)
|
||||
{
|
||||
AIGrenadeThrown(%gren);
|
||||
%gren.detThread = schedule(1800, %gren, "detonateGrenade", %gren); // Was 2000
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Prevent package from being activated if it is already
|
||||
|
|
|
|||
222
Classic/scripts/autoexec/zzDiscordBot.cs
Normal file → Executable file
222
Classic/scripts/autoexec/zzDiscordBot.cs
Normal file → Executable file
|
|
@ -4,13 +4,17 @@
|
|||
|
||||
//exec("scripts/autoexec/zzDiscordBot.cs");
|
||||
|
||||
$discordBot::AuthKey[0] = "";
|
||||
$discordBot::IP[0] = "";
|
||||
//note first channel is for monitoring
|
||||
$discordBot::discordCHID = "";
|
||||
$discordBot::IP = "";
|
||||
$discordBot::reconnectTimeout = 3 * 60000;
|
||||
$discordBot::AuthSet = 0;
|
||||
$discordBot::autoStart = 1;
|
||||
|
||||
|
||||
$discordBot::autoStart = 0;
|
||||
//used on the bot to help split thigns up
|
||||
$discordBot::cmdSplit = "%cmd%";
|
||||
$discordBot::cmdSubSplit = "%tab%";
|
||||
//These correspond with $discordBot::discordCHID
|
||||
$discordBot::monitorChannel = 1;
|
||||
$discordBot::serverFeed = 2;
|
||||
package discordPackage
|
||||
{
|
||||
|
||||
|
|
@ -25,11 +29,12 @@ package discordPackage
|
|||
function messageAll(%msgType, %msgString, %a1, %a2, %a3, %a4, %a5, %a6, %a7, %a8, %a9, %a10, %a11, %a12, %a13)
|
||||
{
|
||||
parent::messageAll(%msgType, %msgString, %a1, %a2, %a3, %a4, %a5, %a6, %a7, %a8, %a9, %a10, %a11, %a12, %a13);
|
||||
%type = getTaggedString(%msgType);
|
||||
%type = getTaggedString(%msgType);
|
||||
switch$(%type)
|
||||
{
|
||||
case "msgExplosionKill" or "msgSuicide" or "msgVehicleSpawnKill" or "msgVehicleCrash" or "msgVehicleKill" or "msgTurretSelfKill" or "msgTurretSelfKill" or "msgCTurretKill" or "msgTurretKill" or
|
||||
"msgSelfKill" or "msgOOBKill" or "msgCampKill" or "msgTeamKill" or "msgLavaKill" or "msgLightningKill" or "MsgRogueMineKill" or "MsgHeadshotKill" or "MsgRearshotKill" or "MsgLegitKill":
|
||||
"msgSelfKill" or "msgOOBKill" or "msgCampKill" or "msgTeamKill" or "msgLavaKill" or "msgLightningKill" or "MsgRogueMineKill" or "MsgHeadshotKill" or "MsgRearshotKill" or "MsgLegitKill" or
|
||||
"MsgClientJoin" or "MsgClientDrop":
|
||||
%message = getTaggedString(%msgString);
|
||||
%message = strreplace(%message,"%1",getTaggedString(%a1));
|
||||
%message = strreplace(%message,"%2",getTaggedString(%a2));
|
||||
|
|
@ -40,74 +45,13 @@ function messageAll(%msgType, %msgString, %a1, %a2, %a3, %a4, %a5, %a6, %a7, %a8
|
|||
%message = strreplace(%message,"%7",getTaggedString(%a7));
|
||||
%message = strreplace(%message,"%8",getTaggedString(%a8));
|
||||
%message = stripChars(%message, "\cp\co\c0\c6\c7\c8\c9");
|
||||
sendToDiscord(%message,2);
|
||||
}
|
||||
sendToDiscordEmote(%message, $discordBot::serverFeed);
|
||||
}
|
||||
if($missionName !$= $discordBot::cm && ClientGroup.getCount() > 2){
|
||||
sendToDiscordEmote("The mission changed to" SPC $missionName, $discordBot::serverFeed);
|
||||
$discordBot::cm = $missionName;
|
||||
}
|
||||
}
|
||||
|
||||
function discordBotProcess(%type, %var1, %var2, %var3, %var4, %var5, %var6)
|
||||
{
|
||||
//echo(%type SPC %var1 SPC %var2 SPC %var3 SPC %var4 SPC %var5 SPC %var6);
|
||||
|
||||
switch$ (%type)
|
||||
{
|
||||
case "flagCap":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %player.holdingFlag;
|
||||
%held = %game.formatTime(getSimTime() - %game.flagHeldTime[%flag], false);
|
||||
%msg = getTaggedString(%player.client.name) SPC "captured the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag. (Held:" SPC %held @ ")";
|
||||
case "touchEnemyFlag":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %var3;
|
||||
if(!%player.flagTossWait)
|
||||
{
|
||||
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);
|
||||
if(%flag.isHome)
|
||||
%msg = getTaggedString(%player.client.name) SPC "took the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag. (Speed:" SPC %grabspeed @ "Kph)";
|
||||
else if(!%flag.isHome)
|
||||
%msg = getTaggedString(%player.client.name) SPC "took the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag in the field. (Speed:" SPC %grabspeed @ "Kph)";
|
||||
}
|
||||
case "droppedFlag":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %player.holdingFlag;
|
||||
%held = %game.formatTime(getSimTime() - %game.flagHeldTime[%flag], false);
|
||||
%msg = getTaggedString(%player.client.name) SPC "dropped the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag. (Held:" SPC %held @ ")";
|
||||
case "flagReturn":
|
||||
%game = %var1;
|
||||
%flag = %var2;
|
||||
%player = %var3;
|
||||
if(%player !$= "")
|
||||
%msg = getTaggedString(%player.client.name) SPC "returned the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag.";
|
||||
else
|
||||
%msg = "The" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag was returned to base.";
|
||||
case "lakTouchFlag":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %var3;
|
||||
if(!%player.client.flagDeny && %player.getState() !$= "Dead" && PlayingPlayers() > 1)
|
||||
%msg = getTaggedString(%player.client.name) SPC "has taken the flag.";
|
||||
case "lakMApoints":
|
||||
%sourceObject = %var1;
|
||||
%points = %var2;
|
||||
if(%points == 1)
|
||||
%s = "s";
|
||||
%hitType = %var3;
|
||||
%weapon = %var4;
|
||||
%distance = %var5;
|
||||
%vel = %var6;
|
||||
if(%points)
|
||||
%msg = getTaggedString(%sourceObject.client.name) SPC "receives" SPC %points @ %s SPC "points! [" @ %hitType SPC %weapon @ "] [Distance:" SPC %distance @ "] [Speed:" SPC %vel @ "]";
|
||||
}
|
||||
|
||||
if(%msg !$= "")
|
||||
{
|
||||
%msg = stripChars(%msg, "\cp\co\c0\c6\c7\c8\c9");
|
||||
sendToDiscord(%msg, 2);
|
||||
}
|
||||
}
|
||||
|
||||
function CTFGame::flagCap(%game, %player)
|
||||
{
|
||||
if(discord.lastState $= "Connected")
|
||||
|
|
@ -183,11 +127,11 @@ function dtEventLog(%log, %save)
|
|||
{
|
||||
parent::dtEventLog(%log, %save);
|
||||
if(discord.lastState $= "Connected")
|
||||
sendToDiscord(%log, 1);
|
||||
sendToDiscord(%log, $discordBot::monitorChannel);
|
||||
}
|
||||
function LogMessage(%client, %msg, %cat){
|
||||
if(discord.lastState $= "Connected")
|
||||
sendToDiscord("Message" SPC %client.nameBase SPC %msg, 1);
|
||||
sendToDiscord("Message" SPC %client.nameBase SPC %msg, $discordBot::monitorChannel);
|
||||
parent::LogMessage(%client, %msg, %cat);
|
||||
}
|
||||
|
||||
|
|
@ -195,18 +139,90 @@ function LogMessage(%client, %msg, %cat){
|
|||
|
||||
if(!isActivePackage(discordPackage))
|
||||
activatePackage(discordPackage);
|
||||
|
||||
|
||||
function discordBotProcess(%type, %var1, %var2, %var3, %var4, %var5, %var6)
|
||||
{
|
||||
//echo(%type SPC %var1 SPC %var2 SPC %var3 SPC %var4 SPC %var5 SPC %var6);
|
||||
|
||||
switch$ (%type)
|
||||
{
|
||||
case "flagCap":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %player.holdingFlag;
|
||||
%held = %game.formatTime(getSimTime() - %game.flagHeldTime[%flag], false);
|
||||
%msg = getTaggedString(%player.client.name) SPC "captured the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag. (Held:" SPC %held @ ")";
|
||||
case "touchEnemyFlag":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %var3;
|
||||
if(!%player.flagTossWait)
|
||||
{
|
||||
%grabspeed = mFloor(VectorLen(setWord(%player.getVelocity(), 2, 0)) * 3.6);
|
||||
if(%flag.isHome)
|
||||
%msg = getTaggedString(%player.client.name) SPC "took the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag. (Speed:" SPC %grabspeed @ "Kph)";
|
||||
else if(!%flag.isHome)
|
||||
%msg = getTaggedString(%player.client.name) SPC "took the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag in the field. (Speed:" SPC %grabspeed @ "Kph)";
|
||||
}
|
||||
case "droppedFlag":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %player.holdingFlag;
|
||||
%held = %game.formatTime(getSimTime() - %game.flagHeldTime[%flag], false);
|
||||
%msg = getTaggedString(%player.client.name) SPC "dropped the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag. (Held:" SPC %held @ ")";
|
||||
case "flagReturn":
|
||||
%game = %var1;
|
||||
%flag = %var2;
|
||||
%player = %var3;
|
||||
if(%player !$= "")
|
||||
%msg = getTaggedString(%player.client.name) SPC "returned the" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag.";
|
||||
else
|
||||
%msg = "The" SPC getTaggedString(%game.getTeamName(%flag.team)) SPC "flag was returned to base.";
|
||||
case "lakTouchFlag":
|
||||
%game = %var1;
|
||||
%player = %var2;
|
||||
%flag = %var3;
|
||||
if(!%player.client.flagDeny && %player.getState() !$= "Dead" && PlayingPlayers() > 1)
|
||||
%msg = getTaggedString(%player.client.name) SPC "has taken the flag.";
|
||||
case "lakMApoints":
|
||||
%sourceObject = %var1;
|
||||
%points = %var2;
|
||||
if(%points == 1)
|
||||
%s = "s";
|
||||
%hitType = %var3;
|
||||
%weapon = %var4;
|
||||
%distance = %var5;
|
||||
%vel = %var6;
|
||||
if(%points)
|
||||
%msg = getTaggedString(%sourceObject.client.name) SPC "receives" SPC %points @ %s SPC "points! [" @ %hitType SPC %weapon @ "] [Distance:" SPC %distance @ "] [Speed:" SPC %vel @ "]";
|
||||
}
|
||||
|
||||
if(%msg !$= "")
|
||||
{
|
||||
%msg = stripChars(%msg, "\cp\co\c0\c6\c7\c8\c9");
|
||||
sendToDiscordEmote(%msg, $discordBot::serverFeed);
|
||||
}
|
||||
}
|
||||
function sendToDiscord(%msg,%channel)
|
||||
{
|
||||
if(isObject(discord) && %msg !$= "")
|
||||
{
|
||||
if(discord.lastState $= "Connected")
|
||||
{
|
||||
discord.send("MSG" SPC (%channel-1) SPC %msg @ "\r\n");
|
||||
discord.send("MSG" @ $discordBot::cmdSplit @ (%channel-1) @ $discordBot::cmdSplit @ %msg @ "\r\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
function sendToDiscordEmote(%msg,%channel)//emote filter will be applyed used in server feed
|
||||
{
|
||||
if(isObject(discord) && %msg !$= "")
|
||||
{
|
||||
if(discord.lastState $= "Connected")
|
||||
{
|
||||
discord.send("MSGE" @ $discordBot::cmdSplit @ (%channel-1) @ $discordBot::cmdSplit @ %msg @ "\r\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function discordCon(){
|
||||
if(discord.lastState !$= "Connected"){
|
||||
if(isEventPending($discordBot::reconnectEvent))
|
||||
|
|
@ -215,7 +231,7 @@ function discordCon(){
|
|||
discord.delete();
|
||||
new TCPObject(discord);
|
||||
discord.lastState = "Connecting";
|
||||
discord.connect($discordBot::IP[$discordBot::AuthSet]);
|
||||
discord.connect($discordBot::IP);
|
||||
}
|
||||
}
|
||||
function discordKill(){
|
||||
|
|
@ -246,7 +262,7 @@ function discord::onDNSResolved(%this){
|
|||
function discord::onConnected(%this){
|
||||
%this.lastState = "Connected";
|
||||
error(%this.lastState);
|
||||
discord.send("AUTH" SPC $discordBot::AuthKey[$discordBot::AuthSet] @ "\r\n");
|
||||
discord.send("AUTH" @ $discordBot::cmdSplit @ $discordBot::discordCHID @ $discordBot::cmdSplit @ $Host::GameName @ "\r\n");
|
||||
}
|
||||
|
||||
function discord::onDisconnect(%this){
|
||||
|
|
@ -265,9 +281,45 @@ function discord::onLine(%this, %line){
|
|||
//case "Discord":
|
||||
//messageAll( 'MsgDiscord', '\c3Discord: \c4%1 %2',getWord(%lineStrip,1),getWords(%lineStrip,2,getWordCount(%lineStrip) -1));
|
||||
case "PING":
|
||||
discord.send("PONG" @ "\r\n");
|
||||
case "PINGX":
|
||||
discord.send("PINGY" @ "\r\n");
|
||||
discord.send("PONG" @ $discordBot::cmdSplit @ "\r\n");
|
||||
case "PINGAVG":
|
||||
%min = 10000;
|
||||
%max = -10000;
|
||||
%lowCount = %lowPing = 0;
|
||||
for(%i = 0; %i < ClientGroup.getCount(); %i++){
|
||||
%cl = ClientGroup.getObject(%i);
|
||||
%ping = %cl.isAIControlled() ? 0 : %cl.getPing();
|
||||
%min = (%ping < %min) ? %ping : %min;
|
||||
%max = (%ping > %max) ? %ping : %max;
|
||||
if(%ping < 250){
|
||||
%lowCount++;
|
||||
%lowPing += %ping;
|
||||
}
|
||||
%pc++;
|
||||
%pingT += %ping;
|
||||
}
|
||||
%lowCount = (%lowCount == 0) ? 1 : %lowCount;
|
||||
if(!%pc){
|
||||
sendToDiscord("Ping AVG:" @ 0 SPC "Low Avg:" @ 0 SPC "Min:" @ 0 SPC "Max:" @ 0, $discordBot::monitorChannel);
|
||||
}
|
||||
else{
|
||||
%avg = mFloor(%pingT/%pc);
|
||||
%lavg = mFloor(%lowPing/%lowCount);
|
||||
sendToDiscord("Ping AVG:" @ %avg SPC "Low Avg:" @ %lavg SPC "Min:" @ %min SPC "Max:" @ %max, $discordBot::monitorChannel);
|
||||
}
|
||||
case "PINGLIST":
|
||||
if(isObject(discord) && discord.lastState $= "Connected"){
|
||||
%channel = 1;
|
||||
if(ClientGroup.getCount() > 0){
|
||||
for(%i = 0; %i < ClientGroup.getCount(); %i++){
|
||||
%cl = ClientGroup.getObject(%i);
|
||||
%ping = %cl.isAIControlled() ? 0 : %cl.getPing();
|
||||
%msg = %cl.namebase @ $discordBot::cmdSubSplit @ %ping @ $discordBot::cmdSubSplit @ %i;
|
||||
discord.schedule(%i*32,"send","MSGSTACK" @ $discordBot::cmdSplit @ (%channel-1) @ $discordBot::cmdSplit @ %msg @ "\r\n");
|
||||
}
|
||||
discord.schedule((%i+1)*32,"send","PROCSTACK" @ $discordBot::cmdSplit @ (%channel-1) @ $discordBot::cmdSplit @ "msgList" @ "\r\n");
|
||||
}
|
||||
}
|
||||
default:
|
||||
error("Bad Command" SPC %line);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue