rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tidy up the event values code

Browse source
This commit is contained in:
Madpeter 2024-06-30 13:02:18 +01:00
parent 38338da219
commit 973fdb56b0
1 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
SecondBotEvents/Services/TriggerOnEventService.cs
View file

@ -460,25 +460,21 @@ namespace SecondBotEvents.Services
return; return;
} }
string avataruuid = inArgsOrDefault("avataruuid", args, null); string avataruuid = inArgsOrDefault("avataruuid", args, null);
string groupuuid = inArgsOrDefault("groupuuid", args, "none");
string groupname = inArgsOrDefault("groupname", args, "none");
string funds = inArgsOrDefault("funds", args, "-1");
string alertmessage = inArgsOrDefault("alertmessage", args, "none");
string oldsimname = inArgsOrDefault("oldsimname", args, "none");
string newsimname = inArgsOrDefault("newsimname", args, "none");
List<int> AvPos = GetAvPos(avataruuid); List<int> AvPos = GetAvPos(avataruuid);
Vector3 A = GetClient().Self.SimPosition; Vector3 A = GetClient().Self.SimPosition;
List<int> BotPos = new List<int>() { (int)Math.Round(A.X), (int)Math.Round(A.Y), (int)Math.Round(A.Z) }; List<int> BotPos = new List<int>() { (int)Math.Round(A.X), (int)Math.Round(A.Y), (int)Math.Round(A.Z) };
Dictionary<string, string> values = new Dictionary<string, string> Dictionary<string, string> values = new Dictionary<string, string>
{ {
{ "alertmessage", alertmessage }, { "alertmessage", inArgsOrDefault("alertmessage", args, "none") },
{ "funds", funds }, { "message", inArgsOrDefault("message", args, "none") },
{ "funds", inArgsOrDefault("funds", args, "-1") },
{ "eventype", eventName }, { "eventype", eventName },
{ "groupuuid", groupuuid }, { "groupuuid", inArgsOrDefault("groupuuid", args, "none") },
{ "groupname", groupname }, { "groupname", inArgsOrDefault("groupname", args, "none") },
{ "oldsimname", oldsimname }, { "oldsimname", inArgsOrDefault("oldsimname", args, "none") },
{ "newsimname", newsimname }, { "newsimname", inArgsOrDefault("newsimname", args, "none") },
{ "avataruuid", avataruuid },
{ "avatarname", GetAvName(avataruuid) }, { "avatarname", GetAvName(avataruuid) },
{ "avatarparcel", GetAvParcel(avataruuid) }, { "avatarparcel", GetAvParcel(avataruuid) },
{ "botsim", GetClient().Network.CurrentSim.Name }, { "botsim", GetClient().Network.CurrentSim.Name },
@ -495,16 +491,6 @@ namespace SecondBotEvents.Services
{ "dayofweek", ((int)DateTime.Now.DayOfWeek).ToString() } { "dayofweek", ((int)DateTime.Now.DayOfWeek).ToString() }
}; };
if (avataruuid == null)
{
avataruuid = "none";
}
if(args.ContainsKey("message") == false)
{
args["message"] = "none";
}
values.Add("avataruuid", avataruuid);
foreach (CustomOnEvent E in MyCustomEvents[eventName]) foreach (CustomOnEvent E in MyCustomEvents[eventName])
{ {
bool canFireEvent = true; bool canFireEvent = true;
@ -527,7 +513,7 @@ namespace SecondBotEvents.Services
} }
} }
int loop = 0; int loop = 0;
while(loop < E.WhereChecksLeft.Count()) while(loop < E.WhereChecksLeft.Count)
{ {
string left = swapvalues(E.WhereChecksLeft[loop],values); string left = swapvalues(E.WhereChecksLeft[loop],values);
string center = E.WhereChecksCenter[loop]; string center = E.WhereChecksCenter[loop];