hedgewars: comparison hedgewars/uGearsUtils.pas

equal deleted inserted replaced

-:2af2309207b0
+:56bd029245fc
 Gear^.DirAngle := Gear^.DirAngle + 360
 else if 360 < Gear^.DirAngle then
 Gear^.DirAngle := Gear^.DirAngle - 360
 end;
+procedure DrownGear(Gear: PGear);
+begin
+Gear^.doStep := @doStepDrowningGear;
+Gear^.Timer := 5000; // how long game should wait
+end;
 function CheckGearDrowning(var Gear: PGear): boolean;
 var
-skipSpeed, skipAngle, skipDecay: hwFloat;
+skipSpeed, skipAngle, skipDecay, hwTmp: hwFloat;
-i, maxDrops, X, Y: LongInt;
+i, maxDrops, X, Y, dist2Water: LongInt;
-vdX, vdY: real;
+vdX, vdY, tmp: real;
 particle, splash: PVisualGear;
-isSubmersible: boolean;
+isSubmersible, isImpactH, isImpactRight, isLeaving: boolean;
 s: ansistring;
 begin
 // probably needs tweaking. might need to be in a case statement based upon gear type
+X:= hwRound(Gear^.X);
 Y:= hwRound(Gear^.Y);
-if cWaterLine < Y + Gear^.Radius then
-begin
+dist2Water:= cWaterLine - (Y + Gear^.Radius);
+isImpactH:= false;
+if WorldEdge = weSea then
+begin
+i:= dist2Water;
+dist2Water:= min(dist2Water, min(X - Gear^.Radius - leftX, rightX - (X + Gear^.Radius)));
+isImpactH:= i <> dist2Water;
+end;
+if dist2Water < 0 then
+begin
+// invisible gears will just be deleted
+// unless they are generic fallers, then they will be "respawned"
 if Gear^.State and gstInvisible <> 0 then
 begin
 if Gear^.Kind = gtGenericFaller then
 begin
 Gear^.X:= int2hwFloat(GetRandom(rightX-leftX)+leftX);
 end;
 isSubmersible:= ((Gear = CurrentHedgehog^.Gear) and (CurAmmoGear <> nil) and (CurAmmoGear^.State and gstSubmersible <> 0)) or (Gear^.State and gstSubmersible <> 0);
 skipSpeed := _0_25;
 skipAngle := _1_9;
 skipDecay := _0_87;
-X:= hwRound(Gear^.X);
+vdX:= abs(hwFloat2Float(Gear^.dX));
-vdX:= hwFloat2Float(Gear^.dX);
+vdY:= abs(hwFloat2Float(Gear^.dY));
-vdY:= hwFloat2Float(Gear^.dY);
-// this could perhaps be a tiny bit higher.
+// skipping
-if  (cWaterLine + 64 + Gear^.Radius > Y) and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > skipSpeed)
-and (hwAbs(Gear^.dX) > skipAngle * hwAbs(Gear^.dY)) then
+// check for -1 depth because if deeper, then it already had its chance of skipping
+if  (dist2Water = -1) and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > skipSpeed)
+and ( ((not isImpactH) and (hwAbs(Gear^.dX) > skipAngle * hwAbs(Gear^.dY)))
+or (isImpactH and (hwAbs(Gear^.dY) > skipAngle * hwAbs(Gear^.dX))) ) then
 begin
-Gear^.dY.isNegative := true;
+// if skipping we move the gear out of water
+if isImpactH then
+begin
+Gear^.dX.isNegative := (not Gear^.dX.isNegative);
+Gear^.X:= Gear^.X + Gear^.dX;
+end
+else
+begin
+Gear^.dY.isNegative := (not Gear^.dY.isNegative);
+Gear^.Y:= Gear^.Y + Gear^.dY;
+end;
 Gear^.dY := Gear^.dY * skipDecay;
 Gear^.dX := Gear^.dX * skipDecay;
 CheckGearDrowning := false;
 PlaySound(sndSkip)
 end
-else
+else // not skipping
 begin
 if not isSubmersible then
 begin
 CheckGearDrowning := true;
 Gear^.State := gstDrowning;
 ResurrectHedgehog(Gear);
 exit(true)
 end
 else
 begin
-Gear^.doStep := @doStepDrowningGear;
+DrownGear(Gear);
 Gear^.State := Gear^.State and (not gstHHDriven);
 s:= ansistring(Gear^.Hedgehog^.Name);
 AddCaption(FormatA(GetEventString(eidDrowned), s), cWhiteColor, capgrpMessage);
 end
 end
 else
-Gear^.doStep := @doStepDrowningGear;
+DrownGear(Gear);
 if Gear^.Kind = gtFlake then
-exit(true) // skip splashes
+exit(true); // skip splashes
 end
+// drown submersible grears if far below map
 else if (Y > cWaterLine + cVisibleWater*4) and
 ((Gear <> CurrentHedgehog^.Gear) or (CurAmmoGear = nil) or (CurAmmoGear^.State and gstSubmersible = 0)) then
-Gear^.doStep:= @doStepDrowningGear;
+DrownGear(Gear);
-if ((not isSubmersible) and (Y < cWaterLine + 64 + Gear^.Radius))
-or (isSubmersible and (Y < cWaterLine + 2 + Gear^.Radius) and (Gear = CurAmmoGear) and ((CurAmmoGear^.Pos = 0)
+isImpactRight:= isImpactH and (abs(X - leftX) > abs(rightX - X));
-and (CurAmmoGear^.dY < _0_01))) then
+isLeaving:= (isSubmersible and (dist2Water = -2 * Gear^.Radius) and (Gear = CurAmmoGear) and (CurAmmoGear^.Pos = 0)
-if Gear^.Density * Gear^.dY > _1 then
+and (((not isImpactH) and CurAmmoGear^.dY.isNegative) or (isImpactH and (isImpactRight = CurAmmoGear^.dX.isNegative))));
+// splash sound
+if ((not isSubmersible) and (dist2Water = -1))
+or isLeaving then
+begin
+// adjust water impact sound on gear speed and density
+if isImpactH then
+hwTmp:= hwAbs(Gear^.Density * Gear^.dX)
+else
+hwTmp:= hwAbs(Gear^.Density * Gear^.dY);
+if hwTmp > _1 then
 PlaySound(sndSplash)
-else if Gear^.Density * Gear^.dY > _0_5 then
+else if hwTmp > _0_5 then
 PlaySound(sndSkip)
 else
 PlaySound(sndDroplet2);
+end;
 end;
+// splash animation
 if ((cReducedQuality and rqPlainSplash) = 0)
-and (((not isSubmersible) and (Y < cWaterLine + 64 + Gear^.Radius))
+and (((not isSubmersible) and (dist2Water = -1))
-or (isSubmersible and (Y < cWaterLine + 2 + Gear^.Radius) and (Gear = CurAmmoGear) and ((CurAmmoGear^.Pos = 0)
+or isLeaving) then
-and (CurAmmoGear^.dY < _0_01)))) then
 begin
-splash:= AddVisualGear(X, cWaterLine, vgtSplash);
+splash:= AddVisualGear(X, Y, vgtSplash);
 if splash <> nil then
+begin
+if isImpactH then
+begin
+splash^.Scale:= abs(hwFloat2Float((Gear^.Density / _3) * Gear^.dX));
+if isImpactRight then
+splash^.Angle:= -90
+else
+splash^.Angle:=  90;
+end
+else
+splash^.Scale:= abs(hwFloat2Float(Gear^.Density / _3 * Gear^.dY));
 with splash^ do
 begin
-Scale:= hwFloat2Float(Gear^.Density / _3 * Gear^.dY);
+if Scale > 1 then Scale:= power(Scale,0.3333)
-if Scale > 1 then Scale:= power(Scale,0.3333)
+else Scale:= Scale + ((1-Scale) / 2);
-else Scale:= Scale + ((1-Scale) / 2);
+if Scale > 1 then Timer:= round(min(Scale*0.0005/cGravityf,4))
-if Scale > 1 then Timer:= round(min(Scale*0.0005/cGravityf,4))
+else Timer:= 1;
-else Timer:= 1;
+// Low Gravity
-// Low Gravity
+FrameTicks:= FrameTicks*Timer;
-FrameTicks:= FrameTicks*Timer;
+end;
 end;
+// eject water drops
 maxDrops := (hwRound(Gear^.Density) * 3) div 2 + round(vdX * hwRound(Gear^.Density) * 6) + round(vdY * hwRound(Gear^.Density) * 6);
 for i:= max(maxDrops div 3, min(32, Random(maxDrops))) downto 0 do
 begin
-particle := AddVisualGear(X - 3 + Random(7), cWaterLine, vgtDroplet);
+if isImpactH then
+begin
+if isImpactRight then
+particle := AddVisualGear(RightX, Y - 3 + Random(7), vgtDroplet)
+else
+particle := AddVisualGear(LeftX, Y - 3 + Random(7), vgtDroplet)
+end
+else
+particle := AddVisualGear(X - 3 + Random(7), cWaterLine, vgtDroplet);
 if particle <> nil then
 with particle^ do
 begin
-dX := dX - vdX / 10;
+// dX and dY were initialized to have a random value on creation (see uVisualGearsList)
-dY := dY - vdY / 5;
+if isImpactH then
+begin
+tmp:= dX;
+if isImpactRight then
+dX:=  dY - vdX / 5
+else
+dX:= -dy + vdX / 5;
+dY:= tmp * (1 + vdY / 10);
+end
+else
+begin
+dX:= dX * (1 + vdX / 10);
+dY:= dY - vdY / 5;
+end;
 if splash <> nil then
 begin
 if splash^.Scale > 1 then
 begin
 dX:= dX * power(splash^.Scale,0.3333); // tone down the droplet height further
 else
 begin
 dX:= dX * splash^.Scale;
 dY:= dY * splash^.Scale
 end
-end
+end;
 end
 end
 end;
 if isSubmersible and (Gear = CurAmmoGear) and (CurAmmoGear^.Pos = 0) then
 CurAmmoGear^.Pos := 1000
 * From the depths (same as from sky, but from sea, with submersible flag set)
 Trying to make the checks a little broader than on first pass to catch things that don't move normally.
 *)
 function WorldWrap(var Gear: PGear): boolean;
-var tdx: hwFloat;
+//var tdx: hwFloat;
 begin
 WorldWrap:= false;
 if WorldEdge = weNone then exit(false);
 if (hwRound(Gear^.X) < LongInt(leftX)) or
 (hwRound(Gear^.X) > LongInt(rightX)) then
 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)
-end
+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)
 else
 tdx:= Gear^.dX;
 Gear^.dX:= -Gear^.dY;
 Gear^.dY:= tdx;
 Gear^.dY.isNegative:= true
 end
-end;
+end};
 (*
 * Window in the sky (Gear moved high into the sky, Y is used to determine X) [unfortunately, not a safe thing to do. shame, I thought aerial bombardment would be kinda neat
 This one would be really easy to freeze game unless it was flagged unfortunately.
 else

changeset 10354	56bd029245fc
parent 10274	07adc8b6288c
child 10356	7d1044267b83