Remove extraneous log lines. Restore original cannon cycle. Release Build 11972.

This commit is contained in:
sigonasr2 2025-01-24 23:59:15 -06:00
parent 0d15ad2fa7
commit c3261bb301
5 changed files with 3 additions and 6 deletions

View File

@ -927,11 +927,9 @@ void AiL::ProximityKnockback(const vf2d pos,const float radius,const float knock
}
}
if(CheckForPlayerCollisions){
LOG(std::format("Checking for player collision: {} {} {} {}",pos.str(),radius,GetPlayer()->GetPos().str(),12*GetPlayer()->GetSizeMult()));
if(geom2d::overlaps(geom2d::circle(pos,radius),geom2d::circle(GetPlayer()->GetPos(),12*GetPlayer()->GetSizeMult()))){
LOG("Player collision succeeded.");
GetPlayer()->ProximityKnockback(pos,knockbackAmt);
}else LOG("Player collision failed.");
}
}
}

View File

@ -683,7 +683,6 @@ void Player::Update(float fElapsedTime){
float newX=pos.x+totalVel.x*fElapsedTime;
float newY=pos.y+totalVel.y*fElapsedTime;
MoveFlag::MoveFlag flag{MoveFlag::NONE};
LOG(std::format("Vel is currently: {}",totalVel.str()));
if(vel==vf2d{})flag=MoveFlag::PREVENT_CAST_CANCELLING; //This means added velocity is the only thing affecting movement, we don't stop casting for additional velocity actors.
SetX(newX,flag);
SetY(newY,flag);

View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1
#define VERSION_MINOR 3
#define VERSION_PATCH 0
#define VERSION_BUILD 11970
#define VERSION_BUILD 11972
#define stringify(a) stringify_(a)
#define stringify_(a) #a

View File

@ -1302,7 +1302,7 @@ MonsterStrategy
{
# 0 = Normal Cannon Shot, 1 = Silence, 2 = Shrapnel Shot
# Repeats at end of cycle.
Cannon Cycle = 0
Cannon Cycle = 0,0,0,0,0,0,0,0,1,2,1
Cannon Shot Delay = 0.4s
Cannon Shot Impact Time = 2.5s