hedgewars-draft: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:66bb79dd248d
+:29b477319854
 end;
 procedure DeleteGear(Gear: PGear); forward;
 procedure doMakeExplosion(X, Y, Radius: integer; Mask: LongWord); forward;
 procedure AmmoShove(Ammo: PGear; Damage, Power: integer); forward;
+procedure AmmoFlameWork(Ammo: PGear); forward;
 function  CheckGearNear(Gear: PGear; Kind: TGearType; rX, rY: integer): PGear; forward;
 procedure SpawnBoxOfSmth; forward;
 procedure AfterAttack; forward;
 procedure FindPlace(Gear: PGear; withFall: boolean; Left, Right: integer); forward;
 doStepCase,
 doStepDEagleShot,
 doStepDynamite,
 doStepTeamHealthSorter,
 doStepBomb,
-doStepCluster
+doStepCluster,
+doStepShover,
+doStepFlame
 );
 function AddGear(X, Y: integer; Kind: TGearType; State: Cardinal; const dX: real=0.0; dY: real=0.0; Timer: LongWord=0): PGear;
-begin
+const Counter: Longword = 0;
+begin
+inc(Counter);
 {$IFDEF DEBUGFILE}AddFileLog('AddGear: ('+inttostr(x)+','+inttostr(y)+')');{$ENDIF}
 New(Result);
 {$IFDEF DEBUGFILE}AddFileLog('AddGear: handle = '+inttostr(integer(Result)));{$ENDIF}
 FillChar(Result^, sizeof(TGear), 0);
 Result.X:= X;
 gtClusterBomb: begin
 Result.Radius:= 4;
 Result.Elasticity:= 0.6;
 Result.Friction:= 0.995;
 Result.Timer:= Timer
+end;
+gtFlame: begin
+Result.Angle:= Counter mod 64;
+Result.Radius:= 1;
+Result.Health:= 2;
+Result.dY:= (getrandom - 0.8) * 0.03;
+Result.dX:= (getrandom - 0.5) * 0.4
 end;
 end;
 if GearsList = nil then GearsList:= Result
 else begin
 GearsList.PrevGear:= Result;
 posCaseAmmo  : DrawSprite(sprCase, Round(Gear.X) - 16 + WorldDx, Round(Gear.Y) - 16 + WorldDy, 0, Surface);
 posCaseHealth: DrawSprite(sprFAid, Round(Gear.X) - 24 + WorldDx, Round(Gear.Y) - 24 + WorldDy, (GameTicks shr 6) mod 13, Surface);
 end;
 gtClusterBomb: DrawSprite(sprClusterBomb, Round(Gear.X) - 8 + WorldDx, Round(Gear.Y) - 8 + WorldDy, trunc(Gear.DirAngle), Surface);
 gtCluster: DrawSprite(sprClusterParticle, Round(Gear.X) - 8 + WorldDx, Round(Gear.Y) - 8 + WorldDy, 0, Surface);
+gtFlame: DrawSprite(sprFlame, Round(Gear.X) - 8 + WorldDx, Round(Gear.Y) - 8 + WorldDy,(GameTicks div 128 + Gear.Angle) mod 8, Surface);
 end;
 Gear:= Gear.NextGear
 end;
 end;
 begin
 dmg:= dmg shr 1;
 case Gear.Kind of
 gtHedgehog,
 gtMine,
-gtCase: begin
+gtCase,
+gtFlame: begin
 if (Mask and EXPLNoDamage) = 0 then inc(Gear.Damage, dmg);
 if ((Mask and EXPLDoNotTouchHH) = 0) or (Gear.Kind <> gtHedgehog) then
 begin
 Gear.dX:= Gear.dX + dmg / 200 * Sign(Gear.X - X);
 Gear.dY:= Gear.dY + dmg / 200 * Sign(Gear.Y - Y);
 end;
 procedure AmmoShove(Ammo: PGear; Damage, Power: integer);
 var t: PGearArray;
 i: integer;
-Gear: PGear;
 begin
 t:= CheckGearsCollision(Ammo);
 i:= t.Count;
 while i > 0 do
 begin
 dec(i);
-case t.ar[i].Kind of
+if (t.ar[i].State and gstNoDamage) = 0 then
+case t.ar[i].Kind of
 gtHedgehog,
 gtMine,
 gtCase: begin
 inc(t.ar[i].Damage, Damage);
 t.ar[i].dX:= Ammo.dX * Power * 0.01;
 t.ar[i].Active:= true;
 DeleteCI(t.ar[i]);
 FollowGear:= t.ar[i]
 end;
 end
-end;
+end
-Gear:= GearsList;
-while Gear <> nil do
-begin
-if Round(sqrt(sqr(Gear.X - Ammo.X) + sqr(Gear.Y - Ammo.Y))) < 50 then // why 50?
-Gear.Active:= true;
-Gear:= Gear.NextGear
-end
 end;
 procedure AssignHHCoords;
 var Gear: PGear;
 begin
 exit
 end;
 t:= t.NextGear
 end;
 Result:= nil
+end;
+procedure AmmoFlameWork(Ammo: PGear);
+var t: PGear;
+begin
+t:= GearsList;
+while t <> nil do
+begin
+if (t.Kind = gtHedgehog) and (t.Y < Ammo.Y) then
+if sqr(Ammo.X - t.X) + sqr(Ammo.Y - t.Y - cHHRadius) * 2 <= sqr(4) then
+begin
+inc(t.Damage, 5);
+t.dX:= t.dX + (t.X - Ammo.X) * 0.02;
+t.dY:= - 0.25;
+t.Active:= true;
+DeleteCI(t);
+FollowGear:= t
+end;
+t:= t.NextGear
+end;
 end;
 function CheckGearsNear(mX, mY: integer; Kind: TGearsType; rX, rY: integer): PGear;
 var t: PGear;
 begin

changeset 79	29b477319854
parent 78	66bb79dd248d
child 80	3c3dc6a148ca