# HG changeset patch # User Wuzzy # Date 1463074410 -7200 # Node ID 2c0811bbc1d9e3828e6713a324fb988cc3bfdd7b # Parent 02f6d786627d330484d8eb1ebf84a2372d424cdf Put duck speed factor into gear variable diff -r 02f6d786627d -r 2c0811bbc1d9 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Thu May 12 19:22:53 2016 +0200 +++ b/hedgewars/uGearsHandlersMess.pas Thu May 12 19:33:30 2016 +0200 @@ -6391,13 +6391,13 @@ // Mirrored duck // Pos 1 or 2: Duck is on water (not Sea world edge) if Gear^.Pos = 1 then - Gear^.dX:= cWindSpeed * 500 + Gear^.dX:= cWindSpeed * Gear^.Damage else if Gear^.Pos = 2 then - Gear^.dX:= -cWindSpeed * 500 + Gear^.dX:= -cWindSpeed * Gear^.Damage else if Gear^.Pos = 3 then - Gear^.dY:= cWindSpeed * 500 + Gear^.dY:= cWindSpeed * Gear^.Damage else if Gear^.Pos = 4 then - Gear^.dY:= -cWindSpeed * 500; + Gear^.dY:= -cWindSpeed * Gear^.Damage; // Rotate duck and change direction when reaching Sea world edge (Pos 3 or 4) if WorldEdge = weSea then @@ -6411,7 +6411,7 @@ Gear^.Angle:= 90 else Gear^.Angle:= 270; - Gear^.dY:= cWindSpeed * 500; + Gear^.dY:= cWindSpeed * Gear^.Damage; Gear^.dX:= _0; end // Right edge @@ -6423,7 +6423,7 @@ Gear^.Angle:= 270 else Gear^.Angle:= 90; - Gear^.dY:= -cWindspeed * 500; + Gear^.dY:= -cWindspeed * Gear^.Damage; Gear^.dX:= _0; end; end; diff -r 02f6d786627d -r 2c0811bbc1d9 hedgewars/uGearsList.pas --- a/hedgewars/uGearsList.pas Thu May 12 19:22:53 2016 +0200 +++ b/hedgewars/uGearsList.pas Thu May 12 19:33:30 2016 +0200 @@ -726,6 +726,7 @@ gear^.Timer:= 15000; // Explosion timer to avoid duck existing forever gear^.Radius:= 9; // Collision radius (with landscape) gear^.Karma:= 24; // Distance from water when swimming + gear^.Damage:= 500; // Speed factor when swimming on water (multiplied with wind speed) gear^.Elasticity:= _0_6; gear^.Friction:= _0_8; gear^.Density:= _0_5;