Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Harm Lara with rockets

Browse source
This commit is contained in:
Lwmte 2022-05-17 15:54:29 +03:00
parent 934747731f
commit 07c3e730da
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TombEngine/Game/Lara/lara_one_gun.cpp
View file

@ -703,7 +703,7 @@ void FireGrenade(ItemInfo* laraItem)
item->Animation.ActiveState = item->Pose.Orientation.x;
item->Animation.TargetState = item->Pose.Orientation.y;
item->Animation.RequiredState = 0;
item->HitPoints = 120;
item->HitPoints = GRENADE_TIME;
item->ItemFlags[0] = (int)WeaponAmmoType::Ammo2;
AddActiveItem(itemNumber);
@ -932,7 +932,7 @@ void GrenadeControl(short itemNumber)
if (item->HitPoints)
{
if (item->HitPoints > 118)
if (item->HitPoints > EXPLOSION_TRIGGER_TIME)
return;
}
else
@ -1148,6 +1148,7 @@ void FireRocket(ItemInfo* laraItem)
item->Pose.Orientation.x = laraItem->Pose.Orientation.x + lara->LeftArm.Orientation.x;
item->Pose.Orientation.y = laraItem->Pose.Orientation.y + lara->LeftArm.Orientation.y;
item->Pose.Orientation.z = 0;
item->HitPoints = ROCKET_TIME;
if (!lara->LeftArm.Locked)
{
@ -1258,13 +1259,20 @@ void RocketControl(short itemNumber)
int radius = (explode ? ROCKET_EXPLODE_RADIUS : ROCKET_HIT_RADIUS);
bool foundCollidedObjects = false;
if (item->HitPoints)
{
item->HitPoints--;
if (item->HitPoints > EXPLOSION_TRIGGER_TIME)
return;
}
for (int n = 0; n < 2; n++)
{
// Step 0: check for specific collision in a small radius
// Step 1: done only if explosion, try to smash all objects in the blast radius
// Found possible collided items and statics
GetCollidedObjects(item, radius, true, &CollidedItems[0], &CollidedMeshes[0], true);
GetCollidedObjects(item, radius, true, &CollidedItems[0], &CollidedMeshes[0], false);
// If no collided items and meshes are found, then exit the loop
if (!CollidedItems[0] && !CollidedMeshes[0])

3
TombEngine/Game/Lara/lara_one_gun.h
View file

@ -10,6 +10,9 @@ constexpr auto HARPOON_DRAW_ANIM = 1;
constexpr auto ROCKET_DRAW_ANIM = 0;
constexpr auto HARPOON_VELOCITY = CLICK(1);
constexpr auto HARPOON_TIME = 300;
constexpr auto GRENADE_TIME = 120;
constexpr auto ROCKET_TIME = 125;
constexpr auto EXPLOSION_TRIGGER_TIME = 118;
constexpr auto ROCKET_VELOCITY = CLICK(2);
constexpr auto GRENADE_VELOCITY = CLICK(0.5f);
constexpr auto MAX_GRENADE_VERTICAL_VELOCITY = CLICK(0.5f);