sheepy-clone: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:d5051cc8a313
+:cd355befa683
 			@doStepBallgun,
 			@doStepBomb,
 			@doStepRCPlane,
 			@doStepSniperRifleShot,
 			@doStepJetpack,
-			@doStepMolotov
+			@doStepMolotov,
+			@doStepCase
 			);
 procedure InsertGearToList(Gear: PGear);
 var tmp, ptmp: PGear;
 begin
 gear^.Timer:= cMinesTime*1;
 end;
 gtCase: begin
 gear^.Radius:= 16;
 gear^.Elasticity:= _0_3
+end;
+gtExplosives: begin
+gear^.Radius:= 16;
+gear^.Elasticity:= _0_3;
+gear^.Health:= cBarrelHealth
 end;
 gtDEagleShot: begin
 gear^.Radius:= 1;
 gear^.Health:= 50
 end;
 if i > 23 then i:= 0;
 i:= i mod 12;
 DrawSprite(sprUtility, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i);
 end;
 end;
+gtExplosives: begin
+i:= (GameTicks shr 6) mod 64;
+if i > 18 then i:= 0;
+DrawSprite(sprExplosives, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i);
+end;
 gtDynamite: DrawSprite2(sprDynamite, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 25 + WorldDy, Gear^.Tag and 1, Gear^.Tag shr 1);
 gtClusterBomb: DrawRotated(sprClusterBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
 gtCluster: DrawSprite(sprClusterParticle, hwRound(Gear^.X) - 8 + WorldDx, hwRound(Gear^.Y) - 8 + WorldDy, 0);
 gtFlame: DrawTextureF(SpritesData[sprFlame].Texture, 2 / (Gear^.Tag mod 3 + 2), hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, (GameTicks div 128 + LongWord(Gear^.Tag)) mod 8, 1, 16, 16);
 gtParachute: begin
 var i: LongInt;
 	Gear: PGear;
 begin
 AddGear(0, 0, gtATStartGame, 0, _0, _0, 2000);
+// HACK: just for testing explosives!
+if (GameFlags and gfMines) <> 0 then
+	GameFlags:= (GameFlags or gfExplosives) and not gfMines;
 if (TrainingFlags and tfSpawnTargets) <> 0 then
 	begin
 	TrainingTargetGear:= AddGear(0, 0, gtTarget, 0, _0, _0, 0);
 	FindPlace(TrainingTargetGear, false, 0, LAND_WIDTH);
 	end;
-if ((GameFlags and gfForts) = 0) and ((GameFlags and gfMines) <> 0) then
+if ((GameFlags and gfForts) = 0) then
-	for i:= 0 to Pred(cLandAdditions) do
+	begin
-		begin
+	// TODO: exclude each other or allow both, mines and explosives, on same map?
-		Gear:= AddGear(0, 0, gtMine, 0, _0, _0, 0);
+	if ((GameFlags and gfMines) <> 0) then
-		Gear^.TriggerId:= i + 1;
+		for i:= 0 to Pred(cLandAdditions) do
-		FindPlace(Gear, false, 0, LAND_WIDTH);
+			begin
-{		if(Gear <> nil) then
+			Gear:= AddGear(0, 0, gtMine, 0, _0, _0, 0);
-			ParseCommand('addtrig s' + inttostr(Gear^.TriggerId) + ' 1 5 11 ' +
+			Gear^.TriggerId:= i + 1;
-				inttostr(hwRound(Gear^.X)) + ' ' + inttostr(hwRound(Gear^.Y)) +
+			FindPlace(Gear, false, 0, LAND_WIDTH);
-				' ' + inttostr(Gear^.TriggerId), true);
+			end;
-}		end;
+	if ((GameFlags and gfExplosives) <> 0) then
+		for i:= 0 to Pred(cLandAdditions) do
+			begin
+			Gear:= AddGear(0, 0, gtExplosives, 0, _0, _0, 0);
+			Gear^.TriggerId:= i + 1;
+			FindPlace(Gear, false, 0, LAND_WIDTH);
+			end;
+	end;
 if (GameFlags and gfLowGravity) <> 0 then
 cGravity:= cMaxWindSpeed / 2;
 if (GameFlags and gfVampiric) <> 0 then
 		case Gear^.Kind of
 			gtHedgehog,
 				gtMine,
 				gtCase,
 				gtTarget,
-				gtFlame: begin
+				gtFlame,
+				gtExplosives: begin
 						//{$IFDEF DEBUGFILE}AddFileLog('Damage: ' + inttostr(dmg));{$ENDIF}
 						if (Mask and EXPLNoDamage) = 0 then
 							begin
 							if not Gear^.Invulnerable then
 ApplyDamage(Gear, dmg)
 	if dmg > 0 then
 	case t^.Kind of
 		gtHedgehog,
 			gtMine,
 			gtCase,
-			gtTarget: begin
+			gtTarget,
+			gtExplosives: begin
 if (not t^.Invulnerable) then
 ApplyDamage(t, dmg)
 else
 Gear^.State:= Gear^.State or gstWinner;
 		case Gear^.Kind of
 			gtHedgehog,
 			gtMine,
 			gtTarget,
-			gtCase: begin
+			gtCase,
+			gtExplosives: begin
 					if (Ammo^.Kind = gtDrill) then begin Ammo^.Timer:= 0; exit; end;
 if (not Gear^.Invulnerable) then
 ApplyDamage(Gear, tmpDmg)
 else
 Gear^.State:= Gear^.State or gstWinner;
 				inc(y);
 			until (y >= LAND_HEIGHT) or (CountNonZeroz(x, y, Gear^.Radius - 1, 1) <> 0);
 			if (y - sy > Gear^.Radius * 2)
 				and (y < LAND_HEIGHT)
-				and (CheckGearsNear(x, y - Gear^.Radius, [gtFlame, gtHedgehog, gtMine, gtCase], 110, 110) = nil) then
+				and (CheckGearsNear(x, y - Gear^.Radius, [gtFlame, gtHedgehog, gtMine, gtCase, gtExplosives], 110, 110) = nil) then
 				begin
 				ar[cnt].X:= x;
 				if withFall then ar[cnt].Y:= sy + Gear^.Radius
 							else ar[cnt].Y:= y - Gear^.Radius;
 				inc(cnt)

changeset 2911	cd355befa683
parent 2909	f982208e7f21
child 2914	7db64c269a5b