From 02452aaa3de5e3f3d7fe48ea3a667abe75f7d2eb Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 9 Aug 2022 11:03:35 -0400 Subject: [PATCH] Forgot to change updater to look for newest full DBs --- Source/Framework/Database/DatabaseUpdater.cs | 4 ++-- Source/Framework/Util/Extensions.cs | 4 ++-- Source/Game/Movement/MoveSpline.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Framework/Database/DatabaseUpdater.cs b/Source/Framework/Database/DatabaseUpdater.cs index 42b82e8b6..45346ae9a 100644 --- a/Source/Framework/Database/DatabaseUpdater.cs +++ b/Source/Framework/Database/DatabaseUpdater.cs @@ -51,10 +51,10 @@ namespace Framework.Database fileName = @"/sql/base/characters_database.sql"; break; case "WorldDatabase": - fileName = @"/sql/TDB_full_world_920.22031_2022_03_06.sql"; + fileName = @"/sql/TDB_full_world_925.22071_2022_07_25.sql"; break; case "HotfixDatabase": - fileName = @"/sql/TDB_full_hotfixes_920.22031_2022_03_06.sql"; + fileName = @"/sql/TDB_full_hotfixes_925.22071_2022_07_25.sql"; break; } diff --git a/Source/Framework/Util/Extensions.cs b/Source/Framework/Util/Extensions.cs index bbc5f21d8..19ea31039 100644 --- a/Source/Framework/Util/Extensions.cs +++ b/Source/Framework/Util/Extensions.cs @@ -283,7 +283,7 @@ namespace System else { // WARNING. Not unique. ZA - XA = -atan2(r01,r02) - z = -(float)MathF.Atan2(matrix.M12, matrix.M13); + z = -MathF.Atan2(matrix.M12, matrix.M13); y = MathFunctions.PiOver2; x = 0.0f; } @@ -291,7 +291,7 @@ namespace System else { // WARNING. Not unique. ZA + XA = atan2(-r01,-r02) - z = (float)MathF.Atan2(-matrix.M12, -matrix.M13); + z = MathF.Atan2(-matrix.M12, -matrix.M13); y = -MathFunctions.PiOver2; x = 0.0f; } diff --git a/Source/Game/Movement/MoveSpline.cs b/Source/Game/Movement/MoveSpline.cs index 287aa65d9..645e0bf83 100644 --- a/Source/Game/Movement/MoveSpline.cs +++ b/Source/Game/Movement/MoveSpline.cs @@ -163,7 +163,7 @@ namespace Game.Movement if (facing.type == MonsterMoveType.FacingAngle) orientation = facing.angle; else if (facing.type == MonsterMoveType.FacingSpot) - orientation = (float)Math.Atan2(facing.f.Y - c.Y, facing.f.X - c.X); + orientation = MathF.Atan2(facing.f.Y - c.Y, facing.f.X - c.X); //nothing to do for MoveSplineFlag.Final_Target flag } else @@ -172,11 +172,11 @@ namespace Game.Movement { Vector3 hermite; spline.Evaluate_Derivative(point_Idx, u, out hermite); - orientation = (float)MathF.Atan2(hermite.Y, hermite.X); + orientation = MathF.Atan2(hermite.Y, hermite.X); } if (splineflags.HasFlag(SplineFlag.Backward)) - orientation -= (float)Math.PI; + orientation -= MathF.PI; } return new Vector4(c.X, c.Y, c.Z, orientation);