Skip to content

Commit

Permalink
0.9.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@paissaheavyindustries
paissaheavyindustries committed Jan 29, 2023
1 parent 894e50c commit 0e59593
Show file tree
Hide file tree
Showing 13 changed files with 355 additions and 190 deletions.
19 changes: 19 additions & 0 deletions Telesto/Context.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using Dalamud.Game.ClientState.Objects.Types;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Telesto
{

public class Context
{

internal Doodle doo = null;
internal GameObject go = null;

}

}
47 changes: 24 additions & 23 deletions Telesto/Doodle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ internal enum CoordinateTypeEnum
Waymark
}


internal Doodle doo { get; set; }
internal CoordinateTypeEnum ct { get; set; }
internal Vector3 cp { get; set; }

Expand All @@ -48,16 +48,16 @@ internal Vector3 UnadjustedPosition(Plugin p)
default:
case CoordinateTypeEnum.Screen:
return new Vector3(
(float)p.EvaluateNumericExpression(X),
(float)p.EvaluateNumericExpression(Y),
(float)p.EvaluateNumericExpression(Z)
(float)p.EvaluateNumericExpression(doo, X),
(float)p.EvaluateNumericExpression(doo, Y),
(float)p.EvaluateNumericExpression(doo, Z)
);
break;
case CoordinateTypeEnum.World:
return new Vector3(
(float)p.EvaluateNumericExpression(X),
(float)p.EvaluateNumericExpression(Y),
(float)p.EvaluateNumericExpression(Z)
(float)p.EvaluateNumericExpression(doo, X),
(float)p.EvaluateNumericExpression(doo, Y),
(float)p.EvaluateNumericExpression(doo, Z)
);
break;
case CoordinateTypeEnum.Entity:
Expand All @@ -81,9 +81,9 @@ internal Vector3 UnadjustedPosition(Plugin p)
else
{
return new Vector3(
(float)p.EvaluateNumericExpression(X),
(float)p.EvaluateNumericExpression(Y),
(float)p.EvaluateNumericExpression(Z)
(float)p.EvaluateNumericExpression(doo, X),
(float)p.EvaluateNumericExpression(doo, Y),
(float)p.EvaluateNumericExpression(doo, Z)
);
}
break;
Expand Down Expand Up @@ -119,16 +119,16 @@ internal void RefreshVector(Plugin p)
{
case CoordinateTypeEnum.Screen:
cp = new Vector3(
(float)p.EvaluateNumericExpression(X),
(float)p.EvaluateNumericExpression(Y),
(float)p.EvaluateNumericExpression(Z)
(float)p.EvaluateNumericExpression(doo, X),
(float)p.EvaluateNumericExpression(doo, Y),
(float)p.EvaluateNumericExpression(doo, Z)
);
break;
case CoordinateTypeEnum.World:
cp = p.TranslateToScreen(
p.EvaluateNumericExpression(X),
p.EvaluateNumericExpression(Y),
p.EvaluateNumericExpression(Z)
p.EvaluateNumericExpression(doo, X),
p.EvaluateNumericExpression(doo, Y),
p.EvaluateNumericExpression(doo, Z)
);
break;
case CoordinateTypeEnum.Entity:
Expand All @@ -152,9 +152,9 @@ internal void RefreshVector(Plugin p)
else
{
cp = p.TranslateToScreen(
p.EvaluateNumericExpression(X),
p.EvaluateNumericExpression(Y),
p.EvaluateNumericExpression(Z)
p.EvaluateNumericExpression(doo, X),
p.EvaluateNumericExpression(doo, Y),
p.EvaluateNumericExpression(doo, Z)
);
}
break;
Expand Down Expand Up @@ -254,6 +254,7 @@ internal enum ExpiryTypeEnum

internal Plugin p { get; set; }
internal string Name { get; set; }
internal DateTime Created { get; set; } = DateTime.UtcNow;
internal DateTime ExpiresAt { get; set; } = DateTime.UtcNow.AddSeconds(5);
internal ExpiryTypeEnum ExpiresOn { get; set; } = ExpiryTypeEnum.Timed | ExpiryTypeEnum.NotLoggedIn | ExpiryTypeEnum.OnZoneChange | ExpiryTypeEnum.OnWipe;
internal Vector4 col { get; set; } = new Vector4();
Expand Down Expand Up @@ -342,10 +343,10 @@ internal virtual bool Update()
}
}
col = new Vector4(
(float)p.EvaluateNumericExpression(R),
(float)p.EvaluateNumericExpression(G),
(float)p.EvaluateNumericExpression(B),
(float)p.EvaluateNumericExpression(A)
(float)p.EvaluateNumericExpression(this, R),
(float)p.EvaluateNumericExpression(this, G),
(float)p.EvaluateNumericExpression(this, B),
(float)p.EvaluateNumericExpression(this, A)
);
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions Telesto/Doodles/Arrow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ internal override void Initialize(Dictionary<string, object> d)
{
base.Initialize(d);
Thickness = (d.ContainsKey("thickness") == true) ? d["thickness"].ToString() : "3";
from = new Coordinate();
from = new Coordinate() { doo = this };
if (d.ContainsKey("from") == true)
{
from.Initialize((Dictionary<string, object>)d["from"]);
}
to = new Coordinate();
to = new Coordinate() { doo = this };
if (d.ContainsKey("to") == true)
{
to.Initialize((Dictionary<string, object>)d["to"]);
Expand All @@ -67,7 +67,7 @@ internal override bool Update()
}
from.RefreshVector(p);
to.RefreshVector(p);
linechonk = (float)p.EvaluateNumericExpression(Thickness);
linechonk = (float)p.EvaluateNumericExpression(this, Thickness);
return true;
}

Expand Down
10 changes: 5 additions & 5 deletions Telesto/Doodles/Beam.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ internal override void Initialize(Dictionary<string, object> d)
Thickness = (d.ContainsKey("thickness") == true) ? d["thickness"].ToString() : "3";
Width = (d.ContainsKey("width") == true) ? d["width"].ToString() : "1";
Length = (d.ContainsKey("length") == true) ? d["length"].ToString() : "1";
from = new Coordinate();
from = new Coordinate() { doo = this }; ;
if (d.ContainsKey("from") == true)
{
from.Initialize((Dictionary<string, object>)d["from"]);
}
at = new Coordinate();
at = new Coordinate() { doo = this };
if (d.ContainsKey("at") == true)
{
at.Initialize((Dictionary<string, object>)d["at"]);
Expand All @@ -73,9 +73,9 @@ internal override bool Update()
}
from.RefreshVector(p);
at.RefreshVector(p);
linechonk = (float)p.EvaluateNumericExpression(Thickness);
widthchonk = (float)p.EvaluateNumericExpression(Width);
lengthchonk = (float)p.EvaluateNumericExpression(Length);
linechonk = (float)p.EvaluateNumericExpression(this, Thickness);
widthchonk = (float)p.EvaluateNumericExpression(this, Width);
lengthchonk = (float)p.EvaluateNumericExpression(this, Length);
return true;
}

Expand Down
6 changes: 3 additions & 3 deletions Telesto/Doodles/Circle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal override void Initialize(Dictionary<string, object> d)
filled = false;
bool.TryParse(fill, out bool filledtemp);
filled = filledtemp;
position = new Coordinate();
position = new Coordinate() { doo = this };
if (d.ContainsKey("position") == true)
{
position.Initialize((Dictionary<string, object>)d["position"]);
Expand All @@ -66,8 +66,8 @@ internal override bool Update()
return false;
}
position.RefreshVector(p);
radiuschonk = (float)p.EvaluateNumericExpression(Radius);
linechonk = (float)p.EvaluateNumericExpression(Thickness);
radiuschonk = (float)p.EvaluateNumericExpression(this, Radius);
linechonk = (float)p.EvaluateNumericExpression(this, Thickness);
return true;
}

Expand Down
6 changes: 3 additions & 3 deletions Telesto/Doodles/Line.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ internal override void Initialize(Dictionary<string, object> d)
{
base.Initialize(d);
Thickness = (d.ContainsKey("thickness") == true) ? d["thickness"].ToString() : "1";
start = new Coordinate();
start = new Coordinate() { doo = this };
if (d.ContainsKey("start") == true)
{
start.Initialize((Dictionary<string, object>)d["start"]);
}
end = new Coordinate();
end = new Coordinate() { doo = this };
if (d.ContainsKey("end") == true)
{
end.Initialize((Dictionary<string, object>)d["end"]);
Expand All @@ -47,7 +47,7 @@ internal override bool Update()
}
start.RefreshVector(p);
end.RefreshVector(p);
chonkiness = (float)p.EvaluateNumericExpression(Thickness);
chonkiness = (float)p.EvaluateNumericExpression(this, Thickness);
return true;
}

Expand Down
6 changes: 3 additions & 3 deletions Telesto/Doodles/Rectangle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ internal override void Initialize(Dictionary<string, object> d)
filled = false;
bool.TryParse(fill, out bool filledtemp);
filled = filledtemp;
pos1 = new Coordinate();
pos1 = new Coordinate() { doo = this };
if (d.ContainsKey("pos1") == true)
{
pos1.Initialize((Dictionary<string, object>)d["pos1"]);
}
pos2 = new Coordinate();
pos2 = new Coordinate() { doo = this };
if (d.ContainsKey("pos2") == true)
{
pos2.Initialize((Dictionary<string, object>)d["pos2"]);
Expand All @@ -71,7 +71,7 @@ internal override bool Update()
}
pos1.RefreshVector(p);
pos2.RefreshVector(p);
linechonk = (float)p.EvaluateNumericExpression(Thickness);
linechonk = (float)p.EvaluateNumericExpression(this, Thickness);
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions Telesto/Doodles/Text.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ internal override void Initialize(Dictionary<string, object> d)
{
base.Initialize(d);
Size = (d.ContainsKey("size") == true) ? d["size"].ToString() : "10";
position = new Coordinate();
position = new Coordinate() { doo = this };
if (d.ContainsKey("position") == true)
{
position.Initialize((Dictionary<string, object>)d["position"]);
Expand All @@ -41,7 +41,7 @@ internal override bool Update()
return false;
}
position.RefreshVector(p);
chonkiness = (float)p.EvaluateNumericExpression(Size);
chonkiness = (float)p.EvaluateNumericExpression(this, Size);
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion Telesto/Doodles/Waymark.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal override Coordinate GetCoordinateByName(string id)
internal override void Initialize(Dictionary<string, object> d)
{
base.Initialize(d);
position = new Coordinate();
position = new Coordinate() { doo = this };
if (d.ContainsKey("position") == true)
{
position.Initialize((Dictionary<string, object>)d["position"]);
Expand Down
2 changes: 1 addition & 1 deletion Telesto/Endpoint.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void ThreadProc(object o)
byte[] buf = Encoding.UTF8.GetBytes(resp);
s.Write(buf, 0, buf.Length);
}
plug._sentTelegrams++;
plug._sentResponses++;
hctx.Response.StatusCode = 200;
}
catch (Exception ex)
Expand Down
Loading

0 comments on commit 0e59593

Please sign in to comment.