Skip to content

Commit ab07779

Browse files
committed
Cleanded up global commands, they now work as !gl <command>
only 2 so far are apply and rules ill be adding more soon
1 parent 227e5c9 commit ab07779

File tree

3 files changed

+67
-11
lines changed

3 files changed

+67
-11
lines changed

LambAdmin/Commands.cs

+57-3
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,10 @@ public void InitCommands()
488488
(sender, arguments, optarg) =>
489489
{
490490
WriteChatToPlayer(sender, Command.GetString("admins", "firstline"));
491-
WriteChatToPlayerCondensed(sender, database.GetAdminsString(Players), 1000, 40, Command.GetString("admins", "separator"));
491+
//going to clean out certain group names
492+
493+
string[] cookies = database.GetAdminsString(Players);
494+
WriteChatToPlayerCondensed(sender, cookies, 1000, 40, Command.GetString("admins", "separator"));
492495
}));
493496

494497
// STATUS
@@ -716,6 +719,15 @@ select Command.GetString("status", "formatting").Format(new Dictionary<string, s
716719
{
717720
WriteChatToPlayerMultiline(sender, System.IO.File.ReadAllLines(ConfigValues.ConfigPath + @"Commands\rules.txt"));
718721
}));
722+
CommandList.Add(new Command("rules", 0, Command.Behaviour.Normal,
723+
(sender, arguments, optarg) =>
724+
{
725+
string[] lines = File.ReadAllLines(ConfigValues.ConfigPath + @"Commands\apply.txt");
726+
foreach (string line in lines)
727+
{
728+
WriteChatToAll(line);
729+
}
730+
}));
719731
}
720732

721733
if (System.IO.File.Exists(ConfigValues.ConfigPath + @"Commands\apply.txt"))
@@ -736,7 +748,48 @@ select Command.GetString("status", "formatting").Format(new Dictionary<string, s
736748
}
737749
}));
738750
}
739-
751+
CommandList.Add(new Command("gl", 1, Command.Behaviour.Normal, (sender, arguments, optarg) =>
752+
{
753+
if (arguments[0] == "")
754+
{
755+
WriteChatToPlayer(sender, "^1Error you suck try again");
756+
return;
757+
}
758+
// RULES
759+
if (arguments[0] == "rules")
760+
{
761+
if (System.IO.File.Exists(ConfigValues.ConfigPath + @"Commands\rules.txt"))
762+
{
763+
string[] lines = File.ReadAllLines(ConfigValues.ConfigPath + @"Commands\rules.txt");
764+
foreach (string line in lines)
765+
{
766+
WriteChatToAll(line);
767+
}
768+
}
769+
else
770+
{
771+
WriteChatToPlayer(sender, "^1Error: Rules file not found");
772+
return;
773+
}
774+
}
775+
// apply
776+
if (arguments[0] == "apply")
777+
{
778+
if (System.IO.File.Exists(ConfigValues.ConfigPath + @"Commands\apply.txt"))
779+
{
780+
string[] lines = File.ReadAllLines(ConfigValues.ConfigPath + @"Commands\apply.txt");
781+
foreach (string line in lines)
782+
{
783+
WriteChatToAll(line);
784+
}
785+
}
786+
else
787+
{
788+
WriteChatToPlayer(sender, "^1Error: apply file not found");
789+
return;
790+
}
791+
}
792+
}));
740793
// WARN
741794
CommandList.Add(new Command("warn", 1, Command.Behaviour.HasOptionalArguments,
742795
(sender, arguments, optarg) =>
@@ -820,6 +873,7 @@ select Command.GetString("status", "formatting").Format(new Dictionary<string, s
820873
}));
821874
}));
822875

876+
823877
// GETWARNS
824878
CommandList.Add(new Command("getwarns", 1, Command.Behaviour.HasOptionalArguments,
825879
(sender, arguments, optarg) =>
@@ -2643,7 +2697,7 @@ select Command.GetString("dbsearch", "message_found").Format(new Dictionary<stri
26432697
CMD_kick(player, "^3Server killed");
26442698
AfterDelay(1000, () => Environment.Exit(-1));
26452699
});
2646-
}));
2700+
}));
26472701
}
26482702

26492703
#endregion

LambAdmin/Config.cs

+2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ public partial class DGAdmin
106106
{"command_pm_message", "^1<sender>^0: ^2<message>" },
107107
{"command_pm_confirmation", "^2PM SENT." },
108108

109+
{"command_gl_usage", "^1Usage: !gl <cmd>" },
110+
109111
{"command_admins_usage", "^1Usage: !admins" },
110112
{"command_admins_firstline", "^1Online Admins: ^7" },
111113
{"command_admins_formatting", "<formattedname>" },

LambAdmin/Groups.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ public GroupsDatabase()
8383
File.WriteAllLines(ConfigValues.ConfigPath + @"Groups\groups.txt", new string[]
8484
{
8585
"default::pm,admins,guid,version,rules,afk,credits,hidebombicon,help,rage,maps,time,amsg,ft,hwid,apply,night,fillammo,report,suicide,yes,no,register,xlrstats,xlrtop",
86-
"moderator:password:login,app,warn,unwarn,kick,mode,map,setafk,kick,tmpban,changeteam,lastreports:^0[^5Moderator^0]^7",
87-
"family:password:kickhacker,kill,app,mute,unmute,end,tmpbantime,cdvar,getplayerinfo,say,sayto,resetwarns,setgroup,scream,whois,changeteam,yell,gametype,mode,login,map,status,kick,tmpban,ban,warn,unwarn,getwarns,res,setafk,setteam,balance,clanvsall,clanvsallspectate,sunlight,alias,lastreports,fire:^0[^3F^0]^7",
86+
"moderator:password:login,gl,warn,unwarn,kick,mode,map,setafk,kick,tmpban,changeteam,lastreports:^0[^5Moderator^0]^7",
87+
"family:password:kickhacker,kill,gl,mute,unmute,end,tmpbantime,cdvar,getplayerinfo,say,sayto,resetwarns,setgroup,scream,whois,changeteam,yell,gametype,mode,login,map,status,kick,tmpban,ban,warn,unwarn,getwarns,res,setafk,setteam,balance,clanvsall,clanvsallspectate,sunlight,alias,lastreports,fire:^0[^3F^0]^7",
8888
"elder:password:-*unsafe*,*all*:^0[^4Elder^0]^7",
8989
"developer:password:*all*:^0[^;D^0]^",
9090
"owner:password:*all*:^0[^1O^2w^3n^4e^5r^0]^3",
91-
"admin:password:scream,whois,changeteam,app,yell,gametype,mode,login,map,status,unban,unban-id,kick,tmpban,ban,warn,unwarn,getwarns,res,setafk,setteam,balance,clanvsall,clanvsallspectate,login,lastreports:^0[^1Admin^0]^7",
91+
"admin:password:scream,whois,changeteam,gl,yell,gametype,mode,login,map,status,unban,unban-id,kick,tmpban,ban,warn,unwarn,getwarns,res,setafk,setteam,balance,clanvsall,clanvsallspectate,login,lastreports:^0[^1Admin^0]^7",
9292
"leader:password:*all*:^0[^1L^2e^3a^4d^5e^7r^0]^2",
9393
"trial:password:login,warn,unwarn,kick:^0[^5Trial^0]^7",
94-
"member:password:login,warn,unwarn,app,kick,mode,map,setafk,kick,tmpban,lastreports:^0[^5Member^0]^7",
95-
"friend:password:login,warn,unwarn,app,kick,mode,map,setafk,kick,tmpban,map,mode,tmpban,lastreports:^0[^6Friend^0]^7",
96-
"vip:password:ban,kick,tmpban,warn,app,unwarn,map,balance,mode,whois,status,login,setafk,changeteam,scream,fakesay,myalias,fire:^0[^3V.I.P.^0]^7",
94+
"member:password:login,warn,unwarn,gl,kick,mode,map,setafk,kick,tmpban,lastreports:^0[^5Member^0]^7",
95+
"friend:password:login,warn,unwarn,gl,kick,mode,map,setafk,kick,tmpban,map,mode,tmpban,lastreports:^0[^6Friend^0]^7",
96+
"vip:password:ban,kick,tmpban,warn,gl,unwarn,map,balance,mode,whois,status,login,setafk,changeteam,scream,fakesay,myalias,fire:^0[^3V.I.P.^0]^7",
9797
"founder:password:*all*:^0[^1F^2o^3u^4n^5d^6e^8r^0]^6",
98-
"donator:password:kick,warn,tmpban,app,unwarn,mute,unmute,login,balance,setafk,changeteam,myalias,lastreports,fire:^0[^2Donator^0]^7",
98+
"donator:password:kick,warn,tmpban,gl,unwarn,mute,unmute,login,balance,setafk,changeteam,myalias,lastreports,fire:^0[^2Donator^0]^7",
9999
"banned::-pm,-admins,-guid,-version,-rules,-afk,-credits,-hidebombicon,-help,-rage,-maps,-time,-amsg,-ft,-hwid,-apply,-night,-fillammo,-report,-yes,-no,-register,-xlrstats,-xlrtop:^0[^1BANNED]^7",
100100
"coleader:password:-*abusive*,-*unsafe*,*all*:^0[^3CoLeader^0]^7"
101101
});
@@ -296,7 +296,7 @@ public string[] GetAdminsString(List<Entity> Players)
296296
where !string.IsNullOrWhiteSpace(grp.short_name)
297297
select Command.GetString("admins", "formatting").Format(new Dictionary<string, string>()
298298
{
299-
{"<name>", player.Name },
299+
{ "<name>", player.Name },
300300
{"<formattedname>", player.GetFormattedName(this) },
301301
{"<rankname>", grp.group_name },
302302
{"<shortrank>", grp.short_name },

0 commit comments

Comments
 (0)