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

shovel: changed GetModifiedDigSpeed to GetDigSpeed 

Half of the callback's work was done outside (fetching the target speed) for no good reason. It's now all done in the callback, making it less weird.
epoxy
David Dormagen 2016-02-05 21:06:30 +01:00
parent 71fa846016
commit a13a9036a5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c
View File

@ -134,9 +134,8 @@ public func FxShovelDigTimer(object clonk, effect, int time)
}
if(fDigging)
{
// Adjust speed at current animation position
var speed = clonk.ActMap.Dig.Speed*2;
speed = this->GetModifiedDigSpeed(clonk, speed);
// Get animation-adjusted dig speed.
var speed = this->GetDigSpeed(clonk);
// Limit the digging angle: one can dig maximally 30 degrees upwards.
DigAngle = BoundBy(DigAngle, 60, 300);
@ -167,8 +166,10 @@ public func FxShovelDigTimer(object clonk, effect, int time)
}
}
func GetModifiedDigSpeed(object clonk, int speed)
private func GetDigSpeed(object clonk)
{
var speed = clonk.ActMap.Dig.Speed * 2;
// Adjust speed at current animation position.
var iAnimation = GetEffect("IntDig", clonk).var1;
var iPosition = clonk->GetAnimationPosition(iAnimation)*180/clonk->GetAnimationLength("Dig");
speed = speed*(Cos(iPosition-45, 50)**2)/2500;