marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

catapult: cannot shoot yourself into solid material anymore (#1139)

shapetextures
David Dormagen 2015-11-03 20:54:11 +01:00
parent fe4c320a6b
commit e4009a683c
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c
View File

@ -166,6 +166,34 @@ protected func DoFire(object clonk, int power)
{
CatapultDismount(projectile);
projectile->SetAction("Tumble");
// Special behavior for Clonks: make sure the Clonk can't shoot itself into solid material.
if (projectile->Stuck())
{
// First, try to just put the Clonk a few pixels lower - might still look okay in some situations.
for (var i = 0; i <= 4; ++i)
{
projectile->SetPosition(projectile->GetX(), projectile->GetY() + 2);
if (!projectile->Stuck()) break;
}
// Then as a safeguard, just place the Clonk at the catapult's feet and do nothing.
if (projectile->Stuck())
{
projectile->SetPosition(GetX(), GetY());
// Still stuck? Then we don't actually care if stuck here or at the end of the arm.
if (projectile->Stuck())
{
// Go back to normal shooting position.
projectile->SetPosition(GetX() + x, GetY() + y);
}
else
{
// We set the Clonk back down on the ground. This is not a normal shot.
angle = 0;
power = 20;
}
}
}
}
//Catapult is facing left or right?