diff --git a/Adventures in Lestoria Tests/PlayerTests.cpp b/Adventures in Lestoria Tests/PlayerTests.cpp index f5e8e542..c49691d9 100644 --- a/Adventures in Lestoria Tests/PlayerTests.cpp +++ b/Adventures in Lestoria Tests/PlayerTests.cpp @@ -100,6 +100,7 @@ namespace PlayerTests } TEST_METHOD_CLEANUP(CleanupTests){ testGame->EndGame(); + testGame->OnUserUpdate(0.f); } TEST_METHOD(PlayerAlive){ Assert::IsTrue(player->IsAlive()); diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index eef639ee..13ca15ea 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -394,7 +394,7 @@ bool AiL::OnUserCreate(){ void AiL::AdminConsole(){ if(ADMIN_MODE){ - if(GetKey(F12).bPressed)ConsoleShow(F12); + if(GetKey(F11).bPressed)ConsoleShow(F11); } } diff --git a/Adventures in Lestoria/ChargedArrow.cpp b/Adventures in Lestoria/ChargedArrow.cpp index d4eadf11..2b446f27 100644 --- a/Adventures in Lestoria/ChargedArrow.cpp +++ b/Adventures in Lestoria/ChargedArrow.cpp @@ -54,7 +54,11 @@ void ChargedArrow::Update(float fElapsedTime){ float dist=lineToCurrentPos.length(); if(dist>=1){ vf2d midpoint(lineToCurrentPos.rpoint(0.5)); - game->AddEffect(std::make_unique(midpoint,0.1f,"laser.png",upperLevel,vf2d{1,dist},0.3f,vf2d{},Pixel{192,128,238},atan2(pos.y-lastLaserPos.y,pos.x-lastLaserPos.x)+PI/2,0,true)); + + const float normalBeamRadius{12*"Ranger.Ability 2.Radius"_F/100}; + float laserWidth{radius/normalBeamRadius}; + + game->AddEffect(std::make_unique(midpoint,0.1f,"laser.png",upperLevel,vf2d{laserWidth,dist*2},0.3f,vf2d{},Pixel{192,128,238},atan2(pos.y-lastLaserPos.y,pos.x-lastLaserPos.x)+PI/2,0,true)); lastLaserPos=pos; } } diff --git a/Adventures in Lestoria/Ranger.cpp b/Adventures in Lestoria/Ranger.cpp index 495a4288..f8b346e4 100644 --- a/Adventures in Lestoria/Ranger.cpp +++ b/Adventures in Lestoria/Ranger.cpp @@ -126,7 +126,11 @@ void Ranger::InitializeClassAbilities(){ Ranger::ability2.action= [](Player*p,vf2d pos={}){ vf2d arrowVelocity=util::pointTo(p->GetPos(),p->GetWorldAimingLocation()); - BULLET_LIST.push_back(std::make_unique(p->GetPos(),arrowVelocity*"Ranger.Ability 2.Speed"_F,12*"Ranger.Ability 2.Radius"_F/100,p->GetAttack()*"Ranger.Ability 2.DamageMult"_F,p->OnUpperLevel(),true)); + + float beamRadius{12*"Ranger.Ability 2.Radius"_F/100}; + if(p->HasEnchant("Charge Beam"))beamRadius*="Charge Beam"_ENC["ATTACK RADIUS INCREASE MULT"]; + + BULLET_LIST.push_back(std::make_unique(p->GetPos(),arrowVelocity*"Ranger.Ability 2.Speed"_F,beamRadius,p->GetAttack()*"Ranger.Ability 2.DamageMult"_F,p->OnUpperLevel(),true)); p->SetState(State::SHOOT_ARROW); p->rangerShootAnimationTimer=0.3f; p->SetAnimationBasedOnTargetingDirection("SHOOT",atan2(arrowVelocity.y,arrowVelocity.x)); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index e125cafa..1629c33c 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 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 10819 +#define VERSION_BUILD 10824 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/testEnvironments.json b/testEnvironments.json new file mode 100644 index 00000000..a110b57d --- /dev/null +++ b/testEnvironments.json @@ -0,0 +1,17 @@ +{ + "version": "1", + "environments": [ + // See https://aka.ms/remotetesting for more details + // about how to configure remote environments. + //{ + // "name": "WSL Ubuntu", + // "type": "wsl", + // "wslDistribution": "Ubuntu" + //}, + //{ + // "name": "Docker dotnet/sdk", + // "type": "docker", + // "dockerImage": "mcr.microsoft.com/dotnet/sdk" + //} + ] +} \ No newline at end of file diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 259ada57..777ef96c 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ