diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp index 80393be3..4b7ed822 100644 --- a/Adventures in Lestoria/Player.cpp +++ b/Adventures in Lestoria/Player.cpp @@ -1443,17 +1443,18 @@ const vf2d Player::GetAimingLocation(bool useWalkDir,bool invert){ vf2d closestPoint={std::numeric_limits::max(),std::numeric_limits::max()}; for(Monster&m:MONSTER_LIST){ if(m.IsAlive()){ - float distToMonster=geom2d::line(GetPos(),m.GetPos()).length(); geom2d::lineaimingLine=geom2d::line(GetPos(),m.GetPos()); - vf2d aimingPoint=aimingLine.rpoint((invert?-1.f:1.f)*operator""_Pixels("Player.Aiming Cursor Max Distance"_F)); + float distToMonster=aimingLine.length(); float distToClosestPoint=geom2d::line(GetPos(),closestPoint).length(); if(distToClosestPoint>distToMonster&&distToMonster<=operator""_Pixels("Player.Auto Aim Detection Distance"_F)){ - closestPoint=aimingPoint; + closestPoint=m.GetPos(); } } } if(closestPoint!=vf2d{std::numeric_limits::max(),std::numeric_limits::max()}){ - return game->GetScreenSize()/2+closestPoint-GetPos(); + geom2d::lineaimingLine=geom2d::line(GetPos(),closestPoint); + vf2d aimingPoint=aimingLine.rpoint((invert?-1.f:1.f)*operator""_Pixels("Player.Aiming Cursor Max Distance"_F)); + return game->GetScreenSize()/2+aimingPoint-GetPos(); }else return game->GetScreenSize()/2+vf2d{float(operator""_Pixels("Player.Aiming Cursor Max Distance"_F)),aimingAngle.y}.cart(); } diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 3f944970..222cc346 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -10,34 +10,6 @@ Upon the second time entering a stage, the game will spawn a timer that the play Upon completion of a stage in time trial mode if the player beat their previous time (which they likely will) the record will update. For each class and stage combination there will be a "dev time" -Achievements -A Good Night's Rest - Unlock the Camp -Handyman - Unlock Greg the Blacksmith -A Strange Gemstone - Complete Chapter 1 -Slime Hunter(100), Killer(250), Slayer(1000) -Slime King -Slime King Destroyer (<1 Minute Kill) -Ursule, Mother of Bears -Ursule, Mother of Bears Destroyer (<1 Minute Kill) -Tough as Steel - Obtain Level 5 on Warrior -Skilled Marksman - Obtain Level 5 on Ranger -Controller of Elements - Obtain Level 5 on Wizard -+5 a Weapon -+5 an Armor piece -+10 an Armor piece -Fully Decked out - Wear a full set of maxed out gear -Beat the Devs - Obtained a Time Medal -Speedrunner - Obtained 11 Time Medals - -SetAchievement - -File Hash on Save/Load. - -Include a Reset Achievements button in Settings - -Move based on analog stick amount instead of full speed by default -Still aiming at a target down below? - ============================================ Consider a "killed by player" / "marked by player" flag for monsters to determine if a player gets credit for a monster kill (for achievements) Make another actions config file for the main build (The app # is different) \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 40f9a38d..461110db 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_BUILD 8577 +#define VERSION_BUILD 8578 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 0a904e16..663bbd83 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ