AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Merge commit '20d5cf0bfcea65f2ff1faf86dba2069932cbfb3f' into pullstream

Browse Source
This commit is contained in:
Rebekah 2024-02-14 06:41:13 -05:00
commit 527f5a8dfd
Signed by: oneechanhax
GPG Key ID: 183EB7902964DAE5
3 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -22,6 +22,7 @@ derouinw
dImrich (Damian Imrich) dImrich (Damian Imrich)
Diusrex Diusrex
Duralex Duralex
dyexlzc
Earboxer (Zach DeCook) Earboxer (Zach DeCook)
FakeTruth (founder) FakeTruth (founder)
feyokorenhof feyokorenhof

91
src/Entities/Minecart.cpp
View File

@ -35,9 +35,12 @@
#define NO_SPEED 0.0 #define NO_SPEED 0.0
#define MAX_SPEED 8 #define MAX_SPEED 8
#define MAX_SPEED_NEGATIVE -MAX_SPEED #define MAX_SPEED_NEGATIVE -MAX_SPEED
#define DIR_NORTH_SOUTH 270
#define DIR_EAST_WEST 180
#define DIR_NORTH_WEST 315
#define DIR_NORTH_EAST 225
#define DIR_SOUTH_WEST 135
#define DIR_SOUTH_EAST 45
class cMinecartAttachCallback class cMinecartAttachCallback
{ {
@ -183,7 +186,10 @@ void cMinecart::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
return; return;
} }
auto relPos = cChunkDef::AbsoluteToRelative(GetPosition()); // pos need floor, then call vec3i overload func
// if use default double -> int, will cast -1.xx -> -1(actually need to be -2)
auto relPos = cChunkDef::AbsoluteToRelative(GetPosition().Floor());
auto chunk = a_Chunk.GetRelNeighborChunkAdjustCoords(relPos); auto chunk = a_Chunk.GetRelNeighborChunkAdjustCoords(relPos);
if (chunk == nullptr) if (chunk == nullptr)
{ {
@ -284,10 +290,10 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
{ {
case E_META_RAIL_ZM_ZP: // NORTHSOUTH case E_META_RAIL_ZM_ZP: // NORTHSOUTH
{ {
SetYaw(270); SetYaw(DIR_NORTH_SOUTH);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0); // Don't move vertically as on ground SetSpeedY(NO_SPEED); // Don't move vertically as on ground
SetSpeedX(0); // Correct diagonal movement from curved rails SetSpeedX(NO_SPEED); // Correct diagonal movement from curved rails
// Execute both the entity and block collision checks // Execute both the entity and block collision checks
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
@ -315,7 +321,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_XM_XP: // EASTWEST case E_META_RAIL_XM_XP: // EASTWEST
{ {
SetYaw(180); SetYaw(DIR_EAST_WEST);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(NO_SPEED); SetSpeedY(NO_SPEED);
SetSpeedZ(NO_SPEED); SetSpeedZ(NO_SPEED);
@ -343,8 +349,8 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
{ {
SetYaw(270); SetYaw(DIR_NORTH_SOUTH);
SetSpeedX(0); SetSpeedX(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -370,8 +376,8 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
{ {
SetYaw(270); SetYaw(DIR_NORTH_SOUTH);
SetSpeedX(0); SetSpeedX(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -397,7 +403,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_ASCEND_XM: // ASCEND EAST case E_META_RAIL_ASCEND_XM: // ASCEND EAST
{ {
SetYaw(180); SetYaw(DIR_EAST_WEST);
SetSpeedZ(NO_SPEED); SetSpeedZ(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
@ -422,8 +428,8 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_ASCEND_XP: // ASCEND WEST case E_META_RAIL_ASCEND_XP: // ASCEND WEST
{ {
SetYaw(180); SetYaw(DIR_EAST_WEST);
SetSpeedZ(0); SetSpeedZ(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -447,9 +453,9 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_CURVED_ZM_XM: // Ends pointing NORTH and WEST case E_META_RAIL_CURVED_ZM_XM: // Ends pointing NORTH and WEST
{ {
SetYaw(315); // Set correct rotation server side SetYaw(DIR_NORTH_WEST); // Set correct rotation server side
SetPosY(floor(GetPosY()) + 0.55); // Levitate dat cart SetPosY(floor(GetPosY()) + 0.55); // Levitate dat cart
SetSpeedY(0); SetSpeedY(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -464,9 +470,9 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_CURVED_ZM_XP: // Curved NORTH EAST case E_META_RAIL_CURVED_ZM_XP: // Curved NORTH EAST
{ {
SetYaw(225); SetYaw(DIR_NORTH_EAST);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0); SetSpeedY(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -479,9 +485,9 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_CURVED_ZP_XM: // Curved SOUTH WEST case E_META_RAIL_CURVED_ZP_XM: // Curved SOUTH WEST
{ {
SetYaw(135); SetYaw(DIR_SOUTH_WEST);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0); SetSpeedY(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -494,9 +500,9 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::millisecon
} }
case E_META_RAIL_CURVED_ZP_XP: // Curved SOUTH EAST case E_META_RAIL_CURVED_ZP_XP: // Curved SOUTH EAST
{ {
SetYaw(45); SetYaw(DIR_SOUTH_EAST);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0); SetSpeedY(NO_SPEED);
auto BlckCol = TestBlockCollision(a_RailMeta); auto BlckCol = TestBlockCollision(a_RailMeta);
auto EntCol = TestEntityCollision(a_RailMeta); auto EntCol = TestEntityCollision(a_RailMeta);
@ -520,17 +526,18 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
// If the rail is powered set to speed up else slow down. // If the rail is powered set to speed up else slow down.
const bool IsRailPowered = ((a_RailMeta & 0x8) == 0x8); const bool IsRailPowered = ((a_RailMeta & 0x8) == 0x8);
const double Acceleration = IsRailPowered ? 1.0 : -2.0; const double Acceleration = IsRailPowered ? 1.0 : -2.0;
// PoweredRail only has 5 status in low 3bit. so we need do a logical and to get correct powered rail meta data.
switch (a_RailMeta & 0x07) NIBBLETYPE PoweredRailMeta = a_RailMeta & 0x7;
switch (PoweredRailMeta)
{ {
case E_META_RAIL_ZM_ZP: // NORTHSOUTH case E_META_RAIL_ZM_ZP: // NORTHSOUTH
{ {
SetYaw(270); SetYaw(DIR_NORTH_SOUTH);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(0); SetSpeedY(0);
SetSpeedX(0); SetSpeedX(0);
bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta); bool BlckCol = TestBlockCollision(PoweredRailMeta), EntCol = TestEntityCollision(PoweredRailMeta);
if (EntCol || BlckCol) if (EntCol || BlckCol)
{ {
return; return;
@ -566,12 +573,12 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
case E_META_RAIL_XM_XP: // EASTWEST case E_META_RAIL_XM_XP: // EASTWEST
{ {
SetYaw(180); SetYaw(DIR_EAST_WEST);
SetPosY(floor(GetPosY()) + 0.55); SetPosY(floor(GetPosY()) + 0.55);
SetSpeedY(NO_SPEED); SetSpeedY(NO_SPEED);
SetSpeedZ(NO_SPEED); SetSpeedZ(NO_SPEED);
bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta); bool BlckCol = TestBlockCollision(PoweredRailMeta), EntCol = TestEntityCollision(PoweredRailMeta);
if (EntCol || BlckCol) if (EntCol || BlckCol)
{ {
return; return;
@ -607,7 +614,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
case E_META_RAIL_ASCEND_XM: // ASCEND EAST case E_META_RAIL_ASCEND_XM: // ASCEND EAST
{ {
SetYaw(180); SetYaw(DIR_EAST_WEST);
SetSpeedZ(NO_SPEED); SetSpeedZ(NO_SPEED);
if (GetSpeedX() >= NO_SPEED) if (GetSpeedX() >= NO_SPEED)
@ -624,7 +631,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
case E_META_RAIL_ASCEND_XP: // ASCEND WEST case E_META_RAIL_ASCEND_XP: // ASCEND WEST
{ {
SetYaw(180); SetYaw(DIR_EAST_WEST);
SetSpeedZ(NO_SPEED); SetSpeedZ(NO_SPEED);
if (GetSpeedX() > NO_SPEED) if (GetSpeedX() > NO_SPEED)
@ -641,7 +648,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
{ {
SetYaw(270); SetYaw(DIR_NORTH_SOUTH);
SetSpeedX(NO_SPEED); SetSpeedX(NO_SPEED);
if (GetSpeedZ() >= NO_SPEED) if (GetSpeedZ() >= NO_SPEED)
@ -658,7 +665,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
} }
case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
{ {
SetYaw(270); SetYaw(DIR_NORTH_SOUTH);
SetSpeedX(NO_SPEED); SetSpeedX(NO_SPEED);
if (GetSpeedZ() > NO_SPEED) if (GetSpeedZ() > NO_SPEED)
@ -1304,6 +1311,24 @@ void cMinecart::OnRemoveFromWorld(cWorld & a_World)
void cMinecart::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
{
// limit normal minecart speed max lower than 4
// once speed is higher than 4, no more add speed.
if (GetSpeed().Length() > 4)
{
return;
}
Vector3d LookVector = m_Attachee->GetLookVector();
Vector3d ToAddSpeed = LookVector * (a_Forward * 0.4) ;
ToAddSpeed.y = 0;
AddSpeed(ToAddSpeed);
}
void cMinecart::ApplyAcceleration(Vector3d a_ForwardDirection, double a_Acceleration) void cMinecart::ApplyAcceleration(Vector3d a_ForwardDirection, double a_Acceleration)
{ {
double CurSpeed = GetSpeed().Dot(a_ForwardDirection); double CurSpeed = GetSpeed().Dot(a_ForwardDirection);

2
src/Entities/Minecart.h
View File

@ -58,7 +58,7 @@ public:
virtual bool DoTakeDamage(TakeDamageInfo & TDI) override; virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;
virtual void KilledBy(TakeDamageInfo & a_TDI) override; virtual void KilledBy(TakeDamageInfo & a_TDI) override;
virtual void OnRemoveFromWorld(cWorld & a_World) override; virtual void OnRemoveFromWorld(cWorld & a_World) override;
virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) override;
int LastDamage(void) const { return m_LastDamage; } int LastDamage(void) const { return m_LastDamage; }
ePayload GetPayload(void) const { return m_Payload; } ePayload GetPayload(void) const { return m_Payload; }