hedgewars: comparison hedgewars/uGearsUtils.pas

equal deleted inserted replaced

-:f7a199346c3e
+:7705784902e1
 uses uTypes, uFloat;
 procedure doMakeExplosion(X, Y, Radius: LongInt; AttackingHog: PHedgehog; Mask: Longword); inline;
 procedure doMakeExplosion(X, Y, Radius: LongInt; AttackingHog: PHedgehog; Mask: Longword; const Tint: LongWord);
 procedure AddSplashForGear(Gear: PGear; justSkipping: boolean);
+procedure AddBounceEffectForGear(Gear: PGear);
 function  ModifyDamage(dmg: Longword; Gear: PGear): Longword;
 procedure ApplyDamage(Gear: PGear; AttackerHog: PHedgehog; Damage: Longword; Source: TDamageSource);
 procedure spawnHealthTagForHH(HHGear: PGear; dmg: Longword);
 procedure HHHurt(Hedgehog: PHedgehog; Source: TDamageSource);
 var x, y, i, distL, distR, distB, minDist, maxDrops: LongInt;
 splash, particle: PVisualGear;
 speed, hwTmp: hwFloat;
 vi, vs, tmp: real; // impact speed and sideways speed
 isImpactH, isImpactRight: boolean;
+const dist2surf = 4;
 begin
 x:= hwRound(Gear^.X);
 y:= hwRound(Gear^.Y);
-splash:= AddVisualGear(x, y, vgtSplash);
+// find position for splash and impact speed
-if splash = nil then
-exit;
-// correct position and angle
 distB:= cWaterline - y;
 if WorldEdge <> weSea then
 minDist:= distB
 isImpactH:= (minDist <> distB);
 if not isImpactH then
 begin
-dec(y, distB);
+y:= cWaterline - dist2surf;
-splash^.Y:= y;
 speed:= hwAbs(Gear^.dY);
-vs:= abs(hwFloat2Float(Gear^.dX));
 end
 else
 begin
 isImpactRight := minDist = distR;
 if isImpactRight then
-begin
+x:= rightX - dist2surf
-inc(x, distR);
-splash^.Angle:= -90;
-end
 else
-begin
+x:= leftX + dist2surf;
-dec(x, distL);
-splash^.Angle:=  90;
-end;
-splash^.X:= x;
 speed:= hwAbs(Gear^.dX);
-vs:= abs(hwFloat2Float(Gear^.dY));
+end;
-end;
-vi:= hwFloat2Float(speed);
 // splash sound
 if justSkipping then
 PlaySound(sndSkip)
 else if hwTmp > _0_5 then
 PlaySound(sndSkip)
 else
 PlaySound(sndDroplet2);
 end;
+// splash visuals
+if ((cReducedQuality and rqPlainSplash) <> 0) then
+exit;
+splash:= AddVisualGear(x, y, vgtSplash);
+if splash = nil then
+exit;
+if not isImpactH then
+vs:= abs(hwFloat2Float(Gear^.dX))
+else
+begin
+if isImpactRight then
+splash^.Angle:= -90
+else
+splash^.Angle:=  90;
+vs:= abs(hwFloat2Float(Gear^.dY));
+end;
+vi:= hwFloat2Float(speed);
 with splash^ do
 begin
 Scale:= abs(hwFloat2Float(Gear^.Density / _3 * speed));
 if Scale > 1 then Scale:= power(Scale,0.3333)
 isDirH:= false;
 if WorldEdge = weSea then
 begin
 tmp:= dist2Water;
-dist2Water:= min(dist2Water, min(X - Gear^.Radius - leftX, rightX - (X + Gear^.Radius)));
+dist2Water:= min(dist2Water, min(X - Gear^.Radius - LongInt(leftX), LongInt(rightX) - (X + Gear^.Radius)));
 // if water on sides is closer than on bottom -> horizontal direction
 isDirH:= tmp <> dist2Water;
 end;
 isImpact:= false;
 skipDecay := _0_87;
 // skipping
-if (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > skipSpeed)
+if (not isSubmersible) and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > skipSpeed)
 and ( ((not isDirH) and (hwAbs(Gear^.dX) > skipAngle * hwAbs(Gear^.dY)))
 or (isDirH and (hwAbs(Gear^.dY) > skipAngle * hwAbs(Gear^.dX))) ) then
 begin
 isSkip:= true;
 // if skipping we move the gear out of water
 AddCaption(FormatA(GetEventString(eidDrowned), s), cWhiteColor, capgrpMessage);
 end
 end
 else
 DrownGear(Gear);
-if (dist2Water < -1) or (Gear^.Kind = gtFlake) then
+if Gear^.Kind = gtFlake then
 exit(true); // skip splashes
 end
 else // submersible
 begin
 // drown submersible grears if far below map
 begin
 tmp:= hwRound(Gear^.Y - Gear^.dY);
 tmp:= abs(cWaterLine - tmp);
 end;
-// there was an impact if distance was same as radius
+// there was an impact if distance was >= radius
-isImpact:= (tmp = Gear^.Radius)
+isImpact:= (tmp >= Gear^.Radius)
 end;
 end; // end of submersible
 end; // end of not skipping
 // splash sound animation and droplets
 if t<h then
 begin
 FollowGear:= AddGear(0, 0, gtCase, 0, _0, _0, 0);
 FollowGear^.Health:= cHealthCaseAmount;
 FollowGear^.Pos:= posCaseHealth;
+// health crate is smaller than the other crates
+FollowGear^.Radius := cCaseHealthRadius;
 AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo);
 end
 else if (t<a+h) then
 begin
 t:= aTot;
 RightImpactTimer:= 333;
 Gear^.dX.isNegative:= true;
 Gear^.X:= int2hwfloat(rightX-Gear^.Radius)
 end;
 if (Gear^.Radius > 2) and (Gear^.dX.QWordValue > _0_001.QWordValue) then
-PlaySound(sndMelonImpact)
+AddBounceEffectForGear(Gear);
 end{
 else if WorldEdge = weSea then
 begin
 if (hwRound(Gear^.Y) > cWaterLine) and (Gear^.State and gstSubmersible <> 0) then
 Gear^.State:= Gear^.State and (not gstSubmersible)
 *)
 WorldWrap:= true
 end;
 end;
+procedure AddBounceEffectForGear(Gear: PGear);
+var boing: PVisualGear;
+begin
+boing:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot, 0, false, 1);
+if boing <> nil then
+with boing^ do
+begin
+Angle:= random(360);
+dx:= 0;
+dy:= 0;
+FrameTicks:= 200;
+Scale:= hwFloat2Float(Gear^.Density * hwAbs(Gear^.dY) + hwAbs(Gear^.dX)) / 1.5;
+State:= ord(sprBoing)
+end;
+PlaySound(sndMelonImpact, true)
+end;
 end.

branch	qmlfrontend
changeset 10515	7705784902e1
parent 10512	25021aac078e
child 10526	b43d175d1577