sheepy-clone: comparison hedgewars/uGearsHandlersMess.pas

equal deleted inserted replaced

-:ef2592892432
+:966ae86aac75
 procedure doStepBee(Gear: PGear);
 begin
 AllInactive := false;
 Gear^.X := Gear^.X + Gear^.dX;
 Gear^.Y := Gear^.Y + Gear^.dY;
+WorldWrap(Gear);
 Gear^.dY := Gear^.dY + cGravity;
 CheckGearDrowning(Gear);
 CheckCollision(Gear);
 if (Gear^.State and gstCollision) <> 0 then
 begin
 // TODO: do real calculation?
 land:= TestCollisionXwithGear(Gear, 2);
 if land = 0 then land:= TestCollisionYwithGear(Gear,-2);
 if land = 0 then land:= TestCollisionXwithGear(Gear,-2);
 if land = 0 then land:= TestCollisionYwithGear(Gear, 2);
-if (land <> 0) and (land and lfBouncy = 0) then
+if (land <> 0) and ((land and lfBouncy = 0) or ((Gear^.State and gstMoving) = 0)) then
 begin
 if ((Gear^.State and gstMoving) <> 0) or (not isZero(Gear^.dX)) or (not isZero(Gear^.dY)) then
 begin
 PlaySound(sndRopeAttach);
 Gear^.dX:= _0;
 2: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtNapalmBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0);
 3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, gsttmpFlag, cBombsSpeed * Gear^.Tag, _0, Gear^.Timer + 1);
 //4: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtWaterMelon, 0, cBombsSpeed *
 //                 Gear^.Tag, _0, 5000);
 end;
-Gear^.dX := Gear^.dX + int2hwFloat(30 * Gear^.Tag);
+Gear^.dX := Gear^.dX + int2hwFloat(Gear^.Damage * Gear^.Tag);
 if CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y)) then
 FollowGear^.State:= FollowGear^.State or gstSubmersible;
 StopSoundChan(Gear^.SoundChannel, 4000);
 end;
 Gear^.Tag := -1;
 Gear^.X := int2hwFloat(max(LAND_WIDTH,4096) + 2048);
 end;
 Gear^.Y := int2hwFloat(topY-300);
-Gear^.dX := int2hwFloat(Gear^.Target.X - 5 * Gear^.Tag * 15);
+Gear^.dX := int2hwFloat(Gear^.Target.X) - int2hwFloat(Gear^.Tag * Gear^.Health * Gear^.Damage) / 2;
 // calcs for Napalm Strike, so that it will hit the target (without wind at least :P)
 if (Gear^.State = 2) then
 Gear^.dX := Gear^.dX - cBombsSpeed * Gear^.Tag * 900
 // calcs for regular falling gears
 else if (int2hwFloat(Gear^.Target.Y) - Gear^.Y > _0) then
 Gear^.dX := Gear^.dX - cBombsSpeed * hwSqrt((int2hwFloat(Gear^.Target.Y) - Gear^.Y) * 2 /
 cGravity) * Gear^.Tag;
-Gear^.Health := 6;
 Gear^.doStep := @doStepAirAttackWork;
 Gear^.SoundChannel := LoopSound(sndPlane, 4000);
 end;
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepPoisonCloud(Gear: PGear);
 begin
-WorldWrap(Gear);
+// don't bounce
+if WorldEdge <> weBounce then
+WorldWrap(Gear);
 if Gear^.Timer = 0 then
 begin
 DeleteGear(Gear);
 exit
 end;
 // do 1/2 current hp worth of damage if extra damage is enabled (1/3 damage if not)
 if cDamageModifier > _1 then
 d:= 2
 else
 d:= 3;
-// always round up
-if dmg mod d > 0 then
+// always rounding down
-dmg:= dmg div d + 1
+dmg:= dmg div d;
-else
-dmg:= dmg div d;
+if dmg > 0 then
+ApplyDamage(tmp, CurrentHedgehog, dmg, dsUnknown);
-ApplyDamage(tmp, CurrentHedgehog, dmg, dsUnknown);
 end;
 end;
 if (tmp^.Kind <> gtHedgehog) or (dmg > 0) or (tmp^.Health > tmp^.Damage) then
 begin
 begin
 // now really resurrect the hogs with the hp saved in the graves
 for i:= 0 to graves.size - 1 do
 if graves.ar^[i]^.Health > 0 then
 begin
-resgear := AddGear(hwRound(graves.ar^[i]^.X), hwRound(graves.ar^[i]^.Y), gtHedgehog, gstWait, _0, _0, 0);
+resgear := AddGear(hwRound(graves.ar^[i]^.X), hwRound(graves.ar^[i]^.Y), gtHedgehog, gstWait, _0, _0, 0,graves.ar^[i]^.Pos);
 resgear^.Hedgehog := graves.ar^[i]^.Hedgehog;
 resgear^.Health := graves.ar^[i]^.Health;
 PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := resgear;
 graves.ar^[i]^.Message:= graves.ar^[i]^.Message or gmDestroy;
 graves.ar^[i]^.Active:= true;
 spewing ice cubes.  The cubes will be visual gears only.  The scatter from them and the impact snow dust should help hide imprecisions in things like the GearsNear effect.
 For now we assume a "ray" like a deagle projected out from the gun.
 All these effects assume the ray's angle is not changed and that the target type was unchanged over a number of ticks.  This is a simplifying assumption for "gun was applying freezing effect to the same target".
 * When fired at water a layer of ice textured land is added above the water.
 * When fired at non-ice land (land and lfLandMask and not lfIce) the land is overlaid with a thin layer of ice textured land around that point (say, 1 or 2px into land, 1px above). For attractiveness, a slope would probably be needed.
-* When fired at a hog (land and $00FF <> 0), while the hog is targetted, the hog's state is set to frozen.  As long as the gun is on the hog, a frozen hog sprite creeps up from the feet to the head.  If the effect is interrupted before reaching the top, the freezing state is cleared.
+* When fired at a hog (land and $00FF <> 0), while the hog is targetted, the hog's state is set to frozen.
-A frozen hog will animate differently.  To be decided, but possibly in a similar fashion to a grave when it comes to explosions.  The hog might (possibly) not be damaged by explosions.  This might make freezing potentially useful for friendlies in a bad position.  It might be better to allow damage though.
+As long as the gun is on the hog, a frozen hog sprite creeps up from the feet to the head.
-A frozen hog stays frozen for a certain number of turns. Each turn the frozen overlay becomes fainter, until it fades and the hog animates normally again.
+If the effect is interrupted before reaching the top, the freezing state is cleared.
+A frozen hog will animate differently.
+To be decided, but possibly in a similar fashion to a grave when it comes to explosions.
+The hog might (possibly) not be damaged by explosions.
+This might make freezing potentially useful for friendlies in a bad position.
+It might be better to allow damage though.
+A frozen hog stays frozen for a certain number of turns.
+Each turn the frozen overlay becomes fainter, until it fades and the hog animates normally again.
 *)
 procedure updateFuel(Gear: PGear);
 var

branch	ios-revival
changeset 11312	966ae86aac75
parent 11304	a20f416c91ec
child 11337	aa3f886c6298